bug#29076: GTK+ 'icon-theme.cache' files are not reproducible

bug#29076: GTK+ 'icon-theme.cache' files are not reproducible

[Ludovic Courtès]

Here’s an example:

--8<---------------cut here---------------start------------->8---
$ wget -q -O - https://mirror.hydra.gnu.org/guix/nar/gzip/7drfxfiwif436bw908iy6jm3myrinn4m-xfce4-session-4.12.0 | gunzip -c | guix archive -x xfsession1
$ wget -q -O -   https://berlin.guixsd.org/nar/gzip/7drfxfiwif436bw908iy6jm3myrinn4m-xfce4-session-4.12.0 | gunzip | guix archive -x xfsession2
$ diff -ru --no-dereference xfsession[12]
Ciferecaj dosieroj xfsession1/share/icons/hicolor/icon-theme.cache kaj xfsession2/share/icons/hicolor/icon-theme.cache estas malsamaj
$ diffoscope xfsession[12]/share/icons/hicolor/icon-theme.cache
--- xfsession1/share/icons/hicolor/icon-theme.cache
+++ xfsession2/share/icons/hicolor/icon-theme.cache
│┄ xxd not available in path. Falling back to Python hexlify.
│┄ 'showttf' not available in path. Falling back to binary comparison.
@@ -1,20 +1,20 @@
 000100000000000c000002380000000b0000003cffffffff000000a0ffffffff
 ffffffffffffffff000000ec000001140000016cffffffff000001bc00000068
 000000480000005c73797374656d2d68696265726e6174650000000000000001
-0000000400000000ffffffff000000740000008478666365342d73657373696f
-6e00000000000003000200040000000000010002000000000000000400000000
-000000c4000000ac000000b87866736d2d6c6f676f7574000000000100000004
+0002000400000000ffffffff000000740000008478666365342d73657373696f
+6e00000000000003000200040000000000010004000000000000000200000000
+000000c4000000ac000000b87866736d2d6c6f676f7574000000000100020004
 00000000ffffffff000000d0000000e073797374656d2d73757370656e640000
-000000010000000400000000ffffffff000000f8000001087866736d2d686962
-65726e6174650000000000010000000400000000000001440000012000000130
-73797374656d2d73687574646f776e0000000002000100020000000000000004
+000000010002000400000000ffffffff000000f8000001087866736d2d686962
+65726e6174650000000000010002000400000000000001440000012000000130
+73797374656d2d73687574646f776e0000000002000200040000000000000002
 00000000ffffffff00000150000001607866736d2d73757370656e6400000000
-00000001000000040000000000000194000001780000018878666365342d7370
-6c61736800000000000000010000000400000000ffffffff000001a0000001b0
-73797374656d2d6c6f672d6f75740000000000010000000400000000000001e4
-000001c8000001d873797374656d2d7265626f6f740000000000000100000004
+00000001000200040000000000000194000001780000018878666365342d7370
+6c61736800000000000000010002000400000000ffffffff000001a0000001b0
+73797374656d2d6c6f672d6f75740000000000010002000400000000000001e4
+000001c8000001d873797374656d2d7265626f6f740000000000000100020004
 0000000000000214000001f0000002007866736d2d73687574646f776e000000
-0000000200010002000000000000000400000000ffffffff000002200000022c
-7866736d2d7265626f6f74000000000100000004000000000000000300000248
-000002540000026434387834382f6170707300007363616c61626c652f617070
-73000000313238783132382f6170707300000000
+0000000200020004000000000000000200000000ffffffff000002200000022c
+7866736d2d7265626f6f74000000000100020004000000000000000300000248
+00000258000002687363616c61626c652f61707073000000313238783132382f
+617070730000000034387834382f617070730000
--8<---------------cut here---------------end--------------->8---

These files are created by ‘gtk-update-icon-cache’.

Most likely the same issue as with GDK: <https://bugs.gnu.org/25414>.

Ludo’.

bug#29076: GTK+ 'icon-theme.cache' files are not reproducible

[Danny Milosavljevic]

There's a profile hook to generate icon cache files - so maybe we can just remove those cache output files from packages.

bug#29076: GTK+ 'icon-theme.cache' files are not reproducible

[Danny Milosavljevic]

On Tue, 19 Dec 2017 10:38:00 +0100
Danny Milosavljevic <dannym@scratchpost.org> wrote:

> There's a profile hook to generate icon cache files - so maybe we can just remove those cache output files from packages.

(See claws-mail in master where I did something like that already)

bug#29076: [PATCH] gnu: xfce4-session: Disable (duplicate) Gtk+ icon cache generation

[Danny Milosavljevic]

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

Patch attached...

[-- Attachment #2: 0001-gnu-xfce4-session-Disable-duplicate-Gtk-icon-cache-g.patch --]
[-- Type: text/x-patch, Size: 1091 bytes --]

From b31ad22a3b618dbebfc209887b3383a7ce8210b8 Mon Sep 17 00:00:00 2001
From: Danny Milosavljevic <dannym@scratchpost.org>
Date: Tue, 19 Dec 2017 10:45:15 +0100
Subject: [PATCH] gnu: xfce4-session: Disable (duplicate) Gtk+ icon cache
 generation.
Tags: patch

* gnu/packages/xfce.scm (xfce4-session)[arguments]: Add make-flags to disable
Gtk+ icon cache generation.
---
 gnu/packages/xfce.scm | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/xfce.scm b/gnu/packages/xfce.scm
index 7668a1d38..bbe6ab454 100644
--- a/gnu/packages/xfce.scm
+++ b/gnu/packages/xfce.scm
@@ -492,7 +492,10 @@ your system in categories, so you can quickly find and launch them.")
     (build-system gnu-build-system)
     (arguments
      '(#:configure-flags
-       (list (string-append "--with-xsession-prefix=" %output))))
+       (list (string-append "--with-xsession-prefix=" %output))
+       ;; Disable icon cache update.
+       #:make-flags
+       '("gtk_update_icon_cache=true")))
     (native-inputs
      `(("pkg-config" ,pkg-config)
        ("intltool" ,intltool)))

bug#29076: [PATCH] gnu: xfce4-session: Disable (duplicate) Gtk+ icon cache generation

[Ludovic Courtès]

Danny Milosavljevic <dannym@scratchpost.org> skribis:

> From b31ad22a3b618dbebfc209887b3383a7ce8210b8 Mon Sep 17 00:00:00 2001
> From: Danny Milosavljevic <dannym@scratchpost.org>
> Date: Tue, 19 Dec 2017 10:45:15 +0100
> Subject: [PATCH] gnu: xfce4-session: Disable (duplicate) Gtk+ icon cache
>  generation.
> Tags: patch
>
> * gnu/packages/xfce.scm (xfce4-session)[arguments]: Add make-flags to disable
> Gtk+ icon cache generation.

LGTM.

I wonder if we could do that in a cross-cutting fashion, perhaps in
‘glib-or-gtk-build-system’?

Thanks,
Ludo’.

bug#29076: [PATCH] gnu: xfce4-session: Disable (duplicate) Gtk+ icon cache generation

[Danny Milosavljevic]

Hi Ludo,

On Tue, 19 Dec 2017 11:04:30 +0100
ludo@gnu.org (Ludovic Courtès) wrote:

> Danny Milosavljevic <dannym@scratchpost.org> skribis:
> 
> > From b31ad22a3b618dbebfc209887b3383a7ce8210b8 Mon Sep 17 00:00:00 2001
> > From: Danny Milosavljevic <dannym@scratchpost.org>
> > Date: Tue, 19 Dec 2017 10:45:15 +0100
> > Subject: [PATCH] gnu: xfce4-session: Disable (duplicate) Gtk+ icon cache
> >  generation.
> > Tags: patch
> >
> > * gnu/packages/xfce.scm (xfce4-session)[arguments]: Add make-flags to disable
> > Gtk+ icon cache generation.  
> 
> LGTM.

Pushed.

> I wonder if we could do that in a cross-cutting fashion, perhaps in
> ‘glib-or-gtk-build-system’?

I think it's not possible. The Makefile.am this variable is in is source and not generated - as far as I know.

We could have a phase in glib-or-gtk-build-system which at least checks that the cache files are not in the installed files of the package in the end.

bug#29076: [PATCH] gnu: xfce4-session: Disable (duplicate) Gtk+ icon cache generation

[Danny Milosavljevic]

Hmm, after fixing up a lot of the places manually, apparently almost everyone is copying their Makefile.am from the same template. The variable name "gtk_update_icon_cache" is used *very* often.

So I suggest fixing it once and for all after all.  If the make variable "gtk_update_icon_cache" is unused after all and we then set it, it doesn't do anything anyway.

bug#29076: [PATCH core-updates] build-system/glib-or-gtk: Don't generate 'icon-theme.cache'.

[Danny Milosavljevic]

* guix/build-system/glib-or-gtk.scm (glib-or-gtk-build): Don't generate
'icon-theme.cache'.
---
 guix/build-system/glib-or-gtk.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/guix/build-system/glib-or-gtk.scm b/guix/build-system/glib-or-gtk.scm
index d585d84f2..fb241ec94 100644
--- a/guix/build-system/glib-or-gtk.scm
+++ b/guix/build-system/glib-or-gtk.scm
@@ -159,7 +159,9 @@
                           #:glib-or-gtk-wrap-excluded-outputs
                            ,glib-or-gtk-wrap-excluded-outputs
                           #:configure-flags ,configure-flags
-                          #:make-flags ,make-flags
+                          ;; Disable icon theme cache generation.
+                          #:make-flags ,(cons "gtk_update_icon_cache=true"
+                                              make-flags)
                           #:out-of-source? ,out-of-source?
                           #:tests? ,tests?
                           #:test-target ,test-target

bug#29076: [PATCH core-updates v2] build-system/glib-or-gtk: Don't generate 'icon-theme.cache'.

[Danny Milosavljevic]

* guix/build-system/glib-or-gtk.scm (glib-or-gtk-build): Don't generate
'icon-theme.cache'.
---
 guix/build-system/glib-or-gtk.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/guix/build-system/glib-or-gtk.scm b/guix/build-system/glib-or-gtk.scm
index d585d84f2..621e68e0a 100644
--- a/guix/build-system/glib-or-gtk.scm
+++ b/guix/build-system/glib-or-gtk.scm
@@ -110,7 +110,8 @@
                             (outputs '("out"))
                             (search-paths '())
                             (configure-flags ''())
-                            (make-flags ''())
+                            ;; Disable icon theme cache generation.
+                            (make-flags ''("gtk_update_icon_cache=true"))
                             (out-of-source? #t)
                             (tests? #t)
                             (test-target "check")

bug#29076: [PATCH core-updates] build-system/glib-or-gtk: Don't generate 'icon-theme.cache'.

[Danny Milosavljevic]

* guix/build-system/glib-or-gtk.scm (glib-or-gtk-build): Don't generate
'icon-theme.cache'.
---
 guix/build-system/glib-or-gtk.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/guix/build-system/glib-or-gtk.scm b/guix/build-system/glib-or-gtk.scm
index d585d84f2..fb241ec94 100644
--- a/guix/build-system/glib-or-gtk.scm
+++ b/guix/build-system/glib-or-gtk.scm
@@ -159,7 +159,9 @@
                           #:glib-or-gtk-wrap-excluded-outputs
                            ,glib-or-gtk-wrap-excluded-outputs
                           #:configure-flags ,configure-flags
-                          #:make-flags ,make-flags
+                          ;; Disable icon theme cache generation.
+                          #:make-flags ,(cons "gtk_update_icon_cache=true"
+                                              make-flags)
                           #:out-of-source? ,out-of-source?
                           #:tests? ,tests?
                           #:test-target ,test-target

bug#29076: [PATCH core-updates v2] build-system/glib-or-gtk: Don't generate 'icon-theme.cache'.

[Danny Milosavljevic]

* guix/build-system/glib-or-gtk.scm (glib-or-gtk-build): Don't generate
'icon-theme.cache'.
---
 guix/build-system/glib-or-gtk.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/guix/build-system/glib-or-gtk.scm b/guix/build-system/glib-or-gtk.scm
index d585d84f2..621e68e0a 100644
--- a/guix/build-system/glib-or-gtk.scm
+++ b/guix/build-system/glib-or-gtk.scm
@@ -110,7 +110,8 @@
                             (outputs '("out"))
                             (search-paths '())
                             (configure-flags ''())
-                            (make-flags ''())
+                            ;; Disable icon theme cache generation.
+                            (make-flags ''("gtk_update_icon_cache=true"))
                             (out-of-source? #t)
                             (tests? #t)
                             (test-target "check")

bug#29076: [PATCH core-updates v2] build-system/glib-or-gtk: Don't generate 'icon-theme.cache'.

[Ludovic Courtès]

Danny Milosavljevic <dannym@scratchpost.org> skribis:

> * guix/build-system/glib-or-gtk.scm (glib-or-gtk-build): Don't generate
> 'icon-theme.cache'.
> ---
>  guix/build-system/glib-or-gtk.scm | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/guix/build-system/glib-or-gtk.scm b/guix/build-system/glib-or-gtk.scm
> index d585d84f2..621e68e0a 100644
> --- a/guix/build-system/glib-or-gtk.scm
> +++ b/guix/build-system/glib-or-gtk.scm
> @@ -110,7 +110,8 @@
>                              (outputs '("out"))
>                              (search-paths '())
>                              (configure-flags ''())
> -                            (make-flags ''())
> +                            ;; Disable icon theme cache generation.
> +                            (make-flags ''("gtk_update_icon_cache=true"))

I’ve pushed it on your behalf so I could start a new evaluation.  \o/

Thanks!

Ludo’.