From eaed1a7ea50235d5fc2d08f55fb1cf042dfbdc79 Mon Sep 17 00:00:00 2001
From: Raghav Gururajan <raghavgururajan@disroot.org>
Date: Thu, 28 May 2020 09:10:39 -0400
Subject: [PATCH 1/7] gnu: adwaita-icon-theme: Update package definition.

* gnu/packages/gnome.scm (adwaita-icon-theme): Remove inheritance
from gnome-icon-theme.
[build-system]: Change from gnu to glib-or-gtk.
[native-inputs]: Add python-wrapper.
[description]: Rewrite.
[license]: List the licenses.
---
 gnu/packages/gnome.scm | 46 +++++++++++++++++++++++++++++++-----------
 1 file changed, 34 insertions(+), 12 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 5c769b2b9c..df29ba0000 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -2011,21 +2011,43 @@ GNOME and KDE desktops to the icon names proposed in the specification.")
     (description "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)
+  (package
     (name "adwaita-icon-theme")
-    (version "3.34.3")
-    (source (origin
-              (method url-fetch)
-              (uri (string-append "mirror://gnome/sources/" name "/"
-                                  (version-major+minor version) "/"
-                                  name "-" version ".tar.xz"))
-              (sha256
-               (base32
-                "025rj1fskw1y448hiar4a9icyzpyr242nlh9xhsmyp8jb71dihp7"))))
+    (version "3.36.1")
+    (source
+     (origin
+       (method url-fetch)
+       (uri
+        (string-append "mirror://gnome/sources/" name "/"
+                       (version-major+minor version)  "/"
+                       name "-" version ".tar.xz"))
+       (sha256
+        (base32
+         "0kgiq712lfidd81yzx0yk7qwlj3q8cymp6npnxyzsk844y353674"))))
+    (build-system glib-or-gtk-build-system)
+    (arguments
+     '(#:configure-flags
+       ;; Don't create 'icon-theme.cache'.
+       (let*
+           ((coreutils (assoc-ref %build-inputs "coreutils"))
+            (true (string-append coreutils "/bin/true")))
+         (list
+          (string-append "GTK_UPDATE_ICON_CACHE=" true)))))
     (native-inputs
-     `(("gtk-encode-symbolic-svg" ,gtk+ "bin")))))
+     `(("gtk+:bin" ,gtk+ "bin")
+       ("icon-naming-utils" ,icon-naming-utils)
+       ("intltool" ,intltool)
+       ("pkg-config" ,pkg-config)
+       ("python-wrapper" ,python-wrapper)))
+    (synopsis "GNOME icon theme")
+    (description "The standard icon theme for GNOME desktop environment.")
+    (home-page "https://wiki.gnome.org/Personalization")
+    (license
+     ;; Any one of the following licenses can be chosen.
+     (list
+      license:cc-by-sa3.0
+      license:lgpl3+))))
 
 (define-public tango-icon-theme
   (package
-- 
2.26.2