GNU bug report logs - #77455
Updates for papirus-icon-theme

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 77455 in the body.
You can then email your comments to 77455 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: "Timo Wilken" <guix <at> twilken.net>
To: <guix-patches <at> gnu.org>
Subject: Updates for papirus-icon-theme
Date: Wed, 02 Apr 2025 13:13:57 +0200

Hi,

I'd like to update papirus-icon-theme to the latest version.

In the course of that, I discovered that the workaround to reduce the number
of inodes the package uses doesn't seem to work very well, so I added a `cp'
flag that fixes it for me.

The package also contains a bunch of icon files that are marked "executable",
so I'm also fixing that.

Patches for the above incoming.

Finally, the upstream developers recommend splitting the package into a main
`papirus-icon-theme' and an `epapirus-icon-theme' (for the pantheon desktop),
the latter of which depends on the former:
<https://github.com/PapirusDevelopmentTeam/papirus-icon-theme/releases/tag/20231101>

I've not done this yet because I wasn't sure what the best way to do this in
Guix is -- separate outputs of the same package? Two separate packages? What
do you think?

Cheers,
Timo

Message #8 received at 77455 <at> debbugs.gnu.org (full text, mbox):

From: Timo Wilken <guix <at> twilken.net>
To: 77455 <at> debbugs.gnu.org
Cc: Timo Wilken <guix <at> twilken.net>
Subject: [PATCH 1/4] gnu: papirus-icon-theme: Update to 20250201.
Date: Wed,  2 Apr 2025 13:16:19 +0200

* gnu/packages/gnome-xyz.scm (papirus-icon-theme): Update to 20250201.

Change-Id: I963c1452d442b16b52795bfd022bc967839451e4
---
 gnu/packages/gnome-xyz.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm
index 4e75bc0e46..92867d1177 100644
--- a/gnu/packages/gnome-xyz.scm
+++ b/gnu/packages/gnome-xyz.scm
@@ -204,7 +204,7 @@ (define-public moka-icon-theme
 (define-public papirus-icon-theme
   (package
     (name "papirus-icon-theme")
-    (version "20230104")
+    (version "20250201")
     (source
      (origin
        (method git-fetch)
@@ -212,7 +212,7 @@ (define-public papirus-icon-theme
              (url "https://github.com/PapirusDevelopmentTeam/papirus-icon-theme")
              (commit version)))
        (sha256
-        (base32 "1x40gdqyw0gj389by6904g5a64r72by544k3nlyiamjhg2zmpx97"))
+        (base32 "1sbzmfcmbsa57grq0jy17mmagdsg95qr2v75zpqlp53jpjq74v53"))
        (file-name (git-file-name name version))))
     (build-system gnu-build-system)
     (arguments
-- 
2.49.0

Message #11 received at 77455 <at> debbugs.gnu.org (full text, mbox):

From: Timo Wilken <guix <at> twilken.net>
To: 77455 <at> debbugs.gnu.org
Cc: Timo Wilken <guix <at> twilken.net>
Subject: [PATCH 2/4] gnu: papirus-icon-theme: Use g-exps for arguments.
Date: Wed,  2 Apr 2025 13:16:20 +0200

* gnu/packages/gnome-xyz.scm (papirus-icon-theme) [arguments]:
  Use g-expressions instead of plain quoted lists.

Change-Id: I8578fd392d10be3f249c304ffd7e9dbc23952fa1
---
 gnu/packages/gnome-xyz.scm | 40 +++++++++++++++++++-------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm
index 92867d1177..2a9b50d9b4 100644
--- a/gnu/packages/gnome-xyz.scm
+++ b/gnu/packages/gnome-xyz.scm
@@ -216,27 +216,27 @@ (define-public papirus-icon-theme
        (file-name (git-file-name name version))))
     (build-system gnu-build-system)
     (arguments
-     '(#:tests? #f                      ; no test suite
-       #:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")))
+     `(#:tests? #f                      ; no test suite
+       #:make-flags ,#~(list (string-append "PREFIX=" (assoc-ref %outputs "out")))
        #:phases
-       (modify-phases %standard-phases
-         (delete 'bootstrap)
-         (delete 'configure)
-         (delete 'build)
-         (add-before 'install 'halve-inode-consumption
-           ;; This package uses over 100K inodes, which is a lot.  We can easily
-           ;; halve that number by using (hard) links, to no ill effect.
-           ;; See <https://logs.guix.gnu.org/guix/2023-01-31.log#171227>.
-           ;; However, the source checkout will still use the full amount!
-           (lambda _
-             (let ((symlink? (lambda (_ stat)
-                               (eq? 'symlink (stat:type stat)))))
-               (for-each (lambda (file)
-                           (let ((target (canonicalize-path file)))
-                             (when (eq? 'regular (stat:type (stat target)))
-                               (delete-file file)
-                               (link target file))))
-                         (find-files "." symlink?))))))))
+       ,#~(modify-phases %standard-phases
+            (delete 'bootstrap)
+            (delete 'configure)
+            (delete 'build)
+            (add-before 'install 'halve-inode-consumption
+              ;; This package uses over 100K inodes, which is a lot.  We can easily
+              ;; halve that number by using (hard) links, to no ill effect.
+              ;; See <https://logs.guix.gnu.org/guix/2023-01-31.log#171227>.
+              ;; However, the source checkout will still use the full amount!
+              (lambda _
+                (let ((symlink? (lambda (_ stat)
+                                  (eq? 'symlink (stat:type stat)))))
+                  (for-each (lambda (file)
+                              (let ((target (canonicalize-path file)))
+                                (when (eq? 'regular (stat:type (stat target)))
+                                  (delete-file file)
+                                  (link target file))))
+                            (find-files "." symlink?))))))))
     (native-inputs
      (list `(,gtk+ "bin")))
     (home-page "https://git.io/papirus-icon-theme")
-- 
2.49.0

Message #14 received at 77455 <at> debbugs.gnu.org (full text, mbox):

From: Timo Wilken <guix <at> twilken.net>
To: 77455 <at> debbugs.gnu.org
Cc: Timo Wilken <guix <at> twilken.net>
Subject: [PATCH 3/4] gnu: papirus-icon-theme: Preserve hardlinks to save
 inodes.
Date: Wed,  2 Apr 2025 13:16:21 +0200

Even though the package has a 'halve-inode-consumption phase, this only works
if the subsequent `cp' doesn't break the created hardlinks again.  Tell `cp'
to preserve them.

For me, this commit reduces the number of hardlinks under /share/icons inside
this package from 113886 to 58697 (compared to 116011 without the
'halve-inode-consumption phase).

* gnu/packages/gnome-xyz.scm (papirus-icon-theme) [arguments]:
  Preserve hardlinks during installation.

Change-Id: I594fb47ecd09754f6b3e13b74215826521db5cfa
---
 gnu/packages/gnome-xyz.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm
index 2a9b50d9b4..2054cd9762 100644
--- a/gnu/packages/gnome-xyz.scm
+++ b/gnu/packages/gnome-xyz.scm
@@ -217,7 +217,8 @@ (define-public papirus-icon-theme
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f                      ; no test suite
-       #:make-flags ,#~(list (string-append "PREFIX=" (assoc-ref %outputs "out")))
+       #:make-flags ,#~(list "CP_OPTS=--preserve=links"
+                             (string-append "PREFIX=" (assoc-ref %outputs "out")))
        #:phases
        ,#~(modify-phases %standard-phases
             (delete 'bootstrap)
-- 
2.49.0

Message #17 received at 77455 <at> debbugs.gnu.org (full text, mbox):

From: Timo Wilken <guix <at> twilken.net>
To: 77455 <at> debbugs.gnu.org
Cc: Timo Wilken <guix <at> twilken.net>
Subject: [PATCH 4/4] gnu: papirus-icon-theme: Avoid creating executable icons.
Date: Wed,  2 Apr 2025 13:16:22 +0200

* gnu/packages/gnome-xyz.scm (papirus-icon-theme) [arguments]:
  Add 'remove-executable-bit phase.

Change-Id: Ic4d4f41b348d728913a90b0ef9cdf50f9901070a
---
 gnu/packages/gnome-xyz.scm | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm
index 2054cd9762..432833a649 100644
--- a/gnu/packages/gnome-xyz.scm
+++ b/gnu/packages/gnome-xyz.scm
@@ -237,7 +237,13 @@ (define-public papirus-icon-theme
                                 (when (eq? 'regular (stat:type (stat target)))
                                   (delete-file file)
                                   (link target file))))
-                            (find-files "." symlink?))))))))
+                            (find-files "." symlink?)))))
+           (add-before 'install 'remove-executable-bit
+             (lambda _
+               (let ((file? (lambda (_ stat)
+                              (eq? 'regular (stat:type stat)))))
+                 (for-each (lambda (file) (chmod file #o644))
+                           (find-files "." file?))))))))
     (native-inputs
      (list `(,gtk+ "bin")))
     (home-page "https://git.io/papirus-icon-theme")
-- 
2.49.0

Message #22 received at 77455-done <at> debbugs.gnu.org (full text, mbox):

From: Liliana Marie Prikler <liliana.prikler <at> gmail.com>
To: Timo Wilken <guix <at> twilken.net>, 77455-done <at> debbugs.gnu.org
Cc: Vivien Kraus <vivien <at> planete-kraus.eu>,
 Maxim Cournoyer <maxim.cournoyer <at> gmail.com>
Subject: Re: [bug#77455] [PATCH 4/4] gnu: papirus-icon-theme: Avoid creating
 executable icons.
Date: Wed, 02 Apr 2025 22:06:14 +0200

Am Mittwoch, dem 02.04.2025 um 13:16 +0200 schrieb Timo Wilken:
> * gnu/packages/gnome-xyz.scm (papirus-icon-theme) [arguments]:
>   Add 'remove-executable-bit phase.
> 
> Change-Id: Ic4d4f41b348d728913a90b0ef9cdf50f9901070a
> ---
Pushed with slight style changes and minor rewordings.

Cheers

Message #25 received at 77455-done <at> debbugs.gnu.org (full text, mbox):

From: "Timo Wilken" <timo <at> twilken.net>
To: "Liliana Marie Prikler" <liliana.prikler <at> gmail.com>
Cc: 77455-done <at> debbugs.gnu.org
Subject: Re: [bug#77455] [PATCH 4/4] gnu: papirus-icon-theme: Avoid creating
 executable icons.
Date: Thu, 03 Apr 2025 12:47:44 +0200

On Wed 2 Apr 2025 at 10:06 pm CEST, Liliana Marie Prikler wrote:
> Pushed with slight style changes and minor rewordings.

Thank you very much Liliana!

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.