From 2394b76bd223f5903e325f1f0e6d6b6fe69d00ed Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 04:02:14 -0400 Subject: gnu: yelp-xsl: Make some cosmetic changes. * gnu/packages/gnome.scm (yelp-xsl): Make some cosmetic changes. Signed-off-by: Danny Milosavljevic --- gnu/packages/gnome.scm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 05499bc220..903c741a3a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6692,24 +6692,25 @@ (define-public yelp-xsl (package (name "yelp-xsl") (version "3.34.2") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1bdpgkzawhqmw52l6zx8czzg1ndfgcf1p44m2bxjdpqkc4afcgqc")))) + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "1bdpgkzawhqmw52l6zx8czzg1ndfgcf1p44m2bxjdpqkc4afcgqc")))) (build-system gnu-build-system) (native-inputs `(("gettext-minimal" ,gettext-minimal) ("itstool" ,itstool) ("xmllint" ,libxml2))) - (home-page "https://wiki.gnome.org/Apps/Yelp") (synopsis "XSL stylesheets for Yelp") (description "Yelp-xsl contains XSL stylesheets that are used by the yelp help browser to format Docbook and Mallard documents.") + (home-page "https://wiki.gnome.org/Apps/Yelp") (license license:gpl2+))) (define-public yelp -- cgit v1.2.3 From dee784f6dee69302f679216fb57f8157507b089e Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 04:04:27 -0400 Subject: gnu: yelp-xsl: Update to 3.36.0. * gnu/packages/gnome.scm (yelp-xsl) [version]: Update to 3.36.0. [source][sha256]: Modify base32. Signed-off-by: Danny Milosavljevic --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 903c741a3a..aedb63e48b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6691,7 +6691,7 @@ (define-public d-feet (define-public yelp-xsl (package (name "yelp-xsl") - (version "3.34.2") + (version "3.36.0") (source (origin (method url-fetch) @@ -6700,7 +6700,7 @@ (define-public yelp-xsl (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 - (base32 "1bdpgkzawhqmw52l6zx8czzg1ndfgcf1p44m2bxjdpqkc4afcgqc")))) + (base32 "1hsfj3q3a3kca0cf9i02xlq2qd4vy12qsjb89hh4r6mp6c11rrag")))) (build-system gnu-build-system) (native-inputs `(("gettext-minimal" ,gettext-minimal) -- cgit v1.2.3 From ba7a7d275dbcb766c76a8baf74739a99bda26a61 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 04:08:12 -0400 Subject: gnu: yelp-xsl: Enable documentation. * gnu/packages/gnome.scm (yelp-xsl) [arguments]<#:configure-flag>[--enable-doc]: New flag. [native-inputs]: Add mallard-ducktype, intltool and libxslt. Signed-off-by: Danny Milosavljevic --- gnu/packages/gnome.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index aedb63e48b..66067007e9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6702,10 +6702,17 @@ (define-public yelp-xsl (sha256 (base32 "1hsfj3q3a3kca0cf9i02xlq2qd4vy12qsjb89hh4r6mp6c11rrag")))) (build-system gnu-build-system) + (arguments + `(#:configure-flags + (list + "--enable-doc"))) (native-inputs - `(("gettext-minimal" ,gettext-minimal) + `(("ducktype" ,mallard-ducktype) + ("gettext-minimal" ,gettext-minimal) + ("intltool" ,intltool) ("itstool" ,itstool) - ("xmllint" ,libxml2))) + ("xmllint" ,libxml2) + ("xsltproc" ,libxslt))) (synopsis "XSL stylesheets for Yelp") (description "Yelp-xsl contains XSL stylesheets that are used by the yelp help browser -- cgit v1.2.3 From a7affce00e897908a0dc7c77654baa4b592e1be0 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 04:09:42 -0400 Subject: gnu: yelp-xsl: Update description. * gnu/packages/gnome.scm (yelp-xsl) [description]: Modify. Signed-off-by: Danny Milosavljevic --- gnu/packages/gnome.scm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 66067007e9..c2120a8b7b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6714,9 +6714,12 @@ (define-public yelp-xsl ("xmllint" ,libxml2) ("xsltproc" ,libxslt))) (synopsis "XSL stylesheets for Yelp") - (description - "Yelp-xsl contains XSL stylesheets that are used by the yelp help browser -to format Docbook and Mallard documents.") + (description "Yelp-XSL is a collection of programs and data files to help +you build, maintain, and distribute documentation. It provides XSLT stylesheets +that can be built upon for help viewers and publishing systems. These +stylesheets output JavaScript and CSS content, and reference images +provided by yelp-xsl. It also redistributes copies of the jQuery and +jQuery.Syntax JavaScript libraries.") (home-page "https://wiki.gnome.org/Apps/Yelp") (license license:gpl2+))) -- cgit v1.2.3 From 695cdc87987cbd2ccf59cc61c1ccf135476cb509 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 04:11:14 -0400 Subject: gnu: yelp-xsl: Update license. * gnu/packages/gnome.scm (yelp-xsl) [license]: Add lgpl2.1+ and expat. Signed-off-by: Danny Milosavljevic --- gnu/packages/gnome.scm | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index c2120a8b7b..b16302afde 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6721,7 +6721,14 @@ (define-public yelp-xsl provided by yelp-xsl. It also redistributes copies of the jQuery and jQuery.Syntax JavaScript libraries.") (home-page "https://wiki.gnome.org/Apps/Yelp") - (license license:gpl2+))) + (license + (list + ;; XSLT + license:gpl2+ + ;; Images + license:lgpl2.1+ + ;; JavaScript + license:expat)))) (define-public yelp (package -- cgit v1.2.3 From 416b1b9f56b514677660b56992cea1c78e00f519 Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 04:14:35 -0400 Subject: gnu: yelp-tools: Make some cosmetic changes. * gnu/packages/gnome.scm (yelp-tools): Make some cosmetic changes. Signed-off-by: Danny Milosavljevic --- gnu/packages/gnome.scm | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b16302afde..8d58e916a5 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6768,31 +6768,31 @@ (define-public yelp-tools (package (name "yelp-tools") (version "3.32.2") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1yg8f5g5wadhmy4yfd9yjhvd8vll4gq4l86ibp0b42qbxnsmcf0q")))) + (source + (origin + (method url-fetch) + (uri + (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "1yg8f5g5wadhmy4yfd9yjhvd8vll4gq4l86ibp0b42qbxnsmcf0q")))) (build-system gnu-build-system) (native-inputs `(("pkg-config" ,pkg-config))) + (inputs + `(("yelp-xsl" ,yelp-xsl))) (propagated-inputs - ;; Needed by `yelp-build', `yelp-check' or 'yelp.m4'. `(("itstool" ,itstool) ("xmllint" ,libxml2) ("xsltproc" ,libxslt))) - (inputs - `(("yelp-xsl" ,yelp-xsl))) - (home-page "https://wiki.gnome.org/Apps/Yelp/Tools") (synopsis "Yelp documentation tools") (description "Yelp-tools is a collection of scripts and build utilities to help create, manage, and publish documentation for Yelp and the web. Most of the heavy lifting is done by packages like yelp-xsl and itstool. This package just wraps things up in a developer-friendly way.") + (home-page "https://wiki.gnome.org/Apps/Yelp/Tools") (license license:gpl2+))) (define-public libgee -- cgit v1.2.3 From c3c92c456b25ffded596a42d11044f62dcc03baa Mon Sep 17 00:00:00 2001 From: Raghav Gururajan Date: Thu, 24 Sep 2020 04:17:52 -0400 Subject: gnu: yelp-tools: De-propagate some inputs. * gnu/packages/gnome.scm (yelp-tools) [propagated-inputs]: Move itstool, libxml2 and libxslt to ... [native-inputs]: ... here. Signed-off-by: Danny Milosavljevic --- gnu/packages/gnome.scm | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 8d58e916a5..7103c02a43 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6779,13 +6779,12 @@ (define-public yelp-tools (base32 "1yg8f5g5wadhmy4yfd9yjhvd8vll4gq4l86ibp0b42qbxnsmcf0q")))) (build-system gnu-build-system) (native-inputs - `(("pkg-config" ,pkg-config))) - (inputs - `(("yelp-xsl" ,yelp-xsl))) - (propagated-inputs `(("itstool" ,itstool) + ("pkg-config" ,pkg-config) ("xmllint" ,libxml2) ("xsltproc" ,libxslt))) + (inputs + `(("yelp-xsl" ,yelp-xsl))) (synopsis "Yelp documentation tools") (description "Yelp-tools is a collection of scripts and build utilities to help create, -- cgit v1.2.3 From e183418ff53807d6998894cb8624da1f3f72a712 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 1 Dec 2020 23:06:24 +0100 Subject: Revert "gnu: yelp-tools: De-propagate some inputs." This reverts commit c3c92c456b25ffded596a42d11044f62dcc03baa. --- gnu/packages/gnome.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 7103c02a43..8d58e916a5 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6779,12 +6779,13 @@ (define-public yelp-tools (base32 "1yg8f5g5wadhmy4yfd9yjhvd8vll4gq4l86ibp0b42qbxnsmcf0q")))) (build-system gnu-build-system) (native-inputs + `(("pkg-config" ,pkg-config))) + (inputs + `(("yelp-xsl" ,yelp-xsl))) + (propagated-inputs `(("itstool" ,itstool) - ("pkg-config" ,pkg-config) ("xmllint" ,libxml2) ("xsltproc" ,libxslt))) - (inputs - `(("yelp-xsl" ,yelp-xsl))) (synopsis "Yelp documentation tools") (description "Yelp-tools is a collection of scripts and build utilities to help create, -- cgit v1.2.3 From aa4e899be36efd8e01513997fdbb0d043dc8382d Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 1 Dec 2020 23:07:00 +0100 Subject: Revert "gnu: yelp-xsl: Enable documentation." This reverts commit ba7a7d275dbcb766c76a8baf74739a99bda26a61. --- gnu/packages/gnome.scm | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 8d58e916a5..c9debb19ba 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6702,17 +6702,10 @@ (define-public yelp-xsl (sha256 (base32 "1hsfj3q3a3kca0cf9i02xlq2qd4vy12qsjb89hh4r6mp6c11rrag")))) (build-system gnu-build-system) - (arguments - `(#:configure-flags - (list - "--enable-doc"))) (native-inputs - `(("ducktype" ,mallard-ducktype) - ("gettext-minimal" ,gettext-minimal) - ("intltool" ,intltool) + `(("gettext-minimal" ,gettext-minimal) ("itstool" ,itstool) - ("xmllint" ,libxml2) - ("xsltproc" ,libxslt))) + ("xmllint" ,libxml2))) (synopsis "XSL stylesheets for Yelp") (description "Yelp-XSL is a collection of programs and data files to help you build, maintain, and distribute documentation. It provides XSLT stylesheets -- cgit v1.2.3 From 0f78b5c1282b3cc60d912fc58d8176b5c6703c14 Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Tue, 1 Dec 2020 23:07:12 +0100 Subject: Revert "gnu: yelp-xsl: Update to 3.36.0." This reverts commit dee784f6dee69302f679216fb57f8157507b089e. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index c9debb19ba..530846350f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6691,7 +6691,7 @@ (define-public d-feet (define-public yelp-xsl (package (name "yelp-xsl") - (version "3.36.0") + (version "3.34.2") (source (origin (method url-fetch) @@ -6700,7 +6700,7 @@ (define-public yelp-xsl (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 - (base32 "1hsfj3q3a3kca0cf9i02xlq2qd4vy12qsjb89hh4r6mp6c11rrag")))) + (base32 "1bdpgkzawhqmw52l6zx8czzg1ndfgcf1p44m2bxjdpqkc4afcgqc")))) (build-system gnu-build-system) (native-inputs `(("gettext-minimal" ,gettext-minimal) -- cgit v1.2.3 From d9865443161efb6edfa82fb924e8fcae02b1e851 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 3 Dec 2020 08:59:00 +0200 Subject: gnu: libsoup: Patch docbook-xml references. * gnu/packages/gnome.scm (libsoup)[arguments]: Add phase to refer to local copy of docbook-xml. [native-inputs]: Add docbook-xml-4.1.2. --- gnu/packages/gnome.scm | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 530846350f..623732d8bc 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4680,6 +4680,14 @@ (define-public libsoup #:configure-flags '("-Dgtk_doc=true") #:phases (modify-phases %standard-phases + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (let ((xmldoc (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook"))) + (substitute* (find-files "docs/reference") + (("http://.*/docbookx\\.dtd") + (string-append xmldoc "/docbookx.dtd"))) + #t))) (add-after 'unpack 'adjust-tests (lambda _ ;; This test fails due to missing /etc/nsswitch.conf @@ -4751,7 +4759,8 @@ (define-public libsoup (delete-file-recursively (string-append out "/share/gtk-doc")) #t)))))) (native-inputs - `(("glib:bin" ,glib "bin") ; for glib-mkenums + `(("docbook-xml" ,docbook-xml-4.1.2) + ("glib:bin" ,glib "bin") ; for glib-mkenums ("gobject-introspection" ,gobject-introspection) ("gtk-doc" ,gtk-doc) ("intltool" ,intltool) -- cgit v1.2.3 From f3340338d56c2596cc1ed48f05462e333b7cce5e Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Sat, 12 Dec 2020 17:12:05 -0300 Subject: gnu: setzer: Update to 0.3.8. * gnu/packages/gnome.scm (setzer): Update to 0.3.8. Signed-off-by: Nicolas Goaziou --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 623732d8bc..64fded105a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -11504,7 +11504,7 @@ (define-public gnome-latex (define-public setzer (package (name "setzer") - (version "0.3.6") + (version "0.3.8") (source (origin (method git-fetch) @@ -11513,7 +11513,7 @@ (define-public setzer (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "118gip6bv4mcsq4nrai7kl0vmqqbyzpsd4ky9vhxb1x2cvg048s8")))) + (base32 "1f5qmkz4hzn54sh56z3hw8zrvg93xlz62ggzlzyg7vgsr83kpns9")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t -- cgit v1.2.3 From 916f2414f0dd26c67075c028cb1486446b9c051e Mon Sep 17 00:00:00 2001 From: Marius Bakke Date: Sat, 12 Dec 2020 19:01:35 +0100 Subject: gnu: libnotify: Update to 0.7.9. * gnu/packages/gnome.scm (libnotify): Update to 0.7.9. [build-system]: Change to MESON-BUILD-SYSTEM. [arguments]: Remove #:configure-flags. Add #:phases. [native-inputs]: Add GTK-DOC, LIBXSLT, and DOCBOOK-XSL. --- gnu/packages/gnome.scm | 43 ++++++++++++++++++++++++++++++------------- 1 file changed, 30 insertions(+), 13 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 64fded105a..4137a12c2f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2945,19 +2945,31 @@ (define-public hicolor-icon-theme (define-public libnotify (package (name "libnotify") - (version "0.7.7") + (version "0.7.9") (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "017wgq9n00hx39n0hm784zn18hl721hbaijda868cm96bcqwxd4w")))) - (build-system gnu-build-system) + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0qa7cx6ra5hwqnxw95b9svgjg5q6ynm8y843iqjszxvds5z53h36")))) + (build-system meson-build-system) (arguments - `(#:configure-flags '("--disable-static"))) + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'fix-docbook + (lambda* (#:key inputs #:allow-other-keys) + ;; Don't attempt to download XSL schema. + (substitute* "meson.build" + (("http://docbook.sourceforge.net/release/xsl-ns/current\ +/manpages/docbook.xsl") + (string-append (assoc-ref inputs "docbook-xsl") + "/xml/xsl/docbook-xsl-" + ,(package-version docbook-xsl) + "/manpages/docbook.xsl"))) + #t))))) (propagated-inputs `(;; In Requires of libnotify.pc. ("gdk-pixbuf" ,gdk-pixbuf) @@ -2966,9 +2978,14 @@ (define-public libnotify `(("gtk+" ,gtk+) ("libpng" ,libpng))) (native-inputs - `(("pkg-config" ,pkg-config) - ("glib" ,glib "bin") - ("gobject-introspection" ,gobject-introspection))) + `(("pkg-config" ,pkg-config) + ("glib" ,glib "bin") + ("gobject-introspection" ,gobject-introspection) + + ;; For the documentation. + ("gtk-doc" ,gtk-doc) + ("xsltproc" ,libxslt) + ("docbook-xsl" ,docbook-xsl))) (home-page "https://developer-next.gnome.org/libnotify/") (synopsis "GNOME desktop notification library") -- cgit v1.2.3 From a531055b0b7bc3a5f70129120a5fe4eeed99cb4e Mon Sep 17 00:00:00 2001 From: Mark H Weaver Date: Tue, 8 Dec 2020 21:27:41 -0500 Subject: gnu: yelp-tools: Restore a comment. * gnu/packages/gnome.scm (yelp-tools)[propagated-inputs]: Restore a comment deleted in commit 416b1b9f56b514677660b56992cea1c78e00f519. --- gnu/packages/gnome.scm | 1 + 1 file changed, 1 insertion(+) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 64fded105a..a55900f9a1 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6785,6 +6785,7 @@ (define-public yelp-tools (inputs `(("yelp-xsl" ,yelp-xsl))) (propagated-inputs + ;; Needed by `yelp-build', `yelp-check' or 'yelp.m4'. `(("itstool" ,itstool) ("xmllint" ,libxml2) ("xsltproc" ,libxslt))) -- cgit v1.2.3 From 9c4910c5e816bf0a19b87673c0762784e1ec4574 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 18 Dec 2020 22:33:36 +0100 Subject: gnu: simple-scan: Update to 3.38.2. * gnu/packages/gnome.scm (simple-scan): Update to 3.38.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a55900f9a1..aff8f89640 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6457,7 +6457,7 @@ (define-public gusb (define-public simple-scan (package (name "simple-scan") - (version "3.38.1") + (version "3.38.2") (source (origin (method url-fetch) @@ -6465,7 +6465,7 @@ (define-public simple-scan (version-major+minor version) "/" "simple-scan-" version ".tar.xz")) (sha256 - (base32 "0grscz96bwj79ka4qvxh8h75avdx6824k8k38ylmaj6xbl6gi0hy")))) + (base32 "02sdkhxgr6i7iy481h4xavgaqd0a5dlsipzwrm4qd242jrr813d8")))) (build-system meson-build-system) ;; TODO: Fix icons in home screen, About dialogue, and scan menu. (arguments -- cgit v1.2.3 From caee6ec7c8c9ce7ef1e90963190396cda1f6ad4c Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Fri, 18 Dec 2020 12:57:26 +0100 Subject: gnu: komikku: Update to 0.24.0. * gnu/packages/gnome.scm (komikku): Update to 0.24.0. [inputs] Replace python-cloudscraper with python-requests. Signed-off-by: Efraim Flashner --- gnu/packages/gnome.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index aff8f89640..3d99b49ae2 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -11936,7 +11936,7 @@ (define-public gnome-builder (define-public komikku (package (name "komikku") - (version "0.23.0") + (version "0.24.0") (source (origin (method git-fetch) @@ -11946,7 +11946,7 @@ (define-public komikku (file-name (git-file-name name version)) (sha256 (base32 - "1xh3qmf2pk80qxj528lajjcwg7mps72s1zz8cj388av58p8l3hyw")))) + "010p32zrim245y0l784yp0rasqcqlyr3lrxwl3r1876x83qhs6q3")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t @@ -11978,7 +11978,6 @@ (define-public komikku ("libnotify" ,libnotify) ("libsecret" ,libsecret) ("python-beautifulsoup4" ,python-beautifulsoup4) - ("python-cloudscraper" ,python-cloudscraper) ("python-dateparser" ,python-dateparser) ("python-keyring" ,python-keyring) ("python-lxml" ,python-lxml) @@ -11987,6 +11986,7 @@ (define-public komikku ("python-pure-protobuf" ,python-pure-protobuf) ("python-pycairo" ,python-pycairo) ("python-pygobject" ,python-pygobject) + ("python-requests" ,python-requests) ("python-unidecode" ,python-unidecode))) (native-inputs `(("desktop-file-utils" ,desktop-file-utils) -- cgit v1.2.3 From f3e0dc63e18c4f4acce1b1d336d23a90beccb77a Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Sat, 19 Dec 2020 12:50:01 +0100 Subject: gnu: gnome-builder: Disable jedi plugin. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As pointed out in #45272, it is broken. * gnu/packages/gnome.scm (gnome-builder)[#:configure-flags] Add -Dplugin_jedi=false. Signed-off-by: Ludovic Courtès --- gnu/packages/gnome.scm | 3 +++ 1 file changed, 3 insertions(+) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3d99b49ae2..f7263b5841 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -11876,6 +11876,9 @@ (define-public gnome-builder "-Dplugin_clang=false" "-Dplugin_flatpak=false" "-Dplugin_glade=false" + ;; XXX: This one has been shown not to work in + ;; + "-Dplugin_jedi=false" ;; ... except this one. "-Dplugin_update_manager=false") #:phases -- cgit v1.2.3 From 46a391394e5c443e9a67b4f62157deff0e4cf061 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Fri, 18 Dec 2020 16:08:57 -0300 Subject: gnu: lollypop: Add dependency on glib-networking. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome.scm (lollypop): Add dependency on glib-networking. Signed-off-by: Ludovic Courtès --- gnu/packages/gnome.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f7263b5841..4caedb14f4 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10330,7 +10330,8 @@ (define-public lollypop ("gtk+:bin" ,gtk+ "bin") ; For gtk-update-icon-cache ("pkg-config" ,pkg-config))) (inputs - `(("gobject-introspection" ,gobject-introspection) + `(("glib-networking" ,glib-networking) + ("gobject-introspection" ,gobject-introspection) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("gst-plugins-base" ,gst-plugins-base) ("libnotify" ,libnotify) -- cgit v1.2.3 From fc21e1b40bb0715a8aa9bd7904723b93fc1faad7 Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Fri, 18 Dec 2020 16:10:47 -0300 Subject: gnu: lollypop: Update to 1.4.6. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome.scm (lollypop): Update to 1.4.6. Signed-off-by: Ludovic Courtès --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4caedb14f4..c380b759f6 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10293,14 +10293,14 @@ (define-public gnome-planner (define-public lollypop (package (name "lollypop") - (version "1.4.2") + (version "1.4.6") (source (origin (method url-fetch) (uri (string-append "https://adishatz.org/lollypop/" "lollypop-" version ".tar.xz")) (sha256 - (base32 "1hfl68gkvqy5kxlmrsalz78mw1bs1yvqvy2rhg7pzgwiazsdvwzz")))) + (base32 "1hlahr50gsagx1ifcdk4yn43xps6w0vqn0gnd6xckfc7qmg1pgq7")))) (build-system meson-build-system) (arguments `(#:imported-modules -- cgit v1.2.3 From be0a06ec41319a093b206a858ea16926c1f3f35f Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Thu, 24 Dec 2020 16:26:29 +0100 Subject: gnu: baobab: updating to version 3.38.0. * gnu/packages/gnome.scm (baobab): updating to version 3.38.0. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index c380b759f6..2756a3d0d4 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8764,7 +8764,7 @@ (define-public nautilus (define-public baobab (package (name "baobab") - (version "3.32.0") + (version "3.38.0") (source (origin (method url-fetch) (uri (string-append @@ -8773,7 +8773,7 @@ (define-public baobab name "-" version ".tar.xz")) (sha256 (base32 - "0b33s9bhpiffv5wl76cq2bbnqhvx3qs2vxyxmil5gcs583llqh9r")))) + "0ac3fbl15l836yvgw724q4whbkws9v4b6l2xy6bnp0b0g0a6i104")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t)) -- cgit v1.2.3 From ae8f61f7c32488d4d775c83265c6ec31d20222cd Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Sun, 22 Nov 2020 14:35:26 +0100 Subject: gnu: libpeas: Update to 1.28.0. * gnu/packages/gnome.scm (libpeas): Update to 1.28.0. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 2756a3d0d4..2b8625a0ab 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2982,7 +2982,7 @@ (define-public libnotify (define-public libpeas (package (name "libpeas") - (version "1.24.1") + (version "1.28.0") (source (origin (method url-fetch) @@ -2991,7 +2991,7 @@ (define-public libpeas name "-" version ".tar.xz")) (sha256 (base32 - "1162dr7smmfb02czmhshr0f93hqj7w0nw29bys5lzfvwarxcyflw")))) + "05cb7drn6arc4gi02wgsvzibigi2riz5gnfnmlb0zmbfnj9ikna2")))) (build-system meson-build-system) (arguments '(#:phases -- cgit v1.2.3 From 597c5c4d1f6de3f64a6451fe42321cff669f09c4 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Mon, 28 Dec 2020 16:18:53 +0100 Subject: gnu: file-roller: Update to 3.38.0. * gnu/packages/gnome.scm (file-roller): Update to 3.38.0. Signed-off-by: Leo Prikler --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 2b8625a0ab..1b1bcce3e3 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6925,7 +6925,7 @@ (define-public shotwell (define-public file-roller (package (name "file-roller") - (version "3.32.3") + (version "3.38.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/file-roller/" @@ -6933,7 +6933,7 @@ (define-public file-roller "file-roller-" version ".tar.xz")) (sha256 (base32 - "0ap2hxvjljh4p6wsd9ikh2my3vsxp9r2nvjxxj3v87nwfyw1y4dy")))) + "06ikvjjcgb8nxabkn2rywy76a1c7s6w8dszaxvaxldbxarp1qgbj")))) (build-system meson-build-system) (native-inputs `(("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database -- cgit v1.2.3 From 595f44df0ad41a268ef58a396c60d0ee51556de0 Mon Sep 17 00:00:00 2001 From: Vincent Legoll Date: Mon, 28 Dec 2020 16:28:15 +0100 Subject: gnu: libsoup: Update to 2.72.0. * gnu/packages/gnome.scm (libsoup): Update to 2.72.0. Signed-off-by: Leo Prikler --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 1b1bcce3e3..55189d096f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4661,7 +4661,7 @@ (define-public rest (define-public libsoup (package (name "libsoup") - (version "2.70.0") + (version "2.72.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/libsoup/" @@ -4669,7 +4669,7 @@ (define-public libsoup "libsoup-" version ".tar.xz")) (sha256 (base32 - "0hjk9lgppc5435my0lyywbpmj7ib5vvcylwfin8ki97g9bvj1c2l")))) + "11skbyw2pw32178q3h8pi7xqa41b2x4k6q4k9f75zxmh8s23y30p")))) (build-system meson-build-system) (outputs '("out" "doc")) (arguments -- cgit v1.2.3 From 81c7a751403d193d66db0f19b2a6d30cefebbc81 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Fri, 1 Jan 2021 17:39:24 +0100 Subject: gnu: gnome-tweaks: Update to 3.34.1. * gnu/packages/gnome.scm (gnome-tweaks): Update to 3.34.1. --- gnu/packages/gnome.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 55189d096f..6f9fc92246 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -21,7 +21,7 @@ ;;; Copyright © 2016 Alex Griffin ;;; Copyright © 2016, 2017 Nikita ;;; Copyright © 2016 David Craven -;;; Copyright © 2016, 2017, 2018, 2019, 2020 Tobias Geerinckx-Rice +;;; Copyright © 2016–2021 Tobias Geerinckx-Rice ;;; Copyright © 2017 Thomas Danckaert ;;; Copyright © 2017 Hartmut Goebel ;;; Copyright © 2017, 2018 nee @@ -9485,7 +9485,7 @@ (define-public gnome-dictionary (define-public gnome-tweaks (package (name "gnome-tweaks") - (version "3.34.0") + (version "3.34.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/gnome-tweaks/" @@ -9495,7 +9495,7 @@ (define-public gnome-tweaks (list (search-patch "gnome-tweaks-search-paths.patch"))) (sha256 (base32 - "0l2j42ba7v866iknygamnkiq7igh0fjvq92r93cslvvfnkx2ccq0")))) + "19y62dj4n5i6v4zpjllxl51dch6ndy8xs45v5aqmmq9xyfrqk5yq")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t -- cgit v1.2.3 From f4a809145feac0e3b07fc196b1c75638e8aec02e Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sat, 2 Jan 2021 20:19:32 +0100 Subject: gnu: geoclue: Update to 2.5.7. * gnu/packages/gnome.scm (geoclue): Update to 2.5.7. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 6f9fc92246..3ee3a698fd 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5157,7 +5157,7 @@ (define-public colord (define-public geoclue (package (name "geoclue") - (version "2.5.6") + (version "2.5.7") (source (origin (method url-fetch) @@ -5165,7 +5165,7 @@ (define-public geoclue (string-append "https://gitlab.freedesktop.org/geoclue/geoclue/-/archive/" version "/geoclue-" version ".tar.bz2")) (sha256 - (base32 "0a833x5apzabxj80ywvsh8crd635vni2i9v9c1p095f6hvmfc45k")) + (base32 "09ww26a76kanldhgwnn5sqy9ly2940k45zpp68spykkv2zjdpivc")) (patches (search-patches "geoclue-config.patch")))) (build-system meson-build-system) (arguments -- cgit v1.2.3 From 55e8865da24e570f79ff15414ca00b78a13e92fd Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 3 Jan 2021 09:14:21 +0200 Subject: gnu: librsvg-next: Build with current rust. * gnu/packages/gnome.scm (librsvg-next)[arguments]: Remove custom rust variable. --- gnu/packages/gnome.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3ee3a698fd..97667803e4 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3283,7 +3283,6 @@ (define-public librsvg-next ((guix build cargo-build-system) (guix build utils) ((guix build gnu-build-system) #:prefix gnu:)) - #:rust ,rust-1.40 #:cargo-inputs (("rust-bitflags" ,rust-bitflags-1) ("rust-cairo-rs" ,rust-cairo-rs-0.8) -- cgit v1.2.3 From e43a91a4291b402a0cc87b23cf76cd1a201e4c0e Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Sun, 3 Jan 2021 10:51:14 +0200 Subject: gnu: librsvg-next: Update to 2.50.2. * gnu/packages/gnome.scm (librsvg-next): Update to 2.50.2. --- gnu/packages/gnome.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 97667803e4..634b251031 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -11,7 +11,7 @@ ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Ricardo Wurmus ;;; Copyright © 2015, 2016, 2017, 2018 Mark H Weaver ;;; Copyright © 2015 David Thompson -;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020 Efraim Flashner +;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Efraim Flashner ;;; Copyright © 2016, 2017, 2018 Rene Saavedra ;;; Copyright © 2016 Jochem Raat ;;; Copyright © 2016, 2017, 2019 Kei Kebreau @@ -3263,7 +3263,7 @@ (define-public librsvg (define-public librsvg-next (package (name "librsvg") - (version "2.50.1") + (version "2.50.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/librsvg/" @@ -3271,7 +3271,7 @@ (define-public librsvg-next "librsvg-" version ".tar.xz")) (sha256 (base32 - "02csvx2nzygh8kyal2qiy3y6xb7d52vszxxr37dzav704a9pkncv")) + "1lsnl08b5pjf01q3agixjd53islw5rqkc38r31rlmm2crrqz44b2")) (modules '((guix build utils))) (snippet '(begin (delete-file-recursively "vendor") -- cgit v1.2.3 From 957f0c40327ce00f53db22737e3775ce616ac258 Mon Sep 17 00:00:00 2001 From: Andy Tai Date: Mon, 14 Dec 2020 23:31:39 -0800 Subject: gnu: terminator: Update to 1.92. * gnu/packages/gnome.scm (terminator): Update to 1.92. [source]: Use new upstream URI. [inputs]: Remove python2-psutil. Replace python2-pycairo, python2-pygobject with python- versions. Add dbus-glib, gtk+. Move gobject-introspection ... [native-inputs]: ... to here. Add python-psutil, python-pytest-runner, python-pytest. [propagated-inputs]: Add pyhton-configobj. [arguments]: Build with python3. Adjust 'wrap-program phase to also wrap with package's own python output. [home-page]: Update to new upstream URI. Signed-off-by: Efraim Flashner --- gnu/packages/gnome.scm | 43 +++++++++++++++++++++++++++---------------- 1 file changed, 27 insertions(+), 16 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 634b251031..f0d94ab1fe 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -56,6 +56,7 @@ ;;; Copyright © 2020 Arun Isaac ;;; Copyright © 2020 Michael Rohleder ;;; Copyright © 2020 Tim Gesthuizen +;;; Copyright © 2020 Andy Tai ;;; ;;; This file is part of GNU Guix. ;;; @@ -10859,32 +10860,37 @@ (define-public gthumb (define-public terminator (package (name "terminator") - (version "1.91") + (version "1.92") (source (origin (method url-fetch) - (uri (string-append "https://launchpad.net/" name "/" - "gtk3/" version "/" "+download/" + (uri (string-append "https://github.com/gnome-" name "/" name "/" + "releases/download/v" version "/" name "-" version ".tar.gz")) (sha256 (base32 - "0sdyqwydmdnh7j6mn74vrywz35m416kqsbxbrqcnv5ak08y6xxwm")))) + "1wbkfp0nk6x9bcwi681zy30qmrp4h754sdz6b7hi9j22mmvdd50z")))) (build-system python-build-system) (native-inputs - `(("intltool" ,intltool) + `(("gettext" ,gettext-minimal) ("glib:bin" ,glib "bin") ; for glib-compile-resources - ("gettext" ,gettext-minimal) - ("pkg-config" ,pkg-config))) + ("gobject-introspection" ,gobject-introspection) + ("intltool" ,intltool) + ("pkg-config" ,pkg-config) + ("python-psutil" ,python-psutil) + ("python-pytest-runner" ,python-pytest-runner) + ("python-pytest" ,python-pytest))) (inputs `(("cairo" ,cairo) - ("gobject-introspection" ,gobject-introspection) + ("dbus-glib" ,dbus-glib) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) - ("python2-pycairo" ,python2-pycairo) - ("python2-pygobject" ,python2-pygobject) - ("python2-psutil" ,python2-psutil) + ("gtk+" ,gtk+) + ("python-pycairo" ,python-pycairo) + ("python-pygobject" ,python-pygobject) ("vte" ,vte))) + (propagated-inputs + `(("python-configobj" ,python-configobj))) (arguments - `(#:python ,python-2 ; Python 3 isn't supported - #:imported-modules ((guix build glib-or-gtk-build-system) + `(#:imported-modules ((guix build glib-or-gtk-build-system) ,@%python-build-system-modules) #:modules ((guix build python-build-system) ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) @@ -10895,14 +10901,19 @@ (define-public terminator 'install 'wrap-program (lambda* (#:key outputs #:allow-other-keys) (let ((prog (string-append (assoc-ref outputs "out") - "/bin/terminator"))) + "/bin/terminator")) + (pylib (string-append (assoc-ref outputs "out") + "/lib/python" + ,(version-major+minor + (package-version python)) + "/site-packages"))) (wrap-program prog - `("PYTHONPATH" = (,(getenv "PYTHONPATH"))) + `("PYTHONPATH" = (,(getenv "PYTHONPATH") ,pylib)) `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))) #t))) (add-after 'wrap-program 'glib-or-gtk-wrap (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) - (home-page "https://gnometerminator.blogspot.com/") + (home-page "https://gnome-terminator.org/") (synopsis "Store and run multiple GNOME terminals in one window") (description "Terminator allows you to run multiple GNOME terminals in a grid and -- cgit v1.2.3 From 364bc7a01b2fe41410c684b1f3c8c825085d7d1f Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Sat, 2 Jan 2021 23:56:30 +0100 Subject: gnu: arc-theme: Move to gnome-xyz. * gnu/packages/gnome.scm (arc-theme): Move from here... * gnu/packages/gnome-xyz.scm (arc-theme): ... to here. --- gnu/packages/gnome-xyz.scm | 47 ++++++++++++++++++++++++++++++++++++++++++++++ gnu/packages/gnome.scm | 44 ------------------------------------------- 2 files changed, 47 insertions(+), 44 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 96e109ba59..4539cddbfb 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -33,12 +33,15 @@ (define-module (gnu packages gnome-xyz) #:use-module (guix git-download) #:use-module (guix packages) #:use-module ((guix licenses) #:prefix license:) + #:use-module (gnu packages autotools) #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages gettext) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) + #:use-module (gnu packages inkscape) + #:use-module (gnu packages image) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python-xyz) #:use-module (gnu packages ssh) @@ -518,6 +521,50 @@ (define-public gnome-shell-extension-paperwm notebooks and tiling window managers.") (license license:gpl3))) +(define-public arc-theme + (package + (name "arc-theme") + (version "20201013") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/jnsh/arc-theme") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1x2l1mwjx68dwf3jb1i90c1q8nqsl1wf2zggcn8im6590k5yv39s")))) + (build-system gnu-build-system) + (arguments + '(#:configure-flags + (list "--disable-cinnamon") + #:phases + (modify-phases %standard-phases + ;; autogen.sh calls configure at the end of the script. + (replace 'bootstrap + (lambda _ (invoke "autoreconf" "-vfi"))) + (add-before 'build 'set-home ;placate Inkscape + (lambda _ + (setenv "HOME" (getcwd)) + #t))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake) + ("glib" ,glib "bin") ; for glib-compile-resources + ("gnome-shell" ,gnome-shell) + ("gtk+" ,gtk+) + ("inkscape" ,inkscape) + ("optipng" ,optipng) + ("pkg-config" ,pkg-config) + ("sassc" ,sassc/libsass-3.5))) + (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+))) + (define-public greybird-gtk-theme (package (name "greybird-gtk-theme") diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f0d94ab1fe..b499684aee 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9570,50 +9570,6 @@ (define-public gnome-shell-extensions (home-page "https://extensions.gnome.org/") (license license:gpl3+))) -(define-public arc-theme - (package - (name "arc-theme") - (version "20201013") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/jnsh/arc-theme") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1x2l1mwjx68dwf3jb1i90c1q8nqsl1wf2zggcn8im6590k5yv39s")))) - (build-system gnu-build-system) - (arguments - '(#:configure-flags - (list "--disable-cinnamon") - #:phases - (modify-phases %standard-phases - ;; autogen.sh calls configure at the end of the script. - (replace 'bootstrap - (lambda _ (invoke "autoreconf" "-vfi"))) - (add-before 'build 'set-home ;placate Inkscape - (lambda _ - (setenv "HOME" (getcwd)) - #t))))) - (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake) - ("glib" ,glib "bin") ; for glib-compile-resources - ("gnome-shell" ,gnome-shell) - ("gtk+" ,gtk+) - ("inkscape" ,inkscape) - ("optipng" ,optipng) - ("pkg-config" ,pkg-config) - ("sassc" ,sassc/libsass-3.5))) - (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+))) - (define-public faba-icon-theme (package (name "faba-icon-theme") -- cgit v1.2.3 From 7ae52dd04f67a215be6d5bfc3135a3baad0a7c13 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Sun, 3 Jan 2021 00:01:13 +0100 Subject: gnu: arc-icon-theme: Move to gnome-xyz. * gnu/packages/gnome.scm (arc-icon-theme): Move from here... * gnu/packages/gnome-xyz.scm (arc-icon-theme): ... to here. --- gnu/packages/gnome-xyz.scm | 35 +++++++++++++++++++++++++++++++++++ gnu/packages/gnome.scm | 35 ----------------------------------- 2 files changed, 35 insertions(+), 35 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 4539cddbfb..0477ccfbaf 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -96,6 +96,41 @@ (define-public matcha-theme (home-page "https://github.com/vinceliuice/matcha") (license license:gpl3+))) +(define-public arc-icon-theme + (package + (name "arc-icon-theme") + (version "20161122") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/horst3180/arc-icon-theme") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 "1ch3hp08qri93510hypzz6m2x4xgg2h15wvnhjwh1x1s1b7jvxjd")))) + (build-system gnu-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-after 'unpack 'disable-configure-during-bootstrap + (lambda _ + (substitute* "autogen.sh" + (("^\"\\$srcdir/configure\".*") "")) + #t))))) + (native-inputs + `(("autoconf" ,autoconf) + ("automake" ,automake))) + ;; When Arc is missing an icon, it looks in the Moka icon theme for it. + (propagated-inputs + `(("moka-icon-theme" ,moka-icon-theme))) + (synopsis "Arc icon theme") + (description "The Arc icon theme provides a set of icons matching the +style of the Arc GTK theme. Icons missing from the Arc theme are provided by +the Moka icon theme.") + (home-page "https://github.com/horst3180/arc-icon-theme") + (license license:gpl3+))) + (define-public delft-icon-theme (package (name "delft-icon-theme") diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b499684aee..3372a6f0dd 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9626,41 +9626,6 @@ (define-public moka-icon-theme (license (list license:gpl3+ license:cc-by-sa4.0)))) -(define-public arc-icon-theme - (package - (name "arc-icon-theme") - (version "20161122") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/horst3180/arc-icon-theme") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1ch3hp08qri93510hypzz6m2x4xgg2h15wvnhjwh1x1s1b7jvxjd")))) - (build-system gnu-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'disable-configure-during-bootstrap - (lambda _ - (substitute* "autogen.sh" - (("^\"\\$srcdir/configure\".*") "")) - #t))))) - (native-inputs - `(("autoconf" ,autoconf) - ("automake" ,automake))) - ;; When Arc is missing an icon, it looks in the Moka icon theme for it. - (propagated-inputs - `(("moka-icon-theme" ,moka-icon-theme))) - (synopsis "Arc icon theme") - (description "The Arc icon theme provides a set of icons matching the -style of the Arc GTK theme. Icons missing from the Arc theme are provided by -the Moka icon theme.") - (home-page "https://github.com/horst3180/arc-icon-theme") - (license license:gpl3+))) - (define-public folks (package (name "folks") -- cgit v1.2.3 From 43c8b56f72e03ec041238283d05b8d533bc40723 Mon Sep 17 00:00:00 2001 From: Leo Prikler Date: Sun, 3 Jan 2021 00:11:53 +0100 Subject: gnu: Move faba-icon-theme and moka-icon-theme to gnome-xyz.scm They need to be moved together, as the latter inherits the former. * gnu/packages/gnome.scm (faba-icon-theme, moka-icon-theme): Move from here... * gnu/packages/gnome-xyz.scm (faba-icon-theme, moka-icon-theme): ... to here. --- gnu/packages/gnome-xyz.scm | 56 ++++++++++++++++++++++++++++++++++++++++++++++ gnu/packages/gnome.scm | 56 ---------------------------------------------- 2 files changed, 56 insertions(+), 56 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 0477ccfbaf..0c76c6320d 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -164,6 +164,62 @@ (define-public delft-icon-theme the Obsidian icon theme.") (license license:gpl3))) +(define-public faba-icon-theme + (package + (name "faba-icon-theme") + (version "4.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/snwh/faba-icon-theme") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0xh6ppr73p76z60ym49b4d0liwdc96w41cc5p07d48hxjsa6qd6n")))) + (build-system meson-build-system) + (arguments + `(#:phases + (modify-phases %standard-phases + (add-before 'configure 'disable-post-install + (lambda _ + (substitute* "meson.build" + (("meson.add_install_script.*") ""))))))) + (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 + (inherit faba-icon-theme) + (name "moka-icon-theme") + (version "5.4.0") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/snwh/moka-icon-theme") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "015l02im4mha5z91dbchxf6xkp66d346bg3xskwg0rh3lglhjsrd")))) + (propagated-inputs + ;; 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. + `(("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.") + (license (list license:gpl3+ + license:cc-by-sa4.0)))) + (define-public gnome-shell-extension-appindicator (package (name "gnome-shell-extension-appindicator") diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3372a6f0dd..60fde4fabb 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9570,62 +9570,6 @@ (define-public gnome-shell-extensions (home-page "https://extensions.gnome.org/") (license license:gpl3+))) -(define-public faba-icon-theme - (package - (name "faba-icon-theme") - (version "4.3") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/snwh/faba-icon-theme") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "0xh6ppr73p76z60ym49b4d0liwdc96w41cc5p07d48hxjsa6qd6n")))) - (build-system meson-build-system) - (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'configure 'disable-post-install - (lambda _ - (substitute* "meson.build" - (("meson.add_install_script.*") ""))))))) - (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 - (inherit faba-icon-theme) - (name "moka-icon-theme") - (version "5.4.0") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/snwh/moka-icon-theme") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 "015l02im4mha5z91dbchxf6xkp66d346bg3xskwg0rh3lglhjsrd")))) - (propagated-inputs - ;; 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. - `(("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.") - (license (list license:gpl3+ - license:cc-by-sa4.0)))) - (define-public folks (package (name "folks") -- cgit v1.2.3 From b6c42727b6d583977a0e3d8c66eb0755e19bb12c Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Thu, 7 Jan 2021 21:13:28 +0100 Subject: gnu: system-config-printer: Update to 1.5.14. * gnu/packages/gnome.scm (system-config-printer): Update to 1.5.14. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 60fde4fabb..3167b69f37 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2841,7 +2841,7 @@ (define-public shared-mime-info (define-public system-config-printer (package (name "system-config-printer") - (version "1.5.13") + (version "1.5.14") (source (origin (method url-fetch) @@ -2850,7 +2850,7 @@ (define-public system-config-printer "download/v" version "/system-config-printer-" version ".tar.xz")) (sha256 - (base32 "18dqvi1s971lggkw6pv1sqxixlpg5a8rppzc1pxbanxa91jg18zf")))) + (base32 "1l79lj44kl079sk308m42x3py1yvcxk5x5bs2vqfmqv26zm8qyqf")))) (build-system glib-or-gtk-build-system) (arguments `(#:imported-modules ((guix build python-build-system) -- cgit v1.2.3