[bug#29128] [PATCH 1/4] gnu: Add faba-icon-theme.

[bug#29128] [PATCH 1/4] gnu: Add faba-icon-theme.

[Brendan Tildesley]

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

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index bb207e56d..8520721ff 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -27,6 +27,7 @@
 ;;; Copyright © 2017 nee <nee-git@hidamari.blue>
 ;;; Copyright © 2017 Chris Marusich <cmmarusich@gmail.com>
 ;;; Copyright © 2017 Mohammed Sadiq <sadiq@sadiqpk.org>
+;;; Copyright © 2017 Brendan Tildesley <brendan.tildesley@openmailbox.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -6301,6 +6302,43 @@ like GNOME, Unity, Budgie, Pantheon, XFCE, Mate, etc.")
     ;; No "or later" language found.
     (license license:gpl3)))
 
+(define-public faba-icon-theme
+  (package
+    (name "faba-icon-theme")
+    (version "4.1.2")
+    (source
+     (origin
+       (method url-fetch)
+       (uri (string-append "https://github.com/moka-project/"
+                           name "/archive/v" version ".tar.gz"))
+       (file-name (string-append name "-" version ".tar.gz"))
+       (sha256
+        (base32
+         "0hi2dl627ayfnihn3v6x9xzid668m4hp098hb7hrkxvahh4h9by7"))))
+    (build-system gnu-build-system)
+    (arguments
+     '(#:phases
+       (modify-phases %standard-phases
+         (add-after 'unpack 'patch-makefile.am
+           (lambda _
+             (substitute* '("Makefile.am")
+               (("\\$\\(DESTDIR\\)/usr/share")
+                "$(datadir)"))
+             #t))
+         (add-after 'patch-makefile.am 'bootstrap
+           (lambda _
+             (zero? (system* "autoreconf" "-vif")))))))
+    (native-inputs
+     `(("autoconf" ,autoconf)
+       ("automake" ,automake)))
+    (synopsis "Faba icon theme")
+    (description
+     "Faba is a minimal icon set used as a basis for other themes such as
+Moka")
+    (home-page "https://snwh.org/moka")
+    (license (list license:lgpl3+
+                   license:cc-by-sa4.0))))
+
 (define-public moka-icon-theme
   (package
     (name "moka-icon-theme")
-- 
2.14.3

[bug#29126] [PATCH 2/4] gnu: moka-icon-theme: Simplify package definition.

[Brendan Tildesley]

* gnu/packages/gnome.scm (moka-icon-theme): Inherit faba-icon-theme to avoid
  duplicating similar package definition.
---
 gnu/packages/gnome.scm | 18 +-----------------
 1 file changed, 1 insertion(+), 17 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 8520721ff..ca1f659bf 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6341,6 +6341,7 @@ Moka")
 
 (define-public moka-icon-theme
   (package
+    (inherit faba-icon-theme)
     (name "moka-icon-theme")
     (version "5.3.6")
     (source (origin
@@ -6352,26 +6353,9 @@ Moka")
               (sha256
                (base32
                 "04axinv79qnngsxkwqzi5j9lc3hn24rjqps5ai8d42pdnfaf0x37"))))
-    (build-system gnu-build-system)
-    (arguments
-     '(#:phases
-       (modify-phases %standard-phases
-         (add-after 'unpack 'patch-makefile.am
-           (lambda _
-             (substitute* '("Makefile.am")
-               (("\\$\\(DESTDIR\\)/usr/share")
-                "$(datadir)"))
-             #t))
-         (add-after 'patch-makefile.am 'bootstrap
-           (lambda _
-             (zero? (system* "autoreconf" "-vif")))))))
-    (native-inputs
-     `(("autoconf" ,autoconf)
-       ("automake" ,automake)))
     (synopsis "Moka icon theme")
     (description "Moka is a stylized desktop icon set, designed to be clear,
 simple and consistent.")
-    (home-page "http://snwh.org/moka")
     (license license:gpl3+)))
 
 (define-public arc-icon-theme
-- 
2.14.3

[bug#29127] [PATCH 3/4] gnu: moka-icon-theme: Add faba-icon-theme as propagated input.

[Brendan Tildesley]

* gnu/packages/gnome.scm (moka-icon-theme): Moka is based on Faba by using it
  as a fallback icon set instead of bundling it, so we need to add it as a
  propagated-input.
---
 gnu/packages/gnome.scm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index ca1f659bf..21b639bff 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6353,6 +6353,8 @@ Moka")
               (sha256
                (base32
                 "04axinv79qnngsxkwqzi5j9lc3hn24rjqps5ai8d42pdnfaf0x37"))))
+    (propagated-inputs
+     `(("faba-icon-theme" ,faba-icon-theme)))
     (synopsis "Moka icon theme")
     (description "Moka is a stylized desktop icon set, designed to be clear,
 simple and consistent.")
-- 
2.14.3

[bug#29129] [PATCH 4/4] gnu: moka-icon-theme: Fix license.

[Brendan Tildesley]

* gnu/packages/gnome.scm (moka-icon-theme): Add cc-by-sa4.0 to license field.
---
 gnu/packages/gnome.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 21b639bff..5ca6a0462 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -6358,7 +6358,8 @@ Moka")
     (synopsis "Moka icon theme")
     (description "Moka is a stylized desktop icon set, designed to be clear,
 simple and consistent.")
-    (license license:gpl3+)))
+    (license (list license:gpl3+
+                   license:cc-by-sa4.0))))
 
 (define-public arc-icon-theme
   (package
-- 
2.14.3

bug#29128: [PATCH 1/4] gnu: Add faba-icon-theme.

[Ludovic Courtès]

Brendan Tildesley <brendan.tildesley@openmailbox.org> skribis:

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

Applied, thanks!

bug#29126: [PATCH 2/4] gnu: moka-icon-theme: Simplify package definition.

[Ludovic Courtès]

Brendan Tildesley <brendan.tildesley@openmailbox.org> skribis:

> * gnu/packages/gnome.scm (moka-icon-theme): Inherit faba-icon-theme to avoid
>   duplicating similar package definition.

Applied, thanks!

bug#29127: [PATCH 3/4] gnu: moka-icon-theme: Add faba-icon-theme as propagated input.

[Ludovic Courtès]

Brendan Tildesley <brendan.tildesley@openmailbox.org> skribis:

> * gnu/packages/gnome.scm (moka-icon-theme): Moka is based on Faba by using it
>   as a fallback icon set instead of bundling it, so we need to add it as a
>   propagated-input.

Applied, thanks!

[bug#29127] [PATCH 3/4] gnu: moka-icon-theme: Add faba-icon-theme as propagated input.

[Ludovic Courtès]

Brendan Tildesley <brendan.tildesley@openmailbox.org> skribis:

> * gnu/packages/gnome.scm (moka-icon-theme): Moka is based on Faba by using it
>   as a fallback icon set instead of bundling it, so we need to add it as a
>   propagated-input.

Note that I added this explanation as a comment in the code.

[bug#29129] [PATCH 4/4] gnu: moka-icon-theme: Fix license.

[Ludovic Courtès]

Brendan Tildesley <brendan.tildesley@openmailbox.org> skribis:

> * gnu/packages/gnome.scm (moka-icon-theme): Add cc-by-sa4.0 to license field.

Applied, thank you for this patch series!

Ludo’.