Subject: bug#36285: closed (Re: [bug#36285] [PATCH] gnu: ungoogled-chromium: Install icons.)

From: [email-masked] (GNU bug Tracking System)
Date: Thu, 20 Jun 2019 21:06:02 +0000

Your bug report

#36285: [PATCH] gnu: ungoogled-chromium: Install icons.

which was filed against the guix-patches package, has been closed.

The explanation is attached below, along with your original report.
If you require more details, please reply to [email-masked].

-- 
36285: http://debbugs.gnu.org/cgi/bugreport.cgi?bug=36285
GNU Bug Tracking System
Contact [email-masked] with problems

Subject: Re: [bug#36285] [PATCH] gnu: ungoogled-chromium: Install icons.
From: Marius Bakke <[email-masked]>
To: Alex Griffin <[email-masked]>, [email-masked]
Date: Thu, 20 Jun 2019 23:05:35 +0200
List-Id: <debbugs-submit.debbugs.gnu.org>

"Alex Griffin" <[email-masked]> writes:

> This patch installs the application icons in the ungoogled-chromium package.

Pushed in 3df7b15e6c9a11cedba1451f0459c715b8ce3ca1, thank you!

Subject: [PATCH] gnu: ungoogled-chromium: Install icons.
From: "Alex Griffin" <[email-masked]>
To: [email-masked]
Date: Wed, 19 Jun 2019 04:43:49 +0000
List-Id: <debbugs-submit.debbugs.gnu.org>

This patch installs the application icons in the ungoogled-chromium package.
-- 
Alex Griffin

From 605782cf5da5faa668692ea31834dcfe324a357e Mon Sep 17 00:00:00 2001
From: Alex Griffin <[email-masked]>
Date: Tue, 18 Jun 2019 14:55:30 -0500
Subject: [PATCH] gnu: ungoogled-chromium: Install icons.

* gnu/packages/chromium.scm (ungoogled-chromium)[arguments]: Install icons.
---
 gnu/packages/chromium.scm | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/gnu/packages/chromium.scm b/gnu/packages/chromium.scm
index 2127e402d7..3a242220f6 100644
--- a/gnu/packages/chromium.scm
+++ b/gnu/packages/chromium.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2019 Marius Bakke <[email-masked]>
+;;; Copyright © 2019 Alex Griffin <[email-masked]>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -650,12 +651,6 @@ from forcing GEXP-PROMISE."
                            (scandir "." (cut regexp-exec install-regexp <>)))
                  (copy-file "chrome" (string-append lib "/chromium"))
 
-                 ;; TODO: Install icons from "../../chrome/app/themes" into
-                 ;; "out/share/icons/hicolor/$size".
-                 (install-file
-                  "product_logo_48.png"
-                  (string-append out "/share/icons/48x48/chromium.png"))
-
                  (copy-recursively "locales" locales)
                  (copy-recursively "resources" resources)
 
@@ -669,8 +664,18 @@ from forcing GEXP-PROMISE."
                      (,(string-append lib ":" nss "/lib/nss:" mesa "/lib:"
                                       udev "/lib")))
                    ;; Avoid file manager crash.  See <https://bugs.gnu.org/26593>.
-                   `("XDG_DATA_DIRS" ":" prefix (,(string-append gtk+ "/share"))))
-                 #t)))))))
+                   `("XDG_DATA_DIRS" ":" prefix (,(string-append gtk+ "/share")))))
+
+               (with-directory-excursion "chrome/app/theme/chromium"
+                 (for-each
+                  (lambda (size)
+                    (let ((icons (string-append out "/share/icons/hicolor/"
+                                                size "x" size "/apps")))
+                      (mkdir-p icons)
+                      (copy-file (string-append "product_logo_" size ".png")
+                                 (string-append icons "/chromium.png"))))
+                  '("22" "24" "48" "64" "128" "256")))
+               #t))))))
     (native-inputs
      `(("bison" ,bison)
        ("gcc" ,gcc-8)
-- 
2.22.0