From 371b074171f582ec72403f55405b83a8b9189e5b Mon Sep 17 00:00:00 2001 From: Vinicius Monego Date: Mon, 7 Feb 2022 19:28:08 -0300 Subject: gnu: gnome-commander: Update to 1.14.0. * gnu/packages/gnome.scm (gnome-commander): Update to 1.14.0. [native-inputs]: Add flex. [inputs]: Remove deprecated gnome-vfs. Add glib. --- gnu/packages/gnome.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index bb5b037736..733223f45a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -51,7 +51,7 @@ ;;; Copyright © 2020, 2021 Nicolas Goaziou ;;; Copyright © 2020 Naga Malleswari ;;; Copyright © 2020 Ryan Prior -;;; Copyright © 2020, 2021 Vinicius Monego +;;; Copyright © 2020, 2021, 2022 Vinicius Monego ;;; Copyright © 2020, 2021 Brice Waegeneire ;;; Copyright © 2020 Arun Isaac ;;; Copyright © 2020, 2022 Michael Rohleder @@ -1856,7 +1856,7 @@ either on a local, or remote machine via a number of methods.") (define-public gnome-commander (package (name "gnome-commander") - (version "1.12.3.1") + (version "1.14.0") (source (origin (method url-fetch) @@ -1864,10 +1864,11 @@ either on a local, or remote machine via a number of methods.") (version-major+minor version) "/" "gnome-commander-" version ".tar.xz")) (sha256 - (base32 "0fhmfxh6kbchggvpbin7d4g4fq5vc49y0w48wdkyxln5dswidss2")))) + (base32 "1zdz82j7vpxiqa188zmsxliqk60g331ycaxfbhx5bzyqfjgrh7gd")))) (build-system glib-or-gtk-build-system) (native-inputs (list desktop-file-utils + flex gettext-minimal `(,glib "bin") gobject-introspection @@ -1877,7 +1878,7 @@ either on a local, or remote machine via a number of methods.") libtool pkg-config)) (inputs - (list gconf gnome-vfs gtk+-2 libxml2)) + (list gconf glib gtk+-2 libxml2)) (home-page "https://gcmd.github.io/") (synopsis "Two-pane graphical file manager for the GNOME desktop") (description -- cgit 1.4.1 From d4ad1f73cdcc60f21d48a3683a9559bd6f2634be Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 13 Feb 2022 01:00:03 +0100 Subject: gnu: dee: Don't explicitly return #t from phases * gnu/packages/gnome.scm (dee)[arguments]: Don't explicitly return #t from phases. --- gnu/packages/gnome.scm | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 733223f45a..dd494a3df0 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -689,23 +689,20 @@ of writing test cases for asynchronous interactions.") (substitute* "dee-1.0-docs.sgml" (("http://www.oasis-open.org/docbook/xml/4.3/") (string-append (assoc-ref inputs "docbook-xml") - "/xml/dtd/docbook/")))) - #t)) + "/xml/dtd/docbook/")))))) (add-after 'patch-docbook-xml 'disable-failing-tests (lambda _ (substitute* "tests/test-icu.c" (("g_test_add \\(DOMAIN\"/Default/AsciiFolder\", Fixture, 0,") "") (("setup, test_ascii_folder, teardown\\);") - "")) - #t)) + "")))) (add-before 'check 'pre-check (lambda _ ;; Tests require a running dbus-daemon. (system "dbus-daemon &") ;; For missing '/etc/machine-id'. - (setenv "DBUS_FATAL_WARNINGS" "0") - #t))))) + (setenv "DBUS_FATAL_WARNINGS" "0")))))) (native-inputs `(("dbus" ,dbus) ("dbus-test-runner" ,dbus-test-runner) -- cgit 1.4.1 From 53c7adc4e69122735be6709240ea068d711f746d Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 13 Feb 2022 01:00:00 +0100 Subject: gnu: dee: Build with older Vala version. * gnu/packages/gnome.scm (dee)[native-inputs]: Substitute vala-0.52 for vala. Reported by florhizome[m] in #guix. --- gnu/packages/gnome.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index dd494a3df0..810f1f28c1 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -714,7 +714,7 @@ of writing test cases for asynchronous interactions.") ("pkg-config" ,pkg-config) ("pygobject" ,python-pygobject) ("python" ,python-wrapper) - ("vala" ,vala))) + ("vala" ,vala-0.52))) (inputs `(("icu" ,icu4c))) (propagated-inputs -- cgit 1.4.1 From c1855d16f18825d20f8111c9d72a757e29f7a0dc Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 13 Feb 2022 01:00:02 +0100 Subject: gnu: zeitgeist: Update to 1.0.4. * gnu/packages/gnome.scm (zeitgeist): Update to 1.0.4. [arguments]: Don't explicitly return #t from phases. --- gnu/packages/gnome.scm | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 810f1f28c1..3081664030 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -734,7 +734,7 @@ of known objects without needing a central registrar.") (define-public zeitgeist (package (name "zeitgeist") - (version "1.0.3") + (version "1.0.4") (source (origin (method git-fetch) @@ -746,7 +746,7 @@ of known objects without needing a central registrar.") (file-name (git-file-name name version)) (sha256 - (base32 "0y6fyzxl5np4yskcxibd0p03h619w9ir907nhf40h02y0pk1kgkp")))) + (base32 "07b1ahj3vd3m8srwkrh7dl3ymr7d55xiiszny44q13g06pq4svch")))) (build-system glib-or-gtk-build-system) (arguments `(#:configure-flags @@ -762,8 +762,7 @@ of known objects without needing a central registrar.") (substitute* "zeitgeist-gtkdoc-index.sgml" (("http://www.oasis-open.org/docbook/xml/4.3/") (string-append (assoc-ref inputs "docbook-xml") - "/xml/dtd/docbook/")))) - #t)) + "/xml/dtd/docbook/")))))) (add-after 'patch-docbook-xml 'disable-failing-tests (lambda _ (substitute* "test/direct/Makefile.am" @@ -771,13 +770,11 @@ of known objects without needing a central registrar.") "")) (substitute* "test/c/Makefile.am" ((" test-log ") - "")) - #t)) + "")))) (add-before 'bootstrap 'remove-autogen-script (lambda _ ;; To honor `autoreconf -vif` by build-system. - (delete-file "autogen.sh") - #t))))) + (delete-file "autogen.sh")))))) (native-inputs `(("autoconf" ,autoconf) ("automake" ,automake) -- cgit 1.4.1 From 7168148abe08b5d21ab4d36ff2c2b8c99978e168 Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Thu, 17 Feb 2022 14:47:38 +0000 Subject: gnu: upower: Make it auto-updatable. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome.scm (upower)[properties]: Set 'release-tag-prefix' and 'release-tag-delimiter'. Signed-off-by: Ludovic Courtès --- gnu/packages/gnome.scm | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3081664030..4e44145ed8 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5508,7 +5508,11 @@ faster results and to avoid unnecessary server load.") listening to device events and querying history and statistics. Any application or service on the system can access the org.freedesktop.UPower service via the system message bus.") - (license license:gpl2+))) + (license license:gpl2+) + ;; Old versions of upower are tagged as UPOWER_0_99_13, which confuses + ;; the 'generic-git' updater. Give it a little help. + (properties '((release-tag-prefix . "v") + (release-tag-version-delimiter . "."))))) (define-public libgweather (package -- cgit 1.4.1 From b3d7eae08ee71674ebcf6c6dc5ef575f35493240 Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Thu, 17 Feb 2022 14:51:13 +0000 Subject: gnu: upower: Update to 0.99.15. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Upstream has removed the Autotools build system and now only supports Meson, so the build system has been changed to 'meson-build-system'. The patch 'power-builddir.patch' has to be replaced to adjust to the switch to Meson. This has been done by adding an origin snippet. The origin snippet has been simplified, and for consistency, it has been made a gexp. Some dependencies were Autotools-only and could be removed. * gnu/packages/gnome.scm (upower): Update to 0.99.15. Signed-off-by: Ludovic Courtès --- gnu/local.mk | 1 - gnu/packages/gnome.scm | 67 +++++++++++++++--------------- gnu/packages/patches/upower-builddir.patch | 34 --------------- 3 files changed, 33 insertions(+), 69 deletions(-) delete mode 100644 gnu/packages/patches/upower-builddir.patch (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/local.mk b/gnu/local.mk index 1252643dc0..433467ee39 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1914,7 +1914,6 @@ dist_patch_DATA = \ %D%/packages/patches/util-linux-tests.patch \ %D%/packages/patches/util-linux-CVE-2021-3995.patch \ %D%/packages/patches/util-linux-CVE-2021-3996.patch \ - %D%/packages/patches/upower-builddir.patch \ %D%/packages/patches/valgrind-enable-arm.patch \ %D%/packages/patches/vboot-utils-fix-format-load-address.patch \ %D%/packages/patches/vboot-utils-fix-tests-show-contents.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4e44145ed8..e7eac10a80 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -62,7 +62,7 @@ ;;; Copyright © 2021 Solene Rapenne ;;; Copyright © 2021, 2022 Guillaume Le Vaillant ;;; Copyright © 2021 Felix Gruber -;;; Copyright © 2021 Maxime Devos +;;; Copyright © 2021, 2022 Maxime Devos ;;; Copyright © 2021 Josselin Poiret ;;; Copyright © 2021 Mathieu Othacehe ;;; Copyright © 2022 Daniel Meißner @@ -5437,55 +5437,54 @@ faster results and to avoid unnecessary server load.") (define-public upower (package (name "upower") - (version "0.99.13") + (version "0.99.15") (source (origin (method git-fetch) (uri (git-reference (url "https://gitlab.freedesktop.org/upower/upower") - (commit (string-append "UPOWER_" - (string-map (match-lambda (#\. #\_) - (chr chr)) - version))))) + (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0khwg6jpq81dcylkpi7cn75bjzif0q9qscwvirrk41krma23iddj")) - (patches (search-patches "upower-builddir.patch")) + (base32 "1zk7w7pw8dhlnxhxzcbk33gmxmg8f32mppd67556v9z2qgcg4lhs")) (modules '((guix build utils))) (snippet - '(begin - ;; Upstream commit - ;; - ;; moved 'dbus-1/system.d' from etc/ to share/. However, - ;; 'dbus-configuration-directory' in (gnu services dbus) - ;; expects it in etc/. Thus, move it back to its previous - ;; location. - (substitute* "src/Makefile.am" - (("^dbusconfdir =.*$") - "dbusconfdir = $(sysconfdir)/dbus-1/system.d\n")))))) - (build-system glib-or-gtk-build-system) + ;; Upstream commit + ;; + ;; moved 'dbus-1/system.d' from etc/ to share/. However, + ;; 'dbus-configuration-directory' in (gnu services dbus) + ;; expects it in etc/. Thus, move it back to its previous + ;; location. + #~(substitute* "src/meson.build" + (("dbusdir / 'system.d'") + "get_option('sysconfdir') / 'dbus-1/system.d'") + ;; Avoid writing to /var during the build, this is + ;; not possible in Guix! + (("^install_subdir\\('does-not-exist'.*$") ""))))) + (build-system meson-build-system) (arguments - '(#:phases - (modify-phases %standard-phases - (add-before 'check 'pre-check - (lambda* (#:key inputs #:allow-other-keys) - (let ((umockdev (string-append (assoc-ref inputs "umockdev") - "/lib"))) - (setenv "LD_LIBRARY_PATH" umockdev))))) - #:configure-flags (list "--localstatedir=/var" - (string-append "--with-udevrulesdir=" - (assoc-ref %outputs "out") - "/lib/udev/rules.d")))) + (list + #:glib-or-gtk? #t + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'pre-check + (lambda* (#:key inputs #:allow-other-keys) + (let ((umockdev (string-append (assoc-ref inputs "umockdev") + "/lib"))) + (setenv "LD_LIBRARY_PATH" umockdev))))) + #:configure-flags + #~(list "-Dsystemdsystemunitdir=no" + ;; If not specified, udev will try putting history information + ;; in /gnu/store. + "-Dhistorydir=/var/lib/upower" + (string-append "-Dudevrulesdir=" #$output "/bin/udev/rules.d")))) (native-inputs - (list autoconf - automake + (list `(,glib "bin") ; for gdbus-codegen gobject-introspection gtk-doc intltool - libtool pkg-config python - which ; for ./autogen.sh ;; For tests. python-dbus python-dbusmock diff --git a/gnu/packages/patches/upower-builddir.patch b/gnu/packages/patches/upower-builddir.patch deleted file mode 100644 index a61d387faf..0000000000 --- a/gnu/packages/patches/upower-builddir.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 27ae011b31d831752b97eb209bc2b2206fcf40f7 Mon Sep 17 00:00:00 2001 -From: Tobias Geerinckx-Rice -Date: Mon, 28 Jun 2021 11:58:47 +0200 -Subject: [PATCH] gnu: upower: Fix build directory. - -Remove explicit set of UPOWER_CONF_FILE_NAME in up-self-test.c; -instead the harness should set it. In Guix we set it explicitly; the -right thing is to use AM_TEST_ENVIRONMENT and regenerate the -makefiles, but we can't regenerate because current autotools carp on -some things, so we patch the Makefile.in instead. - -Also fix to not try to create /var/lib/upower if /var isn't writable. - -Based on a patch by Andy Wingo ---- - src/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Makefile.am b/src/Makefile.am -index 3400139..f51ee89 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -181,7 +181,7 @@ $(systemdservice_DATA): $(systemdservice_in_files) Makefile - endif - - install-data-hook: -- if test -w $(DESTDIR)$(prefix)/; then \ -+ if test -w $(DESTDIR)$(localstatedir)/; then \ - mkdir -p $(DESTDIR)$(historydir); \ - fi - --- -2.32.0 - -- cgit 1.4.1 From 0d1a6cffaf84b28f9eb395451ddd425636877178 Mon Sep 17 00:00:00 2001 From: Maxime Devos Date: Thu, 17 Feb 2022 19:05:26 +0000 Subject: gnu: upower: Remove obsolete phase MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Now umockdev-wrapper refers to things by absolute path, this phase is no longer necessary. * gnu/packages/gnome.scm (upower)[arguments]<#:phases>{pre-check}: Remove. Signed-off-by: Ludovic Courtès --- gnu/packages/gnome.scm | 7 ------- 1 file changed, 7 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e7eac10a80..2c9af5dce2 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5465,13 +5465,6 @@ faster results and to avoid unnecessary server load.") (arguments (list #:glib-or-gtk? #t - #:phases - #~(modify-phases %standard-phases - (add-before 'check 'pre-check - (lambda* (#:key inputs #:allow-other-keys) - (let ((umockdev (string-append (assoc-ref inputs "umockdev") - "/lib"))) - (setenv "LD_LIBRARY_PATH" umockdev))))) #:configure-flags #~(list "-Dsystemdsystemunitdir=no" ;; If not specified, udev will try putting history information -- cgit 1.4.1 From 97065f9fe3da74adab54b70e28bd2cd59c06ee07 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Fri, 4 Mar 2022 20:43:08 +0100 Subject: gnu: komikku: Update to 0.37.0. * gnu/packages/gnome.scm (komikku): Update to 0.37.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 2c9af5dce2..77082f06f2 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -12411,7 +12411,7 @@ profiler via Sysprof, debugging support, and more.") (define-public komikku (package (name "komikku") - (version "0.36.1") + (version "0.37.0") (source (origin (method git-fetch) @@ -12421,7 +12421,7 @@ profiler via Sysprof, debugging support, and more.") (file-name (git-file-name name version)) (sha256 (base32 - "0iqis1b248gj1jb1yzw5dcs99bm078hixg9ir0vb961ymwzv2mmc")))) + "1ab17xjpfy9ks6dzgcnh2p5n9hl82mi6f8zbaz7s36115dmp4fbf")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t -- cgit 1.4.1 From 716265fd69d4de958a792b9f6f4d0ac15df8d3f9 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sun, 6 Mar 2022 14:18:47 +0100 Subject: gnu: gitg: Use new package style. * gnu/packages/gnome.scm (gitg)[arguments]: Use G-expressions. [native-inputs]: Drop labels. --- gnu/packages/gnome.scm | 79 ++++++++++++++++++++++++-------------------------- 1 file changed, 38 insertions(+), 41 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 77082f06f2..024e513b6b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -11353,41 +11353,38 @@ higher level porcelain stuff.") "0npg4kqpwl992fgjd2cn3fh84aiwpdp9kd8z7rw2xaj2iazsm914")))) (build-system meson-build-system) (arguments - `(#:glib-or-gtk? #t - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'disable-post-install-partially - (lambda _ - (substitute* "meson_post_install.py" - (("'python'") ; there are no python sources to compile - (string-append "'" (which "true") "'")) - (("gtk-update-icon-cache") (which "true"))) - #t)) - (add-after 'unpack 'fix-test-sources - (lambda _ - (substitute* "tests/libgitg/test-commit.vala" - (("/bin/bash") (which "bash"))) - #t)) - ;; XXX: Remove upon next version bump - (add-after 'unpack 'harden - (lambda _ - ;; See - (substitute* "libgitg/gitg-date.vala" - (("(val\|tzs) == null" all val) - (string-append val " == null || " val " == \"\"")) - (("(val\|tzs) != null" all val) - (string-append val " != null && " val " != \"\""))) - ;; See - (substitute* "gitg/gitg-action-support.vala" - (("stash_if_needed\\((.*), Gitg.Ref head" all other) - (string-append "stash_if_needed(" other ", Gitg.Ref? head"))))) - (add-after 'glib-or-gtk-wrap 'wrap-typelib - (lambda* (#:key outputs #:allow-other-keys) - (let ((prog (string-append (assoc-ref outputs "out") - "/bin/gitg"))) - (wrap-program prog - `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))) - #t)))))) + (list + #:glib-or-gtk? #t + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'disable-post-install-partially + (lambda _ + (substitute* "meson_post_install.py" + (("'python'") ; there are no python sources to compile + (string-append "'" (which "true") "'")) + (("gtk-update-icon-cache") (which "true"))))) + (add-after 'unpack 'fix-test-sources + (lambda _ + (substitute* "tests/libgitg/test-commit.vala" + (("/bin/bash") (which "bash"))))) + ;; XXX: Remove upon next version bump + (add-after 'unpack 'harden + (lambda _ + ;; See + (substitute* "libgitg/gitg-date.vala" + (("(val\|tzs) == null" all val) + (string-append val " == null || " val " == \"\"")) + (("(val\|tzs) != null" all val) + (string-append val " != null && " val " != \"\""))) + ;; See + (substitute* "gitg/gitg-action-support.vala" + (("stash_if_needed\\((.*), Gitg.Ref head" all other) + (string-append "stash_if_needed(" other ", Gitg.Ref? head"))))) + (add-after 'glib-or-gtk-wrap 'wrap-typelib + (lambda* (#:key outputs #:allow-other-keys) + (let ((prog (string-append #$output "/bin/gitg"))) + (wrap-program prog + `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))))))))) (inputs (list glib gsettings-desktop-schemas @@ -11403,12 +11400,12 @@ higher level porcelain stuff.") libsoup-minimal-2 libxml2)) (native-inputs - `(("glib:bin" ,glib "bin") - ("gtk+:bin" ,gtk+ "bin") - ("gobject-introspection" ,gobject-introspection) - ("intltool" ,intltool) - ("pkg-config" ,pkg-config) - ("vala" ,vala))) + (list `(,glib "bin") + `(,gtk+ "bin") + gobject-introspection + intltool + pkg-config + vala)) (synopsis "Graphical user interface for git") (description "gitg is a graphical user interface for git. It aims at being a small, -- cgit 1.4.1 From 0a7c355e0a11f800880a4d576e9cd40e5345c91d Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sun, 6 Mar 2022 14:50:18 +0100 Subject: gnu: gitg: Update to 41. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome.scm (gitg): Update to 41. [arguments]: Drop ‘harden’ phase. [inputs]: Replace gtkspell3 with gspell and gtksourceview-3 with gtksourceview. [native-inputs]: Add python. --- gnu/packages/gnome.scm | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 024e513b6b..3da05afba7 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -11342,15 +11342,15 @@ higher level porcelain stuff.") (define-public gitg (package (name "gitg") - (version "3.32.1") + (version "41") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" + (version-major version) "/" name "-" version ".tar.xz")) (sha256 (base32 - "0npg4kqpwl992fgjd2cn3fh84aiwpdp9kd8z7rw2xaj2iazsm914")))) + "0aa6djcf7rjw0q688mfy47k67bbjpnx6aw1xs94abfhgn6gipdkz")))) (build-system meson-build-system) (arguments (list @@ -11367,19 +11367,6 @@ higher level porcelain stuff.") (lambda _ (substitute* "tests/libgitg/test-commit.vala" (("/bin/bash") (which "bash"))))) - ;; XXX: Remove upon next version bump - (add-after 'unpack 'harden - (lambda _ - ;; See - (substitute* "libgitg/gitg-date.vala" - (("(val\|tzs) == null" all val) - (string-append val " == null || " val " == \"\"")) - (("(val\|tzs) != null" all val) - (string-append val " != null && " val " != \"\""))) - ;; See - (substitute* "gitg/gitg-action-support.vala" - (("stash_if_needed\\((.*), Gitg.Ref head" all other) - (string-append "stash_if_needed(" other ", Gitg.Ref? head"))))) (add-after 'glib-or-gtk-wrap 'wrap-typelib (lambda* (#:key outputs #:allow-other-keys) (let ((prog (string-append #$output "/bin/gitg"))) @@ -11388,9 +11375,9 @@ higher level porcelain stuff.") (inputs (list glib gsettings-desktop-schemas + gspell gtk+ - gtkspell3 - gtksourceview-3 + gtksourceview json-glib libdazzle libgee @@ -11405,6 +11392,7 @@ higher level porcelain stuff.") gobject-introspection intltool pkg-config + python vala)) (synopsis "Graphical user interface for git") (description -- cgit 1.4.1 From cceb5344ae64faa3079556084c7d63615df53eb4 Mon Sep 17 00:00:00 2001 From: Mathieu Othacehe Date: Thu, 10 Mar 2022 10:46:27 +0100 Subject: gnu: gthumb: Fix build. * gnu/packages/gnome.scm (gthumb)[native-inputs]: Add python. --- 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 3da05afba7..937b10ece7 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -11132,7 +11132,8 @@ functionality.") ("gtk+:bin" ,gtk+ "bin") ; for gtk-update-icon-cache ("intltool" ,intltool) ("itstool" ,itstool) - ("pkg-config" ,pkg-config))) + ("pkg-config" ,pkg-config) + ("python" ,python))) (inputs `(("clutter" ,clutter) ("clutter-gst" ,clutter-gst) -- cgit 1.4.1 From 0cb05f4a06f41970388bfccce29e415a258f98af Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 10 Mar 2022 09:31:19 +0100 Subject: gnu: gnome-sudoku: Add missing dependency on Python. * gnu/packages/gnome.scm (gnome-sudoku)[native-inputs]: Add PYTHON. --- 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 937b10ece7..d186badde8 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1,6 +1,6 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2013, 2015 Andreas Enge -;;; Copyright © 2014, 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès +;;; Copyright © 2014-2022 Ludovic Courtès ;;; Copyright © 2014 Ian Denhardt ;;; Copyright © 2014, 2016, 2020 Eric Bavier ;;; Copyright © 2014, 2015 Federico Beffa @@ -5180,6 +5180,7 @@ once.") (("gtk-update-icon-cache") (which "true")))))))) (native-inputs `(("pkg-config" ,pkg-config) + ("python" ,python) ;for 'build-aux/post_install.py' ("desktop-file-utils" ,desktop-file-utils) ("glib:bin" ,glib "bin") ; for glib-compile-resources ("intltool" ,intltool) -- cgit 1.4.1 From 25afd66a818744a68899460a961bc170af176ce3 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 10 Mar 2022 09:32:50 +0100 Subject: gnu: gnome-sudoku: Remove input labels. * gnu/packages/gnome.scm (gnome-sudoku)[native-inputs]: Remove labels. --- gnu/packages/gnome.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d186badde8..381ea04ea0 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5179,14 +5179,14 @@ once.") (substitute* "build-aux/post_install.py" (("gtk-update-icon-cache") (which "true")))))))) (native-inputs - `(("pkg-config" ,pkg-config) - ("python" ,python) ;for 'build-aux/post_install.py' - ("desktop-file-utils" ,desktop-file-utils) - ("glib:bin" ,glib "bin") ; for glib-compile-resources - ("intltool" ,intltool) - ("itstool" ,itstool) - ("vala" ,vala) - ("xmllint" ,libxml2))) + (list pkg-config + python ;for 'build-aux/post_install.py' + desktop-file-utils + `(,glib "bin") ;for glib-compile-resources + intltool + itstool + vala + libxml2)) (inputs (list gtk+ json-glib libgee librsvg qqwing)) (home-page "https://wiki.gnome.org/Apps/Sudoku") -- cgit 1.4.1 From cce9eb19386063a86a50d9eaf8fac4f70b871435 Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Sat, 12 Mar 2022 11:44:58 +0800 Subject: gnu: eog: Wrap with gsettings schemas. * gnu/packages/gnome.scm (eog)[arguments]: Add #:glib-or-gtk? #t. --- 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 381ea04ea0..212862a515 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6424,7 +6424,8 @@ supports playlists, song ratings, and any codecs installed through gstreamer.") (patches (search-patches "eog-update-libportal-usage.patch")))) (build-system meson-build-system) (arguments - `(#:configure-flags + `(#:glib-or-gtk? #t + #:configure-flags ;; Otherwise, the RUNPATH will lack the final 'eog' path component. (list (string-append "-Dc_link_args=-Wl,-rpath=" (assoc-ref %outputs "out") "/lib/eog")) -- cgit 1.4.1 From b769fe7f75615a1ff9f90fd2b702933a1324a42b Mon Sep 17 00:00:00 2001 From: 宋文武 Date: Sat, 12 Mar 2022 12:03:05 +0800 Subject: gnu: eog-plugins: Symlink eog plugins into 'share/eog/plugins'. Fixes . * gnu/packages/gnome.scm (eog-plugins)[arguments]: Add 'fix-plugins-path' phase. --- gnu/packages/gnome.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 212862a515..e0fc9a9f50 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6472,7 +6472,7 @@ supports image conversion, rotation, and slideshows.") (define-public eog-plugins ;; Note: EOG looks for its plugins (via libpeas) in ~/.local as well as - ;; $DATA/lib/eog/plugins, where DATA is one of the entries in + ;; $DATA/eog/plugins, where DATA is one of the entries in ;; $XDG_DATA_DIRS. Thus, for EOG to find these, you have to have ;; 'XDG_DATA_DIRS' appropriately set. (package @@ -6487,6 +6487,17 @@ supports image conversion, rotation, and slideshows.") (base32 "1dcxdjp7x092wn0iq7975f9b05ksb5kl5mxmyiqmydrja91ryw40")))) (build-system gnu-build-system) + (arguments + '(#:phases + (modify-phases %standard-phases + (add-after 'install 'fix-plugins-path + ;; XXX: EOG looks its plugins in "share/eog/plugins", not in + ;; "lib/eog/plugins". + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (plugins (string-append out "/share/eog/plugins"))) + (mkdir (dirname plugins)) + (symlink (string-append out "/lib/eog/plugins") plugins))))))) (home-page "https://wiki.gnome.org/Apps/EyeOfGnome/Plugins") (synopsis "Extensions for the Eye of GNOME image viewer") (native-inputs -- cgit 1.4.1 From 99b41ffcbf399b1d51b5f90eaa706c9a05173cb1 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sun, 20 Mar 2022 09:51:26 +0100 Subject: gnu: system-config-printer: Add install directories to pythonpath. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages.gnome.scm (system-config-printer)[#:phases]: Add ‘add-install-to-pythonpath’ between ‘install’ and ‘wrap-for-python’. --- gnu/packages/gnome.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e0fc9a9f50..1e1c4f9eeb 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2960,7 +2960,9 @@ database is translated at Transifex.") (string-append (assoc-ref inputs "docbook-xml") "/xml/dtd/docbook/"))) #t)) - (add-after 'install 'wrap-for-python + (add-after 'install 'add-install-to-pythonpath + (@@ (guix build python-build-system) add-install-to-pythonpath)) + (add-after 'add-install-to-pythonpath 'wrap-for-python (@@ (guix build python-build-system) wrap)) (add-after 'install 'wrap (lambda* (#:key outputs #:allow-other-keys) -- cgit 1.4.1 From 323172875a2adec6bf7f7b19d7c2abbb8286b584 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sun, 20 Mar 2022 11:45:16 +0100 Subject: gnu: system-config-printer: Update to 1.5.16. * gnu/packages/gnome.scm (system-config-printer): Update to 1.5.16. [#:phases]: Rename to ... : ... this. Also patch configure.ac [inputs]: Replace intltool with gettext-minimal. --- gnu/packages/gnome.scm | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 1e1c4f9eeb..06829d1e98 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2929,7 +2929,7 @@ database is translated at Transifex.") (define-public system-config-printer (package (name "system-config-printer") - (version "1.5.15") + (version "1.5.16") (source (origin (method url-fetch) @@ -2938,15 +2938,20 @@ database is translated at Transifex.") "download/v" version "/system-config-printer-" version ".tar.xz")) (sha256 - (base32 "12d6xx51vizc476zfnsga9q09nflp51ipn6y7lhi9w2v4772dlpv")))) + (base32 "1z9pvgifj5c87csnqz10qybbcayh3ak9m606f63ifkvyjh4q9jnb")))) (build-system glib-or-gtk-build-system) (arguments `(#:imported-modules ((guix build python-build-system) ,@%glib-or-gtk-build-system-modules) #:phases (modify-phases %standard-phases - (add-after 'unpack 'patch-Makefile.am + (add-after 'unpack 'patch-build-files (lambda _ + (substitute* "configure.ac" + (("AC_INIT.*" all) + (string-append all "\nAC_CONFIG_MACRO_DIR([m4])\n")) + ;; XXX: AX macros appear unavailable + (("AX_REQUIRE_DEFINED.*") "")) ;; The Makefile generates some scripts, so set a valid shebang (substitute* "Makefile.am" (("/bin/bash") (which "bash"))) @@ -2998,7 +3003,7 @@ database is translated at Transifex.") glib autoconf automake - intltool + gettext-minimal xmlto docbook-xml-4.1.2 docbook-xsl -- cgit 1.4.1 From d8079790c3feaf1b7194e2fad8b93504e6ae6c51 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sun, 20 Mar 2022 14:42:10 +0100 Subject: gnu: system-config-printer: Use new style for arguments. * gnu/packages/gnome.scm (system-config-printer)[arguments]: Use G-Expressions. Delete trailing #ts. --- gnu/packages/gnome.scm | 82 ++++++++++++++++++++++++-------------------------- 1 file changed, 40 insertions(+), 42 deletions(-) (limited to 'gnu/packages/gnome.scm') diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 06829d1e98..bc99454b1b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2941,49 +2941,47 @@ database is translated at Transifex.") (base32 "1z9pvgifj5c87csnqz10qybbcayh3ak9m606f63ifkvyjh4q9jnb")))) (build-system glib-or-gtk-build-system) (arguments - `(#:imported-modules ((guix build python-build-system) + (list + #:imported-modules `((guix build python-build-system) ,@%glib-or-gtk-build-system-modules) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-build-files - (lambda _ - (substitute* "configure.ac" - (("AC_INIT.*" all) - (string-append all "\nAC_CONFIG_MACRO_DIR([m4])\n")) - ;; XXX: AX macros appear unavailable - (("AX_REQUIRE_DEFINED.*") "")) - ;; The Makefile generates some scripts, so set a valid shebang - (substitute* "Makefile.am" - (("/bin/bash") (which "bash"))) - (delete-file "configure") - #t)) - (add-after 'unpack 'patch-docbook-xml - (lambda* (#:key inputs #:allow-other-keys) - ;; Modify the man XML otherwise xmlto tries to access the network - (substitute* "man/system-config-printer.xml" - (("http://www.oasis-open.org/docbook/xml/4.1.2/") - (string-append (assoc-ref inputs "docbook-xml") - "/xml/dtd/docbook/"))) - #t)) - (add-after 'install 'add-install-to-pythonpath - (@@ (guix build python-build-system) add-install-to-pythonpath)) - (add-after 'add-install-to-pythonpath 'wrap-for-python - (@@ (guix build python-build-system) wrap)) - (add-after 'install 'wrap - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (gi-typelib-path (getenv "GI_TYPELIB_PATH"))) - (for-each - (lambda (program) - (wrap-program program - `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)))) - (map (lambda (name) - (string-append out "/bin/" name)) - '("system-config-printer" - "system-config-printer-applet" - "install-printerdriver" - "scp-dbus-service")))) - #t))))) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-build-files + (lambda _ + (substitute* "configure.ac" + (("AC_INIT.*" all) + (string-append all "\nAC_CONFIG_MACRO_DIR([m4])\n")) + ;; XXX: AX macros appear unavailable + (("AX_REQUIRE_DEFINED.*") "")) + ;; The Makefile generates some scripts, so set a valid shebang + (substitute* "Makefile.am" + (("/bin/bash") (which "bash"))) + (delete-file "configure"))) + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + ;; Modify the man XML otherwise xmlto tries to access the network + (substitute* "man/system-config-printer.xml" + (("http://www.oasis-open.org/docbook/xml/4.1.2/") + (string-append (assoc-ref inputs "docbook-xml") + "/xml/dtd/docbook/"))))) + (add-after 'install 'add-install-to-pythonpath + (@@ (guix build python-build-system) add-install-to-pythonpath)) + (add-after 'add-install-to-pythonpath 'wrap-for-python + (@@ (guix build python-build-system) wrap)) + (add-after 'install 'wrap + (lambda* (#:key outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (gi-typelib-path (getenv "GI_TYPELIB_PATH"))) + (for-each + (lambda (program) + (wrap-program program + `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path)))) + (map (lambda (name) + (string-append out "/bin/" name)) + '("system-config-printer" + "system-config-printer-applet" + "install-printerdriver" + "scp-dbus-service"))))))))) (inputs (list gsettings-desktop-schemas gobject-introspection -- cgit 1.4.1