From mboxrd@z Thu Jan 1 00:00:00 1970 From: Brendan Tildesley Subject: Re: [PATCH] gnu: Add libicns Date: Sat, 3 Sep 2016 23:16:49 +1000 Message-ID: <6d93862f-c86e-e064-2392-3726c92e06e8@openmailbox.org> References: <3b92e609-3e2f-9f3e-3294-0e8f7a3ae558@openmailbox.org> <87a8fpqnvx.fsf@ike.i-did-not-set--mail-host-address--so-tickle-me> <874m5xqhu6.fsf@ike.i-did-not-set--mail-host-address--so-tickle-me> Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="------------9B542120BD0335A852142B43" Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:53824) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bgAoi-0004kH-1z for guix-devel@gnu.org; Sat, 03 Sep 2016 09:17:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1bgAod-0006gD-04 for guix-devel@gnu.org; Sat, 03 Sep 2016 09:17:02 -0400 Received: from smtp23.openmailbox.org ([62.4.1.57]:36456 helo=smtp8.openmailbox.org) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1bgAoc-0006g9-M5 for guix-devel@gnu.org; Sat, 03 Sep 2016 09:16:58 -0400 In-Reply-To: <874m5xqhu6.fsf@ike.i-did-not-set--mail-host-address--so-tickle-me> List-Id: "Development of GNU Guix and the GNU System distribution." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-devel-bounces+gcggd-guix-devel=m.gmane.org@gnu.org Sender: "Guix-devel" To: guix-devel@gnu.org This is a multi-part message in MIME format. --------------9B542120BD0335A852142B43 Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit On 2016-09-03 22:38, Marius Bakke wrote: > Marius Bakke writes: > >> Additionally this package bundles "m4" even if it doesn't use it. Can >> you remove it with a "origin" snippet? See e.g. "xcb-util-xrm" for how >> that's done. > My mistake, it does appear to use those files, and it's not actually m4. > I think using the generated libtool is probably OK. > > Alternatively it can be re-generated by adding a phase that invokes > "autoreconf -vif". I'm not actually sure if this is desired, so just > leave it for now. > > Thank you, > Marius Ah, well that lost me a bit of time. Anyway, this update should work just fine. It was reproducible for me too. --------------9B542120BD0335A852142B43 Content-Type: text/x-patch; name="0001-gnu-Add-libicns.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0001-gnu-Add-libicns.patch" >From b04ad5e40ac5befe30832ffbcf3b4283b4ae1d63 Mon Sep 17 00:00:00 2001 From: Brendan Tildesley Date: Sat, 3 Sep 2016 05:53:56 +1000 Subject: [PATCH] gnu: Add libicns. * gnu/packages/image.scm (libicns): New variable. --- gnu/packages/image.scm | 40 ++++++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm index 4fdc4ae..1b21306 100644 --- a/gnu/packages/image.scm +++ b/gnu/packages/image.scm @@ -48,6 +48,7 @@ #:use-module (guix download) #:use-module (guix build-system gnu) #:use-module (guix build-system cmake) + #:use-module (guix utils) #:use-module (srfi srfi-1)) (define-public libpng @@ -147,6 +148,45 @@ maximum quality factor.") (license license:gpl2+) (home-page "http://www.kokkonen.net/tjko/projects.html#jpegoptim"))) +(define-public libicns + (package + (name "libicns") + (version "0.8.1") + (source (origin + (method url-fetch) + (uri (string-append + "mirror://sourceforge/icns/libicns-" version ".tar.gz")) + (sha256 (base32 + "1hjm8lwap7bjyyxsyi94fh5817xzqhk4kb5y0b7mb6675xw10prk")))) + (build-system gnu-build-system) + (inputs + `(("libpng" ,libpng-1.2) + ("jasper" ,jasper))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("libtool" ,libtool))) + (arguments + ;; no tests + `(#:tests? #f + #:phases + (modify-phases %standard-phases + (add-before 'configure 'autoconf + (lambda _ + (zero? (system* "autoreconf" "-vfi"))))))) + (home-page "http://icns.sourceforge.net/") + (synopsis "Library for handling Mac OS icns resource files") + (description + "Libicns is a library for the manipulation of Mac OS IconFamily resource +type files (ICNS). @command{icns2png} and @command{png2icns} are provided to +convert between PNG and ICNS. @command{icns2png} will extract image files from +ICNS files under names like \"Foo_48x48x32.png\" useful for installing for use +with .desktop files. Additionally, @Command{icontainer2png} is provided for +extracting icontainer icon files.") + (license (list license:lgpl2.1+ ; libicns + license:lgpl2.0+ ; src/apidocs.* + license:gpl2+)))) ; icns2png, png2icns, icontainer2png + (define-public libtiff (package (name "libtiff") -- 2.9.3 --------------9B542120BD0335A852142B43--