[PATCH] gnu: Add adwaita-icon-theme.

[PATCH] gnu: Add adwaita-icon-theme.

[宋文武]

* gnu/packages/gnome.scm (adwaita-icon-theme): New variable.
---
 gnu/packages/gnome.scm | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 8adcbdd..2f5f125 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -393,6 +393,22 @@ update-desktop-database: updates the database containing a cache of MIME types
      "Icons for the GNOME desktop.")
     (license license:lgpl3))) ; or Creative Commons BY-SA 3.0
 
+(define-public adwaita-icon-theme
+  (package (inherit gnome-icon-theme)
+    (name "adwaita-icon-theme")
+    (version "3.16.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://gnome/sources/" name "/"
+                                  (version-major+minor version) "/"
+                                  name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "1cbfdypxfg74krqrklh4za64jhvskbp206l14fs739cw14xsvj53"))))
+    (native-inputs
+     ;; XXX: gtk-encode-symbolic-svg lacks SVG support.
+     (alist-delete "gtk+" (package-native-inputs gnome-icon-theme)))))
+
 (define-public shared-mime-info
   (package
     (name "shared-mime-info")
-- 
2.2.1

Re: [PATCH] gnu: Add adwaita-icon-theme.

[Ludovic Courtès]

宋文武 <iyzsong@gmail.com> skribis:

> * gnu/packages/gnome.scm (adwaita-icon-theme): New variable.

[...]

> +(define-public adwaita-icon-theme
> +  (package (inherit gnome-icon-theme)
> +    (name "adwaita-icon-theme")
> +    (version "3.16.0")
> +    (source (origin
> +              (method url-fetch)
> +              (uri (string-append "mirror://gnome/sources/" name "/"
> +                                  (version-major+minor version) "/"
> +                                  name "-" version ".tar.xz"))
> +              (sha256
> +               (base32
> +                "1cbfdypxfg74krqrklh4za64jhvskbp206l14fs739cw14xsvj53"))))
> +    (native-inputs
> +     ;; XXX: gtk-encode-symbolic-svg lacks SVG support.
> +     (alist-delete "gtk+" (package-native-inputs gnome-icon-theme)))))

Why is this ‘alist-delete’ needed?  Perhaps you just need to expound the
comment.

Also, I think specific ‘synopsis’ and ‘description’ need to be provided.

WDYT?

Thanks,
Ludo’.

Re: [PATCH] gnu: Add adwaita-icon-theme.

[宋文武]

Ludovic Courtès <ludo@gnu.org> writes:

> 宋文武 <iyzsong@gmail.com> skribis:
>
>> * gnu/packages/gnome.scm (adwaita-icon-theme): New variable.
>
> [...]
>
>> +(define-public adwaita-icon-theme
>> +  (package (inherit gnome-icon-theme)
>> +    (name "adwaita-icon-theme")
>> +    (version "3.16.0")
>> +    (source (origin
>> +              (method url-fetch)
>> +              (uri (string-append "mirror://gnome/sources/" name "/"
>> +                                  (version-major+minor version) "/"
>> +                                  name "-" version ".tar.xz"))
>> +              (sha256
>> +               (base32
>> +                "1cbfdypxfg74krqrklh4za64jhvskbp206l14fs739cw14xsvj53"))))
>> +    (native-inputs
>> +     ;; XXX: gtk-encode-symbolic-svg lacks SVG support.
>> +     (alist-delete "gtk+" (package-native-inputs gnome-icon-theme)))))
>
> Why is this ‘alist-delete’ needed?  Perhaps you just need to expound the
> comment.
With 'gtk+', it will:
1. use gtk-update-icon-cache to build a index-theme.cache       (ok)
2. use gtk-encode-symbolic-svg to convert symbolic SVGs to PNGs (failed)

The reason is gtk-encode-symbolic-svg lacks librsvg support for
gdk-pixbuf, maybe we should wrap it with GDK_PIXBUF_MODULE_FILE.
>
> Also, I think specific ‘synopsis’ and ‘description’ need to be
> provided.
The gnome-icon-theme was renamed to adwaita-icon-theme after 3.12,
So, I think the 'synopsis' and 'description' applied too.
>
> WDYT?
I plan to fix the 'gtk-encode-symbolic-svg' and remove the
'alist-delete'.

Thanks for review!
>
> Thanks,
> Ludo’.

Re: [PATCH] gnu: Add adwaita-icon-theme.

[Ludovic Courtès]

宋文武 <iyzsong@gmail.com> skribis:

> Ludovic Courtès <ludo@gnu.org> writes:
>
>> 宋文武 <iyzsong@gmail.com> skribis:
>>
>>> * gnu/packages/gnome.scm (adwaita-icon-theme): New variable.
>>
>> [...]
>>
>>> +(define-public adwaita-icon-theme
>>> +  (package (inherit gnome-icon-theme)
>>> +    (name "adwaita-icon-theme")
>>> +    (version "3.16.0")
>>> +    (source (origin
>>> +              (method url-fetch)
>>> +              (uri (string-append "mirror://gnome/sources/" name "/"
>>> +                                  (version-major+minor version) "/"
>>> +                                  name "-" version ".tar.xz"))
>>> +              (sha256
>>> +               (base32
>>> +                "1cbfdypxfg74krqrklh4za64jhvskbp206l14fs739cw14xsvj53"))))
>>> +    (native-inputs
>>> +     ;; XXX: gtk-encode-symbolic-svg lacks SVG support.
>>> +     (alist-delete "gtk+" (package-native-inputs gnome-icon-theme)))))
>>
>> Why is this ‘alist-delete’ needed?  Perhaps you just need to expound the
>> comment.
> With 'gtk+', it will:
> 1. use gtk-update-icon-cache to build a index-theme.cache       (ok)
> 2. use gtk-encode-symbolic-svg to convert symbolic SVGs to PNGs (failed)
>
> The reason is gtk-encode-symbolic-svg lacks librsvg support for
> gdk-pixbuf, maybe we should wrap it with GDK_PIXBUF_MODULE_FILE.

Ah I see.  Then what about having the comment say something like “Remove
GTK+ so that gtk-encode-symbolic-svg isn’t invoked since it is currently
broken.”?

>> Also, I think specific ‘synopsis’ and ‘description’ need to be
>> provided.
> The gnome-icon-theme was renamed to adwaita-icon-theme after 3.12,
> So, I think the 'synopsis' and 'description' applied too.

Ah OK, perfect.

Feel free to push with the amended comment.

>> WDYT?
> I plan to fix the 'gtk-encode-symbolic-svg' and remove the
> 'alist-delete'.

Even better.  :-)  That can come as a later commit, if you want.

Thank you!

Ludo’.

Re: [PATCH] gnu: Add adwaita-icon-theme.

[Federico Beffa]

> With 'gtk+', it will:
> 1. use gtk-update-icon-cache to build a index-theme.cache       (ok)
> 2. use gtk-encode-symbolic-svg to convert symbolic SVGs to PNGs (failed)

To enable the SVG functionality of gdk-pixbuf you have to refer to the
cache in the librsvg package, not the default in the gdk-pixbuf
package. See gnome-themes-standard.

Regards,
Fede

Re: [PATCH] gnu: Add adwaita-icon-theme.

[宋文武]

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

Here are updated patches:


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-gtk-Add-SVG-support-to-gtk-encode-symbolic-svg.patch --]
[-- Type: text/x-patch, Size: 1741 bytes --]

From ff7e16bc8b7e803d49d5ee880f31f3f4e1660d3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Tue, 19 May 2015 16:32:09 +0800
Subject: [PATCH 1/2] gnu: gtk+: Add SVG support to 'gtk-encode-symbolic-svg'.

* gnu/packages/gtk.scm (gtk+)[inputs]: Add librsvg.
  [arguments]: Add 'wrap-gtk-encode-symbolic-svg' phase.
---
 gnu/packages/gtk.scm | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 8a5a309..2166aeb 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -501,7 +501,8 @@ application suites.")
       ("libxdamage" ,libxdamage)
       ("pango" ,pango)))
    (inputs
-    `(("libxml2" ,libxml2)
+    `(("librsvg" ,librsvg)                        ;for gtk-encode-symbolic-svg
+      ("libxml2" ,libxml2)
       ("cups" ,cups)))                            ;for printing support
    (native-inputs
     `(("perl" ,perl)
@@ -533,7 +534,16 @@ application suites.")
                         "demos/gtk-demo/Makefile.in")
            (("gtk-update-icon-cache") "$(bindir)/gtk-update-icon-cache"))
          #t)
-       %standard-phases)))))
+       (alist-cons-after
+        'install 'wrap-gtk-encode-symbolic-svg
+        (lambda* (#:key inputs outputs #:allow-other-keys)
+          (let* ((out (assoc-ref outputs "out"))
+                 (prog (string-append out "/bin/gtk-encode-symbolic-svg"))
+                 (librsvg (assoc-ref inputs "librsvg"))
+                 (loaders.cache (find-files librsvg "^loaders\\.cache$")))
+            (wrap-program prog
+              `("GDK_PIXBUF_MODULE_FILE" = ,loaders.cache))))
+        %standard-phases))))))
 
 ;;;
 ;;; Guile bindings.
-- 
2.2.1


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #3: 0002-gnu-Add-adwaita-icon-theme.patch --]
[-- Type: text/x-patch, Size: 1402 bytes --]

From f9aa59c1aca6e30f217d7d2e1c8ae5c6774b66c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
Date: Tue, 12 May 2015 18:42:37 +0800
Subject: [PATCH 2/2] gnu: Add adwaita-icon-theme.

* gnu/packages/gnome.scm (adwaita-icon-theme): New variable.
---
 gnu/packages/gnome.scm | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 8adcbdd..2213e47 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -393,6 +393,20 @@ update-desktop-database: updates the database containing a cache of MIME types
      "Icons for the GNOME desktop.")
     (license license:lgpl3))) ; or Creative Commons BY-SA 3.0
 
+;; gnome-icon-theme was renamed to adwaita-icon-theme after version 3.12.0.
+(define-public adwaita-icon-theme
+  (package (inherit gnome-icon-theme)
+    (name "adwaita-icon-theme")
+    (version "3.16.0")
+    (source (origin
+              (method url-fetch)
+              (uri (string-append "mirror://gnome/sources/" name "/"
+                                  (version-major+minor version) "/"
+                                  name "-" version ".tar.xz"))
+              (sha256
+               (base32
+                "1cbfdypxfg74krqrklh4za64jhvskbp206l14fs739cw14xsvj53"))))))
+
 (define-public shared-mime-info
   (package
     (name "shared-mime-info")
-- 
2.2.1

Re: [PATCH] gnu: Add adwaita-icon-theme.

[宋文武]

Federico Beffa <beffa@ieee.org> writes:

>> With 'gtk+', it will:
>> 1. use gtk-update-icon-cache to build a index-theme.cache       (ok)
>> 2. use gtk-encode-symbolic-svg to convert symbolic SVGs to PNGs (failed)
>
> To enable the SVG functionality of gdk-pixbuf you have to refer to the
> cache in the librsvg package, not the default in the gdk-pixbuf
> package. See gnome-themes-standard.
That's used at runtime, for 'gtk-encode-symbolic-svg', SVG support is
always needed, so I'd like to wrap it. 

And it seems to me that gnome-themes-standard doesn't require librsvg
to build.  The code to set 'GDK_PIXBUF_MODULE_FILE' in the builder
doesn't affect anything when running, it's redudant.

Re: [PATCH] gnu: Add adwaita-icon-theme.

[Federico Beffa]

On Fri, May 22, 2015 at 3:35 AM, 宋文武 <iyzsong@gmail.com> wrote:
> Federico Beffa <beffa@ieee.org> writes:
>
>>> With 'gtk+', it will:
>>> 1. use gtk-update-icon-cache to build a index-theme.cache       (ok)
>>> 2. use gtk-encode-symbolic-svg to convert symbolic SVGs to PNGs (failed)
>>
>> To enable the SVG functionality of gdk-pixbuf you have to refer to the
>> cache in the librsvg package, not the default in the gdk-pixbuf
>> package. See gnome-themes-standard.
> That's used at runtime, for 'gtk-encode-symbolic-svg', SVG support is
> always needed, so I'd like to wrap it.
>
> And it seems to me that gnome-themes-standard doesn't require librsvg
> to build.  The code to set 'GDK_PIXBUF_MODULE_FILE' in the builder
> doesn't affect anything when running, it's redudant.

I do not remember the details, but I'm pretty sure that at the time I
prepared the package librsvg and the env var were required either to
build or to pass the tests. But, if you find it to be wrong, feel free
to change it.

Regards,
Fede

Re: [PATCH] gnu: Add adwaita-icon-theme.

[Ludovic Courtès]

宋文武 <iyzsong@gmail.com> skribis:

> From ff7e16bc8b7e803d49d5ee880f31f3f4e1660d3c Mon Sep 17 00:00:00 2001
> From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
> Date: Tue, 19 May 2015 16:32:09 +0800
> Subject: [PATCH 1/2] gnu: gtk+: Add SVG support to 'gtk-encode-symbolic-svg'.
>
> * gnu/packages/gtk.scm (gtk+)[inputs]: Add librsvg.
>   [arguments]: Add 'wrap-gtk-encode-symbolic-svg' phase.

[...]

> +        'install 'wrap-gtk-encode-symbolic-svg
> +        (lambda* (#:key inputs outputs #:allow-other-keys)
> +          (let* ((out (assoc-ref outputs "out"))
> +                 (prog (string-append out "/bin/gtk-encode-symbolic-svg"))
> +                 (librsvg (assoc-ref inputs "librsvg"))
> +                 (loaders.cache (find-files librsvg "^loaders\\.cache$")))
> +            (wrap-program prog
> +              `("GDK_PIXBUF_MODULE_FILE" = ,loaders.cache))))
> +        %standard-phases))))))

Could you add a comment there explaining what’s going on?

So ‘gtk-encode-symbolic-svg’ uses that loader mechanism, which is why it
doesn’t actually support SVG out-of-the-box, even if librsvg is already
an input, right?

This would have to be committed in a gtk-rebuild branch.

> From f9aa59c1aca6e30f217d7d2e1c8ae5c6774b66c0 Mon Sep 17 00:00:00 2001
> From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
> Date: Tue, 12 May 2015 18:42:37 +0800
> Subject: [PATCH 2/2] gnu: Add adwaita-icon-theme.
>
> * gnu/packages/gnome.scm (adwaita-icon-theme): New variable.

OK!

Thanks,
Ludo’.

Re: [PATCH] gnu: Add adwaita-icon-theme.

[宋文武]

Ludovic Courtès <ludo@gnu.org> writes:

> 宋文武 <iyzsong@gmail.com> skribis:
>
>> From ff7e16bc8b7e803d49d5ee880f31f3f4e1660d3c Mon Sep 17 00:00:00 2001
>> From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= <iyzsong@gmail.com>
>> Date: Tue, 19 May 2015 16:32:09 +0800
>> Subject: [PATCH 1/2] gnu: gtk+: Add SVG support to 'gtk-encode-symbolic-svg'.
>>
>> * gnu/packages/gtk.scm (gtk+)[inputs]: Add librsvg.
>>   [arguments]: Add 'wrap-gtk-encode-symbolic-svg' phase.
>
> [...]
>
>> +        'install 'wrap-gtk-encode-symbolic-svg
>> +        (lambda* (#:key inputs outputs #:allow-other-keys)
>> +          (let* ((out (assoc-ref outputs "out"))
>> +                 (prog (string-append out "/bin/gtk-encode-symbolic-svg"))
>> +                 (librsvg (assoc-ref inputs "librsvg"))
>> +                 (loaders.cache (find-files librsvg "^loaders\\.cache$")))
>> +            (wrap-program prog
>> +              `("GDK_PIXBUF_MODULE_FILE" = ,loaders.cache))))
>> +        %standard-phases))))))
>
> Could you add a comment there explaining what’s going on?
OK.
>
> So ‘gtk-encode-symbolic-svg’ uses that loader mechanism, which is why it
> doesn’t actually support SVG out-of-the-box, even if librsvg is already
> an input, right?
Yes.
>
> This would have to be committed in a gtk-rebuild branch.
Done.

Thanks for review!

Re: [PATCH] gnu: Add adwaita-icon-theme.

[Mark H Weaver]

宋文武 <iyzsong@gmail.com> writes:

> Ludovic Courtès <ludo@gnu.org> writes:
>> This would have to be committed in a gtk-rebuild branch.
> Done.

I added the gnutls update to that branch and started Hydra building it.

     Mark

Re: [PATCH] gnu: Add adwaita-icon-theme.

[Ludovic Courtès]

Mark H Weaver <mhw@netris.org> skribis:

> 宋文武 <iyzsong@gmail.com> writes:
>
>> Ludovic Courtès <ludo@gnu.org> writes:
>>> This would have to be committed in a gtk-rebuild branch.
>> Done.
>
> I added the gnutls update to that branch and started Hydra building it.

Good idea, thanks for paying attention!

Ludo’.

Re: [PATCH] gnu: Add adwaita-icon-theme.

[宋文武]

Ludovic Courtès <ludo@gnu.org> writes:

> Mark H Weaver <mhw@netris.org> skribis:
>
>> 宋文武 <iyzsong@gmail.com> writes:
>>
>>> Ludovic Courtès <ludo@gnu.org> writes:
>>>> This would have to be committed in a gtk-rebuild branch.
>>> Done.
>>
>> I added the gnutls update to that branch and started Hydra building it.
>
> Good idea, thanks for paying attention!
All look ok, merged into master.

Thanks!