[PATCH] gnu: Add libicns

[PATCH] gnu: Add libicns

[Brendan Tildesley]

[-- Attachment #1: Type: text/plain, Size: 1 bytes --]



[-- Attachment #2: 0001-gnu-Add-libicns.patch --]
[-- Type: text/x-patch, Size: 1923 bytes --]

From 64ca4155a754a93b26a1002185950f49469197f3 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
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 | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 4fdc4ae..7f1d237 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -147,6 +147,34 @@ 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
+                   "https://sourceforge.net/projects/icns/files/libicns-"
+                   version ".tar.gz/download"))
+             (file-name (string-append "libicns-" version ".tar.gz"))
+             (sha256 (base32
+                      "1hjm8lwap7bjyyxsyi94fh5817xzqhk4kb5y0b7mb6675xw10prk"))))
+    (build-system gnu-build-system)
+    (arguments
+     ;; no tests
+     '(#:tests? #f))
+    (inputs `(("libpng" ,libpng)
+              ("jasper" ,jasper)))
+    (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).  icns2png and png2icns are provided to convert between PNG
+and ICNS. icns2png will extract image files from ICNS files under names like
+\"Foo_48x48x32.png\" useful for installing for use with .desktop files.")
+    (license (list license:lgpl2.1+  ; libicns
+                   license:gpl2+)))) ; icns2png, png2icns, icontainer2png
+
 (define-public libtiff
   (package
    (name "libtiff")
-- 
2.9.3

[PATCH] gnu: Add libicns

[Brendan Tildesley]

[-- Attachment #1: Type: text/plain, Size: 1 bytes --]



[-- Attachment #2: 0001-gnu-Add-libicns.patch --]
[-- Type: text/x-patch, Size: 1923 bytes --]

From 64ca4155a754a93b26a1002185950f49469197f3 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
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 | 28 ++++++++++++++++++++++++++++
 1 file changed, 28 insertions(+)

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 4fdc4ae..7f1d237 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -147,6 +147,34 @@ 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
+                   "https://sourceforge.net/projects/icns/files/libicns-"
+                   version ".tar.gz/download"))
+             (file-name (string-append "libicns-" version ".tar.gz"))
+             (sha256 (base32
+                      "1hjm8lwap7bjyyxsyi94fh5817xzqhk4kb5y0b7mb6675xw10prk"))))
+    (build-system gnu-build-system)
+    (arguments
+     ;; no tests
+     '(#:tests? #f))
+    (inputs `(("libpng" ,libpng)
+              ("jasper" ,jasper)))
+    (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).  icns2png and png2icns are provided to convert between PNG
+and ICNS. icns2png will extract image files from ICNS files under names like
+\"Foo_48x48x32.png\" useful for installing for use with .desktop files.")
+    (license (list license:lgpl2.1+  ; libicns
+                   license:gpl2+)))) ; icns2png, png2icns, icontainer2png
+
 (define-public libtiff
   (package
    (name "libtiff")
-- 
2.9.3

Re: [PATCH] gnu: Add libicns

[Marius Bakke]

Brendan Tildesley <brendan.tildesley@openmailbox.org> writes:

> From 64ca4155a754a93b26a1002185950f49469197f3 Mon Sep 17 00:00:00 2001
> From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
> Date: Sat, 3 Sep 2016 05:53:56 +1000
> Subject: [PATCH] gnu: Add libicns
>
> * gnu/packages/image.scm (libicns): New variable

Thanks! Nit-pick: we end commit messages and descriptions with a ".",
but this can be fixed by the committer.
  
> +(define-public libicns
> +  (package
> +    (name "libicns")
> +    (version "0.8.1")
> +    (source (origin
> +             (method url-fetch)
> +             (uri (string-append
> +                   "https://sourceforge.net/projects/icns/files/libicns-"

Could you change this to the mirror://sourceforge system?

> +                   version ".tar.gz/download"))
> +             (file-name (string-append "libicns-" version ".tar.gz"))

Changing file-name is only necessary if it doesn't already use a
"package-version.ext" style name, which this appears to do. `guix lint`
will tell whether this is needed.

> +             (sha256 (base32
> +                      "1hjm8lwap7bjyyxsyi94fh5817xzqhk4kb5y0b7mb6675xw10prk"))))
> +    (build-system gnu-build-system)
> +    (arguments
> +     ;; no tests
> +     '(#:tests? #f))
> +    (inputs `(("libpng" ,libpng)
> +              ("jasper" ,jasper)))

We typically add the inputs on a new line, but I have no strong opinions
on this.

> +    (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).  icns2png and png2icns are provided to convert between PNG

When describing command-line tools, it looks prettier in generated
documentation by using `@command(icns2png)`, but this is not always the
case or necessary.

> +and ICNS. icns2png will extract image files from ICNS files under names like
> +\"Foo_48x48x32.png\" useful for installing for use with .desktop files.")
> +    (license (list license:lgpl2.1+  ; libicns
> +                   license:gpl2+)))) ; icns2png, png2icns, icontainer2png

A couple of files are "lgpl2+" as well.

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.

The rest looks fine to me. Can you send an updated patch?

Thanks!
Marius

Re: [PATCH] gnu: Add libicns

[Marius Bakke]

Marius Bakke <mbakke@fastmail.com> 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

Re: [PATCH] gnu: Add libicns

[Brendan Tildesley]

[-- Attachment #1: Type: text/plain, Size: 681 bytes --]

On 2016-09-03 22:38, Marius Bakke wrote:
> Marius Bakke <mbakke@fastmail.com> 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.


[-- Attachment #2: 0001-gnu-Add-libicns.patch --]
[-- Type: text/x-patch, Size: 2514 bytes --]

From b04ad5e40ac5befe30832ffbcf3b4283b4ae1d63 Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
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

Re: [PATCH] gnu: Add libicns

[Marius Bakke]

Brendan Tildesley <brendan.tildesley@openmailbox.org> writes:

> On 2016-09-03 22:38, Marius Bakke wrote:
>> Marius Bakke <mbakke@fastmail.com> 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.

Sorry about that! Now it re-generates libtool and friends, so it doesn't
hurt, at least. I only have a couple of remarks, and then someone with
commit access can take a final glance.

> From b04ad5e40ac5befe30832ffbcf3b4283b4ae1d63 Mon Sep 17 00:00:00 2001
> From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
> 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)

I don't think this is required.

>    #: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)

It built fine with the latest libpng, is there a specific reason to use
this version?

> +       ("jasper" ,jasper)))
> +    (native-inputs
> +     `(("autoconf" ,autoconf)
> +       ("automake" ,automake)
> +       ("libtool" ,libtool)))
> +    (arguments
> +     ;; no tests
> +     `(#:tests? #f

Typically we add the "no tests" remark at the end of the line, i.e.
`(#:tests? #f ; No tests.

> +       #:phases
> +       (modify-phases %standard-phases
> +         (add-before 'configure 'autoconf

I would call this phase "autoreconf", since autoconf is another tool.

> +           (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
                                      ^^^
                         This probably should not be capitalized.

> +extracting icontainer icon files.")
> +    (license (list license:lgpl2.1+     ; libicns
> +                   license:lgpl2.0+     ; src/apidocs.*
> +                   license:gpl2+))))    ; icns2png, png2icns, icontainer2png

The rest of the patch looks good to me.

Thanks again!
Marius

Re: [PATCH] gnu: Add libicns

[Brendan Tildesley]

On 2016-09-04 04:59, Marius Bakke wrote:
> Brendan Tildesley <brendan.tildesley@openmailbox.org> writes:
>
>> On 2016-09-03 22:38, Marius Bakke wrote:
>>> Marius Bakke <mbakke@fastmail.com> 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.
> Sorry about that! Now it re-generates libtool and friends, so it doesn't
> hurt, at least. I only have a couple of remarks, and then someone with
> commit access can take a final glance.
>
>> From b04ad5e40ac5befe30832ffbcf3b4283b4ae1d63 Mon Sep 17 00:00:00 2001
>> From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
>> 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)
> I don't think this is required.
>
>>    #: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)
> It built fine with the latest libpng, is there a specific reason to use
> this version?
>
I just notice the configure script wasn't looking for any newer version.
I was using icns2png to
extract png file, but probably wasn't utilising libpng to do this? as
you can see it is built without
support for larger icons, but I never used that feature. This is old
software that hasn't been
updated since 2012. Perhaps it could be made to work but I wouldn't know
myself. Depends on the
standards of Guix developers.

checking libpng/png.h usability... no
checking libpng/png.h presence... no
checking for libpng/png.h... no
checking libpng10/png.h usability... no
checking libpng10/png.h presence... no
checking for libpng10/png.h... no
checking libpng12/png.h usability... yes
checking libpng12/png.h presence... yes
checking for libpng12/png.h... yes
checking for jas_init in -ljasper... no
checking for opj_setup_decoder in -lopenjpeg2... no
checking for opj_setup_decoder in -lopenjpeg... no
configure: WARNING: libopenjpeg or libjasper jp2000 codec libraries not
found
configure: WARNING: libicns will be built without 256x256 and 512x512
support

>
> The rest of the patch looks good to me.
>
> Thanks again!
> Marius

Thanks. If I posted a fix, I'd just end up making some new mistakes, so
I'll just leave it to be added!

Re: [PATCH] gnu: Add libicns

[Marius Bakke]

[-- Attachment #1: Type: text/plain, Size: 1439 bytes --]

Brendan Tildesley <brendan.tildesley@openmailbox.org> writes:

> I just notice the configure script wasn't looking for any newer version.

[...]

> checking libpng/png.h usability... no
> checking libpng/png.h presence... no
> checking for libpng/png.h... no
> checking libpng10/png.h usability... no
> checking libpng10/png.h presence... no
> checking for libpng10/png.h... no
> checking libpng12/png.h usability... yes
> checking libpng12/png.h presence... yes
> checking for libpng12/png.h... yes

You cut off the important lines! Here is how it looks with the latest
libpng in inputs:

checking for png_create_read_struct in -lpng... yes
checking png.h usability... yes                      <---
checking png.h presence... yes                       <---
checking for png.h... yes                            <---
checking libpng/png.h usability... no
checking libpng/png.h presence... no
checking for libpng/png.h... no
checking libpng10/png.h usability... no
checking libpng10/png.h presence... no
checking for libpng10/png.h... no
checking libpng12/png.h usability... no
checking libpng12/png.h presence... no
checking for libpng12/png.h... no

>>
>> The rest of the patch looks good to me.
>>
>> Thanks again!
>> Marius
>
> Thanks. If I posted a fix, I'd just end up making some new mistakes, so
> I'll just leave it to be added!

I did the mentioned adjustments and attached a new patch.

Hope I did not scare you off! :)

~marius


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-libicns.patch --]
[-- Type: text/x-patch, Size: 2287 bytes --]

From 0efb2e7cb5c3344b49e30af57efcdd5b1136ac7f Mon Sep 17 00:00:00 2001
From: Brendan Tildesley <brendan.tildesley@openmailbox.org>
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 | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/gnu/packages/image.scm b/gnu/packages/image.scm
index 4fdc4ae..c1b79f3 100644
--- a/gnu/packages/image.scm
+++ b/gnu/packages/image.scm
@@ -147,6 +147,44 @@ 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)
+       ("jasper" ,jasper)))
+    (native-inputs
+     `(("autoconf" ,autoconf)
+       ("automake" ,automake)
+       ("libtool" ,libtool)))
+    (arguments
+     `(#:tests? #t ; No tests.
+       #:phases
+       (modify-phases %standard-phases
+         (add-before 'configure 'autoreconf
+           (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

Re: [PATCH] gnu: Add libicns

[David Craven]

Thanks Marius and Brendan!

I removed the autotools inputs and build-phase, since the release
tarball already contains a configure script and fixed some
indentation.

Pushed as f5e4229a075e7aca255ab54d4e98526409520c62.