From a18f8eaf61dbc359a1ca724c147e4600553247fb Mon Sep 17 00:00:00 2001 From: Björn Höfling Date: Wed, 5 Dec 2018 17:44:28 -0500 Subject: gnu: arc-theme: Update to 20181022 and fix build. * gnu/packages/gnome.scm (arc-theme)[version]: Update to 20181022. [source]: Use new fork, change to git-fetch. [inputs]: Remove and move gtk+ to native-inputs. [native-inputs]: Add gtk+, glib:bin, gnome-shell, inkscape, optipng and sassc. [home-page]: Adapt to new fork. [license]: Fix to GPL 3 or later (gpl3+). Signed-off-by: Maxim Cournoyer --- gnu/packages/gnome.scm | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b497b965bc..fe3c8b86ae 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -31,6 +31,7 @@ ;;; Copyright © 2017, 2018 Rutger Helling ;;; Copyright © 2018 Jovany Leandro G.C ;;; Copyright © 2018 Vasile Dumitrascu +;;; Copyright © 2018 Björn Höfling ;;; ;;; This file is part of GNU Guix. ;;; @@ -95,6 +96,7 @@ #:use-module (gnu packages polkit) #:use-module (gnu packages popt) #:use-module (gnu packages ghostscript) + #:use-module (gnu packages inkscape) #:use-module (gnu packages ibus) #:use-module (gnu packages iso-codes) #:use-module (gnu packages libcanberra) @@ -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)) @@ -6435,15 +6438,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 @@ -6454,16 +6458,20 @@ functionality and behavior.") (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) - ("pkg-config" ,pkg-config))) - (inputs - `(("gtk+" ,gtk+))) + ("glib" ,glib "bin") ; for glib-compile-resources + ("gnome-shell" ,gnome-shell) + ("gtk+" ,gtk+) + ("inkscape" ,inkscape) + ("optipng" ,optipng) + ("pkg-config" ,pkg-config) + ("sassc" ,sassc))) (synopsis "A 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") ;; No "or later" language found. - (license license:gpl3))) + (license license:gpl3+))) (define-public faba-icon-theme (package -- cgit 1.4.1 From 8a831c6f0699953a878dae07250c17a34a6025bf Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 8 Dec 2018 02:02:51 +0100 Subject: gnu: Remove more GCC ICE workarounds. These were fixed with . * gnu/packages/glib.scm (python-pygobject, python2-pygobject)[native-inputs]: Remove GCC-7. * gnu/packages/gnome.scm (gjs)[native-inputs]: Likewise. [arguments]: Remove related phase. --- gnu/packages/glib.scm | 13 ++----------- gnu/packages/gnome.scm | 14 +------------- 2 files changed, 3 insertions(+), 24 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 491f688c8e..cd9b48caff 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -36,7 +36,6 @@ #:use-module (gnu packages enlightenment) #:use-module (gnu packages file) #:use-module (gnu packages flex) - #:use-module (gnu packages gcc) #:use-module (gnu packages gettext) #:use-module (gnu packages gnome) #:use-module (gnu packages gperf) @@ -621,11 +620,7 @@ useful for C++.") (delete-file "tests/test_ossig.py") #t))))) (native-inputs - `(;; Use gcc-7 to work around an internal compiler error that happens - ;; when using gcc-5.5.0. FIXME: Try removing this when the default - ;; compiler is no longer gcc-5.5.0. - ("gcc" ,gcc-7) - ("which" ,which) + `(("which" ,which) ;for tests: dbus-run-session and glib-compile-schemas ("dbus" ,dbus) ("glib-bin" ,glib "bin") @@ -656,11 +651,7 @@ useful for C++.") ("python-pycairo" ,python2-pycairo) ("gobject-introspection" ,gobject-introspection))) (native-inputs - `(;; Use gcc-7 to work around an internal compiler error that happens - ;; when using gcc-5.5.0. FIXME: Try removing this when the default - ;; compiler is no longer gcc-5.5.0. - ("gcc" ,gcc-7) - ("which" ,which) + `(("which" ,which) ;for tests: dbus-run-session and glib-compile-schemas ("dbus" ,dbus) ("glib-bin" ,glib "bin") diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index fe3c8b86ae..415398eeee 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4633,14 +4633,6 @@ configuration program to choose applications starting on login.") (arguments '(#:phases (modify-phases %standard-phases - (add-after 'set-paths 'work-around-gcc-7-include-path-issue - ;; FIXME: Work around a problem with gcc-7 includes (see - ;; ). Note that we use gcc-7 - ;; to work around an internal compiler error in gcc-5. - (lambda _ - (unsetenv "C_INCLUDE_PATH") - (unsetenv "CPLUS_INCLUDE_PATH") - #t)) (add-before 'check 'pre-check (lambda _ @@ -4658,11 +4650,7 @@ configuration program to choose applications starting on login.") ((".*expect\\(datestr\\).*") "")) #t))))) (native-inputs - `(("gcc" ,gcc-7) ; FIXME: Work around an internal compiler error in - ; gcc-5. Try removing this when our default compiler is - ; no longer gcc-5.5.0, and also remove the - ; 'work-around-gcc-7-include-path-issue' phase above. - ("glib:bin" ,glib "bin") ; for glib-compile-resources + `(("glib:bin" ,glib "bin") ; for glib-compile-resources ("pkg-config" ,pkg-config) ("xmllint" ,libxml2) ;; For testing -- cgit 1.4.1