[bug#33546] [PATCH 0/2] Fix arc-theme

[bug#33546] [PATCH 0/2] Fix arc-theme

[Björn Höfling]

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

Hi Guix,

this patch fixes compilation issues with the arc-theme on core-updates.

Some questions:

* I cherry-picked a sassc-fix from wip-gnome-upgrades. Is that OK?
* I could not test it: I created a VM with %gnome-services and
arc-theme as a
system package, but it was not available in the gnome-tweak-tool.
Any idea of how to use/test it?

Björn

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]

[bug#33546] [PATCH 1/2] gnu: sassc: Fix build.

[Björn Höfling]

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

From: Ricardo Wurmus <rekado@elephly.net>
Date: Sun, 5 Aug 2018 13:03:09 +0200


* gnu/packages/web.scm (sassc)[arguments]: Delete bootstrap phase; let
phase end on boolean.
---
 gnu/packages/web.scm | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 7f9574827..2e3647ddc 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -1281,12 +1281,14 @@ minimum to provide high performance operation.")
          #:tests? #f
          #:phases
          (modify-phases %standard-phases
+           (delete 'bootstrap)
            (delete 'configure)
            (add-after 'unpack 'unpack-libsass-and-set-path
              (lambda* (#:key inputs #:allow-other-keys)
                (invoke "tar" "xvf" (assoc-ref inputs "libsass"))
                (setenv "SASS_LIBSASS_PATH"
-                       (string-append (getcwd)
"/libsass-" ,version)))))))
+                       (string-append (getcwd) "/libsass-" ,version))
+               #t)))))
       (inputs
        `(("libsass" ,libsass)))
       (synopsis "CSS pre-processor")
-- 
2.19.1


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]

[bug#33546] [PATCH 2/2] gnu: arc-theme: Update to 20181022, fixing build.

[Björn Höfling]

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


* gnu/packages/gnome.scm (arc-theme)[version]: Update to 20181022.
[source]: Use new fork, change to git-fetch.
[inputs]: Remove, Move gtk+ to native-inputs.
[native-inputs]: Add gtk+, glib:bin, gnome-shell, inkscape, optipng,
pkg-config, sassc.
[home-page]: Adapt to new fork.
---
 gnu/packages/gnome.scm | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index cbd9afbd3..1135ef9b6 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -31,6 +31,7 @@
 ;;; Copyright © 2017, 2018 Rutger Helling <rhelling@mykolab.com>
 ;;; Copyright © 2018 Jovany Leandro G.C <bit4bit@riseup.net>
 ;;; Copyright © 2018 Vasile Dumitrascu <va511e@yahoo.com>
+;;; Copyright © 2018 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -96,6 +97,7 @@
   #:use-module (gnu packages popt)
   #:use-module (gnu packages ghostscript)
   #:use-module (gnu packages ibus)
+  #:use-module (gnu packages inkscape)
   #:use-module (gnu packages iso-codes)
   #:use-module (gnu packages libcanberra)
   #:use-module (gnu packages libunistring)
@@ -151,6 +153,7 @@
   #:use-module (gnu packages version-control)
   #:use-module (gnu packages virtualization)
   #:use-module (gnu packages vpn)
+  #:use-module (gnu packages web)
   #:use-module (gnu packages xorg)
   #:use-module (ice-9 match)
   #:use-module (srfi srfi-1))
@@ -6428,15 +6431,16 @@ functionality and behavior.")
 (define-public arc-theme
   (package
     (name "arc-theme")
-    (version "20170302")
+    (version "20181022")
     (source (origin
-              (method url-fetch)
-              (uri (string-append
"https://github.com/horst3180/arc-theme"
-                                  "/archive/" version ".tar.gz"))
-              (file-name (string-append name "-" version ".tar.gz"))
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/NicoHood/arc-theme.git")
+                    (commit version)))
+              (file-name (git-file-name name version))
               (sha256
                (base32
-
"0igxpngnkf1wpsg872a9jg3c9f5z8afm312yfbillz16mk8w39cw"))))
+
"08951dk1irfadwpr3p323a4fprmxg53rk2r2niwq3v62ryhi3663"))))
(build-system gnu-build-system) (arguments
      '(#:phases
@@ -6447,14 +6451,18 @@ functionality and behavior.")
     (native-inputs
      `(("autoconf" ,autoconf)
        ("automake" ,automake)
-       ("pkg-config" ,pkg-config)))
-    (inputs
-     `(("gtk+" ,gtk+)))
-    (synopsis "A flat GTK+ theme with transparent elements")
+       ("glib" ,glib "bin") ; for glib-compile-resources
+       ("gnome-shell" ,gnome-shell)
+       ("gtk+" ,gtk+)
+       ("inkscape" ,inkscape)
+       ("optipng" ,optipng)
+       ("pkg-config" ,pkg-config)
+       ("sassc" ,sassc)))
+    (synopsis "Flat GTK+ theme with transparent elements")
     (description "Arc is a flat theme with transparent elements for
GTK 3, GTK 2, and GNOME Shell which supports GTK 3 and GTK 2 based
desktop environments like GNOME, Unity, Budgie, Pantheon, XFCE, Mate,
etc.")
-    (home-page "https://github.com/horst3180/arc-theme")
+    (home-page "https://github.com/NicoHood/arc-theme")
     ;; No "or later" language found.
     (license license:gpl3)))
 
-- 
2.19.1


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]

bug#33546: [PATCH 0/2] Fix arc-theme

[Maxim Cournoyer]

Hello Björn,

Björn Höfling <bjoern.hoefling@bjoernhoefling.de> writes:

> Hi Guix,
>
> this patch fixes compilation issues with the arc-theme on core-updates.
>
> Some questions:
>
> * I cherry-picked a sassc-fix from wip-gnome-upgrades. Is that OK?

I ran `guix refresh -l sassc' and it seems nothing depends on it, so I
think it is!

> * I could not test it: I created a VM with %gnome-services and
> arc-theme as a
> system package, but it was not available in the gnome-tweak-tool.
> Any idea of how to use/test it?

That's a good question; I use arc-theme on a foreign distro to make Guix
applications style match with the host distro style, and there I could
use the native "Themes" tool (Cinnamon desktop) to select the natively
installed arc-theme, and this makes it so that the Guix applications
also use arc-theme (from Guix -- if it's not installed in Guix, it
doesn't work).

I've tested you changes they look good to me. Thanks for fixing the
issue :-).

Merged as a18f8eaf61dbc359a1ca724c147e4600553247fb with minor changes to
the commit message as well as 68464ea259c87cf9e9eec5858f96e0cdf1d4125c.

Thank you!

Maxim

[bug#33546] [PATCH 0/2] Fix arc-theme

[Björn Höfling]

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

On Thu, 06 Dec 2018 12:35:27 -0500
Maxim Cournoyer <maxim.cournoyer@gmail.com> wrote:


> I've tested you changes they look good to me. Thanks for fixing the
> issue :-).
> 
> Merged as a18f8eaf61dbc359a1ca724c147e4600553247fb with minor changes
> to the commit message as well as
> 68464ea259c87cf9e9eec5858f96e0cdf1d4125c.

Thanks for testing and committing,

Björn

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 181 bytes --]