From 666fc96858fdde39779f8371023cc6bb458d5b3b Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sun, 26 Mar 2023 17:39:11 +0200 Subject: gnu: glib: Update to 2.76.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/glib.scm (glib): Update to 2.76.1. [source]: Adjust accordingly. [arguments]<#:phases>: Add ‘set-G_TEST_SRCDIR’. Update ‘delete-failing-tests’. [propagated-inputs]: Replace pcre with pcre2. (glib-with-documentation): Inherit from glib. * gnu/packages/gnome.scm (sysprof, gtranslator): Use glib. * gnu/packages/gtk.scm (gtksourceview, libpanel): Use glib. * gnu/packages/guile-xyz.scm (guile-g-golf): Use glib. * gnu/packages/music.scm (zrythm): Use glib. * gnu/packages/patches/glib-skip-failing-test.patch: Adjust accordingly. --- gnu/packages/glib.scm | 159 +++++++++------------- gnu/packages/gnome.scm | 8 +- gnu/packages/gtk.scm | 6 +- gnu/packages/guile-xyz.scm | 2 +- gnu/packages/music.scm | 4 +- gnu/packages/patches/glib-skip-failing-test.patch | 3 +- 6 files changed, 74 insertions(+), 108 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 1f3d3ef628..c90f178885 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -215,7 +215,7 @@ (define-public dbus-verbose (define glib (package (name "glib") - (version "2.72.3") + (version "2.76.1") (source (origin (method url-fetch) @@ -224,14 +224,14 @@ (define glib name "/" (string-take version 4) "/" name "-" version ".tar.xz")) (sha256 - (base32 "1w25sf2wxkkah2p2w189q58mza3zv8z1fh2q1m82sldq4kva4faa")) + (base32 "17x1zpr2avj8hjbpc6hp2sf2885lxac46v0kajsgan3929m0zp23")) (patches (search-patches "glib-appinfo-watch.patch" "glib-skip-failing-test.patch")) (modules '((guix build utils))) (snippet '(begin - (substitute* "tests/spawn-test.c" + (substitute* "glib/tests/spawn-test.c" (("/bin/sh") "sh")))))) (build-system meson-build-system) (outputs '("out" ;libraries, locales, etc @@ -256,6 +256,9 @@ (define glib #$output:bin "/bin")) #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'set-G_TEST_SRCDIR + (lambda _ + (setenv "G_TEST_SRCDIR" (string-append (getcwd) "/gio/tests")))) ;; Needed to pass the test phase on slower ARM and i686 machines. (add-after 'unpack 'increase-test-timeout (lambda _ @@ -271,9 +274,19 @@ (define glib (substitute* '("unix.c" "utils.c") (("[ \t]*g_test_add_func.*;") ""))) (with-directory-excursion "gio/tests" - (substitute* '("contenttype.c" "gdbus-address-get-session.c" - "gdbus-peer.c" "appinfo.c" "desktop-app-info.c") - (("[ \t]*g_test_add_func.*;") ""))) + (substitute* '("contenttype.c" + "gdbus-address-get-session.c" + "gdbus-server-auth.c" + "gdbus-peer.c" + "appinfo.c" + "desktop-app-info.c") + (("[ \t]*g_test_add_func.*;") "")) + (unless (which "update-desktop-database") + (substitute* "file.c" + (("[ \t]*g_test_add_func.*query-default-handler.*;") ""))) + (substitute* '("portal-support-snap.c") + (("g_test_init .*") + "return EXIT_SUCCESS;"))) #$@(if (target-x86-32?) ;; Comment out parts of timer.c that fail on i686 due to @@ -351,10 +364,10 @@ (define glib python python-wrapper)) (propagated-inputs - (list libffi ;in the Requires.private field of gobject-2.0.pc - pcre ;in the Requires.private field of glib-2.0.pc - `(,util-linux "lib") ;for libmount - zlib)) ;in the Requires.private field of glib-2.0.pc + (list libffi ; in the Requires.private field of gobject-2.0.pc + pcre2 ; in the Requires.private field of glib-2.0.pc + `(,util-linux "lib") ;for libmount + zlib)) ; in the Requires.private field of glib-2.0.pc (native-search-paths ;; This variable is not really "owned" by GLib, but several related ;; packages refer to it: gobject-introspection's tools use it as a search @@ -378,92 +391,47 @@ (define glib (license license:lgpl2.1+) (properties '((hidden? . #t))))) -(define-public glib-next - (package - (inherit glib) - (name "glib") - (version "2.73.3") - (source - (origin - (inherit (package-source glib)) - (uri - (string-append "mirror://gnome/sources/" - name "/" (string-take version 4) "/" - name "-" version ".tar.xz")) - (snippet - '(substitute* "glib/tests/spawn-test.c" - (("/bin/sh") "sh"))) - (sha256 - (base32 "1bgfch7zj1pq4rkqcibfky1470ijljyrx5pn5s5v9mk72s22n6nz")))) - (arguments - (substitute-keyword-arguments (package-arguments glib) - ((#:test-options test-options ''()) - ;; Skip flaky or slow tests. - `(cons* "--no-suite=slow" "--no-suite=flaky" ,test-options)) - ((#:phases phases #~%standard-phases) - #~(modify-phases #$phases - (replace 'disable-failing-tests - (lambda _ - (with-directory-excursion "glib/tests" - (substitute* '("unix.c" "utils.c") - (("[ \t]*g_test_add_func.*;") ""))) - ;; The "glib:gio / file" test fails with the error "No - ;; application is registered as handling this file" (see: - ;; https://gitlab.gnome.org/GNOME/glib/-/issues/2742). - (with-directory-excursion "gio/tests" - (substitute* '("appinfo.c" - "contenttype.c" - "desktop-app-info.c" - "file.c" - "gdbus-address-get-session.c" - "gdbus-peer.c") - (("[ \t]*g_test_add_func.*;") ""))) - - #$@(if (target-x86-32?) - ;; Comment out parts of timer.c that fail on i686 due to - ;; excess precision when building with GCC 10: - ;; . - '((substitute* "glib/tests/timer.c" - (("^ g_assert_cmpuint \\(micros.*" all) - (string-append "//" all "\n")) - (("^ g_assert_cmpfloat \\(elapsed, ==.*" all) - (string-append "//" all "\n")))) - '()))))))) - (native-inputs - (modify-inputs (package-native-inputs glib) - (append desktop-file-utils))) - (propagated-inputs - (modify-inputs (package-propagated-inputs glib) - (replace "pcre" pcre2))))) - (define-public glib-with-documentation ;; glib's doc must be built in a separate package since it requires gtk-doc, ;; which in turn depends on glib. - (package/inherit glib - (properties (alist-delete 'hidden? (package-properties glib))) - (outputs (cons "doc" (package-outputs glib))) ; 20 MiB of GTK-Doc reference - (native-inputs - (modify-inputs (package-native-inputs glib) - (prepend docbook-xml-4.2 - docbook-xml - docbook-xsl - gtk-doc - libxml2 - libxslt))) - (arguments - (substitute-keyword-arguments (package-arguments glib) - ((#:configure-flags flags ''()) - #~(cons "-Dgtk_doc=true" - (delete "-Dman=false" #$flags))) - ((#:phases phases) - #~(modify-phases #$phases - (add-after 'install 'move-doc - (lambda _ - (let ((html "/share/gtk-doc")) - (mkdir-p (string-append #$output:doc "/share")) - (rename-file - (string-append #$output html) - (string-append #$output:doc html))))))))))) + (let ((base glib)) + (package/inherit base + (properties (alist-delete 'hidden? (package-properties base))) + (outputs (cons "doc" (package-outputs base))) ; 20 MiB of GTK-Doc reference + (native-inputs + `(("docbook-xml-4.2" ,docbook-xml-4.2) + ("docbook-xml-4.5" ,docbook-xml) + ("docbook-xsl" ,docbook-xsl) + ("gtk-doc" ,gtk-doc) + ("libxml2" ,libxml2) + ("xsltproc" ,libxslt) + ,@(package-native-inputs base))) + (arguments + (substitute-keyword-arguments (package-arguments base) + ((#:configure-flags flags ''()) + #~(cons "-Dgtk_doc=true" + (delete "-Dman=false" #$flags))) + ((#:phases phases) + #~(modify-phases #$phases + (add-after 'unpack 'patch-docbook-xml + (lambda* (#:key inputs #:allow-other-keys) + (with-directory-excursion "docs" + (substitute* (find-files "." "\\.xml$") + (("http://www.oasis-open.org/docbook/xml/4\\.5/") + (string-append (assoc-ref inputs "docbook-xml-4.5") + "/xml/dtd/docbook/")) + (("http://www.oasis-open.org/docbook/xml/4\\.2/") + (string-append (assoc-ref inputs "docbook-xml-4.2") + "/xml/dtd/docbook/")))))) + (add-after 'install 'move-doc + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (assoc-ref outputs "doc")) + (html (string-append "/share/gtk-doc"))) + (mkdir-p (string-append doc "/share")) + (rename-file + (string-append out html) + (string-append doc html)))))))))))) (define (python-extension-suffix python triplet) "Determine the suffix for C extensions for PYTHON when compiled @@ -602,10 +570,7 @@ (define-public gobject-introspection-next (patches (search-patches "gobject-introspection-cc-1.72.patch" "gobject-introspection-girepository.patch" - "gobject-introspection-absolute-shlib-path-1.72.patch")))) - (propagated-inputs - (modify-inputs (package-propagated-inputs gobject-introspection) - (replace "glib" glib-next))))) + "gobject-introspection-absolute-shlib-path-1.72.patch")))))) (define intltool (package diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 7aa7180f5e..ddbe86a39b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -12856,7 +12856,7 @@ (define-public sysprof (propagated-inputs (list polkit)) (inputs - (list glib-next + (list glib gtk json-glib libadwaita @@ -12865,7 +12865,7 @@ (define-public sysprof polkit)) (native-inputs (list gettext-minimal - `(,glib-next "bin") ;for gdbus-codegen, etc. + `(,glib "bin") ;for gdbus-codegen, etc. itstool libxml2 pkg-config)) @@ -13133,7 +13133,7 @@ (define-public gtranslator (substitute* "build-aux/meson/meson_post_install.py" (("gtk-update-icon-cache") (which "true")))))))) (native-inputs - (list `(,glib-next "bin") + (list `(,glib "bin") gettext-minimal itstool pkg-config)) @@ -13141,7 +13141,7 @@ (define-public gtranslator (list json-glib jsonrpc-glib gettext-minimal - glib-next + glib gsettings-desktop-schemas gspell libgda diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 1d547d6ac7..048d48a2bc 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -632,7 +632,7 @@ (define-public gtksourceview ;; gtksourceview-5.pc refers to all these. (list fontconfig fribidi - glib-next + glib gtk libxml2 pango @@ -2928,11 +2928,11 @@ (define-public libpanel (substitute* "meson.build" (("gtk_update_icon_cache: true") "gtk_update_icon_cache: false"))))))) - (native-inputs (list `(,glib-next "bin") + (native-inputs (list `(,glib "bin") gobject-introspection pkg-config vala)) - (inputs (list glib-next gtk libadwaita)) + (inputs (list glib gtk libadwaita)) (home-page "https://gitlab.gnome.org/GNOME/libpanel") (synopsis "Dock and panel library for GTK 4") (description "Libpanel provides a library to create IDE-like applications diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 1fb0bbcd26..1ca1753e46 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -2327,7 +2327,7 @@ (define (get lib) (setenv "DISPLAY" ":1") #t))))) (inputs - (list guile-3.0 guile-lib glib-next)) + (list guile-3.0 guile-lib glib)) (native-inputs (list autoconf automake diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 446580dc52..f180d3c1e2 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -6497,7 +6497,7 @@ (define-public zrythm flex font-dseg gettext-minimal - glib-next + glib glibc graphviz gtk @@ -6535,7 +6535,7 @@ (define-public zrythm ;; XDG_DATA_DIRS. (list breeze-icons ;native because not executable help2man - `(,glib-next "bin") ;for 'glib-compile-resources' + `(,glib "bin") ;for 'glib-compile-resources' pkg-config python-sphinx python-sphinx-intl diff --git a/gnu/packages/patches/glib-skip-failing-test.patch b/gnu/packages/patches/glib-skip-failing-test.patch index c7706aaa74..3fde5cb1e2 100644 --- a/gnu/packages/patches/glib-skip-failing-test.patch +++ b/gnu/packages/patches/glib-skip-failing-test.patch @@ -10,12 +10,13 @@ diff --git a/gio/tests/meson.build b/gio/tests/meson.build index a926ae0..4fdbe7a 100644 --- a/gio/tests/meson.build +++ b/gio/tests/meson.build -@@ -317,10 +317,6 @@ if host_machine.system() != 'windows' +@@ -317,11 +317,6 @@ if host_machine.system() != 'windows' 'extra_sources' : [extra_sources, gdbus_test_codegen_generated, gdbus_test_codegen_generated_interface_info], 'c_args' : ['-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32'], }, - 'gdbus-threading' : { - 'extra_sources' : extra_sources, +- 'extra_programs': extra_programs, - 'suite' : ['slow'], - }, 'gmenumodel' : { -- cgit v1.2.3 From ad49bc6ebe79d4e90f69c2bdb3de44f1daade98c Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sun, 26 Mar 2023 20:53:15 +0200 Subject: gnu: pango: Update to 1.50.14. * gnu/packages/gtk.scm (pango): Update to 1.50.14. --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 048d48a2bc..8ea84dbe3c 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -366,7 +366,7 @@ (define-public libthai (define-public pango (package (name "pango") - (version "1.50.10") + (version "1.50.14") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/pango/" @@ -375,7 +375,7 @@ (define-public pango (patches (search-patches "pango-skip-libthai-test.patch")) (sha256 (base32 - "0rj9sszflckk8gj47ppirpndpp3mzsx97l64lalj8kc580g2ypby")))) + "1s41sprfgkc944fva36zjmkmdpv8hn1bdpyg55xc4663pw2z4rqx")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas -- cgit v1.2.3 From c861dc68eeb38cb203ee4e3b453e29ff06bb7cb3 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sun, 26 Mar 2023 21:19:11 +0200 Subject: gnu: gobject-introspection: Update to 1.76.1. * gnu/packages/glib.scm (gobject-introspection): Update to 1.76.1. --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index c90f178885..9413371929 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -472,14 +472,14 @@ (define target-name (define gobject-introspection (package (name "gobject-introspection") - (version "1.72.0") + (version "1.76.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" "gobject-introspection/" (version-major+minor version) "/gobject-introspection-" version ".tar.xz")) (sha256 - (base32 "1g5aps3b20ck96ahy7fjl4nhp9nabkd9rlqd0s1qzn3111cqxzh2")) + (base32 "1grq6wmbi2nbnwffgvsljd481zm6darnk12dvkf02m9lcjzphq8r")) (patches (search-patches "gobject-introspection-cc.patch" "gobject-introspection-girepository.patch" -- cgit v1.2.3 From 6af9e7d2282e7b0c546d5ed909544b2f1277be67 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Tue, 28 Mar 2023 06:26:28 +0200 Subject: gnu: libsoup-minimal@2: Update to 2.74.3. * gnu/packages/gnome.scm (libsoup-minimal-2): Update to 2.74.3. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ddbe86a39b..7c5987b9a6 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5053,7 +5053,7 @@ (define-public libsoup-minimal (define-public libsoup-minimal-2 (package (inherit libsoup-minimal) - (version "2.74.2") + (version "2.74.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/libsoup/" @@ -5061,7 +5061,7 @@ (define-public libsoup-minimal-2 "libsoup-" version ".tar.xz")) (sha256 (base32 - "0n8is108n0dn4dw7nm2wq9rydcm1vy47w40wywfrxqazdrjjg97h")))) + "04rgv6hkyhgi7lak9865yxgbgky6gc635p7w6nhcbj64rx0prdz4")))) (arguments (substitute-keyword-arguments (package-arguments libsoup-minimal) ((#:phases phases) -- cgit v1.2.3 From 2a911cd34ce454bc13255526059416947a9fd9f0 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Tue, 28 Mar 2023 18:51:06 +0200 Subject: gnu: python-pygobject: Update to 3.44.1. * gnu/packages/glib.scm (python-pygobject): Update to 3.44.1. --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 9413371929..4cf9da3027 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -899,7 +899,7 @@ (define-public glibmm-2.64 (define-public python-pygobject (package (name "python-pygobject") - (version "3.42.2") + (version "3.44.1") (source (origin (method url-fetch) @@ -908,7 +908,7 @@ (define-public python-pygobject "/pygobject-" version ".tar.xz")) (sha256 (base32 - "0my95gjnps093inzznbipkhf25cffbc32v9is2fq8wvh59g6ks5d")) + "042pmpyaz7bsbr68znnwdqyhs3j3cajib0k45v1hrs8v6b8has1w")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 289f7a47de00480d5fdb7b9c1bba2dd0d97ef4bc Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Thu, 30 Mar 2023 20:41:59 +0200 Subject: gnu: gtk+-2: Fix build by hardening list store. * gnu/packages/patches/gtk2-harden-list-store.patch: New file. * gnu/packages/gtk.scm (gtk+-2)[patches]: Add it here. * gnu/local.mk (dist_patch_DATA): Register it here. --- gnu/local.mk | 1 + gnu/packages/gtk.scm | 1 + gnu/packages/patches/gtk2-harden-list-store.patch | 42 +++++++++++++++++++++++ 3 files changed, 44 insertions(+) create mode 100644 gnu/packages/patches/gtk2-harden-list-store.patch diff --git a/gnu/local.mk b/gnu/local.mk index 1a84e5b499..2286aceade 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1312,6 +1312,7 @@ dist_patch_DATA = \ %D%/packages/patches/guile-rsvg-pkgconfig.patch \ %D%/packages/patches/guile-emacs-fix-configure.patch \ %D%/packages/patches/gtk2-fix-builder-test.patch \ + %D%/packages/patches/gtk2-harden-list-store.patch \ %D%/packages/patches/gtk2-respect-GUIX_GTK2_PATH.patch \ %D%/packages/patches/gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch \ %D%/packages/patches/gtk2-theme-paths.patch \ diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 8ea84dbe3c..b45c1466ef 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -897,6 +897,7 @@ (define-public gtk+-2 "1nn6kks1zyvb5xikr9y2k7r9bwjy1g4b0m0s66532bclymbwfamc")) (patches (search-patches "gtk2-respect-GUIX_GTK2_PATH.patch" "gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch" + "gtk2-harden-list-store.patch" "gtk2-theme-paths.patch" "gtk2-fix-builder-test.patch")))) (build-system gnu-build-system) diff --git a/gnu/packages/patches/gtk2-harden-list-store.patch b/gnu/packages/patches/gtk2-harden-list-store.patch new file mode 100644 index 0000000000..f49dc3bc77 --- /dev/null +++ b/gnu/packages/patches/gtk2-harden-list-store.patch @@ -0,0 +1,42 @@ +Backport the implementation of gtk_list_store_iter_is_valid from gtk+-3. + +Index: gtk+-2.24.33/gtk/gtkliststore.c +=================================================================== +--- gtk+-2.24.33.orig/gtk/gtkliststore.c ++++ gtk+-2.24.33/gtk/gtkliststore.c +@@ -1195,16 +1195,31 @@ gboolean + gtk_list_store_iter_is_valid (GtkListStore *list_store, + GtkTreeIter *iter) + { ++ GSequenceIter *seq_iter; ++ + g_return_val_if_fail (GTK_IS_LIST_STORE (list_store), FALSE); + g_return_val_if_fail (iter != NULL, FALSE); + +- if (!VALID_ITER (iter, list_store)) +- return FALSE; ++ /* can't use VALID_ITER() here, because iter might point ++ * to random memory. ++ * ++ * We MUST NOT dereference it. ++ */ + +- if (g_sequence_iter_get_sequence (iter->user_data) != list_store->seq) ++ if (iter == NULL || ++ iter->user_data == NULL || ++ list_store->stamp != iter->stamp) + return FALSE; + +- return TRUE; ++ for (seq_iter = g_sequence_get_begin_iter (list_store->seq); ++ !g_sequence_iter_is_end (seq_iter); ++ seq_iter = g_sequence_iter_next (seq_iter)) ++ { ++ if (seq_iter == iter->user_data) ++ return TRUE; ++ } ++ ++ return FALSE; + } + + static gboolean real_gtk_list_store_row_draggable (GtkTreeDragSource *drag_source, -- cgit v1.2.3 From eab4d0e18a616c71ab5f3af7f2915a9591ef04e8 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Mon, 10 Apr 2023 18:12:19 +0200 Subject: gnu: Remove lib2geom 1.1. * gnu/packages/graphics.scm (lib2geom): Update to 1.2. (lib2geom-1.2): Remove variable. * gnu/packages/inkscape.scm (inkscape)[inputs]: Use libgeom. --- gnu/packages/graphics.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm index 261fcf9547..7bb05055f9 100644 --- a/gnu/packages/graphics.scm +++ b/gnu/packages/graphics.scm @@ -865,9 +865,9 @@ (define-public lib2geom (source (origin (method git-fetch) (uri (git-reference - (url "https://gitlab.com/inkscape/lib2geom.git") + (url "https://gitlab.com/inkscape/lib2geom") (commit version))) - (file-name (git-file-name name version)) + (file-name (git-file-name "lib2geom" version)) (sha256 (base32 "0dq981g894hmvhd6rmfl1w32mksg9hpvpjs1qvfxrnz87rhkknj8")))) -- cgit v1.2.3 From 32cb6c4c6210c4ddcb351fb9f49600bbe9f2880d Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 27 May 2023 09:12:50 +0200 Subject: gnu: gstreamer: Update to 1.22.3. * gnu/packages/gstreamer.scm (gstreamer): Update to 1.22.3. --- gnu/packages/gstreamer.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 8971c11479..5c8d430ef5 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -461,7 +461,7 @@ (define %common-gstreamer-phases (define-public gstreamer (package (name "gstreamer") - (version "1.22.2") + (version "1.22.3") (source (origin (method url-fetch) @@ -470,7 +470,7 @@ (define-public gstreamer version ".tar.xz")) (sha256 (base32 - "08cfz2vkf494rsg0bn75px26fxs3syvxnsc9lj5n074j0cvfgbxj")))) + "0x2rdl6vfpbr7wnh1nk0rllw28cgx0js4g9vxfank7rz0naspzlz")))) (build-system meson-build-system) (arguments (list #:disallowed-references (list python) -- cgit v1.2.3 From 0821bb4af9107cf3171a018532a9c79d07da9715 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sun, 16 Apr 2023 07:47:00 +0200 Subject: gnu: gst-plugins-base: Update to 1.22.3. * gnu/packages/gstreamer.scm (gst-plugins-base): Update to 1.22.3. --- gnu/packages/gstreamer.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 5c8d430ef5..aba0a8d98c 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -542,7 +542,7 @@ (define-public gstreamer (define-public gst-plugins-base (package (name "gst-plugins-base") - (version "1.22.2") + (version "1.22.3") (source (origin (method url-fetch) @@ -550,7 +550,7 @@ (define-public gst-plugins-base name "-" version ".tar.xz")) (sha256 (base32 - "0jcxcx4mgfjvfb3ixibwhx8j330mq3ap469w7hapm6z79q614rgb")))) + "1ww9xx6c4mwvgn9k56d1xfnd3i1jm4v8rfiy4f07686ll24n4n8w")))) (build-system meson-build-system) (propagated-inputs (list glib ;required by gstreamer-sdp-1.0.pc -- cgit v1.2.3 From 2b611f843c46ee4f608655c929b6b3a0c43636a0 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 27 May 2023 09:14:05 +0200 Subject: gnu: gst-plugins-good: Update to 1.22.3. * gnu/packages/gstreamer.scm (gst-plugins-good): Update to 1.22.3. --- gnu/packages/gstreamer.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index aba0a8d98c..3df4997cad 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -641,7 +641,7 @@ (define-public gst-plugins-base (define-public gst-plugins-good (package (name "gst-plugins-good") - (version "1.22.2") + (version "1.22.3") (source (origin (method url-fetch) @@ -650,7 +650,7 @@ (define-public gst-plugins-good "https://gstreamer.freedesktop.org/src/" name "/" name "-" version ".tar.xz")) (sha256 - (base32 "1p8cpkk4dynglw0xswqyf57xl5fnxmb3xld71kv35cpj4nacb33w")))) + (base32 "0wq2f5q395vs7hnwjqpc2gysdvkgd4jmyfdszv9g9wrf795ib0dg")))) (build-system meson-build-system) (arguments (list -- cgit v1.2.3 From 398475049284668ad16d2f69c2b475c618e62822 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 27 May 2023 09:14:14 +0200 Subject: gnu: gst-plugins-bad: Update to 1.22.3. * gnu/packages/gstreamer.scm (gst-plugins-bad): Update to 1.22.3. --- gnu/packages/gstreamer.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 3df4997cad..5f2e8702ff 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -760,14 +760,14 @@ (define-public gst-plugins-good-qt (define-public gst-plugins-bad (package (name "gst-plugins-bad") - (version "1.22.2") + (version "1.22.3") (source (origin (method url-fetch) (uri (string-append "https://gstreamer.freedesktop.org/src/" name "/" name "-" version ".tar.xz")) (sha256 (base32 - "03rd09wsrf9xjianpnnvamb4n3lndhd4x31srqsqab20wcfaz3rx")) + "1n116sphawmlqyjp1b8sv07vz4rjk1zn07286w37y4l65pp8yyg1")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 42695102bfb6ee5ca85a89707b851eca2fedbe43 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 27 May 2023 09:14:22 +0200 Subject: gnu: gst-plugins-ugly: Update to 1.22.3. * gnu/packages/gstreamer.scm (gst-plugins-ugly): Update to 1.22.3. --- gnu/packages/gstreamer.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 5f2e8702ff..4bc5d34ee1 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -943,7 +943,7 @@ (define-public gst-plugins-bad (define-public gst-plugins-ugly (package (name "gst-plugins-ugly") - (version "1.22.2") + (version "1.22.3") (source (origin (method url-fetch) @@ -951,7 +951,7 @@ (define-public gst-plugins-ugly (string-append "https://gstreamer.freedesktop.org/src/" name "/" name "-" version ".tar.xz")) (sha256 - (base32 "1486x08bwasq6l7kc75nph5az61siq9mbgkgpw4kf1mxn16z8c4g")))) + (base32 "0q53snvh7kr8g7qqxy4v5ska0d78kgc5bkp6qjrnhcr9qbaqxj9x")))) (build-system meson-build-system) (arguments (list #:glib-or-gtk? #t ; To wrap binaries and/or compile schemas -- cgit v1.2.3 From 981cb87dce280a804346ae7be88dee787bea9bae Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 27 May 2023 09:14:29 +0200 Subject: gnu: gst-libav: Update to 1.22.3. * gnu/packages/gstreamer.scm (gst-libav): Update to 1.22.3. --- gnu/packages/gstreamer.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 4bc5d34ee1..d78ce347a2 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -1000,7 +1000,7 @@ (define-public gst-plugins-ugly (define-public gst-libav (package (name "gst-libav") - (version "1.22.2") + (version "1.22.3") (source (origin (method url-fetch) @@ -1009,7 +1009,7 @@ (define-public gst-libav "https://gstreamer.freedesktop.org/src/" name "/" name "-" version ".tar.xz")) (sha256 - (base32 "1zfg7giwampmjxkqr5pqy66vck42b0akmwby661brwz8iy3zkapw")))) + (base32 "08x929yhjd2wpy05146fnqv6p2hw58ha079bwfkp2hwbh02wii9f")))) (build-system meson-build-system) (native-inputs (list perl pkg-config python-wrapper ruby)) (inputs (list ffmpeg)) -- cgit v1.2.3 From 7de109101b1d85a60fc1e7972feca560cc4a131f Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 27 May 2023 09:14:34 +0200 Subject: gnu: gst-editing-services: Update to 1.22.3. * gnu/packages/gstreamer.scm (gst-editing-services): Update to 1.22.3. --- gnu/packages/gstreamer.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index d78ce347a2..5fecb91207 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -1023,7 +1023,7 @@ (define-public gst-libav (define-public gst-editing-services (package (name "gst-editing-services") - (version "1.22.2") + (version "1.22.3") (source (origin (method url-fetch) (uri (string-append @@ -1031,7 +1031,7 @@ (define-public gst-editing-services "gst-editing-services-" version ".tar.xz")) (sha256 (base32 - "1gyfw11ns2la1cm6gvvvv5qj3q5gcvcypc3wk8kdwmrqzij18fs5")))) + "18nfq3av5ksz17048l2b4r4zbh11yd0yq2asx0jy3c894pkbr98m")))) (build-system meson-build-system) (arguments (list -- cgit v1.2.3 From 817deeb1aa07cff7dc418b7ea745d0c3c8bd2daa Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 27 May 2023 09:14:39 +0200 Subject: gnu: python-gst: Update to 1.22.3. * gnu/packages/gstreamer.scm (python-gst): Update to 1.22.3. --- gnu/packages/gstreamer.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index 5fecb91207..8021e74265 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -1091,7 +1091,7 @@ (define-public gst-plugins-bad-minimal (define-public python-gst (package (name "python-gst") - (version "1.22.2") + (version "1.22.3") (source (origin (method url-fetch) (uri (string-append @@ -1099,7 +1099,7 @@ (define-public python-gst "gst-python-" version ".tar.xz")) (sha256 (base32 - "1bak46bj92gyz613m99mnl0yw0qhbhq5dfxifnvldgp45kcb7wmy")))) + "073kii36ncgsyq0b5njbsvprrg1k3kmydr3dxwiccjv3pvxd7gkh")))) (build-system meson-build-system) (arguments (list -- cgit v1.2.3 From b90738f02c33b23d811a5a2f55f77ccc89928af8 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 13 May 2023 20:50:08 +0200 Subject: gnu: gtk: Update to 4.10.3. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gtk.scm (gtk): Update to 4.10.3. [source]: Unbundle gi-docgen. [native-inputs]: Add gi-docgen. [arguments]<#:test-options>: Add “--no-suite=failing” and “--no-suite=flaky”. --- gnu/packages/gtk.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 9d628d243c..de45eb3870 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1109,7 +1109,7 @@ (define-public gtk+ (define-public gtk (package (name "gtk") - (version "4.8.1") + (version "4.10.3") (source (origin (method url-fetch) @@ -1117,9 +1117,11 @@ (define-public gtk (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 - (base32 "1za2nyqqs2lrbss61gfw17qba2f0w6a119m1xk4d0fx2k3gdis2w")) + (base32 "1aff06l9v40j16s4s0qvdbj8cs54qxnh41d7w2v7wdwyswd48ia5")) (patches - (search-patches "gtk4-respect-GUIX_GTK4_PATH.patch")))) + (search-patches "gtk4-respect-GUIX_GTK4_PATH.patch")) + (modules '((guix build utils))) + (snippet #~(begin (delete-file-recursively "subprojects/gi-docgen"))))) (build-system meson-build-system) (outputs '("out" "bin" "doc")) (arguments @@ -1143,6 +1145,8 @@ (define-public gtk ;; Use the same test options as upstream uses for ;; their CI. "--suite=gtk" + "--no-suite=failing" + "--no-suite=flaky" "--no-suite=gsk-compare-broadway") #:phases #~(modify-phases %standard-phases @@ -1249,6 +1253,7 @@ (define-public gtk cups ;for CUPS print-backend ffmpeg ;for ffmpeg media-backend fribidi + gi-docgen gstreamer ;for gstreamer media-backend gst-plugins-bad ;provides gstreamer-player gst-plugins-base ;provides gstreamer-gl -- cgit v1.2.3 From 00d8a4116427fb69f79e334bfbf91920a0d871d2 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 13 May 2023 22:27:57 +0200 Subject: gnu: gtksourceview: Fix build. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gtk.scm (gtksourceview)[#:phases]: Set “GDK_BACKEND” and “GTK_A11Y”. --- gnu/packages/gtk.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index de45eb3870..b957989689 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -616,6 +616,11 @@ (define-public gtksourceview ;; Tests require a running X server. (system (string-append Xvfb " :1 &")) (setenv "DISPLAY" ":1") + ;; Use an X11 setup to find the display. + (setenv "GDK_BACKEND" "x11") + ;; Avoid spawning (and failing to connect to) the accessiblity + ;; bus. + (setenv "GTK_A11Y" "none") ;; For the missing /etc/machine-id. (setenv "DBUS_FATAL_WARNINGS" "0"))))))) (native-inputs -- cgit v1.2.3 From 16a5ce3bb7fbd14fb17a6ba6a62fb079d2379fcc Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 3 Jun 2023 08:26:45 +0200 Subject: gnu: Make glibmm-next the new glibmm. * gnu/packages/glib.scm (glibmm): Update to 2.76.0. (glibmm-next): Remove variable. * gnu/packages/telegram.scm (webrtc-for-telegram-desktop) (telegram-desktop)[inputs]: Adjust accordingly. --- gnu/packages/glib.scm | 18 ++---------------- gnu/packages/telegram.scm | 4 ++-- 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index a799098614..de6de1f3f0 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -830,7 +830,7 @@ (define-public libsigc++-2 (define glibmm (package (name "glibmm") - (version "2.72.1") + (version "2.76.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/glibmm/" @@ -838,7 +838,7 @@ (define glibmm "/glibmm-" version ".tar.xz")) (sha256 (base32 - "1n2w2pcpbxjbsxynmar3i5ibr7src6gnrdxb9nn57p5miai4jxia")))) + "1cia8vrpwzn8zwalws42mga5hi965840m5s8dvfzv55xx86dhdw6")))) (build-system meson-build-system) (outputs '("out" "doc")) (arguments @@ -879,20 +879,6 @@ (define glibmm useful for C++.") (license license:lgpl2.1+))) -(define-public glibmm-next - (package - (inherit glibmm) - (version "2.76.0") - (name "glibmm") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/glibmm/" - (version-major+minor version) - "/glibmm-" version ".tar.xz")) - (sha256 - (base32 - "1cia8vrpwzn8zwalws42mga5hi965840m5s8dvfzv55xx86dhdw6")))))) - (define-public glibmm-2.64 (package (inherit glibmm) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index d2403b00ee..d56409cbe9 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -320,7 +320,7 @@ (define-public webrtc-for-telegram-desktop crc32c ffmpeg glib - glibmm-next + glibmm libdrm libglvnd libjpeg-turbo @@ -492,7 +492,7 @@ (define-public telegram-desktop fcitx5-qt ffmpeg glib - glibmm-next + glibmm gtk+ hime hunspell -- cgit v1.2.3 From 0ccafddca9d9fea971c5baeabf03d8e5123cc4bd Mon Sep 17 00:00:00 2001 From: Bruno Victal Date: Thu, 22 Jun 2023 20:33:17 +0100 Subject: gnu: shared-mime-info: Move to (gnu packages freedesktop). MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome.scm (shared-mime-info): Move to … * gnu/packages/freedesktop.scm: … here. * gnu/packages/gnuzilla.scm: Use (gnu packages freedesktop). * gnu/packages/kde-games.scm: Ditto. * gnu/packages/kde-multimedia.scm: Ditto. * gnu/packages/kde-pim.scm: Ditto. * gnu/packages/kde-utils.scm: Ditto. * gnu/packages/maths.scm: Ditto. * gnu/packages/mp3.scm: Ditto. * gnu/packages/ruby.scm: Ditto. * guix/profiles.scm (xdg-mime-database): Adjust to new location. Signed-off-by: Liliana Marie Prikler --- gnu/packages/freedesktop.scm | 33 +++++++++++++++++++++++++++++++++ gnu/packages/gnome.scm | 33 --------------------------------- gnu/packages/gnuzilla.scm | 1 + gnu/packages/kde-games.scm | 2 +- gnu/packages/kde-multimedia.scm | 1 + gnu/packages/kde-pim.scm | 1 + gnu/packages/kde-utils.scm | 1 + gnu/packages/maths.scm | 1 + gnu/packages/mp3.scm | 1 + gnu/packages/ruby.scm | 1 + guix/profiles.scm | 2 +- 11 files changed, 42 insertions(+), 35 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 6385741d89..bd3df9ee68 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -465,6 +465,39 @@ (define-public maliit-keyboard display servers. It supports many different languages and emoji.") (license license:gpl3+))) +(define-public shared-mime-info + (package + (name "shared-mime-info") + (version "1.15") + (source (origin + (method url-fetch) + (uri (string-append + "https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/" + "b27eb88e4155d8fccb8bb3cd12025d5b/shared-mime-info-" version + ".tar.xz")) + (sha256 + (base32 + "146vynj78wcwdq0ms52jzm1r4m6dzi1rhyh3h4xyb6bw8ckv10pl")))) + (build-system gnu-build-system) + (arguments + ;; The build system appears not to be parallel-safe. + '(#:parallel-build? #f)) + (inputs + (list glib libxml2)) + (native-inputs + `(("gettext" ,gettext-minimal) + ("itstool" ,itstool) + ("pkg-config" ,pkg-config))) + (home-page "https://www.freedesktop.org/wiki/Software/shared-mime-info") + (synopsis "Database of common MIME types") + (description + "The shared-mime-info package contains the core database of common types +and the update-mime-database command used to extend it. It requires glib2 to +be installed for building the update command. Additionally, it uses intltool +for translations, though this is only a dependency for the maintainers. This +database is translated at Transifex.") + (license license:gpl2+))) + (define-public xdg-utils (package (name "xdg-utils") diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 17ef8a642c..88857da82b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2913,39 +2913,6 @@ (define-public tango-icon-theme guidelines.") (license license:public-domain))) -(define-public shared-mime-info - (package - (name "shared-mime-info") - (version "1.15") - (source (origin - (method url-fetch) - (uri (string-append - "https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/" - "b27eb88e4155d8fccb8bb3cd12025d5b/shared-mime-info-" version - ".tar.xz")) - (sha256 - (base32 - "146vynj78wcwdq0ms52jzm1r4m6dzi1rhyh3h4xyb6bw8ckv10pl")))) - (build-system gnu-build-system) - (arguments - ;; The build system appears not to be parallel-safe. - '(#:parallel-build? #f)) - (inputs - (list glib libxml2)) - (native-inputs - `(("gettext" ,gettext-minimal) - ("itstool" ,itstool) - ("pkg-config" ,pkg-config))) - (home-page "https://www.freedesktop.org/wiki/Software/shared-mime-info") - (synopsis "Database of common MIME types") - (description - "The shared-mime-info package contains the core database of common types -and the update-mime-database command used to extend it. It requires glib2 to -be installed for building the update command. Additionally, it uses intltool -for translations, though this is only a dependency for the maintainers. This -database is translated at Transifex.") - (license license:gpl2+))) - (define-public system-config-printer (package (name "system-config-printer") diff --git a/gnu/packages/gnuzilla.scm b/gnu/packages/gnuzilla.scm index 0ce5917d5d..52336de4b8 100644 --- a/gnu/packages/gnuzilla.scm +++ b/gnu/packages/gnuzilla.scm @@ -63,6 +63,7 @@ (define-module (gnu packages gnuzilla) #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages databases) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages gnome) diff --git a/gnu/packages/kde-games.scm b/gnu/packages/kde-games.scm index 9be889f6aa..73fb88c4cb 100644 --- a/gnu/packages/kde-games.scm +++ b/gnu/packages/kde-games.scm @@ -30,7 +30,7 @@ (define-module (gnu packages kde-games) #:use-module (gnu packages bash) #:use-module (gnu packages compression) #:use-module (gnu packages gl) - #:use-module ((gnu packages gnome) #:select (shared-mime-info)) + #:use-module ((gnu packages freedesktop) #:select (shared-mime-info)) #:use-module (gnu packages kde) #:use-module (gnu packages kde-frameworks) #:use-module (gnu packages perl) diff --git a/gnu/packages/kde-multimedia.scm b/gnu/packages/kde-multimedia.scm index e3de6db432..6460345c47 100644 --- a/gnu/packages/kde-multimedia.scm +++ b/gnu/packages/kde-multimedia.scm @@ -35,6 +35,7 @@ (define-module (gnu packages kde-multimedia) #:use-module (gnu packages compression) #:use-module (gnu packages cdrom) #:use-module (gnu packages docbook) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) #:use-module (gnu packages gtk) #:use-module (gnu packages gnome) diff --git a/gnu/packages/kde-pim.scm b/gnu/packages/kde-pim.scm index 6f3cbf2999..dc0533d24b 100644 --- a/gnu/packages/kde-pim.scm +++ b/gnu/packages/kde-pim.scm @@ -34,6 +34,7 @@ (define-module (gnu packages kde-pim) #:use-module (gnu packages cyrus-sasl) #:use-module (gnu packages databases) #:use-module (gnu packages documentation) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gnupg) diff --git a/gnu/packages/kde-utils.scm b/gnu/packages/kde-utils.scm index 5774fa9910..35ad20f541 100644 --- a/gnu/packages/kde-utils.scm +++ b/gnu/packages/kde-utils.scm @@ -35,6 +35,7 @@ (define-module (gnu packages kde-utils) #:use-module (gnu packages compression) #:use-module (gnu packages crypto) #:use-module (gnu packages cups) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages glib) ; dbus for tests #:use-module (gnu packages gnome) #:use-module (gnu packages gstreamer) diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index f5a2181905..89ae48633a 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm @@ -122,6 +122,7 @@ (define-module (gnu packages maths) #:use-module (gnu packages flex) #:use-module (gnu packages fltk) #:use-module (gnu packages fontutils) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #:use-module (gnu packages gcc) #:use-module (gnu packages gd) diff --git a/gnu/packages/mp3.scm b/gnu/packages/mp3.scm index 7ede16f4bb..85f45d3271 100644 --- a/gnu/packages/mp3.scm +++ b/gnu/packages/mp3.scm @@ -40,6 +40,7 @@ (define-module (gnu packages mp3) #:use-module (gnu packages check) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages gettext) #:use-module (gnu packages ghostscript) #:use-module (gnu packages gnome) diff --git a/gnu/packages/ruby.scm b/gnu/packages/ruby.scm index 8c0e19d015..f60a0ec537 100644 --- a/gnu/packages/ruby.scm +++ b/gnu/packages/ruby.scm @@ -61,6 +61,7 @@ (define-module (gnu packages ruby) #:use-module (gnu packages curl) #:use-module (gnu packages databases) #:use-module (gnu packages dbm) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages rails) #:use-module (gnu packages readline) #:use-module (gnu packages autotools) diff --git a/guix/profiles.scm b/guix/profiles.scm index 6467e464c8..2e2466ccbc 100644 --- a/guix/profiles.scm +++ b/guix/profiles.scm @@ -1562,7 +1562,7 @@ (define (xdg-mime-database manifest) "Return a derivation that builds the @file{mime.cache} database from manifest entries. It's used to query the MIME type of a given file." (define shared-mime-info ; lazy reference - (module-ref (resolve-interface '(gnu packages gnome)) 'shared-mime-info)) + (module-ref (resolve-interface '(gnu packages freedesktop)) 'shared-mime-info)) (mlet %store-monad ((glib (manifest-lookup-package manifest "glib"))) (define build -- cgit v1.2.3 From 5539ad8c65a943bfc0cec35dea76d016bcb881fc Mon Sep 17 00:00:00 2001 From: Bruno Victal Date: Thu, 22 Jun 2023 20:33:18 +0100 Subject: gnu: Add xdgmime. This package is only used for testing shared-mime-info, and thus not exported. * gnu/packages/freedesktop.scm (xdgmime): New variable. Signed-off-by: Liliana Marie Prikler --- gnu/packages/freedesktop.scm | 47 ++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index bd3df9ee68..b6b9f5d4ee 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -33,6 +33,7 @@ ;;; Copyright © 2022 Petr Hodina ;;; Copyright © 2022 muradm ;;; Copyright © 2023 Alex Devaure +;;; Copyright © 2023 Bruno Victal ;;; ;;; This file is part of GNU Guix. ;;; @@ -465,6 +466,52 @@ (define-public maliit-keyboard display servers. It supports many different languages and emoji.") (license license:gpl3+))) +;; Private package used by shared-mime-info. +(define xdgmime + ;; No public release, match commit to the one used in the + ;; shared-mime-info release. + (let ((commit "de283fc430460b9b3a7e61432a6d273cd64cb102") + (revision "1")) + (package + (name "xdgmime") + (version (git-version "0.0" revision commit)) + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.freedesktop.org/xdg/xdgmime.git") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0m9k7nfxgchb9j0xh9cwsldz6564qisqdkvlhgkcgc0grd4nfbn9")))) + (build-system gnu-build-system) + (arguments + (list + #:tests? #f ; no tests + #:make-flags #~(list (string-append "DESTDIR=" #$output) + #$(string-append "CC=" (cc-for-target))) + #:imported-modules `((guix build copy-build-system) + ,@%gnu-build-system-modules) + #:modules `((guix build gnu-build-system) + ((guix build copy-build-system) #:prefix copy:) + (guix build utils)) + #:phases + #~(modify-phases %standard-phases + ;; Package uses a hand-crafted Makefile. + (delete 'configure) + (replace 'install + (lambda args + (apply (assoc-ref copy:%standard-phases 'install) + #:install-plan + '(("src" "bin/" #:include ("print-mime-data" + "test-mime-data" + "test-mime"))) + args)))))) + (home-page "https://gitlab.freedesktop.org/xdg/xdgmime/") + (synopsis "Module that parses the freedesktop.org MIME spec") + (description "This module is used for shared-mime-info package tests.") + (license (list license:lgpl2.1+ license:artistic2.0))))) + (define-public shared-mime-info (package (name "shared-mime-info") -- cgit v1.2.3 From 0a167432dbccb3ed5b6f27a48b61e570846cf784 Mon Sep 17 00:00:00 2001 From: Bruno Victal Date: Thu, 22 Jun 2023 20:33:19 +0100 Subject: gnu: shared-mime-info: Update to 2.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/freedesktop.scm (shared-mime-info): Update to 2.2. [source]: Use git-fetch. [build-system]: Use meson-build-system. [arguments]<#:parallel-build?>: Removed argument. <#:phases>: Replace ‘patch-source-shebangs’ with a version that skips mime detection checks. [native-inputs]: Drop labels. Add python and xdgmime. Remove itstool. * gnu/packages/patches/shared-mime-info-xdgmime-path.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it. Signed-off-by: Liliana Marie Prikler --- gnu/local.mk | 2 ++ gnu/packages/freedesktop.scm | 41 +++++++++++++++------- .../patches/shared-mime-info-xdgmime-path.patch | 22 ++++++++++++ 3 files changed, 52 insertions(+), 13 deletions(-) create mode 100644 gnu/packages/patches/shared-mime-info-xdgmime-path.patch diff --git a/gnu/local.mk b/gnu/local.mk index 5dae534ec3..d0c03b9078 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -59,6 +59,7 @@ # Copyright © 2023 Zheng Junjie <873216071@qq.com> # Copyright © 2023 Ivana Drazovic # Copyright © 2023 Andy Tai +# Copyright © 2023 Bruno Victal # # This file is part of GNU Guix. # @@ -1919,6 +1920,7 @@ dist_patch_DATA = \ %D%/packages/patches/libsequoia-remove-store.patch \ %D%/packages/patches/serf-python3.patch \ %D%/packages/patches/shakespeare-spl-fix-grammar.patch \ + %D%/packages/patches/shared-mime-info-xdgmime-path.patch \ %D%/packages/patches/sharutils-CVE-2018-1000097.patch \ %D%/packages/patches/slim-session.patch \ %D%/packages/patches/slim-config.patch \ diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index b6b9f5d4ee..b16fa5d387 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -512,29 +512,44 @@ (define xdgmime (description "This module is used for shared-mime-info package tests.") (license (list license:lgpl2.1+ license:artistic2.0))))) +;; Note: when updating shared-mime-info, don't forget to update xdgmime's commit +;; to the one used in the release. (define-public shared-mime-info (package (name "shared-mime-info") - (version "1.15") + (version "2.2") (source (origin - (method url-fetch) - (uri (string-append - "https://gitlab.freedesktop.org/xdg/shared-mime-info/uploads/" - "b27eb88e4155d8fccb8bb3cd12025d5b/shared-mime-info-" version - ".tar.xz")) + (method git-fetch) + (uri (git-reference + (url "https://gitlab.freedesktop.org/xdg/shared-mime-info.git") + (commit version))) + (file-name (git-file-name name version)) (sha256 (base32 - "146vynj78wcwdq0ms52jzm1r4m6dzi1rhyh3h4xyb6bw8ckv10pl")))) - (build-system gnu-build-system) + "04dfnnflspprxg7qia3whz1754lfvgi4ihvmihg379936zy5xd22")) + (patches (search-patches "shared-mime-info-xdgmime-path.patch")))) + (build-system meson-build-system) (arguments - ;; The build system appears not to be parallel-safe. - '(#:parallel-build? #f)) + (list + #:configure-flags + #~(list #$(format #f "-Dxdgmime-path=~a/bin" + (this-package-native-input "xdgmime")) + "-Dupdate-mimedb=true") + #:phases + #~(modify-phases %standard-phases + ;; Don't patch shebangs for the test files. + (replace 'patch-source-shebangs + (lambda _ + (let ((pred (lambda (file stat) + (and (eq? 'regular (stat:type stat)) + (not (string-prefix? "./tests/mime-detection" + file)))))) + (for-each patch-shebang + (find-files "." pred #:stat lstat)))))))) (inputs (list glib libxml2)) (native-inputs - `(("gettext" ,gettext-minimal) - ("itstool" ,itstool) - ("pkg-config" ,pkg-config))) + (list gettext-minimal pkg-config python xdgmime)) (home-page "https://www.freedesktop.org/wiki/Software/shared-mime-info") (synopsis "Database of common MIME types") (description diff --git a/gnu/packages/patches/shared-mime-info-xdgmime-path.patch b/gnu/packages/patches/shared-mime-info-xdgmime-path.patch new file mode 100644 index 0000000000..27c578f3fa --- /dev/null +++ b/gnu/packages/patches/shared-mime-info-xdgmime-path.patch @@ -0,0 +1,22 @@ +Adapted from . + +diff --git a/meson.build b/meson.build +index 3c75424..7058562 100644 +--- a/meson.build ++++ b/meson.build +@@ -26,11 +26,11 @@ xmlto = find_program('xmlto', required: false) + ############################################################################### + # Find xdgmime + +-xdgmime = get_option('xdgmime-path') / 'src' ++xdgmime = get_option('xdgmime-path') + +-xdgmime_print_mime_data = find_program(xdgmime/'print-mime-data', required: false) +-xdgmime_test_mime_data = find_program(xdgmime/'test-mime-data', required: false) +-xdgmime_test_mime = find_program(xdgmime/'test-mime', required: false) ++xdgmime_print_mime_data = find_program('print-mime-data', xdgmime/'print-mime-data', required: false) ++xdgmime_test_mime_data = find_program('test-mime-data', xdgmime/'test-mime-data', required: false) ++xdgmime_test_mime = find_program('test-mime', xdgmime/'test-mime', required: false) + xdgmime_found = ( + xdgmime_print_mime_data.found() and + xdgmime_test_mime_data.found() and -- cgit v1.2.3 From 4346c092ea8f1c3084609d3e9173d232bf04af0c Mon Sep 17 00:00:00 2001 From: Bruno Victal Date: Thu, 22 Jun 2023 20:33:20 +0100 Subject: gnu: shared-mime-info: Add doc output. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/freedesktop.scm (shared-mime-info[#:phases]: Add ‘install-doc’. [outputs]: Add “doc”. [native-inputs]: Add docbook-xml-4.1.2, docbook-xsl and xmlto. Signed-off-by: Liliana Marie Prikler --- gnu/packages/freedesktop.scm | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index b16fa5d387..65781fed11 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -545,11 +545,24 @@ (define-public shared-mime-info (not (string-prefix? "./tests/mime-detection" file)))))) (for-each patch-shebang - (find-files "." pred #:stat lstat)))))))) + (find-files "." pred #:stat lstat))))) + ;; The docs have no install rule. + (add-after 'install 'install-doc + (lambda* (#:key source #:allow-other-keys) + (let ((dest (string-append #$output:doc "/share/doc"))) + (with-directory-excursion "data/shared-mime-info-spec-html" + (install-file "shared-mime-info-spec.html" + (string-append dest "/html"))) + (install-file (string-append source + "/data/shared-mime-info-spec.xml") + dest))))))) (inputs (list glib libxml2)) (native-inputs - (list gettext-minimal pkg-config python xdgmime)) + (list gettext-minimal pkg-config python xdgmime + ;; For 'doc' output. + docbook-xml-4.1.2 docbook-xsl xmlto)) + (outputs (list "out" "doc")) (home-page "https://www.freedesktop.org/wiki/Software/shared-mime-info") (synopsis "Database of common MIME types") (description -- cgit v1.2.3 From 3b3d9a13dd2bd67f34c890047680a1ce6e3af28e Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sun, 25 Jun 2023 10:49:13 +0200 Subject: gnu: gst-plugins-bad: Remove ineffective substitution. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gstreamer.scm (gst-plugins-bad)[adjust-tests]: Remove the substitution that was commmented to be “no longer effective”. --- gnu/packages/gstreamer.scm | 7 ------- 1 file changed, 7 deletions(-) diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm index b883022621..12d4b52f15 100644 --- a/gnu/packages/gstreamer.scm +++ b/gnu/packages/gstreamer.scm @@ -806,13 +806,6 @@ (define-public gst-plugins-bad "'elements/viewfinderbin.c'], true, ],")) '()) - ;; This substitution is no longer effective and can be removed. - #$@(if (member (%current-system) - '("i686-linux" "aarch64-linux" "riscv64-linux")) - `((("'elements/camerabin\\.c'\\]\\],") - "'elements/camerabin.c'], true, ],")) - '()) - ;; https://gitlab.freedesktop.org/gstreamer/gst-plugins-bad/-/issues/1412 ((".*elements/dtls\\.c.*") "")) (substitute* "tests/check/elements/zxing.c" -- cgit v1.2.3 From ebe133359f94af2ebf680335182a996ec464fe53 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Fri, 14 Jul 2023 13:26:40 +0200 Subject: gnu: Unify gsettings-desktop-schemas and gsettings-desktop-schemas-next. * gnu/packages/gnome.scm (gsettings-desktop-schemas-next): Remove variable. (gnome-desktop)[propagated-inputs]: Use gsettings-desktop-schemas instead of gsettings-desktop-schemas-next. (gnome-settings-daemon)[inputs]: Likewise. (mutter)[propagated-inputs]: Likewise. (gnome-weather)[inputs]: Likewise. (gnome-calculator)[inputs]: Likewise. --- gnu/packages/gnome.scm | 25 +++++-------------------- 1 file changed, 5 insertions(+), 20 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 27e8949fa1..823dff40b5 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2245,7 +2245,7 @@ (define-public gnome-desktop xorg-server-for-tests)) (propagated-inputs ;; Required by gnome-desktop-3.0.pc. - (list gsettings-desktop-schemas-next + (list gsettings-desktop-schemas gtk gtk+ iso-codes @@ -2714,21 +2714,6 @@ (define-public gsettings-desktop-schemas schemas for settings shared by various components of the GNOME desktop.") (license license:lgpl2.1+))) -(define-public gsettings-desktop-schemas-next - (package - (inherit gsettings-desktop-schemas) - (name "gsettings-desktop-schemas-next") ;to avoid propagation conflicts - (version "42.0") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "1li3fcqwnw20f4j0i21i88fygm0hli8gmzkn4apgf8ynkrd371k6")))))) - (define-public python-liblarch (package (name "python-liblarch") @@ -5990,7 +5975,7 @@ (define-public gnome-settings-daemon geoclue geocode-glib-with-libsoup2 gnome-desktop - gsettings-desktop-schemas-next + gsettings-desktop-schemas lcms libcanberra libgudev @@ -7924,7 +7909,7 @@ (define-public mutter python-dbusmock tini)) ;acting as init (zombie reaper) (propagated-inputs - (list gsettings-desktop-schemas-next ;required by libmutter.pc + (list gsettings-desktop-schemas ;required by libmutter.pc gtk+ ;required by libmutter.pc ;; mutter-clutter-1.0.pc and mutter-cogl-1.0.pc refer to these: at-spi2-core @@ -9966,7 +9951,7 @@ (define-public gnome-weather bash-minimal geoclue gjs - gsettings-desktop-schemas-next + gsettings-desktop-schemas gtk libadwaita libgweather4)) @@ -10768,7 +10753,7 @@ (define-public gnome-calculator python vala)) (inputs - (list gsettings-desktop-schemas-next + (list gsettings-desktop-schemas gtksourceview libadwaita libgee -- cgit v1.2.3 From 82bdb77082fa4e100761f70086b745dfb280c3ac Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 15 Jul 2023 08:50:46 +0200 Subject: gnu: gsettings-desktop-schemas: Update to 44.0. * gnu/packages/gnome.scm (gsettings-desktop-schemas): Update to 44.0. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 823dff40b5..7ba1a9f6b0 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2678,7 +2678,7 @@ (define-public evince (define-public gsettings-desktop-schemas (package (name "gsettings-desktop-schemas") - (version "42.0") + (version "44.0") (source (origin (method url-fetch) @@ -2687,7 +2687,7 @@ (define-public gsettings-desktop-schemas name "-" version ".tar.xz")) (sha256 (base32 - "1li3fcqwnw20f4j0i21i88fygm0hli8gmzkn4apgf8ynkrd371k6")))) + "03pc3wlfmf07586x89h63fr42pdpvqx64ak4ks298nchmmff8bgb")))) (build-system meson-build-system) (arguments `(#:phases (modify-phases %standard-phases -- cgit v1.2.3 From bc3e4ae4da7bed1ce08554c9c51909fc9889ad41 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Tue, 15 Aug 2023 16:07:27 +0800 Subject: gnu: emacs-flim-lb: Update to 1.14.9-137.80b8121. * gnu/packages/emacs-xyz.scm (emacs-flim-lb): Update to 1.14.9-137.80b8121. [version]: Inline version. Signed-off-by: Liliana Marie Prikler --- gnu/packages/emacs-xyz.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index 0f0751e39a..be8ff7ad5a 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -37687,12 +37687,11 @@ (define-public emacs-apel-lb (define-public emacs-flim-lb ;; No release since Nov 28, 2007. - (let ((version "1.14.9") - (revision "136") - (commit "2cf5a7891090faca8de725b1d3743dcedf233ea2")) + (let ((commit "80b8121f05a5a0d7fcfe3e54085467a646dd2028") + (revision "137")) (package (name "emacs-flim-lb") - (version (git-version version revision commit)) + (version (git-version "1.14.9" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -37701,7 +37700,7 @@ (define-public emacs-flim-lb (file-name (git-file-name name version)) (sha256 (base32 - "1wsnipyl3blldcl8ynmpj1mxfvl7kjmxd8gapl83vqd3r0l9cr6q")))) + "02shd2mp9ywncn0wxgrijn0i8fa69kfx1y6nh5jjd64dyiczmskk")))) (build-system emacs-build-system) (propagated-inputs (list emacs-apel-lb emacs-oauth2)) (home-page "https://www.emacswiki.org/emacs/WanderLust") -- cgit v1.2.3 From b6b8e5004de56a55186b215b3263b39f34e8ce1d Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Tue, 15 Aug 2023 16:08:14 +0800 Subject: gnu: emacs-semi-epg: Update to 1.14.6-246.9370961. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/emacs-xyz.scm (emacs-semi-epg): Update to 1.14.6-246.9370961. [version]: Inline version. [propagated-inputs]: Move emacs-bbdb-vcard … [inputs]: … here. Signed-off-by: Liliana Marie Prikler --- gnu/packages/emacs-xyz.scm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm index be8ff7ad5a..818d796a97 100644 --- a/gnu/packages/emacs-xyz.scm +++ b/gnu/packages/emacs-xyz.scm @@ -37714,12 +37714,11 @@ (define-public emacs-flim-lb (define-public emacs-semi-epg ;; No release since Dec 24, 2003. - (let ((version "1.14.6") - (revision "242") - (commit "7d8df0ef2f483e2dc063a72099295f467e6bc2c8")) + (let ((commit "9370961ddcee78e389e44b36d38c3d93f8351619") + (revision "246")) (package (name "emacs-semi-epg") - (version (git-version version revision commit)) + (version (git-version "1.14.6" revision commit)) (source (origin (method git-fetch) (uri (git-reference @@ -37728,9 +37727,10 @@ (define-public emacs-semi-epg (file-name (git-file-name name version)) (sha256 (base32 - "01dn91xjcl7p5rnbgyh5l4kdlqx31s0gw5vh7hhcapbiq8rihmjd")))) + "13f267j0mrji9cvjhq129nslrj2gwvq7ibsz384a4qilxf5rhccc")))) (build-system emacs-build-system) - (propagated-inputs (list emacs-bbdb-vcard emacs-flim-lb)) + (propagated-inputs (list emacs-flim-lb)) + (inputs (list emacs-bbdb-vcard)) (home-page "https://www.emacswiki.org/emacs/WanderLust") (synopsis "Library to provide MIME feature for GNU Emacs") (description -- cgit v1.2.3 From e43498b32dcbbf055d72339086213cd60c336acf Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 19 Aug 2023 20:36:50 +0200 Subject: gnu: shared-mime-info: Make .drv reproducible again. This fixes an issue in commit 0a167432dbccb3ed5b6f27a48b61e570846cf784, that causes the .drv of shared-mime-info to change with each invocation of guix. For more information, refer to and . * gnu/packages/freedesktop.scm (shared-mime-info)[#:configure-flags]: Infer xdgmime-path via search-input-file. --- gnu/packages/freedesktop.scm | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 8cb4c61d9f..85ba5ba147 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -534,8 +534,10 @@ (define-public shared-mime-info (arguments (list #:configure-flags - #~(list #$(format #f "-Dxdgmime-path=~a/bin" - (this-package-native-input "xdgmime")) + #~(list (string-append + "-Dxdgmime-path=" + (dirname + (search-input-file %build-inputs "/bin/test-mime"))) "-Dupdate-mimedb=true") #:phases #~(modify-phases %standard-phases -- cgit v1.2.3 From e1bfd5536891d1e678125259f3639976041a95b8 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sun, 20 Aug 2023 00:30:20 +0200 Subject: gnu: wpewebkit: Update to 2.40.5. * gnu/packages/webkit.scm (wpewebkit): Update to 2.40.5. --- gnu/packages/webkit.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index c46bcd5662..0c82435cde 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -317,13 +317,13 @@ (define-public wpewebkit (package (inherit webkitgtk) (name "wpewebkit") - (version "2.40.0") + (version "2.40.5") (source (origin (inherit (package-source webkitgtk)) (uri (string-append "https://wpewebkit.org/releases/" name "-" version ".tar.xz")) (sha256 - (base32 "1dl663nbm011sx099x9gdhk3aj119yn5rxp77jmnhdv1l77jpv58")))) + (base32 "0cv74qy67a0hg8sba18wrjcmmwkj4z23wqnn5yqrh3n594q8srac")))) (arguments (substitute-keyword-arguments (package-arguments webkitgtk) ((#:configure-flags flags) -- cgit v1.2.3 From 1b3d824482b6c8ebbc7c17a83d6b584ec71cf787 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sun, 20 Aug 2023 08:21:19 +0200 Subject: gnu: gnome-online-accounts: Update to 3.48.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome.scm (gnome-online-accounts): Update to 3.48.0. [arguments]: Adjust ‘disable-gtk-update-icon-cache’ accordingly. Move it after unpack. --- gnu/packages/gnome.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d718764dfc..1c4d3f29a0 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7949,7 +7949,7 @@ (define-public mutter (define-public gnome-online-accounts (package (name "gnome-online-accounts") - (version "3.45.2") + (version "3.48.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -7957,16 +7957,18 @@ (define-public gnome-online-accounts name "-" version ".tar.xz")) (sha256 (base32 - "15zzzndbfba8a497vxb6cmy1y22l3lfn4sx9s9r59kwzd83i6fxn")))) + "1gvmc4k5vm4qd97yfkd5a4sixz0pfq9nblss42c2mmyvzzybk2s1")))) (build-system meson-build-system) (arguments (list #:glib-or-gtk? #t #:phases #~(modify-phases %standard-phases - (add-before 'install 'disable-gtk-update-icon-cache + (add-after 'unpack 'disable-gtk-update-icon-cache (lambda _ - (setenv "DESTDIR" "/")))))) + (substitute* "meson.build" + (("gtk_update_icon_cache: true") + "gtk_update_icon_cache: false"))))))) (native-inputs (list gettext-minimal `(,glib "bin") ; for glib-compile-schemas, etc. -- cgit v1.2.3 From 8ffeea8fa1ff1ce77d3a4b1c6bc09f95c5164537 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sun, 20 Aug 2023 08:22:08 +0200 Subject: gnu: evolution-data-server: Update to 3.48.4. * gnu/packages/gnome.scm (evolution-data-server): Update to 3.48.4. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 1c4d3f29a0..68b3c86175 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8024,7 +8024,7 @@ (define-public gnome-online-accounts-3.44 (define-public evolution-data-server (package (name "evolution-data-server") - (version "3.46.4") + (version "3.48.4") (source (origin (method url-fetch) @@ -8032,7 +8032,7 @@ (define-public evolution-data-server (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 - (base32 "1j0c7kwmjng7spkqz6vfd8gyvw65invjsf5mqzbsr7y58m0jb6x5")))) + (base32 "0q3d5masw20sr6xm2rg3170a4pxsh23ywyq1rkzhmyvyn69kyzlr")))) (build-system cmake-build-system) (arguments (list -- cgit v1.2.3 From 65cfbfd16e0964a1b9875194a70ff5cadd444cae Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sun, 20 Aug 2023 08:23:00 +0200 Subject: gnu: evolution: Update to 3.48.4. * gnu/packages/gnome.scm (evolution): Update to 3.48.4. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 68b3c86175..08debe6e8a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -11612,7 +11612,7 @@ (define-public libdazzle (define-public evolution (package (name "evolution") - (version "3.46.4") + (version "3.48.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/evolution/" @@ -11620,7 +11620,7 @@ (define-public evolution "evolution-" version ".tar.xz")) (sha256 (base32 - "0gbvd460hsha0gss9rjjpyisq336fwxd8y1xf55s6ifjrqql423s")))) + "1dwbwy67xg1fypxj0qyhhvy608hbw19gqhvxqkr739shl3mrjbx0")))) (build-system cmake-build-system) (arguments (list -- cgit v1.2.3 From 8a0a5b4e6289eaa357bd2134101507aea320cc39 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sun, 20 Aug 2023 09:18:51 +0200 Subject: gnu: vala: Update to 0.56.12. * gnu/packages/gnome.scm (vala): Update to 0.56.12. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 08debe6e8a..922d6ba24b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4402,7 +4402,7 @@ (define-public seahorse (define-public vala (package (name "vala") - (version "0.56.3") + (version "0.56.12") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/vala/" @@ -4410,7 +4410,7 @@ (define-public vala "vala-" version ".tar.xz")) (sha256 (base32 - "1gwrnr0d0bqkh6m4bgz39mh3pcswcj43hyijlwgwp2bvpwhn41p1")))) + "0n9m4l8d2n4wmgn9l5gdhnr6xl5ms7483ng5fxqak8xygi5xbjcj")))) (build-system glib-or-gtk-build-system) (arguments (list -- cgit v1.2.3 From 35a9ebf83ef1063dfdda255b5a670d19747564f7 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sun, 20 Aug 2023 09:00:33 +0200 Subject: gnu: gcr: Update to 4.0.0. * gnu/packages/gnome.scm (gcr): Update to 4.0.0. (gcr-3): New variable for current version. (libgdata)[propagated-inputs]: Replace gcr with gcr-3. (gnome-keyring)[inputs]: Likewise. (seahorse)[inputs]: Likewise. (gnome-settings-daemon)[inputs]: Likewise. (gvfs)[inputs]: Likewise. (epiphany)[inputs]: Likewise. (gexiv2)[inputs]: Likewise. (shotwell)[inputs]: Likewise. (gnome-online-accounts)[inputs]: Likewise. (evolution-data-server)[inputs]: Likewise. (network-manager-openconnect)[inputs]: Likewise. (network-manager-applet)[inputs]: Likewise. (gnome-shell)[inputs]: Likewise. (evolution)[inputs]: Likewise. (geary)[inputs]: Likewise. * gnu/packages/gnome-xyz.scm (gpaste)[native-inputs]: Likewise. * gnu/packages/gnupg.scm (pinentry-gnome3)[inputs]: Likewise. * gnu/packages/suckless.scm (surf)[inputs]: Likewise. * gnu/packages/web-browsers.scm (midori)[inputs]: Likewise. --- gnu/packages/gnome-xyz.scm | 2 +- gnu/packages/gnome.scm | 81 +++++++++++++++++++++++++++---------------- gnu/packages/gnupg.scm | 2 +- gnu/packages/suckless.scm | 2 +- gnu/packages/web-browsers.scm | 2 +- 5 files changed, 56 insertions(+), 33 deletions(-) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index a1701aaa77..9e13bcb59d 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -1030,7 +1030,7 @@ (define-public gpaste (search-patches "gpaste-fix-paths.patch")))) (build-system meson-build-system) (native-inputs - (list gcr + (list gcr-3 gettext-minimal gobject-introspection (list glib "bin") ; for glib-compile-resources diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 922d6ba24b..6f49114893 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1775,7 +1775,7 @@ (define-public libnma pkg-config vala)) (inputs - (list gcr + (list gcr-3 (if (supported-package? gtk) gtk gtk+) iso-codes mobile-broadband-provider-info @@ -2021,7 +2021,7 @@ (define-public libgdata (inputs (list cyrus-sasl glib-networking vala)) (propagated-inputs - `(("gcr" ,gcr) + `(("gcr" ,gcr-3) ("glib" ,glib) ("gnome-online-accounts" ,gnome-online-accounts) ("json-glib" ,json-glib) @@ -2373,7 +2373,7 @@ (define-public gnome-font-viewer (define-public gcr (package (name "gcr") - (version "3.41.1") + (version "4.0.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -2381,7 +2381,7 @@ (define-public gcr name "-" version ".tar.xz")) (sha256 (base32 - "0kx2pv272p0qc0nq1287gciyn34d95yxg41vq3lzxfzyqaijhwdv")))) + "0z7cviri25qy2v042hw6x731bj1azpx8plrd7ssbmrqf9y95an64")))) (build-system meson-build-system) (arguments (list @@ -2394,11 +2394,11 @@ (define-public gcr (substitute* (find-files "." "^meson\\.build$") ((".*'--fatal-warnings',.*") "")))) (add-after 'unpack 'skip-gtk-update-icon-cache - ;; Don't create 'icon-theme.cache'. (lambda _ - (substitute* "meson_post_install.py" - (("gtk-update-icon-cache") "true")))) - (add-before 'check 'pre-check + (substitute* "meson.build" + (("gtk_update_icon_cache: true") + "gtk_update_icon_cache: false")))) + (add-before 'check 'pre-check (lambda _ ;; Some tests expect to write to $HOME. (setenv "HOME" "/tmp"))) @@ -2432,11 +2432,9 @@ (define-public gcr pkg-config python-wrapper vala)) - ;; mentioned in gck.pc, gcr.pc and gcr-ui.pc - (propagated-inputs - (list glib - gtk+ - p11-kit)) + ;; GLib and p11-kit are mentioned in gck.pc and gcr.pc + ;; GTK is kept for symmetry with gcr-3, which propagates gtk+. + (propagated-inputs (list glib gtk p11-kit)) (home-page "https://www.gnome.org") (synopsis "Libraries for displaying certificates and accessing key stores") (description @@ -2445,6 +2443,31 @@ (define-public gcr GNOME Desktop.") (license license:lgpl2.1+))) +(define-public gcr-3 + (package + (inherit gcr) + (name "gcr") + (version "3.41.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0kx2pv272p0qc0nq1287gciyn34d95yxg41vq3lzxfzyqaijhwdv")))) + (arguments + (substitute-keyword-arguments (package-arguments gcr) + ((#:phases phases) + #~(modify-phases #$phases + (replace 'skip-gtk-update-icon-cache + ;; Don't create 'icon-theme.cache'. + (lambda _ + (substitute* "meson_post_install.py" + (("gtk-update-icon-cache") "true")))))))) + ;; mentioned in gck.pc, gcr.pc and gcr-ui.pc + (propagated-inputs (list glib gtk+ p11-kit)))) + (define-public gdl (package (name "gdl") @@ -2570,7 +2593,7 @@ (define-public gnome-keyring "1")))))))) (inputs (list dbus - gcr + gcr-3 libgcrypt linux-pam openssh)) @@ -2587,7 +2610,7 @@ (define-public gnome-keyring pkg-config python-wrapper)) ;for tests (propagated-inputs - (list gcr)) + (list gcr-3)) ;; XXX: There are concerning test failures on i686-linux and other 32-bit ;; platforms: . @@ -4374,7 +4397,7 @@ (define-public seahorse (setenv "HOME" (getcwd))))))) (inputs (list gtk+ - gcr + gcr-3 gnupg gpgme openldap @@ -5952,7 +5975,7 @@ (define-public gnome-settings-daemon baobab colord cups - gcr + gcr-3 geoclue geocode-glib-with-libsoup2 gnome-desktop @@ -6939,7 +6962,7 @@ (define-public gvfs dbus elogind fuse - gcr + gcr-3 glib gnome-online-accounts gsettings-desktop-schemas @@ -7117,7 +7140,7 @@ (define-public epiphany xorg-server-for-tests)) (inputs (list avahi - gcr + gcr-3 glib-networking gnome-desktop gsettings-desktop-schemas @@ -7402,7 +7425,7 @@ (define-public gexiv2 (python:site-packages %build-inputs %outputs) "/gi/overrides")))) (native-inputs - (list gcr + (list gcr-3 `(,glib "bin") pkg-config python @@ -7454,7 +7477,7 @@ (define-public shotwell python vala)) (inputs - (list gcr + (list gcr-3 gexiv2 gst-plugins-base gstreamer @@ -7981,7 +8004,7 @@ (define-public gnome-online-accounts gtk+)) ; required by goa-backend-1.0.pc (inputs (list docbook-xsl - gcr + gcr-3 json-glib libsecret mit-krb5 @@ -8097,7 +8120,7 @@ (define-public evolution-data-server (inputs (list bdb boost - gcr + gcr-3 gnome-online-accounts json-glib libcanberra @@ -8503,7 +8526,7 @@ (define-public network-manager-openconnect libnma pkg-config)) (inputs - (list gcr + (list gcr-3 gtk gtk+ kmod @@ -8634,7 +8657,7 @@ (define-public network-manager-applet ;; nm-applet need by org.gnome.nm-applet.gschema.xml libnma)) (inputs - (list gcr + (list gcr-3 libappindicator libgudev libsecret @@ -9047,7 +9070,7 @@ (define-public gnome-control-center colord-gtk cups dconf - gcr + gcr-3 gnome-bluetooth gnome-desktop gnome-online-accounts @@ -9226,7 +9249,7 @@ (define-public gnome-shell caribou docbook-xsl evolution-data-server - gcr + gcr-3 gdm librsvg gjs @@ -11659,7 +11682,7 @@ (define-public evolution (list cmark enchant evolution-data-server ;must be the same version - gcr + gcr-3 gsettings-desktop-schemas gnome-autoar gnome-desktop @@ -12346,7 +12369,7 @@ (define-public geary (inputs (list enchant folks - gcr + gcr-3 glib gmime gnome-online-accounts diff --git a/gnu/packages/gnupg.scm b/gnu/packages/gnupg.scm index a5b8587a14..00307ec270 100644 --- a/gnu/packages/gnupg.scm +++ b/gnu/packages/gnupg.scm @@ -866,7 +866,7 @@ (define-public pinentry-gnome3 (name "pinentry-gnome3") (inputs (modify-inputs (package-inputs pinentry-tty) - (prepend gtk+-2 gcr glib))) + (prepend gtk+-2 gcr-3 glib))) (arguments `(#:configure-flags '("--enable-pinentry-gnome3" "--enable-fallback-curses"))) diff --git a/gnu/packages/suckless.scm b/gnu/packages/suckless.scm index 400832045f..e8cf86f504 100644 --- a/gnu/packages/suckless.scm +++ b/gnu/packages/suckless.scm @@ -514,7 +514,7 @@ (define-public surf #t))))) (inputs `(("dmenu" ,dmenu) - ("gcr" ,gcr) + ("gcr" ,gcr-3) ("glib-networking" ,glib-networking) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("webkitgtk" ,webkitgtk-with-libsoup2) diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index ac46cffb19..3003f16c83 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -138,7 +138,7 @@ (define-public midori ("which" ,which))) ;for tests (inputs `(("adwaita-icon-theme" ,adwaita-icon-theme) - ("gcr" ,gcr) + ("gcr" ,gcr-3) ("glib" ,glib) ("glib-networking" ,glib-networking) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) -- cgit v1.2.3 From 69ed4f137dce7d2cdbb99d55fde90eaa4b0b1b21 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Tue, 29 Aug 2023 22:21:50 +0200 Subject: gnu: gjs: Update to 1.76.2. * gnu/packages/gnome.scm (gjs): Update to 1.76.2. --- gnu/packages/gnome.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 6f49114893..f437b712b4 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7606,8 +7606,7 @@ (define-public gnome-session (define-public gjs (package (name "gjs") - ;; Note: We use a pre-release for compatibility with recent LibFFI. - (version "1.73.2") + (version "1.76.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -7615,7 +7614,7 @@ (define-public gjs name "-" version ".tar.xz")) (sha256 (base32 - "0xfspsc1q4xm7p500lmy17b9csyaqps1kilylq8wjjd0fjqq8ayg")) + "1m15qscx2z862gfkb9pxg30bz8ka0h774l2azs5dfvzaagbckn7p")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From f1c70ac025e48629fdd8f005030e0678bf7ba040 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Tue, 29 Aug 2023 22:20:52 +0200 Subject: gnu: mutter: Update to 44.3. * gnu/packages/gnome.scm (mutter): Update to 44.3. [arguments]: Adjust linker rpath accordingly. [inputs]: Add colord. --- gnu/packages/gnome.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f437b712b4..90946716b3 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7761,7 +7761,7 @@ (define-public zenity (define-public mutter (package (name "mutter") - (version "42.4") + (version "44.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -7769,7 +7769,7 @@ (define-public mutter name "-" version ".tar.xz")) (sha256 (base32 - "0h1ak3201mdc2qbf67fhcn801ddp33hm0f0c52zis1l7s6ipyb62")) + "0l85qyn6x5hyaaclzcbqd44xpd582gdindqfam8f9lsh46zvwp0q")) ;; TODO: Remove on update as this was merged upstream. See ;; . (patches (search-patches "mutter-fix-inverted-test.patch")))) @@ -7792,7 +7792,7 @@ (define-public mutter ;; Otherwise, the RUNPATH will lack the final path component. (string-append "-Dc_link_args=-Wl,-rpath=" #$output "/lib,-rpath=" - #$output "/lib/mutter-10") + #$output "/lib/mutter-12") ;; Disable systemd support. "-Dsystemd=false" ;; Don't install tests. @@ -7939,7 +7939,8 @@ (define-public mutter pango xinput)) (inputs - (list egl-wayland ;for wayland-eglstream-protocols + (list colord + egl-wayland ;for wayland-eglstream-protocols elogind gnome-desktop gnome-settings-daemon -- cgit v1.2.3 From f29be169fbd994b5e8a5f62e942e09e2847af745 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sun, 20 Aug 2023 09:01:21 +0200 Subject: gnu: baobab: Update to 44.0. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome.scm (baobab): Update to 44.0. [arguments]: Add ‘skip-gtk-update-icon-cache’ phase. [native-inputs]: Remove gtk+:bin. [inputs]: Remove libhandy. --- gnu/packages/gnome.scm | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 90946716b3..557a22cad2 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9693,7 +9693,7 @@ (define-public nautilus (define-public baobab (package (name "baobab") - (version "42.0") + (version "44.0") (source (origin (method url-fetch) (uri (string-append @@ -9702,24 +9702,28 @@ (define-public baobab name "-" version ".tar.xz")) (sha256 (base32 - "1p2hg8qxbvdfax9z4qjhdsxia93zrsdq58krx8zjnn5ipbkan6jb")))) + "1h5zl7pvpp8yryi7j0cjzy1k89vlphdmfv0jr1l4bmr3j6xn6nw4")))) (build-system meson-build-system) (arguments - '(#:glib-or-gtk? #t)) + '(#:glib-or-gtk? #t + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'skip-gtk-update-icon-cache + ;; Don't create 'icon-theme.cache'. + (lambda _ + (substitute* "meson.build" + (("gtk_update_icon_cache: true") + "gtk_update_icon_cache: false"))))))) (native-inputs (list desktop-file-utils ;for update-desktop-database gettext-minimal `(,glib "bin") - `(,gtk+ "bin") ;for gtk-update-icon-cache itstool libxml2 pkg-config python vala)) - (inputs - (list gtk - libadwaita - libhandy)) + (inputs (list gtk libadwaita)) (synopsis "Disk usage analyzer for GNOME") (description "Baobab (Disk Usage Analyzer) is a graphical application to analyse disk -- cgit v1.2.3 From b18f30d524008c293212945f0131102b3603fc5f Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sun, 20 Aug 2023 09:11:57 +0200 Subject: gnu: gnome-desktop: Update to 44.0. * gnu/packages/gnome.scm (gnome-desktop): Update to 44.0. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 557a22cad2..46a564e428 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2191,7 +2191,7 @@ (define-public gnome-contacts (define-public gnome-desktop (package (name "gnome-desktop") - (version "42.4") + (version "44.0") (source (origin (method url-fetch) @@ -2200,7 +2200,7 @@ (define-public gnome-desktop name "-" version ".tar.xz")) (sha256 (base32 - "09ddr5fzhh02fcn7xl1wy18qfsdqryd5msl2nbhdnsbr0vawkqhw")))) + "0hlxqprraiwnccf98dykbhx80j31c3scdi7i3jy19fl4bms77is2")))) (build-system meson-build-system) (arguments '(#:phases -- cgit v1.2.3 From 1aa94384b8bb97258ea99eadb55d45f38dde9841 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Thu, 31 Aug 2023 05:37:59 +0200 Subject: gnu: gnome-session: Update to 44.0. * gnu/packages/gnome.scm (gnome-session): Update to 44.0. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 46a564e428..63eb051e35 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7546,7 +7546,7 @@ (define-public file-roller (define-public gnome-session (package (name "gnome-session") - (version "42.0") + (version "44.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -7555,7 +7555,7 @@ (define-public gnome-session (patches (search-patches "gnome-session-support-elogind.patch")) (sha256 (base32 - "1alwjqr36rd0s132qs2clwnxgilcbylps6lm41lr50mn782hdjiw")))) + "1ipjvcjabifqgmrz65m3vwmhk99nbm8jcxcikyg5w4r6cnljky6c")))) (arguments `(#:glib-or-gtk? #t #:phases -- cgit v1.2.3 From 4522022a41acf04dbd6eea5ccf9983e486c06eed Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sun, 20 Aug 2023 09:03:05 +0200 Subject: gnu: gnome-settings-daemon: Update to 44.1. * gnu/packages/gnome.scm (gnome-settings-daemon): Update to 44.1. [inputs]: Replace gcr-3 with gcr. Replace geocode-glib-with-libsoup2 with geocode-glib. Replace libgweather4-with-libsoup2 with libgweather4. --- gnu/packages/gnome.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 63eb051e35..049a6df8da 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5923,7 +5923,7 @@ (define-public libgweather4-with-libsoup2 (define-public gnome-settings-daemon (package (name "gnome-settings-daemon") - (version "42.2") + (version "44.1") (source (origin (method url-fetch) @@ -5932,7 +5932,7 @@ (define-public gnome-settings-daemon name "-" version ".tar.xz")) (sha256 (base32 - "005b1dvrfcyr6n4srl6c0lzr95c18prps4xm1lf2ghcfm8a9fi4w")) + "129rjhr2kvfd37fingz8737brh8a874hlw3xlh01658zv1r3nr8j")) (patches (search-patches "gnome-settings-daemon-gc.patch")))) (build-system meson-build-system) (arguments @@ -5975,15 +5975,15 @@ (define-public gnome-settings-daemon baobab colord cups - gcr-3 + gcr geoclue - geocode-glib-with-libsoup2 + geocode-glib gnome-desktop gsettings-desktop-schemas lcms libcanberra libgudev - libgweather4-with-libsoup2 + libgweather4 libnotify (librsvg-for-system) libwacom -- cgit v1.2.3 From 9c28ee9daf0927905916e2102830b958b20a164c Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Wed, 30 Aug 2023 06:22:28 +0200 Subject: gnu: gdm: Update to 44.1. * gnu/packages/gnome.scm (gdm): Update to 44.1. [inputs]: Add egl-wayland. * gnu/packages/patches/gdm-elogind-support.patch: Adjust accordingly. --- gnu/packages/gnome.scm | 5 +- gnu/packages/patches/gdm-elogind-support.patch | 93 ++++++++++++-------------- 2 files changed, 45 insertions(+), 53 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 049a6df8da..81e3e0cd65 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8728,7 +8728,7 @@ (define-public libxml++-2 (define-public gdm (package (name "gdm") - (version "42.0") + (version "44.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -8736,7 +8736,7 @@ (define-public gdm name "-" version ".tar.xz")) (sha256 (base32 - "0m9qmm3vm81jmqlc30a1fb79hsr4l4lpiw0zjxww3gipd6bsqa53")) + "03avvkrm2jd0731ggh9cjnkhrfysqp4slrq0km3gqa3xpqx6n9k8")) (patches (search-patches "gdm-default-session.patch" @@ -8929,6 +8929,7 @@ (define-public gdm (list accountsservice check ;for testing dbus + egl-wayland elogind eudev gnome-session diff --git a/gnu/packages/patches/gdm-elogind-support.patch b/gnu/packages/patches/gdm-elogind-support.patch index 5c8e3bd610..b27e000585 100644 --- a/gnu/packages/patches/gdm-elogind-support.patch +++ b/gnu/packages/patches/gdm-elogind-support.patch @@ -18,10 +18,10 @@ system and user units. meson_options.txt | 5 +- 6 files changed, 66 insertions(+), 42 deletions(-) -diff --git a/common/meson.build b/common/meson.build -index 074dd92e..bca58f7c 100644 ---- a/common/meson.build -+++ b/common/meson.build +Index: gdm-44.1/common/meson.build +=================================================================== +--- gdm-44.1.orig/common/meson.build ++++ gdm-44.1/common/meson.build @@ -11,7 +11,7 @@ libgdmcommon_src = files( ) @@ -31,10 +31,10 @@ index 074dd92e..bca58f7c 100644 gobject_dep, gio_dep, gio_unix_dep, -diff --git a/data/meson.build b/data/meson.build -index 2dec4c23..c3452e1c 100644 ---- a/data/meson.build -+++ b/data/meson.build +Index: gdm-44.1/data/meson.build +=================================================================== +--- gdm-44.1.orig/data/meson.build ++++ gdm-44.1/data/meson.build @@ -164,41 +164,53 @@ else service_config.set('PLYMOUTH_QUIT_SERVICE', '') endif @@ -114,10 +114,10 @@ index 2dec4c23..c3452e1c 100644 # XSession if get_option('gdm-xsession') -diff --git a/libgdm/meson.build b/libgdm/meson.build -index 3f8cafbb..83e95151 100644 ---- a/libgdm/meson.build -+++ b/libgdm/meson.build +Index: gdm-44.1/libgdm/meson.build +=================================================================== +--- gdm-44.1.orig/libgdm/meson.build ++++ gdm-44.1/libgdm/meson.build @@ -56,7 +56,7 @@ libgdm_deps = [ glib_dep, gio_dep, @@ -127,55 +127,46 @@ index 3f8cafbb..83e95151 100644 libgdmcommon_dep, ] -diff --git a/meson.build b/meson.build -index 845f673e..d0ca41ef 100644 ---- a/meson.build -+++ b/meson.build -@@ -96,21 +96,30 @@ xdmcp_dep = cc.find_library('Xdmcp', required: get_option('xdmcp')) - if xdmcp_dep.found() and get_option('tcp-wrappers') +Index: gdm-44.1/meson.build +=================================================================== +--- gdm-44.1.orig/meson.build ++++ gdm-44.1/meson.build +@@ -100,16 +100,24 @@ if xdmcp_dep.found() and get_option('tcp libwrap_dep = cc.find_library('wrap') endif --# systemd + # systemd -systemd_dep = dependency('systemd') -libsystemd_dep = dependency('libsystemd') --if meson.version().version_compare('>= 0.53') -- systemd_multiseat_x = find_program('systemd-multi-seat-x', -- required: false, -- dirs: [ -- systemd_dep.get_pkgconfig_variable('systemdutildir'), -- '/lib/systemd', -- '/usr/lib/systemd', -- ]) -+ +-systemd_multiseat_x = find_program('systemd-multi-seat-x', +- required: false, +- dirs: [ +- systemd_dep.get_pkgconfig_variable('systemdutildir'), +- '/lib/systemd', +- '/usr/lib/systemd', +- ]) +-systemd_x_server = systemd_multiseat_x.found()? systemd_multiseat_x.path() : '/lib/systemd/systemd-multi-seat-x' +logind_provider = get_option('logind-provider') +systemd_dep = dependency('systemd', required: false) +if logind_provider == 'systemd' + libsystemd_dep = dependency('libsystemd') + logind_dep = libsystemd_dep -+ if meson.version().version_compare('>= 0.53') -+ systemd_multiseat_x = find_program('systemd-multi-seat-x', -+ required: false, -+ dirs: [ -+ systemd_dep.get_pkgconfig_variable('systemdutildir'), -+ '/lib/systemd', -+ '/usr/lib/systemd', -+ ]) -+ else -+ systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false) -+ endif ++ systemd_multiseat_x = find_program('systemd-multi-seat-x', ++ required: false, ++ dirs: [ ++ systemd_dep.get_pkgconfig_variable('systemdutildir'), ++ '/lib/systemd', ++ '/usr/lib/systemd', ++ ]) + systemd_x_server = systemd_multiseat_x.found()? systemd_multiseat_x.path() : '/lib/systemd/systemd-multi-seat-x' - else -- systemd_multiseat_x = find_program('systemd-multi-seat-x', required: false) ++else + elogind_dep = dependency('libelogind') + logind_dep = elogind_dep + systemd_x_server = 'disabled' - endif --systemd_x_server = systemd_multiseat_x.found()? systemd_multiseat_x.path() : '/lib/systemd/systemd-multi-seat-x' -+ ++endif # Plymouth plymouth_dep = dependency('ply-boot-client', required: get_option('plymouth')) # Check for Solaris auditing API (ADT) -@@ -319,6 +328,7 @@ summary({ +@@ -319,6 +327,7 @@ summary({ 'PAM Syslog': have_pam_syslog, 'Supports PAM Extensions': pam_extensions_supported, 'SeLinux': libselinux_dep.found(), @@ -183,11 +174,11 @@ index 845f673e..d0ca41ef 100644 'Use GDM Xsession': get_option('gdm-xsession'), 'Use UserDisplayServer': get_option('user-display-server'), 'Use SystemdJournal': get_option('systemd-journal'), -diff --git a/meson_options.txt b/meson_options.txt -index 14e0b908..5135d7d6 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -12,6 +12,7 @@ option('initial-vt', type: 'integer', value: 1, description: 'Initial virtual te +Index: gdm-44.1/meson_options.txt +=================================================================== +--- gdm-44.1.orig/meson_options.txt ++++ gdm-44.1/meson_options.txt +@@ -12,6 +12,7 @@ option('initial-vt', type: 'integer', va option('ipv6', type: 'boolean', value: false, description: 'Enables compilation of IPv6 code.') option('lang-file', type: 'string', value: '', description: 'File containing default language settings.') option('libaudit', type: 'feature', value: 'auto', description: 'Add Linux audit support.') @@ -195,7 +186,7 @@ index 14e0b908..5135d7d6 100644 option('log-dir', type: 'string', value: '/var/log/gdm', description: 'Log directory.') option('pam-mod-dir', type: 'string', value: '', description: 'Directory to install PAM modules in.') option('pam-prefix', type: 'string', value: '', description: 'Specify where PAM files go.') -@@ -27,8 +28,8 @@ option('solaris', type: 'boolean', value: false, description: 'Build for Solaris +@@ -27,8 +28,8 @@ option('solaris', type: 'boolean', value option('split-authentication', type: 'boolean', value: true, description: 'Enable multiple simultaneous PAM conversations during login.') option('sysconfsubdir', type: 'string', value: 'gdm', description: 'Directory name used under sysconfdir.') option('systemd-journal', type: 'boolean', value: true, description: 'Use journald support.') -- cgit v1.2.3 From 12c3e3341d5d4a3a98c5f6ebe7166034bd025a45 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Thu, 31 Aug 2023 05:35:30 +0200 Subject: gnu: gnome-shell: Update to 44.3. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome.scm (gnome-shell): Update to 44.3. [arguments]<#:phases>: Add ‘unbreak-perf-tests’. Adjust ‘pre-check’ accordingly. [native-inputs]: Add python-dbus and python-dbusmock. [inputs]: Remove caribou. Replace gcr-3 with gcr. --- gnu/packages/gnome.scm | 23 ++++++++++++++++++----- 1 file changed, 18 insertions(+), 5 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 81e3e0cd65..5c0f84d057 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9113,7 +9113,7 @@ (define-public gnome-control-center (define-public gnome-shell (package (name "gnome-shell") - (version "42.4") + (version "44.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -9121,7 +9121,7 @@ (define-public gnome-shell name "-" version ".tar.xz")) (sha256 (base32 - "0kn5fclciybp2fs38wd39hdz85y91pas0ckfa02pmyx91sbz4pw7")))) + "1grizh3fbks5dgizaj38300cz97ay81q0hlk1pvawkpfq9qlnsam")))) (build-system meson-build-system) (arguments (let ((disallowed-references @@ -9159,6 +9159,12 @@ (define-public gnome-shell (substitute* "meson.build" (("gtk_update_icon_cache: true") "gtk_update_icon_cache: false")))) + (add-after 'unpack 'unbreak-perf-tests + (lambda _ + ;; Lest non-fatal dbus warnings be made fatal again… + (substitute* "tests/meson.build" + (("perf_testenv\\.set\\('G_DEBUG'" all) + (string-append "# " all))))) (add-before 'configure 'record-absolute-file-names (lambda* (#:key inputs #:allow-other-keys) (let ((ibus-daemon (search-input-file inputs "bin/ibus-daemon")) @@ -9175,7 +9181,13 @@ (define-public gnome-shell ;; Tests require a running X server. (system "Xvfb :1 &") (setenv "DISPLAY" ":1") - (setenv "HOME" "/tmp"))) ;to avoid "fatal" warnings + ;; For the missing /var/lib/dbus/machine-id + (setenv "DBUS_FATAL_WARNINGS" "0") + (setenv "NO_AT_BRIDGE" "1") + (setenv "HOME" "/tmp") + (setenv "XDG_RUNTIME_DIR" (string-append (getcwd) "/runtime-dir")) + (mkdir (getenv "XDG_RUNTIME_DIR")) + (chmod (getenv "XDG_RUNTIME_DIR") #o700))) (add-after 'install 'wrap-programs (lambda* (#:key inputs #:allow-other-keys) (let ((gi-typelib-path (getenv "GI_TYPELIB_PATH")) @@ -9241,16 +9253,17 @@ (define-public gnome-shell perl pkg-config python + python-dbus + python-dbusmock ruby-sass sassc ;; For tests xorg-server-for-tests)) (inputs (list accountsservice - caribou docbook-xsl evolution-data-server - gcr-3 + gcr gdm librsvg gjs -- cgit v1.2.3 From 4c2fc044d7aedeb6046027db2fe8293b48c09648 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Tue, 29 Aug 2023 22:22:17 +0200 Subject: gnu: gnome-clocks: Update to 44.0. * gnu/packages/gnome.scm (gnome-clocks): Update to 44.0. [inputs]: Replace geocode-glib-with-libsoup2 with geocode-glib. Replace libgweather4-with-libsoup2 with libgweather4. --- gnu/packages/gnome.scm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 5c0f84d057..dd8be48703 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10265,7 +10265,7 @@ (define-public libzapojit (define-public gnome-clocks (package (name "gnome-clocks") - (version "42.0") + (version "44.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -10273,7 +10273,7 @@ (define-public gnome-clocks name "-" version ".tar.xz")) (sha256 (base32 - "1q3gvniwd4dkr1ghqpp05zr7qswdhaxqrn8j6bm3qbh39bdihw8f")))) + "0f1q9wxixjnhwypp6zaplxzj2lrk3x8gfy0x7811m3ybcmrskmqp")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t @@ -10294,13 +10294,13 @@ (define-public gnome-clocks vala)) (inputs (list geoclue - geocode-glib-with-libsoup2 + geocode-glib glib gnome-desktop gsound gtk libadwaita - libgweather4-with-libsoup2)) + libgweather4)) (home-page "https://wiki.gnome.org/Apps/Clocks") (synopsis "GNOME's clock application") (description -- cgit v1.2.3 From e72cbd4ab0fb38b075e6ca68fd466fc2c3b54e6a Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Tue, 29 Aug 2023 22:23:14 +0200 Subject: gnu: gnome-calendar: Update to 44.1. * gnu/packages/gnome.scm (gnome-calendar): Update to 44.1. [inputs]: Replace evolution-data-server-3.44 with evolution-data-server. Replace geocode-glib-with-libsoup2 with geocode-glib. Replace gnome-online-accounts-3.44 with gnome-online-accounts. Replace libgweather4-with-libsoup2 with libgweather. --- gnu/packages/gnome.scm | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index dd8be48703..891bf6a30e 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10311,7 +10311,7 @@ (define-public gnome-clocks (define-public gnome-calendar (package (name "gnome-calendar") - (version "42.2") + (version "44.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -10319,7 +10319,7 @@ (define-public gnome-calendar name "-" version ".tar.xz")) (sha256 (base32 - "1ggvnl2jnc24nzpkjvsk57vpckjzb14a7mmnk6jjm84nmqxccz5f")))) + "0zmpyd5qgryrxflgcapfp6jxph3z31qycs148r715gbhnqwbg89h")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t @@ -10336,16 +10336,14 @@ (define-public gnome-calendar `(,glib "bin") ; For glib-compile-schemas pkg-config)) (inputs - ;; Note: not propagating evolution-data-server-3.44 to keep profiles - ;; clean from libsoup2. - (list evolution-data-server-3.44 + (list evolution-data-server geoclue - geocode-glib-with-libsoup2 - gnome-online-accounts-3.44 + geocode-glib + gnome-online-accounts gsettings-desktop-schemas libadwaita libdazzle - libgweather4-with-libsoup2)) + libgweather4)) (home-page "https://wiki.gnome.org/Apps/Calendar") (synopsis "GNOME's calendar application") (description -- cgit v1.2.3 From b6a337acd755c0df2640a3b54ed8a7ee9fc2f027 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 2 Sep 2023 10:36:53 +0200 Subject: gnu: gnome-initial-setup: Update to 44.0. * gnu/packages/gnome.scm (gnome-initial-setup): Update to 44.0. [inputs]: Remove cheese and libhandy. Add libadwaita. Replace gnome-online-account-3.44 with gnome-online-accounts. Replace libgweather4-with-libsoup2 with libgweather4. Replace rest with rest-next. Replace webkitgtk-with-libsoup2 with webkitgtk-next. --- gnu/packages/gnome.scm | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 891bf6a30e..5ac54b5f6b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1524,7 +1524,7 @@ (define-public libmediaart (define-public gnome-initial-setup (package (name "gnome-initial-setup") - (version "42.2") + (version "44.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/gnome-initial-setup/" @@ -1532,7 +1532,7 @@ (define-public gnome-initial-setup "/gnome-initial-setup-" version ".tar.xz")) (sha256 (base32 - "0yxy39a7d2whphd0jskvra5q8zy4v7m7lziy5fxibgls4j5xk0sd")))) + "1zxv0i6lwcnjs4m0ny08wxbfz25ygnwkbh4l3dkrhapqr1nzqg2r")))) (build-system meson-build-system) (arguments (list @@ -1556,28 +1556,27 @@ (define-public gnome-initial-setup pkg-config)) (inputs (list accountsservice - cheese elogind gdm geoclue gnome-desktop - gnome-online-accounts-3.44 + gnome-online-accounts gstreamer ibus json-glib mit-krb5 + libadwaita libgnomekbd - libgweather4-with-libsoup2 - libhandy + libgweather4 libnma libpwquality libsecret network-manager packagekit polkit - rest + rest-next upower - webkitgtk-with-libsoup2)) + webkitgtk-next)) (synopsis "Initial setup wizard for GNOME desktop") (description "This package provides a set-up wizard when a user logs into GNOME for the first time. It typically provides a -- cgit v1.2.3 From 38bc8c1102ad10d258adce73af746c4fae6e9248 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 2 Sep 2023 13:34:49 +0200 Subject: gnu: gnome-autoar: Update to 0.4.4. * gnu/packages/gnome.scm (gnome-autoar): Update to 0.4.4. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 5ac54b5f6b..a9e3f67e72 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9356,7 +9356,7 @@ (define-public gtk-vnc (define-public gnome-autoar (package (name "gnome-autoar") - (version "0.4.3") + (version "0.4.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -9364,7 +9364,7 @@ (define-public gnome-autoar name "-" version ".tar.xz")) (sha256 (base32 - "124y4j3wgb6axgfzw9f00865r033fg7b0qy9qgfsp5ilan4hgpvv")))) + "1hn3rzd6z2g2xvnx8icifybq26vvxk44qmqz392b2g6g7crvxby0")))) (build-system meson-build-system) (native-inputs (list gobject-introspection `(,glib "bin") pkg-config)) -- cgit v1.2.3 From 7894abde7d9f9cbf73b06e58af5724b5a5d6e219 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 2 Sep 2023 13:34:59 +0200 Subject: gnu: tracker: Update to 3.5.3. * gnu/packages/gnome.scm (tracker): Update to 3.5.3. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a9e3f67e72..abd79eac08 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9382,7 +9382,7 @@ (define-public gnome-autoar (define-public tracker (package (name "tracker") - (version "3.4.2") + (version "3.5.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/tracker/" @@ -9390,7 +9390,7 @@ (define-public tracker "tracker-" version ".tar.xz")) (sha256 (base32 - "0c8ppm03b9r6lyxalama8sjmw3km4jibbswqra7qf17pli1g2vaf")))) + "1vi878f95a2nlvqz46ph6f05hywjb2ni0znqavhdkrbvi6qchrhl")))) (build-system meson-build-system) (arguments (list -- cgit v1.2.3 From 19bd2a7cff4d0784619f2c2b283622e3db6d761b Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 2 Sep 2023 13:35:12 +0200 Subject: gnu: tracker-miners: Update to 3.5.2. * gnu/packages/gnome.scm (tracker-miners): Update to 3.5.2. [#:phases]: Adjust accordingly. [inputs]: Add gst-plugins-base. --- gnu/packages/gnome.scm | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index abd79eac08..9f70b7cc97 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9500,7 +9500,7 @@ (define-public tracker (define-public tracker-miners (package (name "tracker-miners") - (version "3.3.1") + (version "3.5.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/tracker-miners/" @@ -9508,7 +9508,7 @@ (define-public tracker-miners "/tracker-miners-" version ".tar.xz")) (sha256 (base32 - "151w6ljq1gk9idqfq9qs3w16vms91jnxy59c9kx6jaf0fb9cdp9y")))) + "0sbc3fmvqg5hvdl5sq8w77lqmk9i6vc13izcxck8winrrgx93ys0")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t @@ -9542,12 +9542,7 @@ (define-public tracker-miners ;; to be true and the UPower daemon to be started. (substitute* "examples/python/meson.build" (("foreach example_name:.*") - "foreach example_name: []")) - ;; Disable this test that is failing randomly: - ;; https://gitlab.gnome.org/GNOME/tracker-miners/-/issues/170. - (substitute* "tests/libtracker-miner/meson.build" - (("'miner-fs'.*") - "")))) + "foreach example_name: []")))) (replace 'check (lambda* (#:key tests? #:allow-other-keys) (when tests? @@ -9579,6 +9574,7 @@ (define-public tracker-miners giflib glib gstreamer + gst-plugins-base icu4c json-glib libcue -- cgit v1.2.3 From 3ca62461a2545cbdafe9b04488584b15efa390a7 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 2 Sep 2023 13:37:30 +0200 Subject: gnu: libadwaita: Update to 1.3.4. * gnu/packages/gnome.scm (libadwaita): Update to 1.3.4. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 9f70b7cc97..6ad2434b11 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -13275,7 +13275,7 @@ (define-public ocrfeeder (define-public libadwaita (package (name "libadwaita") - (version "1.2.0") + (version "1.3.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/libadwaita/" @@ -13283,7 +13283,7 @@ (define-public libadwaita "libadwaita-" version ".tar.xz")) (sha256 (base32 - "0326qs0zhfi6zv52p90axnicmv0qb2l2hwpyv60pk9lvwcdkwbrj")))) + "1gdimh85f5hb6jhnivjaai4m08nz4x9iif5rxdckn8b0lzrwl740")))) (build-system meson-build-system) (arguments `(#:phases -- cgit v1.2.3 From 453217d69c38d1b858af04f389145fac7a9eb58c Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 2 Sep 2023 13:36:12 +0200 Subject: gnu: nautilus: Update to 44.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome.scm (nautilus): Update to 44.2. [#:phases]: Add ‘patch-tracker3-command’. Adjust ‘skip-gtk-update-icon-cache’ accordingly. [inputs]: Remove gtk+ and libhandy. Add gtk and libadwaita. * gnu/packages/patches/nautilus-extension-search-path.patch: Adjust accordingly. --- gnu/packages/gnome.scm | 24 +++++--- .../patches/nautilus-extension-search-path.patch | 64 ++++++++++++---------- 2 files changed, 52 insertions(+), 36 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 6ad2434b11..b460812348 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9618,7 +9618,7 @@ (define-public tracker-miners (define-public nautilus (package (name "nautilus") - (version "42.2") + (version "44.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -9626,7 +9626,7 @@ (define-public nautilus name "-" version ".tar.xz")) (sha256 (base32 - "1cncyiyh79w1id6a6s2f0rxmgwl65lp4ml4afa0z35jrnwp2s8cr")) + "1rfkh43iw4bqv36ccznl3lh9g0p9pa8xqyjk167qlvar4xchcji7")) (patches (search-patches "nautilus-extension-search-path.patch")))) (build-system meson-build-system) @@ -9635,6 +9635,13 @@ (define-public nautilus #:glib-or-gtk? #t #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'patch-tracker3-command + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/nautilus-tag-manager.c" + (("\"tracker3\"") + (string-append "\"" + (search-input-file inputs "/bin/tracker3") + "\""))))) (add-after 'unpack 'disable-tracker-tests ;; The tracker test hangs in the build container (see: ;; https://gitlab.gnome.org/GNOME/nautilus/-/issues/2486). @@ -9645,8 +9652,9 @@ (define-public nautilus (add-after 'unpack 'skip-gtk-update-icon-cache ;; Don't create 'icon-theme.cache'. (lambda _ - (substitute* "build-aux/meson/postinstall.py" - (("gtk-update-icon-cache") "true")))) + (substitute* "meson.build" + (("gtk_update_icon_cache: true") + "gtk_update_icon_cache: false")))) (delete 'check) (add-after 'install 'check (assoc-ref %standard-phases 'check)) @@ -9673,18 +9681,18 @@ (define-public nautilus gnome-autoar gst-plugins-base json-glib - libhandy + libadwaita libportal libseccomp libselinux tracker tracker-miners - ;; XXX: gtk+ is required by libnautilus-extension.pc + ;; XXX: gtk is required by libnautilus-extension.pc ;; - ;; Don't propagate it to reduces "profile pollution" of the 'gnome' meta + ;; Don't propagate it to reduce "profile pollution" of the 'gnome' meta ;; package. See: ;; . - gtk+ + gtk libexif libxml2)) (native-search-paths diff --git a/gnu/packages/patches/nautilus-extension-search-path.patch b/gnu/packages/patches/nautilus-extension-search-path.patch index d5dc35b241..1394956315 100644 --- a/gnu/packages/patches/nautilus-extension-search-path.patch +++ b/gnu/packages/patches/nautilus-extension-search-path.patch @@ -1,54 +1,62 @@ Allow Nautilus to search for extensions in the directories listed in $NAUTILUS_EXTENSION_PATH. -diff --git a/src/nautilus-module.c b/src/nautilus-module.c -index bf474bd..42e2a4e 100644 ---- a/src/nautilus-module.c -+++ b/src/nautilus-module.c -@@ -211,6 +211,10 @@ static void +Index: nautilus-44.2/src/nautilus-module.c +=================================================================== +--- nautilus-44.2.orig/src/nautilus-module.c ++++ nautilus-44.2/src/nautilus-module.c +@@ -220,8 +220,16 @@ static void load_module_dir (const char *dirname) { GDir *dir; +- + static GHashTable *loaded = NULL; + g_autoptr (GStrvBuilder) installed_module_name_builder = g_strv_builder_new (); ++ ++ if (installed_module_names != NULL) ++ g_strv_builder_addv (installed_module_name_builder, ++ (const gchar **)installed_module_names); + + if (loaded == NULL) + loaded = g_hash_table_new (g_str_hash, g_str_equal); - ++ dir = g_dir_open (dirname, 0, NULL); -@@ -221,15 +225,22 @@ load_module_dir (const char *dirname) - while ((name = g_dir_read_name (dir))) + if (dir) +@@ -232,16 +240,24 @@ load_module_dir (const char *dirname) { if (g_str_has_suffix (name, "." G_MODULE_SUFFIX)) -- { + { - char *filename; - - filename = g_build_filename (dirname, - name, - NULL); -- nautilus_module_load_file (filename); +- nautilus_module_load_file (filename, installed_module_name_builder); - g_free (filename); -- } -+ { -+ /* Make sure each module is loaded only twice or this could -+ lead to a crash. Double loading can occur if DIRNAME -+ occurs more than once in $NAUTILUS_EXTENSION_PATH. */ -+ if (!g_hash_table_contains (loaded, name)) -+ { -+ char *filename; ++ /* Make sure each module is loaded only twice or this could ++ lead to a crash. Double loading can occur if DIRNAME ++ occurs more than once in $NAUTILUS_EXTENSION_PATH. */ ++ if (!g_hash_table_contains (loaded, name)) ++ { ++ char *filename; + -+ filename = g_build_filename (dirname, -+ name, -+ NULL); -+ nautilus_module_load_file (filename); -+ g_hash_table_add (loaded, g_strdup (name)); -+ g_free (filename); -+ } -+ } - } ++ filename = g_build_filename (dirname, ++ name, ++ NULL); ++ nautilus_module_load_file (filename, ++ installed_module_name_builder); ++ g_hash_table_add (loaded, g_strdup (name)); ++ g_free (filename); ++ } + } +- } ++ } g_dir_close (dir); -@@ -257,10 +268,24 @@ nautilus_module_setup (void) + } + +@@ -278,10 +294,24 @@ nautilus_module_setup (void) if (!initialized) { -- cgit v1.2.3 From 9609b674450a5dd7c75a871000c42553cf89d95a Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 2 Sep 2023 13:58:19 +0200 Subject: gnu: vte: Update to 0.72.2. * gnu/packages/gnome.scm (vte): Update to 0.72.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b460812348..acad9f10be 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4492,7 +4492,7 @@ (define-public vala-0.52 (define-public vte (package (name "vte") - (version "0.70.2") + (version "0.72.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/vte/" @@ -4500,7 +4500,7 @@ (define-public vte "vte-" version ".tar.xz")) (sha256 (base32 - "102d6cd9f96czlq01ixhymfp0z20khw0dl5bgvan9xg31lwb85ad")))) + "17hwfkb0vakjgf1gbmjma54hdrppzqfbfqj1jr9iz656hp8nz5pp")))) (build-system meson-build-system) (arguments (list #:configure-flags #~(list "-Dvapi=true" -- cgit v1.2.3 From 965e2d6eb90826181471b834437ac68dcb9217cb Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 2 Sep 2023 13:59:59 +0200 Subject: gnu: gnome-console: Update to 44.4. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome.scm (gnome-console): Update to 44.4. [arguments]: Remove #:phases. <#:configure-flas>: Remove “-Dnautilus=enabled”. [inputs]: Remove gtk+, libhandy, nautilus and vte. Add gtk, libadwaita and vte-with-gtk-4. --- gnu/packages/gnome.scm | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index acad9f10be..1f91156da4 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5375,7 +5375,7 @@ (define-public gnome-sudoku (define-public gnome-console (package (name "gnome-console") - (version "42.2") + (version "44.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/gnome-console/" @@ -5383,28 +5383,20 @@ (define-public gnome-console "gnome-console-" version ".tar.xz")) (sha256 (base32 - "0jbh8g3hmc35fy5fbscqf0831xpg1kv66ci9hykpbia4hz0yc9kx")))) + "13asis4fabsm0wy3m6bk4k3bmnh6a9c9bwwpv6b3why0lvll87xr")))) (build-system meson-build-system) (arguments (list #:glib-or-gtk? #t - #:configure-flags #~(list "-Dtests=true" - "-Dnautilus=enabled") - #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'patch-nautilus-extension-path - (lambda _ - (substitute* "nautilus/meson.build" - (("'extensions-[0-9.]*'") - "'site-extensions'"))))))) + #:configure-flags #~(list "-Dtests=true"))) (native-inputs (list `(,glib "bin") gettext-minimal sassc pkg-config `(,gtk+ "bin") desktop-file-utils)) - (inputs (list gtk+ - libhandy - nautilus - vte + (inputs (list gtk + libadwaita + vte-with-gtk-4 libgtop gsettings-desktop-schemas)) (home-page "https://gitlab.gnome.org/GNOME/console") -- cgit v1.2.3 From 4ebc426602253490a25a4b567e2ac3b88192a3da Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 2 Sep 2023 11:15:00 +0200 Subject: gnu: Remove libgweather4-with-libsoup2. It no longer has any dependents other than itself. * gnu/packages/gnome.scm (libgweather4-with-libsoup2): Delete variable. --- gnu/packages/gnome.scm | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ad118090eb..1f52ca6dc4 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5899,18 +5899,6 @@ (define-public libgweather4 libsoup libxml2)))) -(define-public libgweather4-with-libsoup2 - (package - (inherit libgweather4) - (name "libgweather4-with-libsoup2") - (arguments (substitute-keyword-arguments (package-arguments libgweather4) - ((#:configure-flags flags) - #~(cons "-Dsoup2=true" #$flags)))) - (propagated-inputs - (modify-inputs (package-propagated-inputs libgweather4) - (replace "geocode-glib" geocode-glib-with-libsoup2) - (replace "libsoup" libsoup-minimal-2))))) - (define-public gnome-settings-daemon (package (name "gnome-settings-daemon") -- cgit v1.2.3 From 94a9b26bcfa5446ca1e98968ae47a8cc74a158dc Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Thu, 7 Sep 2023 07:36:31 +0200 Subject: gnu: cogl: Fix double free. This patch fixes a double free in cogl, which broke all of the test cases and thus also the package build itself. * gnu/packages/patches/cogl-fix-double-free.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it here. * gnu/packages/gnome.scm (cogl): Use it here. Signed-off-by: Liliana Marie Prikler --- gnu/local.mk | 1 + gnu/packages/gnome.scm | 4 +++- gnu/packages/patches/cogl-fix-double-free.patch | 32 +++++++++++++++++++++++++ 3 files changed, 36 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/cogl-fix-double-free.patch diff --git a/gnu/local.mk b/gnu/local.mk index 69be1a07c7..fd0d26ff1b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1025,6 +1025,7 @@ dist_patch_DATA = \ %D%/packages/patches/clucene-pkgconfig.patch \ %D%/packages/patches/cmake-curl-certificates-3.24.patch \ %D%/packages/patches/coda-use-system-libs.patch \ + %D%/packages/patches/cogl-fix-double-free.patch \ %D%/packages/patches/collectd-5.11.0-noinstallvar.patch \ %D%/packages/patches/combinatorial-blas-awpm.patch \ %D%/packages/patches/combinatorial-blas-io-fix.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 1f52ca6dc4..87e41c8581 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6133,7 +6133,9 @@ (define-public cogl (version-major+minor version) "/" "cogl-" version ".tar.xz")) (sha256 - (base32 "0nfph4ai60ncdx7hy6hl1i1cmp761jgnyjfhagzi0iqq36qb41d8")))) + (base32 "0nfph4ai60ncdx7hy6hl1i1cmp761jgnyjfhagzi0iqq36qb41d8")) + (patches + (search-patches "cogl-fix-double-free.patch")))) ;; NOTE: mutter exports a bundled fork of cogl, so when making changes to ;; cogl, corresponding changes may be appropriate in mutter as well. (build-system gnu-build-system) diff --git a/gnu/packages/patches/cogl-fix-double-free.patch b/gnu/packages/patches/cogl-fix-double-free.patch new file mode 100644 index 0000000000..e7a994b33a --- /dev/null +++ b/gnu/packages/patches/cogl-fix-double-free.patch @@ -0,0 +1,32 @@ +From 15d0f7d96cf53263196e26f2eb48ededdff0efeb Mon Sep 17 00:00:00 2001 +Message-ID: <15d0f7d96cf53263196e26f2eb48ededdff0efeb.1694148833.git.vivien@planete-kraus.eu> +From: Vivien Kraus +Date: Thu, 7 Sep 2023 22:16:48 +0200 +Subject: [PATCH] Prevent double free on context objects + +The display is unrefed in the context destructor, but not refed in the +constructor. + +This targets an archived (read-only) repository. +--- + cogl/cogl-context.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/cogl/cogl-context.c b/cogl/cogl-context.c +index a7eed29a..7cdc9fe7 100644 +--- a/cogl/cogl-context.c ++++ b/cogl/cogl-context.c +@@ -218,7 +218,7 @@ cogl_context_new (CoglDisplay *display, + return NULL; + } + +- context->display = display; ++ context->display = cogl_object_ref (display); + + /* This is duplicated data, but it's much more convenient to have + the driver attached to the context and the value is accessed a + +base-commit: 61d966c7442d521e38572b7f93ac7b8973a9c65e +-- +2.41.0 + -- cgit v1.2.3 From 0b4a20e448876667c2172b9f07346e1f0b7c605e Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Fri, 8 Sep 2023 21:08:45 +0200 Subject: gnu: cogl: Remove comment about reflecting changes in mutter. Since cogl itself has been archived while the bundled fork continues to exist, the comment no longer holds truth. Whatever patches will in future be needed to build cogl are not expected to require reflection in mutter. * gnu/packages.gnome.scm (cogl): Remove comment about mutter's bundled clutter. --- gnu/packages/gnome.scm | 2 -- 1 file changed, 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 87e41c8581..aaeec821f7 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6220,8 +6220,6 @@ (define-public clutter (sha256 (base32 "1rn4cd1an6a9dfda884aqpcwcgq8dgydpqvb19nmagw4b70zlj4b")))) - ;; NOTE: mutter exports a bundled fork of clutter, so when making changes - ;; to clutter, corresponding changes may be appropriate in mutter as well. (build-system gnu-build-system) (outputs '("out" "doc")) ;9 MiB of gtk-doc HTML pages -- cgit v1.2.3 From 4beac7d95c84ea3be809030f942b8b71d155129e Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Fri, 8 Sep 2023 18:50:18 +0200 Subject: gnu: gegl: Update to 0.4.46. * gnu/packages/gimp.scm (gegl): Update to 0.4.46. * gnu/packages/gimp.scm (gegl-0.4.44): New variable. * gnu/packages/gnome.scm (gnome-photos)[inputs]: Replace gegl with gegl-0.4.44. Signed-off-by: Liliana Marie Prikler --- gnu/local.mk | 1 + gnu/packages/gimp.scm | 27 +++++++- gnu/packages/gnome.scm | 2 +- .../patches/gegl-compatibility-old-librsvg.patch | 80 ++++++++++++++++++++++ 4 files changed, 107 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/gegl-compatibility-old-librsvg.patch diff --git a/gnu/local.mk b/gnu/local.mk index fd0d26ff1b..9866141504 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1239,6 +1239,7 @@ dist_patch_DATA = \ %D%/packages/patches/gdm-remove-hardcoded-xwayland-path.patch \ %D%/packages/patches/gdm-wayland-session-wrapper-from-env.patch \ %D%/packages/patches/gdm-pass-gdk-pixbuf-loader-env.patch \ + %D%/packages/patches/gegl-compatibility-old-librsvg.patch \ %D%/packages/patches/gemmi-fix-pegtl-usage.patch \ %D%/packages/patches/gemmi-fix-sajson-types.patch \ %D%/packages/patches/genimage-mke2fs-test.patch \ diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index b1ff08d652..45a739a3ae 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -215,7 +215,7 @@ (define-public babl (define-public gegl (package (name "gegl") - (version "0.4.42") + (version "0.4.46") (source (origin (method url-fetch) @@ -228,8 +228,10 @@ (define-public gegl (string-append "ftp://ftp.gtk.org/pub/gegl/" (version-major+minor version) "/gegl-" version ".tar.xz"))) + (patches + (search-patches "gegl-compatibility-old-librsvg.patch")) (sha256 - (base32 "0bg0vlmj4n9x1291b9fsjqxsal192zlg48pa57f6xid6p863ma5b")))) + (base32 "14p8n6vily0yp6gqafl2xy7d2rh1j48pcj0a7mglqxy83d4b5cyh")))) (build-system meson-build-system) (arguments `(#:configure-flags @@ -285,6 +287,27 @@ (define-public gegl ;; application and GUI binary gegl is licensed under GPL. (license (list license:lgpl3+ license:gpl3+)))) +;; gnome-photos does not build against gegl 0.4.46 yet. +;; See also . +(define-public gegl-0.4.44 + (package + (inherit gegl) + (version "0.4.44") + (source + (origin + (method url-fetch) + (uri (list (string-append "https://download.gimp.org/pub/gegl/" + (string-take version 3) + "/gegl-" version ".tar.xz") + (string-append "https://ftp.gtk.org/pub/gegl/" + (version-major+minor version) + "/gegl-" version ".tar.xz") + (string-append "ftp://ftp.gtk.org/pub/gegl/" + (version-major+minor version) + "/gegl-" version ".tar.xz"))) + (sha256 + (base32 "09k1sn4h0bakgmq2hgd1iamprngpr81ky3fd9446lh2ycd0xnk0a")))))) + (define-public gimp (package (name "gimp") diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index aaeec821f7..f5ed13565d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -855,7 +855,7 @@ (define-public gnome-photos (inputs (list babl cairo - gegl + gegl-0.4.44 geocode-glib gexiv2 gfbgraph diff --git a/gnu/packages/patches/gegl-compatibility-old-librsvg.patch b/gnu/packages/patches/gegl-compatibility-old-librsvg.patch new file mode 100644 index 0000000000..3e5733f9fd --- /dev/null +++ b/gnu/packages/patches/gegl-compatibility-old-librsvg.patch @@ -0,0 +1,80 @@ +From a99a93e5c9013bd4101f5058cdee7d0cf30234fe Mon Sep 17 00:00:00 2001 +Message-ID: +From: Jehan +Date: Wed, 5 Jul 2023 21:18:19 +0200 +Subject: [PATCH] Issue #333: continuing to support librsvg 2.40.x (C + versions). + +Commit 9beeefcbe uses too new functions of librsvg. We could just bump +the minimum required version but there are issues with Rust not being +available on every platform yet. So instead, let's add some conditional +code paths, so that it still builds with librsvg 2.40.x (which was the +last versions fully in C) while we use newer code and no warnings when +using newer versions. +--- + operations/external/svg-load.c | 25 ++++++++++++++++++++----- + 1 file changed, 20 insertions(+), 5 deletions(-) + +diff --git a/operations/external/svg-load.c b/operations/external/svg-load.c +index 3312a0c0a..15c0b30b7 100644 +--- a/operations/external/svg-load.c ++++ b/operations/external/svg-load.c +@@ -76,16 +76,25 @@ query_svg (GeglOperation *operation) + { + GeglProperties *o = GEGL_PROPERTIES (operation); + Priv *p = (Priv*) o->user_data; ++#if LIBRSVG_CHECK_VERSION(2, 52, 0) + gdouble out_width, out_height; ++#else ++ RsvgDimensionData dimensions; ++#endif + + g_return_val_if_fail (p->handle != NULL, FALSE); + +- rsvg_handle_get_intrinsic_size_in_pixels (p->handle, &out_width, &out_height); +- + p->format = babl_format ("R'G'B'A u8"); + ++#if LIBRSVG_CHECK_VERSION(2, 52, 0) ++ rsvg_handle_get_intrinsic_size_in_pixels (p->handle, &out_width, &out_height); + p->height = out_height; +- p->width = out_width; ++ p->width = out_width; ++#else ++ rsvg_handle_get_dimensions (p->handle, &dimensions); ++ p->height = dimensions.height; ++ p->width = dimensions.width; ++#endif + + return TRUE; + } +@@ -98,10 +107,12 @@ load_svg (GeglOperation *operation, + { + GeglProperties *o = GEGL_PROPERTIES (operation); + Priv *p = (Priv*) o->user_data; +- RsvgRectangle svg_rect = {0.0, 0.0, width, height}; + cairo_surface_t *surface; + cairo_t *cr; +- GError *error = NULL; ++#if LIBRSVG_CHECK_VERSION(2, 52, 0) ++ GError *error = NULL; ++ RsvgRectangle svg_rect = {0.0, 0.0, width, height}; ++#endif + + g_return_val_if_fail (p->handle != NULL, -1); + +@@ -115,7 +126,11 @@ load_svg (GeglOperation *operation, + (double)height / (double)p->height); + } + ++#if LIBRSVG_CHECK_VERSION(2, 52, 0) + rsvg_handle_render_document (p->handle, cr, &svg_rect, &error); ++#else ++ rsvg_handle_render_cairo (p->handle, cr); ++#endif + + cairo_surface_flush (surface); + +-- +2.41.0 + -- cgit v1.2.3 From e8b3f6f7b1d915f205983e496818875a7d167012 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Fri, 8 Sep 2023 20:37:46 +0200 Subject: gnu: gimp: Update to 2.10.34. * gnu/packages/gimp.scm (gimp): Update to 2.10.34. Signed-off-by: Liliana Marie Prikler --- gnu/packages/gimp.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index 45a739a3ae..5a342ed56a 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -311,7 +311,7 @@ (define-public gegl-0.4.44 (define-public gimp (package (name "gimp") - (version "2.10.32") + (version "2.10.34") (source (origin (method url-fetch) @@ -319,7 +319,7 @@ (define-public gimp (version-major+minor version) "/gimp-" version ".tar.bz2")) (sha256 - (base32 "09csp2d8bzf012n7hvbbwngwr9phv3rnip768qdwqpdgah2wf59z")))) + (base32 "18vscmy293q6wq78almv0m7r8jh4j8szvmrw56j9icsisd14c044")))) (build-system gnu-build-system) (outputs '("out" "doc")) ; 9 MiB of gtk-doc HTML -- cgit v1.2.3 From 43cdc8a07517e936812782c313fe145bcf5c7ed3 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Wed, 13 Sep 2023 18:51:29 +0200 Subject: gnu: gegl: Use new style for inputs. * gnu/packages/gimp.scm (gegl)[inputs]: Drop labels. --- gnu/packages/gimp.scm | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/gnu/packages/gimp.scm b/gnu/packages/gimp.scm index 5a342ed56a..9c8100dc7b 100644 --- a/gnu/packages/gimp.scm +++ b/gnu/packages/gimp.scm @@ -255,23 +255,23 @@ (define-public gegl (list babl glib json-glib)) (inputs ;; All inputs except libjpeg and libpng are optional. - `(("cairo" ,cairo) - ("gdk-pixbuf" ,gdk-pixbuf) - ("gexiv2" ,gexiv2) - ("jasper" ,jasper) - ("libjpeg" ,libjpeg-turbo) - ("libnsgif" ,libnsgif) - ("libpng" ,libpng) - ("libraw" ,libraw) - ("librsvg" ,(librsvg-for-system)) - ("libspiro" ,libspiro) - ("libtiff" ,libtiff) - ("libwebp" ,libwebp) - ("maxflow" ,maxflow) - ("openexr" ,openexr-2) - ("pango" ,pango) - ("poppler" ,poppler) - ("sdl2" ,sdl2))) + (list cairo + gdk-pixbuf + gexiv2 + jasper + libjpeg-turbo + libnsgif + libpng + libraw + (librsvg-for-system) + libspiro + libtiff + libwebp + maxflow + openexr-2 + pango + poppler + sdl2)) (native-inputs (list `(,glib "bin") ; for gtester gobject-introspection -- cgit v1.2.3 From 007810c9a1999b826b0bd02170a69b48261822fb Mon Sep 17 00:00:00 2001 From: Jack Hill Date: Tue, 12 Sep 2023 22:18:13 -0400 Subject: gnu: vala: Update to 0.56.13. * gnu/packages/gnome.scm (vala): Update to 0.56.13. Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 2077478ff2..a041139213 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4425,7 +4425,7 @@ (define-public seahorse (define-public vala (package (name "vala") - (version "0.56.12") + (version "0.56.13") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/vala/" @@ -4433,7 +4433,7 @@ (define-public vala "vala-" version ".tar.xz")) (sha256 (base32 - "0n9m4l8d2n4wmgn9l5gdhnr6xl5ms7483ng5fxqak8xygi5xbjcj")))) + "01xfarnhpp30wmv9mwayw8751glwppl0sva79j3y9qf76qq25229")))) (build-system glib-or-gtk-build-system) (arguments (list -- cgit v1.2.3 From d2d0077ea47f88845c247ba51663f51989d7cd4e Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 12 Sep 2023 17:27:21 +0200 Subject: gnu: gnome-photos: Update to 43.1. * gnu/packages/gnome.scm (gnome-photos): Update to 43.1. Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a041139213..d7f4a6491c 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -812,7 +812,7 @@ (define-public gnome-recipes (define-public gnome-photos (package (name "gnome-photos") - (version "43.beta") ;for geocode-glib 2 support + (version "43.1") (source (origin (method url-fetch) @@ -822,7 +822,7 @@ (define-public gnome-photos name "-" version ".tar.xz")) (sha256 (base32 - "1pry45dy4sjw8y63vxw2b499brcxzpkd4hmg2vbqy538r79ah2g9")))) + "1axhabxrrmf4r2xw2hvrzwj62inkckpmrc0gfbjcrwic04d6gqgk")))) (build-system meson-build-system) (arguments (list -- cgit v1.2.3 From 5c8721ad07d9b2af06a938dae29651f2be41dac1 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Fri, 15 Sep 2023 19:03:48 +0200 Subject: gnu: totem: Update to 43.0. * gnu/packages/gnome.scm (totem): Update to 43.0. [#:phases]: Adjust accordingly. Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d7f4a6491c..3e461729ab 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6593,7 +6593,7 @@ (define-public grilo-plugins (define-public totem (package (name "totem") - (version "42.0") + (version "43.0") (source (origin (method url-fetch) @@ -6601,7 +6601,7 @@ (define-public totem (version-major version) "/" "totem-" version ".tar.xz")) (sha256 - (base32 "1az6ay7zhz2naqrzcfldx1yv2ylw1yjx76g3mqrqppwmvcflkw2a")))) + (base32 "07m4jiry78m85sqcx7f9r7dkfvfnd8xzhfad5939cn4bj9akcvdk")))) (build-system meson-build-system) (native-inputs (list pkg-config @@ -6655,8 +6655,9 @@ (define-public totem (add-after 'unpack 'skip-gtk-update-icon-cache ;; Don't create 'icon-theme.cache'. (lambda _ - (substitute* "meson_post_install.py" - (("gtk-update-icon-cache") "true")))) + (substitute* "meson.build" + (("gtk_update_icon_cache: true") + "gtk_update_icon_cache: false")))) (add-before 'install 'disable-cache-generation (lambda _ (setenv "DESTDIR" "/"))) -- cgit v1.2.3 From 8c28401c6d0e8ea69edef80a82e2af31abab93e8 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Fri, 15 Sep 2023 20:07:13 +0200 Subject: gnu: libshumate: Update to 1.0.5. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome.scm (libshumate): Update to 1.0.5. [#:phases]:: Removed, moving logic… : … here. Also set other environment variables and run tests using ‘dbus-run-session’. [native-inputs]: Add dbus and at-spi2-core. Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 36 +++++++++++++++++++++++------------- 1 file changed, 23 insertions(+), 13 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3e461729ab..16516d289c 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4944,7 +4944,7 @@ (define-public rest-next (define-public libshumate (package (name "libshumate") - (version "1.0.0.beta") ;no stable release yet + (version "1.0.5") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -4952,25 +4952,35 @@ (define-public libshumate name "-" version ".tar.xz")) (sha256 (base32 - "13xrc07fm0967gzbqab8k0l3dnknh00p0a6f2dm7k0aa56q41sda")))) + "0v4m07vxm3m4a2vqkp2wfsc3zsf92fpigc1k8yq49vkpj7gxikx8")))) (build-system meson-build-system) - (arguments (list #:configure-flags #~(list "-Dlibsoup3=true") - #:phases #~(modify-phases %standard-phases - (add-before 'check 'pre-check - (lambda _ - ;; The 'coordinate' test requires a - ;; writable HOME. - (setenv "HOME" "/tmp") + (arguments + (list #:configure-flags #~(list "-Dlibsoup3=true") + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? test-options #:allow-other-keys) + (when tests? + ;; Some tests expect to write to $HOME. + (setenv "HOME" "/tmp") + (setenv "XDG_RUNTIME_DIR" "/tmp/run") + (setenv "XDG_CACHE_HOME" "/tmp/cache") + + ;; Tests require a running X server. + (system "Xvfb :1 &") + (setenv "DISPLAY" ":1") - ;; Tests require a running X server. - (system "Xvfb :1 &") - (setenv "DISPLAY" ":1")))))) + (apply invoke "dbus-run-session" "--" "meson" "test" + "--print-errorlogs" test-options))))))) (native-inputs (list gi-docgen `(,glib "bin") gobject-introspection pkg-config - xorg-server-for-tests)) + ;; For tests: + xorg-server-for-tests + dbus + at-spi2-core)) (propagated-inputs ;; All the libraries are listed as "Requires' in the .pc file. (list cairo -- cgit v1.2.3 From e3dcaa19ce9bfa6b1e95162c60895d328b7afa2c Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Sat, 16 Sep 2023 14:25:58 +0200 Subject: gnu: pcre2: Install static libraries. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/pcre.scm (pcre2)[#:configure-flags]: Remove "--disable-static". [#:phases]: Copy ‘move-static-libs’ from pcre. [outputs]: Add “static”. Signed-off-by: Liliana Marie Prikler --- gnu/packages/pcre.scm | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/gnu/packages/pcre.scm b/gnu/packages/pcre.scm index ee48ad0e2b..c7471169d9 100644 --- a/gnu/packages/pcre.scm +++ b/gnu/packages/pcre.scm @@ -102,6 +102,7 @@ (define-public pcre2 (base32 "0s4x2l6g0sb9piwkr3sxqwdswz2g6bk1hhwngv0kv4w38wybir0l")))) (build-system gnu-build-system) + (outputs '("out" "static")) (inputs (list bzip2 readline zlib)) (arguments (list #:configure-flags @@ -114,14 +115,23 @@ (define-public pcre2 ;; riscv64-linux is an unsupported architecture. #$@(if (target-riscv64?) #~() - #~("--enable-jit")) - "--disable-static") + #~("--enable-jit"))) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-paths (lambda _ (substitute* "RunGrepTest" - (("/bin/echo") (which "echo")))))))) + (("/bin/echo") (which "echo"))))) + (add-after 'install 'move-static-libs + (lambda _ + (let ((source (string-append #$output "/lib")) + (static (string-append #$output:static "/lib"))) + (mkdir-p static) + (for-each (lambda (lib) + (link lib (string-append static "/" + (basename lib))) + (delete-file lib)) + (find-files source "\\.a$")))))))) (synopsis "Perl Compatible Regular Expressions") (description "The PCRE library is a set of functions that implement regular expression -- cgit v1.2.3 From e68bf6e1f4991799a78d507c588a83b349765cd1 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Sat, 16 Sep 2023 14:27:26 +0200 Subject: gnu: qemu: Use pcre2. * gnu/packages/virtualization.scm (qemu) [native-inputs]: Replace pcre:static with pcre2:static. Signed-off-by: Liliana Marie Prikler --- gnu/packages/virtualization.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index f5bdedd45e..49817fdbcd 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -481,7 +481,7 @@ (define-public qemu ;; The following static libraries are required to build ;; the static output of QEMU. `(,glib "static") - `(,pcre "static") + `(,pcre2 "static") `(,zlib "static"))) (home-page "https://www.qemu.org") (synopsis "Machine emulator and virtualizer") -- cgit v1.2.3 From 0dfbb723a086cb156644ad128c70c33a4fd646cc Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Sun, 17 Sep 2023 13:29:18 +0200 Subject: gnu: tracker: Update to 3.6.0. * gnu/packages/gnome.scm (tracker): Update to 3.6.0. [#:phases]: Add 'disable-failing-tests'. Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 16516d289c..f1df6291ef 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9398,7 +9398,7 @@ (define-public gnome-autoar (define-public tracker (package (name "tracker") - (version "3.5.3") + (version "3.6.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/tracker/" @@ -9406,7 +9406,7 @@ (define-public tracker "tracker-" version ".tar.xz")) (sha256 (base32 - "1vi878f95a2nlvqz46ph6f05hywjb2ni0znqavhdkrbvi6qchrhl")))) + "1whdqidxmagsc35pmz9kcc5vs3bmvbkmnis7prnx3zxs37z2qnaj")))) (build-system meson-build-system) (arguments (list @@ -9428,6 +9428,22 @@ (define-public tracker (substitute* "utils/trackertestutils/__main__.py" (("/bin/bash") (search-input-file inputs "bin/bash"))))) + (add-after 'unpack 'disable-failing-tests + (lambda _ + #$@(if (target-x86-32?) + ;; On 32-bit systems, the far away dates are incorrect, + ;; and the floats are not parsed exactly. + '((substitute* + "tests/libtracker-sparql/tracker-statement-test.c" + (("g_assert_cmpfloat *\\((.*), ==, ([0-9.e-]+)\\);" + total actual expected) + (string-append "g_assert_cmpfloat_with_epsilon (" + actual ", " expected ", 1e-12);"))) + (substitute* "tests/core/tracker-sparql-test.c" + (("\\{ \"datetime/direct-1\", .* \\},") + "/* datetime test disabled */"))) + '()) + *unspecified*)) (add-before 'configure 'set-shell (lambda _ (setenv "SHELL" (which "bash")))) -- cgit v1.2.3 From 3a1b38dc20dcdc2c55650ed010f44d9b5060e0b2 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 12 Sep 2023 14:38:49 +0200 Subject: gnu: NetworkManager: Update to 1.44.0. * gnu/packages/gnome.scm (network-manager): Update to 1.44.0. Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f1df6291ef..59e9bc70d4 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8243,7 +8243,7 @@ (define-public network-manager (name "network-manager") ;; Note: NetworkManager still follows the odd/even major version number ;; for development/stable releases scheme; be sure to use a stable one. - (version "1.42.6") + (version "1.44.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/NetworkManager/" @@ -8253,7 +8253,7 @@ (define-public network-manager "network-manager-meson.patch")) (sha256 (base32 - "0y82xl84dyhdkyl98y86wspiq9iy5jz23bjzc3mvrijsfz1qlf4c")))) + "17zvg63jjbqdw8xyc6narirvvbbv7micbn0j7dmq0bqqgmihkjpd")))) (build-system meson-build-system) (outputs '("out" "doc")) ; 8 MiB of gtk-doc HTML -- cgit v1.2.3 From 3baee9ee96c40a52c9f6bca2661f15258cbbf1fb Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Fri, 15 Sep 2023 18:57:07 +0200 Subject: gnu: gnome-text-editor: Add missing input. * gnu/packages/gnome.scm (gnome-text-editor) [inputs]: Add pcre2. Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 59e9bc70d4..5d1783289b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5502,7 +5502,7 @@ (define-public gnome-text-editor `(,glib "bin") `(,gtk "bin") itstool)) - (inputs (list gtk gtksourceview libadwaita enchant)) + (inputs (list gtk gtksourceview libadwaita enchant pcre2)) (home-page "https://gitlab.gnome.org/GNOME/gnome-text-editor") (synopsis "GNOME text editor") (description -- cgit v1.2.3 From 8b4db5632992550f936b867a16bb43d85952c2f4 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Fri, 15 Sep 2023 19:50:54 +0200 Subject: gnu: editorconfig-core-c: Update to 0.12.6. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/text-editors.scm (editorconfig-core-c): Update to 0.12.6. [#:phases]: Add ‘disable-failing-tests’. Signed-off-by: Liliana Marie Prikler --- gnu/packages/text-editors.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnu/packages/text-editors.scm b/gnu/packages/text-editors.scm index 44c5754d6d..56554373be 100644 --- a/gnu/packages/text-editors.scm +++ b/gnu/packages/text-editors.scm @@ -826,7 +826,7 @@ (define-public manuskript (define-public editorconfig-core-c (package (name "editorconfig-core-c") - (version "0.12.5") + (version "0.12.6") (source (origin (method git-fetch) @@ -835,7 +835,7 @@ (define-public editorconfig-core-c (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "073sh18y0v8wm10iphaia54pkdmwylalccpn1k5i9dwyfjzgj7yg")))) + (base32 "05qllpls3r95nfl14gqq3cv4lisf07fgn85n52w8blc5pfl1h93g")))) (build-system cmake-build-system) (arguments '(#:phases @@ -845,6 +845,13 @@ (define-public editorconfig-core-c (let ((tests (assoc-ref inputs "tests"))) (copy-recursively tests "tests")) #t)) + (add-after 'insert-tests 'disable-failing-tests + (lambda _ + (substitute* "tests/parser/CMakeLists.txt" + (("# Test max property name and values") + "# Disabled: test max property name and values\nif(FALSE)\n") + (("# Test max section names") + "endif()\n\n# Test max section names")))) (add-after 'install 'delete-static-library (lambda* (#:key outputs #:allow-other-keys) (let* ((out (assoc-ref outputs "out")) -- cgit v1.2.3 From afa9da84255d32d9f457be381c12666b69ac3f69 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Fri, 15 Sep 2023 19:52:03 +0200 Subject: gnu: gnome-text-editor: Update to 44.0. * gnu/packages/gnome.scm (gnome-text-editor): Update to 44.0. [inputs]: Add editorconfig-core-c. Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 5d1783289b..bac84b3851 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5482,7 +5482,7 @@ (define-public gnome-terminal (define-public gnome-text-editor (package (name "gnome-text-editor") - (version "42.2") + (version "44.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/gnome-text-editor/" @@ -5490,7 +5490,7 @@ (define-public gnome-text-editor "gnome-text-editor-" version ".tar.xz")) (sha256 (base32 - "1nn53iv2a82kkqkg5jy0bqh2b2wzg7g4a6w8q3qsis5wvj64lvg5")))) + "1jii59hw31baira2psl1kx2lxljmnnkxmif4zhasizrl0xwc6yzn")))) (build-system meson-build-system) (arguments (list #:glib-or-gtk? #t)) @@ -5502,7 +5502,12 @@ (define-public gnome-text-editor `(,glib "bin") `(,gtk "bin") itstool)) - (inputs (list gtk gtksourceview libadwaita enchant pcre2)) + (inputs (list gtk gtksourceview libadwaita enchant pcre2 + ;; cyclic module dependency + (module-ref + (resolve-interface + '(gnu packages text-editors)) + 'editorconfig-core-c))) (home-page "https://gitlab.gnome.org/GNOME/gnome-text-editor") (synopsis "GNOME text editor") (description -- cgit v1.2.3 From 6c2a6033b4bd5f74463cb0121e15b9cb4fc5ff6d Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Wed, 4 Oct 2023 12:47:04 +0200 Subject: gnu: dbus-service: Make the session bus available under /run/dbus. According to https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3101, glib now searches for the session bus socket in runstatedir. The dbus service must thus have its socket in /run/dbus. For interoperability with the dbus standard, /run/dbus is also symlinked to /var/run/dbus. * gnu/services/dbus.scm (dbus-activation): Symlink /run/dbus to /var/run/dbus. (%dbus-accounts): Run dbus in /run/dbus. (dbus-root-service-type): Save the pid file in /run/dbus. Signed-off-by: Liliana Marie Prikler --- gnu/services/dbus.scm | 37 ++++++++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/gnu/services/dbus.scm b/gnu/services/dbus.scm index 5a0c634393..1edcc6eb9e 100644 --- a/gnu/services/dbus.scm +++ b/gnu/services/dbus.scm @@ -163,7 +163,7 @@ (define %dbus-accounts (group "messagebus") (system? #t) (comment "D-Bus system bus user") - (home-directory "/var/run/dbus") + (home-directory "/run/dbus") (shell (file-append shadow "/sbin/nologin"))))) (define dbus-setuid-programs @@ -186,7 +186,38 @@ (define (dbus-activation config) (let ((user (getpwnam "messagebus"))) ;; This directory contains the daemon's socket so it must be ;; world-readable. - (mkdir-p/perms "/var/run/dbus" user #o755)) + (mkdir-p/perms "/run/dbus" user #o755)) + + (catch 'system-error + (lambda () + (symlink "/run/dbus" "/var/run/dbus")) + (lambda args + (let ((errno (system-error-errno args))) + (cond + ((= errno EEXIST) + (let ((existing-name + (false-if-exception + (readlink "/var/run/dbus")))) + (unless (equal? existing-name "/run/dbus") + ;; Move the content of /var/run/dbus to /run/dbus, and + ;; retry. + (let ((dir (opendir "/var/run/dbus"))) + (let loop ((next (readdir dir))) + (cond + ((eof-object? next) (closedir dir)) + ((member next '("." "..")) (loop (readdir dir))) + (else + (begin + (rename-file (string-append "/var/run/dbus/" next) + (string-append "/run/dbus/" next)) + (loop (readdir dir)))))))) + (rmdir "/var/run/dbus") + (symlink "/run/dbus" "/var/run/dbus"))) + (else + (format (current-error-port) + "Failed to symlink /run/dbus to /var/run/dbus: ~s~%" + (strerror errno)) + (error "cannot create /var/run/dbus")))))) (unless (file-exists? "/etc/machine-id") (format #t "creating /etc/machine-id...~%") @@ -210,7 +241,7 @@ (define dbus-shepherd-service '(#:environment-variables '("DBUS_VERBOSE=1") #:log-file "/var/log/dbus-daemon.log") '()) - #:pid-file "/var/run/dbus/pid")) + #:pid-file "/run/dbus/pid")) (stop #~(make-kill-destructor))))))) (define dbus-root-service-type -- cgit v1.2.3 From 3066ad29cc0f163f7faaf38d1e459e9737ac1355 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Sun, 17 Sep 2023 16:08:03 +0200 Subject: gnu: gnome-control-center: Add gnome-control-center-firmware-security.patch. This patch disables the firmware panel for future gnome-control-center versions. * gnu/packages/patches/gnome-control-center-firmware-security.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it here. Signed-off-by: Liliana Marie Prikler --- gnu/local.mk | 1 + .../gnome-control-center-firmware-security.patch | 33 ++++++++++++++++++++++ 2 files changed, 34 insertions(+) create mode 100644 gnu/packages/patches/gnome-control-center-firmware-security.patch diff --git a/gnu/local.mk b/gnu/local.mk index 728fba5a78..be4c304e9b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1320,6 +1320,7 @@ dist_patch_DATA = \ %D%/packages/patches/gmp-faulty-test.patch \ %D%/packages/patches/gnash-fix-giflib-version.patch \ %D%/packages/patches/gnome-2048-fix-positional-argument.patch \ + %D%/packages/patches/gnome-control-center-firmware-security.patch \ %D%/packages/patches/gnome-control-center-libexecdir.patch \ %D%/packages/patches/gnome-dictionary-meson-i18n.patch \ %D%/packages/patches/gnome-online-miners-tracker-3.patch \ diff --git a/gnu/packages/patches/gnome-control-center-firmware-security.patch b/gnu/packages/patches/gnome-control-center-firmware-security.patch new file mode 100644 index 0000000000..fd9d7b8ff4 --- /dev/null +++ b/gnu/packages/patches/gnome-control-center-firmware-security.patch @@ -0,0 +1,33 @@ +From: Jeremy Bicha +Date: Mon, 22 Aug 2022 08:31:15 -0400 +Subject: firmware-security: Disable + +Not yet useful enough to justify its inclusion by default here + +You can get the same info by running +fwupdmgr security + +If you drop this patch, add a Depends: fwupd [linux-any] + +https://launchpad.net/bugs/1987162 + +https://gitlab.gnome.org/GNOME/gnome-control-center/-/issues/1938 + +[Stolen from the debian package] +--- + shell/cc-panel-loader.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/shell/cc-panel-loader.c b/shell/cc-panel-loader.c +index 17f9601..1b819a5 100644 +--- a/shell/cc-panel-loader.c ++++ b/shell/cc-panel-loader.c +@@ -113,7 +113,7 @@ static CcPanelLoaderVtable default_panels[] = + PANEL_TYPE("info-overview", cc_info_overview_panel_get_type, NULL), + PANEL_TYPE("keyboard", cc_keyboard_panel_get_type, NULL), + PANEL_TYPE("location", cc_location_panel_get_type, NULL), +- PANEL_TYPE("firmware-security",cc_firmware_security_panel_get_type, cc_firmware_security_panel_static_init_func), ++ // PANEL_TYPE("firmware-security",cc_firmware_security_panel_get_type, cc_firmware_security_panel_static_init_func), + PANEL_TYPE("microphone", cc_microphone_panel_get_type, NULL), + PANEL_TYPE("mouse", cc_mouse_panel_get_type, NULL), + PANEL_TYPE("multitasking", cc_multitasking_panel_get_type, NULL), -- cgit v1.2.3 From d6462be6a83bf33b569980734fb7ee23836c91a0 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Mon, 11 Sep 2023 23:26:20 +0200 Subject: gnu: gnome-control-center: Update to 44.3. Some previous fixes have been merged upstream. The gnome version is now read from a dbus service, and passwd is already searched in /run/setuid-programs. In order to let the tests run, we use the same tests environment as gnome-shell. * gnu/packages/gnome.scm (gnome-control-center): Update to 44.3. Apply gnome-control-center-firmware-security.patch. [#:phases]: Adjust accordingly. : Adjust accordingly. : Override the check phase to run under dbus. [native-inputs]: Add setxkbmap. Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 43 ++++++++++++++++++++++++++++++------------- 1 file changed, 30 insertions(+), 13 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index eaceb76e1e..4ed22d4da0 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9032,7 +9032,7 @@ (define-public gnome-bluetooth (define-public gnome-control-center (package (name "gnome-control-center") - (version "42.4") + (version "44.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -9040,7 +9040,10 @@ (define-public gnome-control-center name "-" version ".tar.xz")) (sha256 (base32 - "1ln5rch6zbfh3vl2nnnmw39bylgg38rin6xp7ra0ra4ay3wv3gvs")))) + "0yhcm0c0ghkfqswqlkwcln3jpaz6jzvqaph2c3lgmv635w2nash6")) + (patches + (search-patches + "gnome-control-center-firmware-security.patch")))) (build-system meson-build-system) (arguments (list @@ -9064,19 +9067,32 @@ (define-public gnome-control-center "panels/network/connection-editor/net-connection-editor.c") (("\"nm-connection-editor") (string-append "\"" (search-input-file - inputs "bin/nm-connection-editor")))) - (substitute* "panels/user-accounts/run-passwd.c" - (("/usr/bin/passwd") - "/run/setuid-programs/passwd")) - (substitute* "panels/info-overview/cc-info-overview-panel.c" - (("DATADIR \"/gnome/gnome-version.xml\"") - (format #f "~s" (search-input-file - inputs "share/gnome/gnome-version.xml")))))) + inputs "bin/nm-connection-editor")))))) (add-after 'unpack 'skip-gtk-update-icon-cache ;; Don't create 'icon-theme.cache'. (lambda _ - (substitute* "build-aux/meson/meson_post_install.py" - (("gtk-update-icon-cache") (which "true")))))))) + (substitute* "meson.build" + (("gtk_update_icon_cache: true") + "gtk_update_icon_cache: false")))) + (replace 'check + (lambda* (#:key parallel-tests? tests? #:allow-other-keys) + (when tests? + ;; Tests require a running X server. + (system "Xvfb :1 &") + (setenv "DISPLAY" ":1") + ;; For the missing /var/lib/dbus/machine-id + (setenv "DBUS_FATAL_WARNINGS" "0") + (setenv "NO_AT_BRIDGE" "1") + (setenv "HOME" "/tmp") + (setenv "XDG_RUNTIME_DIR" (string-append (getcwd) "/runtime-dir")) + (mkdir (getenv "XDG_RUNTIME_DIR")) + (chmod (getenv "XDG_RUNTIME_DIR") #o700) + (setenv "MESON_TESTTHREADS" + (if parallel-tests? + (number->string (parallel-job-count)) + "1")) + (invoke "dbus-run-session" "--" + "meson" "test" "-t" "0"))))))) (native-inputs (list docbook-xsl gettext-minimal @@ -9085,7 +9101,8 @@ (define-public gnome-control-center pkg-config python python-dbusmock - xorg-server-for-tests)) + xorg-server-for-tests + setxkbmap)) (inputs (list accountsservice colord-gtk -- cgit v1.2.3 From cde1becfaba7a5757b881a5940ef0c6c2a70794f Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 19 Sep 2023 13:23:22 +0200 Subject: gnu: eudev: Update to 3.2.14. Eudev now has a hardware database /etc/udev/hwdb.bin made up of descriptions installed in the /lib/udev/hwdb.d directory of each package, and more generally, UDEV_HWDB_PATH. This database index is compiled with udevadm hwdb --update. The udev-service-type collects the files and compiles the index. Previously, the hardware description files provided by eudev would be compiled into $prefix/etc/udev/hwdb.bin in the eudev output. * gnu/packages/linux.scm (eudev): Update to 3.2.14. [modules]: Import (guix build utils). [#:phases] : New phase. : New phase. : Remove phase. [#:configure-flags]: Set sysconfdir to avoid a prefix. [native-search-paths]: Add UDEV_HWDB_PATH. * gnu/packages/patches/eudev-rules-directory.patch: Rebase it. --- gnu/packages/linux.scm | 57 +++++++++++++++++------- gnu/packages/patches/eudev-rules-directory.patch | 9 ++-- 2 files changed, 45 insertions(+), 21 deletions(-) diff --git a/gnu/packages/linux.scm b/gnu/packages/linux.scm index c993e7b9bb..c5049843eb 100644 --- a/gnu/packages/linux.scm +++ b/gnu/packages/linux.scm @@ -4327,10 +4327,9 @@ (define-public earlyoom (license license:expat))) (define-public eudev - ;; The post-systemd fork, maintained by Gentoo. (package (name "eudev") - (version "3.2.11") + (version "3.2.14") (source (origin (method git-fetch) (uri (git-reference (url "https://github.com/gentoo/eudev") @@ -4338,8 +4337,9 @@ (define-public eudev (file-name (git-file-name name version)) (sha256 (base32 - "0dzaqwjnl55f69ird57wb6skahc6l7zs1slsrzqqfhww33icp6av")) - (patches (search-patches "eudev-rules-directory.patch")))) + "1f6lz57igi7iw2ls3fpzgw42bfznam4nf9368h7x8yf1mb737yxz")) + (patches (search-patches "eudev-rules-directory.patch")) + (modules '((guix build utils))))) (build-system gnu-build-system) (arguments (list @@ -4350,6 +4350,31 @@ (define-public eudev (substitute* "man/make.sh" (("/usr/bin/xsltproc") (search-input-file (or native-inputs inputs) "/bin/xsltproc"))))) + (add-before 'bootstrap 'install-in-lib + (lambda _ + ;; When the udev-service-type instantiates /etc, it collects + ;; hardware files from the /lib/udev/hwdb.d directories + ;; of different packages. Since we set sysconfdir to /etc, the + ;; only package-dependent location we can install hwdb files is + ;; in /lib/udev/hwdb.d. Eudev is configured to install + ;; these files in sysconfdir, but they should be placed into + ;; udevlibexecdir. + (copy-file "hwdb/Makefile.am" "hwdb/files.am") + (call-with-output-file "hwdb/Makefile.am" + (lambda (port) + (format port "hardwarelibdir = $(udevlibexecdir)/hwdb.d\n") + (format port "include ./files.am"))) + (substitute* "hwdb/files.am" + (("dist_udevhwdb_DATA =") + "dist_hardwarelib_DATA =")) + ;; Do not install the empty udev.conf template. + (substitute* "src/udev/Makefile.am" + (("dist_udevconf_DATA =") + "dist_noinst_DATA =")) + ;; Do not ensure that /etc/udev/rules.d exists. + (substitute* "rules/Makefile.am" + (("\\$\\(MKDIR_P\\) \\$\\(DESTDIR\\)\\$\\(udevconfdir\\)/rules\\.d") + "true")))) (add-after 'install 'move-static-library (lambda _ (let ((source (string-append #$output "/lib/libudev.a")) @@ -4361,19 +4386,17 @@ (define-public eudev ;; such that Libtool looks for it in the usual places. (substitute* (string-append #$output "/lib/libudev.la") (("old_library=.*") - "old_library=''\n"))))) - (add-after 'install 'build-hwdb - (lambda _ - ;; Build OUT/etc/udev/hwdb.bin. This allows 'lsusb' and - ;; similar tools to display product names. - ;; - ;; XXX: This can't be done when cross-compiling. Find another way - ;; to generate hwdb.bin for cross-built systems. - #$@(if (%current-target-system) - #~(#t) - #~((invoke (string-append #$output "/bin/udevadm") - "hwdb" "--update")))))) - #:configure-flags #~(list "--enable-manpages"))) + "old_library=''\n")))))) + #:configure-flags + #~(list "--enable-manpages" + ;; By default, autoconf uses $prefix/etc. The udev-service-type + ;; makes sure /etc is set up with rules and hardware file + ;; descriptions. + "--sysconfdir=/etc"))) + (native-search-paths + (list (search-path-specification + (variable "UDEV_HWDB_PATH") + (files '("lib/udev/hwdb.d"))))) (native-inputs (list autoconf automake diff --git a/gnu/packages/patches/eudev-rules-directory.patch b/gnu/packages/patches/eudev-rules-directory.patch index 54fc01c6d5..c4b1cfae39 100644 --- a/gnu/packages/patches/eudev-rules-directory.patch +++ b/gnu/packages/patches/eudev-rules-directory.patch @@ -4,9 +4,9 @@ The old udev 182 supported $UDEV_CONFIG_FILE, which in turn allowed the search path to be customized, but eudev no longer has this, hence this hack. ---- eudev-3.1.5/src/udev/udev-rules.c 2015-10-13 06:22:14.000000000 +0800 -+++ eudev-3.1.5/src/udev/udev-rules.c 2015-10-16 20:45:38.491934336 +0800 -@@ -47,15 +47,11 @@ +--- a/src/udev/udev-rules.c ++++ b/src/udev/udev-rules.c +@@ -48,16 +48,11 @@ struct uid_gid { }; }; @@ -20,11 +20,12 @@ this hack. - "/lib/udev/rules.d", - "/usr/lib/udev/rules.d", -#endif +- "/usr/local/lib/udev/rules.d", + NULL, /* placeholder for $EUDEV_RULES_DIRECTORY */ NULL}; struct udev_rules { -@@ -1704,6 +1700,9 @@ +@@ -1718,6 +1713,9 @@ struct udev_rules *udev_rules_new(struct udev *udev, int resolve_names) { udev_rules_check_timestamp(rules); -- cgit v1.2.3 From c2c29eb1b451da919e0f9b41d3ca3506ebadd1ec Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Thu, 5 Oct 2023 19:33:24 +0200 Subject: services: udev: Rewrite udev-rule to use file->udev-rule. * gnu/services/base.scm (udev-rule): Use file->udev-rule. --- gnu/services/base.scm | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 98d59fd36d..8b54f30ef6 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -2262,19 +2262,7 @@ (define (rules-sub-directory directory) (define (udev-rule file-name contents) "Return a directory with a udev rule file FILE-NAME containing CONTENTS." - (computed-file file-name - (with-imported-modules '((guix build utils)) - #~(begin - (use-modules (guix build utils)) - - (define rules.d - (string-append #$output "/lib/udev/rules.d")) - - (mkdir-p rules.d) - (call-with-output-file - (string-append rules.d "/" #$file-name) - (lambda (port) - (display #$contents port))))))) + (file->udev-rule file-name (plain-file file-name contents))) (define (file->udev-rule file-name file) "Return a directory with a udev rule file FILE-NAME which is a copy of FILE." -- cgit v1.2.3 From 95400e5c15c203de58aab7ab6b60abdfe1cc3146 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Thu, 5 Oct 2023 19:24:56 +0200 Subject: services: udev: Make udev-rule helper functions generic. * gnu/services/base.scm (udev-configurations-union): New function. (udev-configuration-file): New function, use file->udev-configuration-file. (file->udev-configuration-file): New function. (udev-rules-union): Use udev-configurations-union. (udev-rule): Use udev-configuration-file. (file->udev-rule): Use file->udev-configuration-file. --- gnu/services/base.scm | 50 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 34 insertions(+), 16 deletions(-) diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 8b54f30ef6..10e7383475 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -2234,9 +2234,9 @@ (define-record-type* (rules udev-configuration-rules ;list of file-like (default '()))) -(define (udev-rules-union packages) - "Return the union of the @code{lib/udev/rules.d} directories found in each -item of @var{packages}." +(define (udev-configurations-union subdirectory packages) + "Return the union of the lib/udev/SUBDIRECTORY.d directories found in each +item of PACKAGES." (define build (with-imported-modules '((guix build union) (guix build utils)) @@ -2247,39 +2247,57 @@ (define build (srfi srfi-26)) (define %standard-locations - '("/lib/udev/rules.d" "/libexec/udev/rules.d")) + '(#$(string-append "/lib/udev/" subdirectory ".d") + #$(string-append "/libexec/udev/" subdirectory ".d"))) - (define (rules-sub-directory directory) - ;; Return the sub-directory of DIRECTORY containing udev rules, or - ;; #f if none was found. + (define (configuration-sub-directory directory) + ;; Return the sub-directory of DIRECTORY containing udev + ;; configurations, or #f if none was found. (find directory-exists? (map (cut string-append directory <>) %standard-locations))) (union-build #$output - (filter-map rules-sub-directory '#$packages))))) + (filter-map configuration-sub-directory '#$packages))))) + + (computed-file (string-append "udev-" subdirectory) build)) - (computed-file "udev-rules" build)) +(define (udev-rules-union packages) + "Return the union of the lib/udev/rules.d directories found in each +item of PACKAGES." + (udev-configurations-union "rules" packages)) + +(define (udev-configuration-file subdirectory file-name contents) + "Return a directory with a udev configuration file FILE-NAME containing CONTENTS." + (file->udev-configuration-file subdirectory file-name (plain-file file-name contents))) (define (udev-rule file-name contents) "Return a directory with a udev rule file FILE-NAME containing CONTENTS." - (file->udev-rule file-name (plain-file file-name contents))) + (udev-configuration-file "rules" file-name contents)) -(define (file->udev-rule file-name file) - "Return a directory with a udev rule file FILE-NAME which is a copy of FILE." +(define (file->udev-configuration-file subdirectory file-name file) + "Return a directory with a udev configuration file FILE-NAME which is a copy + of FILE." (computed-file file-name (with-imported-modules '((guix build utils)) #~(begin (use-modules (guix build utils)) - (define rules.d - (string-append #$output "/lib/udev/rules.d")) + (define configuration-directory + (string-append #$output + "/lib/udev/" + #$subdirectory + ".d")) (define file-copy-dest - (string-append rules.d "/" #$file-name)) + (string-append configuration-directory "/" #$file-name)) - (mkdir-p rules.d) + (mkdir-p configuration-directory) (copy-file #$file file-copy-dest))))) +(define (file->udev-rule file-name file) + "Return a directory with a udev rule file FILE-NAME which is a copy of FILE." + (file->udev-configuration-file "rules" file-name file)) + (define kvm-udev-rule ;; Return a directory with a udev rule that changes the group of /dev/kvm to ;; "kvm" and makes it #o660. Apparently QEMU-KVM used to ship this rule, -- cgit v1.2.3 From 498db4de1f09414adf68a3a383f0178434035179 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Mon, 2 Oct 2023 21:08:49 +0200 Subject: gnu: udev-service-type: accept hardware description file extensions. The udev-configuration record now has a hardware field. The contents of the /etc/udev directory now includes hwdb.bin, which is computed when the system is instanciated (prior to system activation). The hardware description files used to generate hwdb.bin are not installed in /etc, because they are not required at run-time. The documentation has been reworked so as to explain why creating udev rules or hardware needs helper functions for configuration or extension. * gnu/services/base.scm (udev-hardware): New function. (file->udev-hardware): New function. (udev-hardware-service): New function. (udev-etc): Add hwdb.d and hwdb.bin. (module): Export udev-hardware, file->udev-hardware, and udev-hardware-service. (): Add the native-udev field. (udev-service-type) [extend]: Populate the hardware field. * doc/guix.texi (Base Services)[udev-service-type]: Explain configuration and extension values. * doc/guix.texi (Base Services)[udev-hardware]: Document it. [udev-hardware-service]: Same. * doc/guix.texi (Base Services)[udev-configuration]: Document the native-udev field. --- doc/guix.texi | 57 ++++++++++++++++++++++++++++++++-------- gnu/services/base.scm | 72 +++++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 104 insertions(+), 25 deletions(-) diff --git a/doc/guix.texi b/doc/guix.texi index ad26a29513..3530d317ec 100644 --- a/doc/guix.texi +++ b/doc/guix.texi @@ -19362,9 +19362,23 @@ Type of the service that runs udev, a service which populates the @file{/dev} directory dynamically, whose value is a @code{} object. -This service type can be @emph{extended} using procedures -@code{udev-rules-service} along with @code{file->udev-rule} or -@code{udev-rule} which simplify the process of writing udev rules. +Since the file names for udev rules and hardware description files +matter, the configuration items for rules and hardware cannot simply be +plain file-like objects with the rules content, because the name would +be ignored. Instead, they are directory file-like objects that contain +optional rules in @file{lib/udev/rules.d} and optional hardware files in +@file{lib/udev/hwdb.d}. This way, the service can be configured with +whole packages from which to take rules and hwdb files. + +The @code{udev-service-type} can be @emph{extended} with file-like +directories that respect this hierarchy. For convenience, the +@code{udev-rule} and @code{file->udev-rule} can be used to construct +udev rules, while @code{udev-hardware} and @code{file->udev-hardware} +can be used to construct hardware description files. + +In an @code{operating-system} declaration, this service type can be +@emph{extended} using procedures @code{udev-rules-service} and +@code{udev-hardware-service}. @end defvar @deftp {Data Type} udev-configuration @@ -19372,10 +19386,17 @@ Data type representing the configuration of udev. @table @asis @item @code{udev} (default: @code{eudev}) (type: file-like) -Package object of the udev service. +Package object of the udev service. This package is used at run-time, +when compiled for the target system. In order to generate the +@file{hwdb.bin} hardware index, it is also used when generating the +system definition, compiled for the current system. @item @code{rules} (default: @var{'()}) (type: list-of-file-like) -List of file-like objects denoting udev-rule files. +List of file-like objects denoting udev rule files under a sub-directory. + +@item @code{hardware} (default: @var{'()}) (type: list-of-file-like) +List of file-like objects denoting udev hardware description files under +a sub-directory. @end table @end deftp @@ -19398,6 +19419,11 @@ upon detecting a USB device with a given product identifier. @end lisp @end deffn +@deffn {Procedure} udev-hardware @var{file-name} @var{contents} +Return a udev hardware description file named @var{file-name} containing +the hardware information @var{contents}. +@end deffn + @deffn {Procedure} udev-rules-service @var{name} @var{rules} [#:groups '()] Return a service that extends @code{udev-service-type} with @var{rules} and @code{account-service-type} with @var{groups} as system groups. @@ -19417,6 +19443,11 @@ with the previously defined rule @code{%example-udev-rule}. @end lisp @end deffn +@deffn {Procedure} udev-hardware-service @var{name} @var{hardware} +Return a service that extends @code{udev-service-type} with +@var{hardware}. The service name is @code{@var{name}-udev-hardware}. +@end deffn + @deffn {Procedure} file->udev-rule @var{file-name} @var{file} Return a udev-rule file named @var{file-name} containing the rules defined within @var{file}, a file-like object. @@ -19441,12 +19472,16 @@ The following example showcases how we can use an existing rule file. @end lisp @end deffn -Additionally, Guix package definitions can be included in @var{rules} in -order to extend the udev rules with the definitions found under their -@file{lib/udev/rules.d} sub-directory. In lieu of the previous -@var{file->udev-rule} example, we could have used the -@var{android-udev-rules} package which exists in Guix in the @code{(gnu -packages android)} module. +Since guix package definitions can be included in @var{rules} in order +to use all their rules under the @file{lib/udev/rules.d} sub-directory, +then in lieu of the previous @var{file->udev-rule} example, we could +have used the @var{android-udev-rules} package which exists in Guix in +the @code{(gnu packages android)} module. + +@deffn {Procedure} file->udev-hardware @var{file-name} @var{file} +Return a udev hardware description file named @var{file-name} containing +the rules defined within @var{file}, a file-like object. +@end deffn The following example shows how to use the @var{android-udev-rules} package so that the Android tool @command{adb} can detect devices diff --git a/gnu/services/base.scm b/gnu/services/base.scm index 10e7383475..db22ac848e 100644 --- a/gnu/services/base.scm +++ b/gnu/services/base.scm @@ -82,6 +82,7 @@ (define-module (gnu services base) #:select (mount-flags->bit-mask swap-space->flags-bit-mask)) #:use-module (guix gexp) + #:use-module ((guix packages) #:select (package-version)) #:use-module (guix records) #:use-module (guix modules) #:use-module (guix pki) @@ -152,11 +153,15 @@ (define-module (gnu services base) udev-configuration udev-configuration? udev-configuration-rules + udev-configuration-hardware udev-service-type udev-service ; deprecated udev-rule + udev-hardware file->udev-rule + file->udev-hardware udev-rules-service + udev-hardware-service login-configuration login-configuration? @@ -2232,10 +2237,12 @@ (define-record-type* (udev udev-configuration-udev ;file-like (default eudev)) (rules udev-configuration-rules ;list of file-like - (default '()))) + (default '())) + (hardware udev-configuration-hardware ;list of file-like + (default '()))) (define (udev-configurations-union subdirectory packages) - "Return the union of the lib/udev/SUBDIRECTORY.d directories found in each + "Return the union of the lib/udev/SUBDIRECTORY directories found in each item of PACKAGES." (define build (with-imported-modules '((guix build union) @@ -2247,8 +2254,8 @@ (define build (srfi srfi-26)) (define %standard-locations - '(#$(string-append "/lib/udev/" subdirectory ".d") - #$(string-append "/libexec/udev/" subdirectory ".d"))) + '(#$(string-append "/lib/udev/" subdirectory) + #$(string-append "/libexec/udev/" subdirectory))) (define (configuration-sub-directory directory) ;; Return the sub-directory of DIRECTORY containing udev @@ -2264,7 +2271,7 @@ (define (configuration-sub-directory directory) (define (udev-rules-union packages) "Return the union of the lib/udev/rules.d directories found in each item of PACKAGES." - (udev-configurations-union "rules" packages)) + (udev-configurations-union "rules.d" packages)) (define (udev-configuration-file subdirectory file-name contents) "Return a directory with a udev configuration file FILE-NAME containing CONTENTS." @@ -2272,7 +2279,11 @@ (define (udev-configuration-file subdirectory file-name contents) (define (udev-rule file-name contents) "Return a directory with a udev rule file FILE-NAME containing CONTENTS." - (udev-configuration-file "rules" file-name contents)) + (udev-configuration-file "rules.d" file-name contents)) + +(define (udev-hardware file-name contents) + "Return a directory with a udev hardware file FILE-NAME containing CONTENTS." + (udev-configuration-file "hwdb.d" file-name contents)) (define (file->udev-configuration-file subdirectory file-name file) "Return a directory with a udev configuration file FILE-NAME which is a copy @@ -2285,8 +2296,7 @@ (define (file->udev-configuration-file subdirectory file-name file) (define configuration-directory (string-append #$output "/lib/udev/" - #$subdirectory - ".d")) + #$subdirectory)) (define file-copy-dest (string-append configuration-directory "/" #$file-name)) @@ -2296,7 +2306,11 @@ (define file-copy-dest (define (file->udev-rule file-name file) "Return a directory with a udev rule file FILE-NAME which is a copy of FILE." - (file->udev-configuration-file "rules" file-name file)) + (file->udev-configuration-file "rules.d" file-name file)) + +(define (file->udev-hardware file-name file) + "Return a directory with a udev hardware file FILE-NAME which is a copy of FILE." + (file->udev-configuration-file "hwdb.d" file-name file)) (define kvm-udev-rule ;; Return a directory with a udev rule that changes the group of /dev/kvm to @@ -2405,13 +2419,27 @@ (define udev.conf (define (udev-etc config) (match-record config - (udev rules) + (udev rules hardware) + (let* ((hardware + (udev-configurations-union "hwdb.d" (cons* udev hardware))) + (hwdb.bin + (computed-file + "hwdb.bin" + (with-imported-modules '((guix build utils)) + #~(begin + (use-modules (guix build utils)) + (setenv "UDEV_HWDB_PATH" #$hardware) + (invoke #+(file-append udev "/bin/udevadm") + "hwdb" + "--update" + "-o" #$output)))))) `(("udev" ,(file-union "udev" `(("udev.conf" ,udev.conf) ("rules.d" ,(udev-rules-union (cons* udev kvm-udev-rule - rules))))))))) + rules))) + ("hwdb.bin" ,hwdb.bin)))))))) (define udev-service-type (service-type (name 'udev) @@ -2420,12 +2448,15 @@ (define udev-service-type udev-shepherd-service) (service-extension etc-service-type udev-etc))) (compose concatenate) ;concatenate the list of rules - (extend (lambda (config rules) + (extend (lambda (config extensions) (let ((initial-rules - (udev-configuration-rules config))) + (udev-configuration-rules config)) + (initial-hardware + (udev-configuration-hardware config))) (udev-configuration (inherit config) - (rules (append initial-rules rules)))))) + (rules (append initial-rules extensions)) + (hardware (append initial-hardware extensions)))))) (default-value (udev-configuration)) (description "Run @command{udev}, which populates the @file{/dev} @@ -2460,6 +2491,19 @@ (define* (udev-rules-service name rules #:key (groups '())) (description "This service adds udev rules.")))) (service type #f))) +(define (udev-hardware-service name hardware-files) + "Return a service that extends udev-service-type with HARDWARE-FILES, named +NAME-udev-hardware." + (let* ((name (symbol-append name '-udev-hardware)) + (udev-extension (const (list hardware-files))) + (type (service-type + (name name) + (extensions (list + (service-extension + udev-service-type udev-extension))) + (description "This service adds udev hardware files.")))) + (service type #f))) + (define (swap-space->shepherd-service-name space) (let ((target (swap-space-target space))) (symbol-append 'swap- -- cgit v1.2.3 From ee554a35e012ecefc9e9e2267e1387b3bf1ca5a5 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 19 Sep 2023 13:32:26 +0200 Subject: gnu: libgudev: Update to 238. * gnu/packages/gnome.scm (libgudev): Update to 238. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4ed22d4da0..d8cdd11bd4 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6899,14 +6899,14 @@ (define-public eog-plugins (define-public libgudev (package (name "libgudev") - (version "236") + (version "238") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" version "/" name "-" version ".tar.xz")) (sha256 (base32 - "094mgjmwgsgqrr1i0vd20ynvlkihvs3vgbmpbrhswjsrdp86j0z5")))) + "1laxgdkgmr30aw44sm4rgpsdybwxx5rszcm8c2y3vmy9myqnl9k1")))) (build-system meson-build-system) (native-inputs `(("glib:bin" ,glib "bin") ; for glib-genmarshal, etc. -- cgit v1.2.3 From b701a7018d94aebef6a967ec235c72c1f7cdfe5c Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 19 Sep 2023 13:32:46 +0200 Subject: gnu: upower: Update to 1.90.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Upower has an extra hardware description file for use with udev. It should be installed under upower’s output, not eudev’s. A test is disabled, for calling an unimplemented bluez method. The conditional 'adjust-test-for-excess-precision phase is included in the new 'adjust-test-suite, so that the list of phases is always the same. * gnu/packages/gnome.scm (upower): Update to 1.90.2. [#:configure-flags]: Set udevhwdbdir. [#:phases] : Add this phase unconditionnally : Disable test_bluetooth_hidpp_mouse. [inputs]: Remove dbus-glib. [native-inputs]: Add dbus. --- gnu/packages/gnome.scm | 39 +++++++++++++++++++++++---------------- 1 file changed, 23 insertions(+), 16 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d8cdd11bd4..6e3933ec96 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5727,7 +5727,7 @@ (define-public geocode-glib-with-libsoup2 (define-public upower (package (name "upower") - (version "1.90.0") + (version "1.90.2") (source (origin (method git-fetch) @@ -5736,7 +5736,7 @@ (define-public upower (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "1g17rm91p8vfpjyb0k2shylrs55nccn3fa890vlk4n9s71sghbzq")) + (base32 "13xp423ycv8imf2cmgf6lii9f01p7x2v19cny7acrmczkc0cqv7d")) (modules '((guix build utils))) (snippet ;; Upstream commit . - (substitute* "src/linux/integration-test.py" - (("assertEqual(.*)40\\.0" _ middle) - (string-append - "assertAlmostEqual" middle "40.0")))))) - #~%standard-phases))) + (string-append "-Dudevrulesdir=" #$output "/bin/udev/rules.d") + (string-append "-Dudevhwdbdir=" #$output "/lib/udev/hwdb.d")) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'adjust-test-suite + (lambda _ + ;; This test calls an unimplemented bluez dbus method. + (substitute* "src/linux/integration-test.py" + (("test_bluetooth_hidpp_mouse") + "disabled_test_bluetooth_hidpp_mouse")) + #$@(if (target-x86-32?) + ;; Address test failure caused by excess precision + ;; on i686: + ;; . + '((substitute* "src/linux/integration-test.py" + (("assertEqual(.*)40\\.0" _ middle) + (string-append + "assertAlmostEqual" middle "40.0")))) + '())))))) (native-inputs (list `(,glib "bin") ; for gdbus-codegen gobject-introspection @@ -5785,12 +5791,13 @@ (define-public upower python-packaging python-pygobject umockdev + dbus ;; For man pages. docbook-xsl libxslt ; for 'xsltproc' libxml2)) ; for 'XML_CATALOG_FILES' (inputs - (list dbus-glib libgudev libusb)) + (list libgudev libusb)) (propagated-inputs ;; In Requires of upower-glib.pc. (list glib)) -- cgit v1.2.3 From ff3ba62c472ab306916d9472b048ae063f34ae6c Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Thu, 12 Oct 2023 10:19:24 +0200 Subject: gnu: libgit2-glib: Update to 1.2.0. * gnu/packages/gnome.scm (libgit2-glib): Update to 1.2.0. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 6e3933ec96..507c078a3b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -11996,7 +11996,7 @@ (define-public libhandy-0.0 (define-public libgit2-glib (package (name "libgit2-glib") - (version "1.1.0") + (version "1.2.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -12004,7 +12004,7 @@ (define-public libgit2-glib name "-" version ".tar.xz")) (sha256 (base32 - "1wqypx0xv20vk0zfh20c474z6rdgbxbklcr2wkhl30dgbmbxg3f3")))) + "1441w7gzn6m3adhx4g6wcbkmscka2929si963dciyklghgddlc8k")))) (build-system meson-build-system) (native-inputs (list `(,glib "bin") ;; For glib-mkenums -- cgit v1.2.3 From 4d182aaf0f91ca975a16c5118e02a745c74eb6c8 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Thu, 12 Oct 2023 10:22:35 +0200 Subject: gnu: libhandy: Update to 1.8.2. * gnu/packages/gnome.scm (libhandy): Update to 1.8.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 507c078a3b..424279b8e2 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -11927,7 +11927,7 @@ (define-public terminator (define-public libhandy (package (name "libhandy") - (version "1.7.90") + (version "1.8.2") (source (origin (method git-fetch) @@ -11936,7 +11936,7 @@ (define-public libhandy (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1z8sbx7g19c1p8dy0sn0l25qfvrd2j28h269lsqm1y98r818h2k1")))) + (base32 "031bmrxc62p86fpk1x8kg4zljxf5bd2cgq8bsm7nrk5yipha2xvy")))) (build-system meson-build-system) (arguments (list #:configure-flags -- cgit v1.2.3 From 9f04e180654494c850be5200ddce6fa6e9067b6d Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Thu, 12 Oct 2023 10:19:35 +0200 Subject: gnu: gitg: Update to 44. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome.scm (gitg): Update to 44. [source]: Remove “gitg-fix-positional-argument.patch”. [inputs]: Add gpgme and libhandy. * gnu/packages/patches/gitg-fix-positional-argument.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Unregister it. --- gnu/local.mk | 1 - gnu/packages/gnome.scm | 7 +++-- .../patches/gitg-fix-positional-argument.patch | 36 ---------------------- 3 files changed, 4 insertions(+), 40 deletions(-) delete mode 100644 gnu/packages/patches/gitg-fix-positional-argument.patch diff --git a/gnu/local.mk b/gnu/local.mk index be4c304e9b..0c0e587ae6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1276,7 +1276,6 @@ dist_patch_DATA = \ %D%/packages/patches/ghostscript-no-header-id.patch \ %D%/packages/patches/ghostscript-no-header-uuid.patch \ %D%/packages/patches/ghostscript-no-header-creationdate.patch \ - %D%/packages/patches/gitg-fix-positional-argument.patch \ %D%/packages/patches/gklib-suitesparse.patch \ %D%/packages/patches/glib-appinfo-watch.patch \ %D%/packages/patches/glib-networking-gnutls-binding.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 424279b8e2..d17100b999 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -12027,7 +12027,7 @@ (define-public libgit2-glib (define-public gitg (package (name "gitg") - (version "41") + (version "44") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -12035,8 +12035,7 @@ (define-public gitg name "-" version ".tar.xz")) (sha256 (base32 - "0aa6djcf7rjw0q688mfy47k67bbjpnx6aw1xs94abfhgn6gipdkz")) - (patches (search-patches "gitg-fix-positional-argument.patch")))) + "0m135v2qm5kaa2jki0y2lbh0wa69bqfh9a4cm7db153v7smrj3jv")))) (build-system meson-build-system) (arguments (list @@ -12060,6 +12059,7 @@ (define-public gitg `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))))))))) (inputs (list glib + gpgme gsettings-desktop-schemas gspell gtk+ @@ -12068,6 +12068,7 @@ (define-public gitg libdazzle libgee libgit2-glib + libhandy libpeas libsecret libsoup-minimal-2 diff --git a/gnu/packages/patches/gitg-fix-positional-argument.patch b/gnu/packages/patches/gitg-fix-positional-argument.patch deleted file mode 100644 index 1d3513921c..0000000000 --- a/gnu/packages/patches/gitg-fix-positional-argument.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 1978973b12848741b08695ec2020bac98584d636 Mon Sep 17 00:00:00 2001 -From: Jan Beich -Date: Mon, 24 Jan 2022 12:17:52 +0000 -Subject: [PATCH] meson: drop unused argument for i18n.merge_file() - -Ignored in Meson < 0.60.0, deprecated since 0.60.1 and fatal since 0.61.0. - -data/meson.build:8:0: ERROR: Function does not take positional arguments. -data/meson.build:44:0: ERROR: Function does not take positional arguments. ---- - data/meson.build | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/data/meson.build b/data/meson.build -index a8b90fd1..2413531d 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -6,7 +6,6 @@ desktop_config = configuration_data() - desktop_config.set('icon', application_id) - desktop_config.set('binary', gitg_name) - i18n.merge_file( -- desktop, - type: 'desktop', - input: configure_file( - input: desktop + '.in.in', -@@ -42,7 +41,6 @@ appdata_config = configuration_data() - appdata_config.set('app-id', application_id) - appdata_config.set('gettext', gitg_name) - i18n.merge_file( -- appdata, - type: 'xml', - input: configure_file( - input: appdata + '.in.in', --- -GitLab - -- cgit v1.2.3 From 1468bf8db5f1ab65e0f8c44a2be2cdb370de1dca Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Thu, 12 Oct 2023 10:21:23 +0200 Subject: gnu: gnome-mahjongg: Update to 3.40.0. * gnu/packages/gnome.scm (gnome-mahjongg): Update to 3.40.0. --- gnu/packages/gnome.scm | 68 ++++++++++++++++++++++++-------------------------- 1 file changed, 32 insertions(+), 36 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d17100b999..5b4059f52e 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -12161,44 +12161,40 @@ (define in-abstract-sockets-test? #f) (license license:gpl2+))) (define-public gnome-mahjongg - ;; There hasn't been a GNOME Mahjongg release in a long time, and the last - ;; release doesn't build with a recent Meson, so use the latest commit. - (let ((commit "e9e73e5165e5968ff897e568f8eba10fc1eb207b") - (revision "0")) - (package - (name "gnome-mahjongg") - (version (git-version "3.38.3" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://gitlab.gnome.org/GNOME/gnome-mahjongg") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1cj0c076h7qfz77wpz8ypli60inj37fgw0cl9cc39b1kjfqcy3mb")))) - (build-system meson-build-system) - (arguments (list #:glib-or-gtk? #t)) - (native-inputs - (list appstream-glib - gettext-minimal - `(,glib "bin") ;for glib-compile-resources - `(,gtk "bin") ;for gtk-update-icon-cache - itstool - pkg-config - vala)) - (propagated-inputs - (list dconf)) - (inputs - (list glib - gtk - libadwaita)) - (synopsis "Mahjongg tile-matching game") - (description "GNOME Mahjongg is a game based on the classic Chinese + (package + (name "gnome-mahjongg") + (version "3.40.0") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.gnome.org/GNOME/gnome-mahjongg") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1yj41lj2vancjzwjcm5cdv48983jq05i6sw8p4nggyqwij3xpllj")))) + (build-system meson-build-system) + (arguments (list #:glib-or-gtk? #t)) + (native-inputs + (list appstream-glib + gettext-minimal + `(,glib "bin") ;for glib-compile-resources + `(,gtk "bin") ;for gtk-update-icon-cache + itstool + pkg-config + vala)) + (propagated-inputs + (list dconf)) + (inputs + (list glib + gtk + libadwaita)) + (synopsis "Mahjongg tile-matching game") + (description "GNOME Mahjongg is a game based on the classic Chinese tile-matching game Mahjongg. It features multiple board layouts, tile themes, and a high score table.") - (home-page "https://wiki.gnome.org/Apps/Mahjongg") - (license license:gpl2+)))) + (home-page "https://wiki.gnome.org/Apps/Mahjongg") + (license license:gpl2+))) (define-public gnome-themes-extra (package -- cgit v1.2.3 From d5ea7441be12f5d0bdda4ef5c168a98f43cc03c3 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Thu, 12 Oct 2023 10:26:28 +0200 Subject: gnu: gthumb: Update to 3.12.4. * gnu/packages/gnome.scm (gthumb): Update to 3.12.4. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 5b4059f52e..fc9db543f2 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -11802,7 +11802,7 @@ (define-public evolution (define-public gthumb (package (name "gthumb") - (version "3.12.2") + (version "3.12.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/gthumb/" @@ -11810,7 +11810,7 @@ (define-public gthumb "gthumb-" version ".tar.xz")) (sha256 (base32 - "09flm8s6jrvfya2ypw5873mnnani8ssy7wdv3ra1cljk4bjszy4p")))) + "1s4lqy883s296mbh4fywd1l3z79811ia00xs57c316pb1an97mmd")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t -- cgit v1.2.3 From f61d1d63d8d1635cac71f6865ee94a6e92411ddc Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Thu, 12 Oct 2023 10:30:54 +0200 Subject: gnu: gthumb: Use new input style. * gnu/packages/gnome.scm (gthumb)[inputs, native-inputs]: Drop labels. --- gnu/packages/gnome.scm | 42 +++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index fc9db543f2..cd3a59f3dd 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -11823,28 +11823,28 @@ (define-public gthumb (assoc-ref %outputs "out") "/lib/gthumb/extensions")))) (native-inputs - `(("desktop-file-utils" ,desktop-file-utils) ; for update-desktop-database - ("glib:bin" ,glib "bin") ; for glib-compile-resources - ("gtk+:bin" ,gtk+ "bin") ; for gtk-update-icon-cache - ("intltool" ,intltool) - ("itstool" ,itstool) - ("pkg-config" ,pkg-config) - ("python" ,python))) + (list desktop-file-utils ; for update-desktop-database + `(,glib "bin") ; for glib-compile-resources + `(,gtk+ "bin") ; for gtk-update-icon-cache + intltool + itstool + pkg-config + python)) (inputs - `(("clutter" ,clutter) - ("clutter-gst" ,clutter-gst) - ("clutter-gtk" ,clutter-gtk) - ("colord" ,colord) - ("exiv2" ,exiv2) - ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) - ("gstreamer" ,gstreamer) - ("gtk" ,gtk+) - ("libheif" ,libheif) - ("libjpeg" ,libjpeg-turbo) - ("libraw" ,libraw) - ("librsvg" ,(librsvg-for-system)) - ("libtiff" ,libtiff) - ("libwebp" ,libwebp))) + (list clutter + clutter-gst + clutter-gtk + colord + exiv2 + gsettings-desktop-schemas + gstreamer + gtk+ + libheif + libjpeg-turbo + libraw + (librsvg-for-system) + libtiff + libwebp)) (home-page "https://wiki.gnome.org/Apps/Gthumb") (synopsis "GNOME image viewer and browser") (description "GThumb is an image viewer, browser, organizer, editor and -- cgit v1.2.3 From cf8514ca428112f58e2e41a914fc57f8faebf84a Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Thu, 12 Oct 2023 10:37:02 +0200 Subject: gnu: workrave: Update to 1.10.52. * gnu/packages/gnome.scm (workrave): Update to 1.10.52. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index cd3a59f3dd..1bb9f8a432 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -11600,7 +11600,7 @@ (define-public soundconverter (define-public workrave (package (name "workrave") - (version "1.10.50") + (version "1.10.52") (source (origin (method git-fetch) @@ -11611,7 +11611,7 @@ (define-public workrave version))))) (file-name (git-file-name name version)) (sha256 - (base32 "0fj3fqmdn4nsjgvbbvzpxw2mgiihcr1zpb08amg2p6hg9n11y9bx")))) + (base32 "1rp6v9a8xmhjy75wmh7pnd092dn9nrb6wd4gcgr3c866qnpp6zsk")))) (build-system glib-or-gtk-build-system) (arguments ;; The only tests are maintainer tests (in po/), which fail. -- cgit v1.2.3 From 93a69ccbc5aea8e00fa3d40eb54641015edcb6f9 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Thu, 12 Oct 2023 10:37:13 +0200 Subject: gnu: workrave: Use new input style. * gnu/packages/gnome.scm (workrave)[native-inputs]: Drop labels. --- gnu/packages/gnome.scm | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 1bb9f8a432..5339c647ed 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -11627,17 +11627,17 @@ (define-public workrave libice libsm libxscrnsaver)) - (native-inputs `(("boost" ,boost) - ("pkg-config" ,pkg-config) - ("gettext" ,gettext-minimal) - ("autoconf" ,autoconf) - ("autoconf-archive" , autoconf-archive) - ("automake" ,automake) - ("libtool" ,libtool) - ("intltool" ,intltool) - ("gobject-introspection" ,gobject-introspection) - ("python3" ,python-3) - ("python-jinja2" ,python-jinja2))) + (native-inputs (list boost + pkg-config + gettext-minimal + autoconf + autoconf-archive + automake + libtool + intltool + gobject-introspection + python-3 + python-jinja2)) (synopsis "Tool to help prevent repetitive strain injury (RSI)") (description "Workrave is a program that assists in the recovery and prevention of -- cgit v1.2.3 From a7be930240c69207eee87368fe3f6ad57c9e24cf Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Thu, 12 Oct 2023 12:50:00 +0200 Subject: gnu: Remove gnome-todo. * gnu/packages/gnome.scm (gnome-todo): Delete variable. --- gnu/packages/gnome.scm | 3 --- 1 file changed, 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 5339c647ed..71645b2076 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10476,9 +10476,6 @@ (define-public endeavour to perfectly fit the GNOME desktop.") (license license:gpl3+))) -(define-public gnome-todo - (deprecated-package "gnome-todo" endeavour)) - (define-public dialect (package (name "dialect") -- cgit v1.2.3 From 3b5961c8df4d578c9fa5906b19c8b21eca1e2b8a Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Wed, 11 Oct 2023 22:23:46 +0200 Subject: gnu: tracker-miners: Update to 3.6.1. * gnu/packages/gnome.scm (tracker-miners): Update to 3.6.1. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 71645b2076..70e256cff5 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9561,7 +9561,7 @@ (define-public tracker (define-public tracker-miners (package (name "tracker-miners") - (version "3.5.2") + (version "3.6.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/tracker-miners/" @@ -9569,7 +9569,7 @@ (define-public tracker-miners "/tracker-miners-" version ".tar.xz")) (sha256 (base32 - "0sbc3fmvqg5hvdl5sq8w77lqmk9i6vc13izcxck8winrrgx93ys0")))) + "13ljx0birrav728ik3bnlwzgas8q6rbhjbvxp7zzwy6ambafiw7f")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t -- cgit v1.2.3 From aadfe59209db73b8549010988623ac9210d8194d Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Thu, 12 Oct 2023 10:40:46 +0200 Subject: gnu: gspell: Update to 1.12.2. * gnu/packages/gnome.scm (gspell): Update to 1.12.2. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 70e256cff5..f4cfba108b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -11157,7 +11157,7 @@ (define-public orca (define-public gspell (package (name "gspell") - (version "1.11.1") + (version "1.12.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -11165,7 +11165,7 @@ (define-public gspell name "-" version ".tar.xz")) (sha256 (base32 - "14h2w0yzqwaw5dykmhh21sy2c96g17waahg2lxc52xqiyzis8spg")))) + "0f91vl42i6fz5yrbw31biffbxqzwa24mw6qbfxmfnk3yhayr7sdl")))) (build-system glib-or-gtk-build-system) (arguments '(#:configure-flags (list "--enable-vala") -- cgit v1.2.3 From cc84687312024dba873e52a94d631390ebd6b0ef Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Thu, 12 Oct 2023 10:47:23 +0200 Subject: gnu: bluefish: Update to 2.2.14. * gnu/packages/gnome.scm (bluefish): Update to 2.2.14. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f4cfba108b..ccb50e43c6 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10992,14 +10992,14 @@ (define-public gcolor3 (define-public bluefish (package (name "bluefish") - (version "2.2.12") + (version "2.2.14") (source (origin (method url-fetch) (uri (string-append "https://www.bennewitz.com/bluefish/stable/source/" "bluefish-" version ".tar.gz")) (sha256 - (base32 "09hgxq139kbkjda5y073lqhq1z1x7cx0j80jh77afrqa3y9c53wl")))) + (base32 "0427xihrr7l1475qr3n40hz2xz6bqmfdbdg9pn8q7rvhvajyvjx7")))) (build-system gnu-build-system) (native-inputs (list desktop-file-utils intltool pkg-config)) -- cgit v1.2.3 From 14ea0a7ee9cac14071000f66a1e72e20d5d4a7ac Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Thu, 12 Oct 2023 12:59:21 +0200 Subject: gnu: gnome-bluetooth: Update to 42.6. * gnu/packages/gnome.scm (gnome-bluetooth): Update to 42.6. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ccb50e43c6..fa71b216fb 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9000,7 +9000,7 @@ (define-public libgtop (define-public gnome-bluetooth (package (name "gnome-bluetooth") - (version "42.4") + (version "42.6") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/gnome-bluetooth/" @@ -9008,7 +9008,7 @@ (define-public gnome-bluetooth "gnome-bluetooth-" version ".tar.xz")) (sha256 (base32 - "1p5wq3rh9p7fhka57qcds6lvphd26yyc18ilncx95jbcvcfcyvqx")))) + "1l2rp8nwsn9mbdj3gv3z4ks0q0jrbavh28mn4vdib1vi3rpzwr2q")))) (build-system meson-build-system) (native-inputs (list gettext-minimal -- cgit v1.2.3 From b4c907adb4b50418fdcf1d0d44ae2433a3570f1c Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Wed, 11 Oct 2023 22:24:37 +0200 Subject: gnu: webkitgtk: Update to 2.42.1. * gnu/packages/webkit.scm (webkitgtk): Update to 2.42.1. [inputs]: Add libjxl. --- gnu/packages/webkit.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 0c82435cde..100875dd52 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -127,13 +127,13 @@ (define-public wpebackend-fdo (define-public webkitgtk (package (name "webkitgtk") ; webkit2gtk4 - (version "2.40.5") + (version "2.42.1") (source (origin (method url-fetch) (uri (string-append "https://www.webkitgtk.org/releases/" name "-" version ".tar.xz")) (sha256 - (base32 "0zq32rn34v7hzr53s100r77aglbi6wffp9b13bcj31k6cfi53q3x")) + (base32 "1694dnqrjzcqh1hlpqspqz5xxvfd77af33f410ffaglxk34zlhbg")) (patches (search-patches "webkitgtk-adjust-bubblewrap-paths.patch")))) (build-system cmake-build-system) @@ -249,6 +249,7 @@ (define-public webkitgtk libgcrypt libgudev libjpeg-turbo + libjxl libmanette libnotify libpng -- cgit v1.2.3 From ee748c1df093dd63da982e2f3cd0e11c6633d3d6 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Thu, 12 Oct 2023 08:25:26 +0200 Subject: gnu: Make webkitgtk-next the new webkitgtk. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit As of version 2.42.0, the WebKit 6.0 typelib is considered stable. With GNOME itself moving to GTK4 as time marches on, we should reflect the fact that this is the preferred Webkit for future applications. * gnu/packages/webkit.scm (webkitgtk-next): Remove variable. Inline logic… (webkitgtk): … here. Move old value … (webkitgtk-for-gtk3): … here. (webkitgtk-with-libsoup2): Inherit from webkitgtk-for-gtk3. * gnu/packages/geo.scm (gnome-maps): Adjust accordingly. * gnu/packages/gnome.scm (gnome-initial-setup, sushi) (cambalache, devhelp, devhelp-with-libsoup2, gnome-online-accounts) (gnome-online-accounts-3.44, evolution-data-server, evolution-data-server-3.44) (lollypop, evolution, gnome-boxes, geary, komikku): Likewise. * gnu/packages/guile-xyz.scm (guile-gi, nomad): Likewise. * gnu/packages/lisp-xyz.scm (sbcl-cl-webkit): Likewise. * gnu/packages/mail.scm (balsa): Likewise. * gnu/packages/mate.scm (atril): Likewise. * gnu/packages/music.scm (ctrlr): Likewise. * gnu/packages/rednotebook.scm (rednotebook): Likewise. * gnu/packages/syndication.scm (gfeeds): Likewise. * gnu/packages/telegram.scm (telegram-desktop): Likewise. * gnu/packages/vnc.scm (remmina): Likewise. * gnu/packages/web-browsers.scm (nyxt): Likewise. --- gnu/packages/geo.scm | 2 +- gnu/packages/gnome.scm | 28 ++++++++++++++-------------- gnu/packages/guile-xyz.scm | 6 +++--- gnu/packages/lisp-xyz.scm | 2 +- gnu/packages/mail.scm | 2 +- gnu/packages/mate.scm | 2 +- gnu/packages/music.scm | 2 +- gnu/packages/rednotebook.scm | 3 ++- gnu/packages/syndication.scm | 2 +- gnu/packages/telegram.scm | 2 +- gnu/packages/vnc.scm | 2 +- gnu/packages/web-browsers.scm | 2 +- gnu/packages/webkit.scm | 27 ++++++++++++--------------- 13 files changed, 40 insertions(+), 42 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index 3c238cd62a..bbf371a88c 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -529,7 +529,7 @@ (define-public gnome-maps libsoup libxml2 rest-next - webkitgtk)) + webkitgtk-for-gtk3)) (synopsis "Graphical map viewer and wayfinding program") (description "GNOME Maps is a graphical map viewer. It uses map data from the OpenStreetMap project. It can provide directions for walking, bicycling, diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index fa71b216fb..f686636c5a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1577,7 +1577,7 @@ (define-public gnome-initial-setup polkit rest-next upower - webkitgtk-next)) + webkitgtk)) (synopsis "Initial setup wizard for GNOME desktop") (description "This package provides a set-up wizard when a user logs into GNOME for the first time. It typically provides a @@ -1665,7 +1665,7 @@ (define-public sushi libmusicbrainz libxml2 neon - webkitgtk)) + webkitgtk-for-gtk3)) (synopsis "File previewer for the GNOME desktop") (description "Sushi is a DBus-activated service that allows applications to preview files on the GNOME desktop.") @@ -3369,7 +3369,7 @@ (define-public cambalache python-pygobject python-lxml webkitgtk - webkitgtk-next)) + webkitgtk)) (native-inputs (list `(,glib "bin") gobject-introspection @@ -6130,7 +6130,7 @@ (define-public devhelp pkg-config)) (inputs (list amtk - webkitgtk)) + webkitgtk-for-gtk3)) (home-page "https://wiki.gnome.org/Apps/Devhelp") (synopsis "API documentation browser for GNOME") (description @@ -6143,7 +6143,7 @@ (define-public devhelp-with-libsoup2 (hidden-package (package/inherit devhelp (inputs (modify-inputs (package-inputs devhelp) - (replace "webkitgtk" webkitgtk-with-libsoup2)))))) + (replace "webkitgtk-for-gtk3" webkitgtk-with-libsoup2)))))) (define-public cogl (package @@ -8036,7 +8036,7 @@ (define-public gnome-online-accounts libsecret mit-krb5 rest-next - webkitgtk)) + webkitgtk-for-gtk3)) (synopsis "Single sign-on framework for GNOME") (home-page "https://wiki.gnome.org/Projects/GnomeOnlineAccounts") (description @@ -8069,7 +8069,7 @@ (define-public gnome-online-accounts-3.44 (delete 'disable-gtk-update-icon-cache))))) (inputs (modify-inputs (package-inputs gnome-online-accounts) (replace "rest" rest) - (replace "webkitgtk" webkitgtk-with-libsoup2))))) + (replace "webkitgtk-for-gtk3" webkitgtk-with-libsoup2))))) (define-public evolution-data-server (package @@ -8155,7 +8155,7 @@ (define-public evolution-data-server libphonenumber mit-krb5 openldap - webkitgtk)) + webkitgtk-for-gtk3)) (synopsis "Store address books and calendars") (home-page "https://wiki.gnome.org/Apps/Evolution") (description @@ -8182,7 +8182,7 @@ (define-public evolution-data-server-3.44 (modify-inputs (package-inputs evolution-data-server) (replace "gnome-online-accounts" gnome-online-accounts-3.44) (replace "libgweather4" libgweather) - (replace "webkitgtk" webkitgtk-with-libsoup2))) + (replace "webkitgtk-for-gtk3" webkitgtk-with-libsoup2))) (propagated-inputs (modify-inputs (package-propagated-inputs evolution-data-server) (delete "gtk") @@ -11315,7 +11315,7 @@ (define-public lollypop python-pygobject python-pylast totem-pl-parser - webkitgtk)) + webkitgtk-for-gtk3)) (propagated-inputs (list gst-plugins-good ;required to start lollypop gst-plugins-ugly)) ;required for streaming @@ -11784,7 +11784,7 @@ (define-public evolution libsoup nss openldap - webkitgtk + webkitgtk-for-gtk3 ytnef)) (home-page "https://gitlab.gnome.org/GNOME/evolution") (synopsis "Manage your email, contacts and schedule") @@ -12400,7 +12400,7 @@ (define-public gnome-boxes spice-gtk tracker vte - webkitgtk)) + webkitgtk-for-gtk3)) (home-page "https://wiki.gnome.org/Apps/Boxes") (synopsis "View, access, and manage remote and virtual systems") (description "GNOME Boxes is a simple application to view, access, and @@ -12474,7 +12474,7 @@ (define-public geary libstemmer libunwind sqlite - webkitgtk + webkitgtk-for-gtk3 ytnef)) (native-inputs (list appstream-glib @@ -13173,7 +13173,7 @@ (define-public komikku python-rarfile python-requests python-unidecode - webkitgtk-next)) + webkitgtk)) (native-inputs (list desktop-file-utils gettext-minimal diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index fc52af4612..871d418bc2 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -3350,7 +3350,7 @@ (define-public guile-gi (guix build utils) (ice-9 popen) (ice-9 rdelim)) - #:disallowed-references ,(list gtk+ webkitgtk) + #:disallowed-references ,(list gtk+ webkitgtk-for-gtk3) #:phases (modify-phases %standard-phases (add-after 'unpack 'remove-dotted-circle-from-combining-character @@ -3396,7 +3396,7 @@ (define-public guile-gi (propagated-inputs (list gobject-introspection)) (inputs (list guile-3.0 glib ;; For tests, only relevant when compiling natively - gtk+ webkitgtk)) + gtk+ webkitgtk-for-gtk3)) (home-page "https://github.com/spk121/guile-gi") (synopsis "GObject bindings for Guile") (description @@ -3935,7 +3935,7 @@ (define-public nomad ("glib-networking" ,glib-networking) ("gtk+" ,gtk+) ("gtk+:bin" ,gtk+ "bin") - ("webkitgtk" ,webkitgtk) + ("webkitgtk" ,webkitgtk-for-gtk3) ("gtksourceview" ,gtksourceview-4) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("vte" ,vte) diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm index 5ba5c7d519..8cda1d00ab 100644 --- a/gnu/packages/lisp-xyz.scm +++ b/gnu/packages/lisp-xyz.scm @@ -5039,7 +5039,7 @@ (define-public sbcl-cl-webkit (inputs `(("cffi" ,sbcl-cffi) ("cl-cffi-gtk" ,sbcl-cl-cffi-gtk) - ("webkitgtk" ,webkitgtk))) + ("webkitgtk" ,webkitgtk-for-gtk3))) (native-inputs `(;; Tests seem to need Xorg. ;; ("xorg-server" ,xorg-server-for-tests) diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index be458a2d92..5e65ded3f2 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm @@ -3915,7 +3915,7 @@ (define-public balsa libsecret openldap sqlite - webkitgtk)) + webkitgtk-for-gtk3)) (native-inputs (list compface `(,glib "bin") intltool pkg-config yelp-tools)) diff --git a/gnu/packages/mate.scm b/gnu/packages/mate.scm index 5c3b4a265e..5a6c6b5b64 100644 --- a/gnu/packages/mate.scm +++ b/gnu/packages/mate.scm @@ -775,7 +775,7 @@ (define-public atril ;; Build libkpathsea as a shared library for DVI support. ;; ("libkpathsea" ,texlive-bin) ("poppler" ,poppler) - ("webkitgtk" ,webkitgtk))) + ("webkitgtk" ,webkitgtk-for-gtk3))) (home-page "https://mate-desktop.org") (synopsis "Document viewer for Mate") (description diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index 6b19e9dde4..f6d418ce81 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm @@ -538,7 +538,7 @@ (define-public ctrlr freetype libiberty libx11 - webkitgtk)) + webkitgtk-for-gtk3)) (native-inputs (list pkg-config)) (home-page "https://ctrlr.org/") diff --git a/gnu/packages/rednotebook.scm b/gnu/packages/rednotebook.scm index f63104ad32..a5dcc26efd 100644 --- a/gnu/packages/rednotebook.scm +++ b/gnu/packages/rednotebook.scm @@ -71,7 +71,8 @@ (define-public rednotebook `("LD_LIBRARY_PATH" ":" prefix (,webkitgtk-path))) #t)))))) (inputs - (list gtk+ gtksourceview-3 python-pyyaml python-pygobject webkitgtk)) + (list gtk+ gtksourceview-3 python-pyyaml python-pygobject + webkitgtk-for-gtk3)) ;; TODO: package the following for python3 (if possible), add them as ;; dependencies, and remove them from rednotebook source: ;; pygtkspellcheck, elib.intl, msgfmt, txt2tags diff --git a/gnu/packages/syndication.scm b/gnu/packages/syndication.scm index ac00d396b5..ea42c579cb 100644 --- a/gnu/packages/syndication.scm +++ b/gnu/packages/syndication.scm @@ -622,7 +622,7 @@ (define-public gfeeds python-readability-lxml python-requests syndication-domination - webkitgtk-next)) + webkitgtk)) (home-page "https://gfeeds.gabmus.org/") (synopsis "Easy-to-use GTK+ RSS/Atom feed reader") (description "Feeds is an RSS/Atom feed reader made with GTK+ diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index d3276cbe7c..af90fc35eb 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -531,7 +531,7 @@ (define-public telegram-desktop rnnoise wayland wayland-protocols - webkitgtk + webkitgtk-for-gtk3 webrtc-for-telegram-desktop xcb-util-keysyms xxhash diff --git a/gnu/packages/vnc.scm b/gnu/packages/vnc.scm index 8ba1292e28..7b39aba58d 100644 --- a/gnu/packages/vnc.scm +++ b/gnu/packages/vnc.scm @@ -151,7 +151,7 @@ (define-public remmina telepathy-glib vte ; for st plugin wayland - webkitgtk ; for www plugin + webkitgtk-for-gtk3 ; for www plugin libx11 libxext ; for xdmcp plugin xdg-utils diff --git a/gnu/packages/web-browsers.scm b/gnu/packages/web-browsers.scm index d0b4e9f971..b5a29647bb 100644 --- a/gnu/packages/web-browsers.scm +++ b/gnu/packages/web-browsers.scm @@ -711,7 +711,7 @@ (define-public nyxt gsettings-desktop-schemas cl-gobject-introspection gtk+ ; For the main loop - webkitgtk ; Required when we use its typelib + webkitgtk-for-gtk3 ; Required when we use its typelib gobject-introspection pkg-config)) (synopsis "Extensible web-browser in Common Lisp") diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 100875dd52..a374711119 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -126,7 +126,7 @@ (define-public wpebackend-fdo (define-public webkitgtk (package - (name "webkitgtk") ; webkit2gtk4 + (name "webkitgtk") (version "2.42.1") (source (origin (method url-fetch) @@ -149,10 +149,8 @@ (define-public webkitgtk #:build-type "Release" #:configure-flags #~(list "-DPORT=GTK" - ;; GTKDOC will be removed upstream soon in favor of - ;; gi-docgen; it is normally disabled because the - ;; doc is rather expensive to build. - "-DENABLE_GTKDOC=ON" + "-DENABLE_INTROSPECTION=ON" + "-DUSE_GTK4=ON" ;; The minibrowser, not built by default, is a good ;; tool to validate the good operation of ;; webkitgtk. @@ -232,7 +230,7 @@ (define-public webkitgtk ruby-2.7 unifdef)) (propagated-inputs - (list gtk+ libsoup)) + (list gtk libsoup)) (inputs (list at-spi2-core bubblewrap @@ -251,7 +249,6 @@ (define-public webkitgtk libjpeg-turbo libjxl libmanette - libnotify libpng libseccomp libsecret @@ -284,28 +281,28 @@ (define-public webkitgtk license:bsd-2 license:bsd-3)))) -(define-public webkitgtk-next +(define-public webkitgtk-for-gtk3 (package (inherit webkitgtk) - (name "webkitgtk-next") ; webkit2gtk5 + (name "webkitgtk-for-gtk3") (arguments (substitute-keyword-arguments (package-arguments webkitgtk) ((#:configure-flags flags) - #~(cons* "-DENABLE_INTROSPECTION=ON" - "-DUSE_GTK4=ON" - (delete "-DENABLE_GTKDOC=ON" #$flags))))) + #~(cons* "-DENABLE_GTKDOC=ON" + (delete "-DENABLE_INTROSPECTION=ON" + (delete "-DUSE_GTK4=ON" #$flags)))))) (propagated-inputs (modify-inputs (package-propagated-inputs webkitgtk) - (replace "gtk+" gtk))) + (replace "gtk" gtk+))) (inputs (modify-inputs (package-inputs webkitgtk) - (delete "libnotify"))))) + (prepend libnotify))))) ;;; Required by e.g. emacs-next-pgtk, emacs-xwidgets, and some other GNOME ;;; packages for webkit2gtk-4.0. See also the upstream tracker for libsoup 3: ;;; https://gitlab.gnome.org/GNOME/libsoup/-/issues/218. (define-public webkitgtk-with-libsoup2 - (package/inherit webkitgtk + (package/inherit webkitgtk-for-gtk3 (name "webkitgtk-with-libsoup2") (arguments (substitute-keyword-arguments (package-arguments webkitgtk) ((#:configure-flags flags) -- cgit v1.2.3 From 574047a6005cfaada9e8210682a3717400744e87 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Thu, 12 Oct 2023 12:54:19 +0200 Subject: gnu: nautilus: Update to 44.2.1. * gnu/packages/gnome.scm (nautilus): Update to 44.2.1. --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f686636c5a..2b5f1d9994 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9679,7 +9679,7 @@ (define-public tracker-miners (define-public nautilus (package (name "nautilus") - (version "44.2") + (version "44.2.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -9687,7 +9687,7 @@ (define-public nautilus name "-" version ".tar.xz")) (sha256 (base32 - "1rfkh43iw4bqv36ccznl3lh9g0p9pa8xqyjk167qlvar4xchcji7")) + "0k0yyh7sqan68c8n0ahwlw0xyiq25f57inm5qrpsgxr78w12zinr")) (patches (search-patches "nautilus-extension-search-path.patch")))) (build-system meson-build-system) -- cgit v1.2.3 From 9bac1cad271de4f4436755c296577c4e185d564c Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Mon, 23 Oct 2023 00:20:16 +0200 Subject: gnu: webkitgtk-with-libsoup2: Use keyword arguments for GTK3. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This fixes an error commit ee748c1df093dd63da982e2f3cd0e11c6633d3d6, where webkitgtk-with-libsoup2 would be built for GTK4 – a contradiction, as GTK4 builds require libsoup3. See also . * gnu/packages/webkit.scm (webkitgtk-with-libsoup2)[arguments]: Use package-arguments of webkitgtk-for-gtk3 rather than webkitgtk. Co-authored-by: Vivien Kraus --- gnu/packages/webkit.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index a374711119..6810ba74e7 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -304,7 +304,7 @@ (define-public webkitgtk-for-gtk3 (define-public webkitgtk-with-libsoup2 (package/inherit webkitgtk-for-gtk3 (name "webkitgtk-with-libsoup2") - (arguments (substitute-keyword-arguments (package-arguments webkitgtk) + (arguments (substitute-keyword-arguments (package-arguments webkitgtk-for-gtk3) ((#:configure-flags flags) #~(cons "-DUSE_SOUP2=ON" #$flags)))) (propagated-inputs -- cgit v1.2.3 From 207b4910805d70a828b3ef16e1856daf4c20847f Mon Sep 17 00:00:00 2001 From: Jack Hill Date: Sun, 22 Oct 2023 23:29:58 -0400 Subject: gnu: epiphany: Use webkitgtk-for-gtk3. * gnu/packages/gnome.scm (epiphany)[inputs]: Replace webkitgtk with webkitgtk-for-gtk3. Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 2b5f1d9994..0f44e3d580 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7160,7 +7160,7 @@ (define-public epiphany libxslt nettle ; for hogweed sqlite - webkitgtk)) + webkitgtk-for-gtk3)) (home-page "https://wiki.gnome.org/Apps/Web") (synopsis "GNOME web browser") (description -- cgit v1.2.3 From da716c8b9cdc358609a368bd5da70b31cd97a938 Mon Sep 17 00:00:00 2001 From: Jack Hill Date: Sun, 22 Oct 2023 23:29:59 -0400 Subject: gnu: epiphany: Update to 42.5. * gnu/packages/gnome.scm (epiphany): Update to 42.5. Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 0f44e3d580..87b860f9d9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7094,7 +7094,7 @@ (define-public simple-scan (define-public epiphany (package (name "epiphany") - (version "42.4") + (version "42.5") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/epiphany/" @@ -7102,7 +7102,7 @@ (define-public epiphany "epiphany-" version ".tar.xz")) (sha256 (base32 - "0q08ixzgp341g5pq6rfy5q75m9bvddvl8na3qa5v5vi056nkh29p")))) + "0mln4iym0fqkri959650cccdhq3r4d4kfn8yld0vvdmzskmak4a6")))) (build-system meson-build-system) (arguments (list -- cgit v1.2.3 From 2677bf985c0025d04ffdcff31763978b633dbc58 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Tue, 24 Oct 2023 19:22:21 +0200 Subject: gnu: webkitgtk-with-libsoup2: Use propagated inputs from GTK3. This fixes an error in commits ee748c1df093dd63da982e2f3cd0e11c6633d3d6 and 9bac1cad271de4f4436755c296577c4e185d564c, the latter of which was missing a hunk to address the failing build of the former. See for the full patch. * gnu/packages/webkit.scm (webkitgtk-with-libsoup2)[propagated-inputs]: Use package-propagated-inputs from webkitgtk-for-gtk3 rather than webkitgtk. Co-authored-by: Vivien Kraus Change-Id: I3f2bfb127da4021d3b557d15cfdae6d6f54e7935 --- gnu/packages/webkit.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 6810ba74e7..7e0370abc0 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -308,7 +308,7 @@ (define-public webkitgtk-with-libsoup2 ((#:configure-flags flags) #~(cons "-DUSE_SOUP2=ON" #$flags)))) (propagated-inputs - (modify-inputs (package-propagated-inputs webkitgtk) + (modify-inputs (package-propagated-inputs webkitgtk-for-gtk3) (replace "libsoup" libsoup-minimal-2))))) (define-public wpewebkit -- cgit v1.2.3 From d34e4676eda7e222e55ab0c039e02478d50d45a2 Mon Sep 17 00:00:00 2001 From: Bruno Victal Date: Fri, 27 Oct 2023 20:03:14 +0100 Subject: gnu: xdgmime: Update to 0.0-2.1792967. * gnu/packages/freedesktop.scm (xdgmime): Update to 0.0-2.1792967. Change-Id: I5d65544ad01526157dbe553d98dc78db037546c8 Signed-off-by: Liliana Marie Prikler --- gnu/packages/freedesktop.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index c52e921756..e482297bc1 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -486,8 +486,8 @@ (define-public maliit-keyboard (define xdgmime ;; No public release, match commit to the one used in the ;; shared-mime-info release. - (let ((commit "de283fc430460b9b3a7e61432a6d273cd64cb102") - (revision "1")) + (let ((commit "179296748e92bd91bf531656632a1056307fb7b7") + (revision "2")) (package (name "xdgmime") (version (git-version "0.0" revision commit)) @@ -499,7 +499,7 @@ (define xdgmime (file-name (git-file-name name version)) (sha256 (base32 - "0m9k7nfxgchb9j0xh9cwsldz6564qisqdkvlhgkcgc0grd4nfbn9")))) + "04bpbqlkmwi2pqx1lj3awa9f9gwp4n91fpnz8hbbd0hl8x41przm")))) (build-system gnu-build-system) (arguments (list -- cgit v1.2.3 From 1b58b5f76b090305206dce0456c0497f651ad680 Mon Sep 17 00:00:00 2001 From: Bruno Victal Date: Fri, 27 Oct 2023 20:03:15 +0100 Subject: gnu: shared-mime-info: Update to 2.3. * gnu/packages/freedesktop.scm (shared-mime-info): Update to 2.3. Signed-off-by: Liliana Marie Prikler --- gnu/packages/freedesktop.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index e482297bc1..d920afe1e7 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -533,7 +533,7 @@ (define xdgmime (define-public shared-mime-info (package (name "shared-mime-info") - (version "2.2") + (version "2.3") (source (origin (method git-fetch) (uri (git-reference @@ -542,7 +542,7 @@ (define-public shared-mime-info (file-name (git-file-name name version)) (sha256 (base32 - "04dfnnflspprxg7qia3whz1754lfvgi4ihvmihg379936zy5xd22")) + "0w8sbhz00sk6k8pyiykfig4rm22jyibalj7g22j9qf3d2nfy8ivh")) (patches (search-patches "shared-mime-info-xdgmime-path.patch")))) (build-system meson-build-system) (arguments -- cgit v1.2.3 From 0ea85e854df4db7e135124262350e888e50af042 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Fri, 27 Oct 2023 19:35:49 +0200 Subject: gnu: xdg-dbus-proxy: Update to 0.1.5. * gnu/packages/glib.scm (xdg-dbus-proxy): Update to 0.1.5. Change-Id: I6d50590dba59a0f177b73bf055a2b9c21ceadd25 Signed-off-by: Liliana Marie Prikler --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 8af89d60e0..b6610ab2c7 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -1435,7 +1435,7 @@ (define-public template-glib (define-public xdg-dbus-proxy (package (name "xdg-dbus-proxy") - (version "0.1.2") + (version "0.1.5") (source (origin (method url-fetch) (uri (string-append "https://github.com/flatpak/xdg-dbus-proxy" @@ -1443,7 +1443,7 @@ (define-public xdg-dbus-proxy "/xdg-dbus-proxy-" version ".tar.xz")) (sha256 (base32 - "03sj1h0c2l08xa8phw013fnxr4fgav7l2mkjhzf9xk3dykwxcj8p")))) + "1yv10v7gpv5z0iii7p3rs2h9wx6sigldycjlkpyyal06iapwy786")))) (build-system gnu-build-system) (native-inputs (list pkg-config -- cgit v1.2.3 From 52294240c20d0deae445006a78b77508f5618dc2 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Fri, 27 Oct 2023 19:36:50 +0200 Subject: gnu: template-glib: Update to 3.36.1. * gnu/packages/glib.scm (template-glib): Update to 3.36.1. [#:configure-flags]: Update variable name. Change-Id: I90761ccfe4f4200060b7cbf05de7be9fc91fa850 Signed-off-by: Liliana Marie Prikler --- gnu/packages/glib.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index b6610ab2c7..cddb3f6d0a 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -1398,7 +1398,7 @@ (define perl-net-dbus-glib (define-public template-glib (package (name "template-glib") - (version "3.34.0") + (version "3.36.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -1406,10 +1406,10 @@ (define-public template-glib name "-" version ".tar.xz")) (sha256 (base32 - "1z9xkin5fyfh071ma9y045jcw83hgx33dfbjraw6cxk0qdmfysr1")))) + "00x5yq1yidxxv6hmlvblpp2k0vf60s0xzyi0psplbmss70bpl5iv")))) (build-system meson-build-system) (arguments - `(#:configure-flags '("-D" "enable_gtk_doc=true"))) + `(#:configure-flags '("-D" "gtk_doc=true"))) (inputs `(("gettext" ,gettext-minimal) ("glib" ,glib) -- cgit v1.2.3 From 07495d93985e4bf64bc1a9fbd7074a711b8c7926 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Fri, 27 Oct 2023 19:37:50 +0200 Subject: gnu: template-glib: Update style. * gnu/packages/glib.scm (template-glib) [arguments]: Convert to list of G-Expressions. [inputs]: Drop labels. [native-inputs]: Drop labels. Change-Id: Ie9bc77f9cba1f8248af0c81bb2667c035e596d47 Signed-off-by: Liliana Marie Prikler --- gnu/packages/glib.scm | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index cddb3f6d0a..af3f15b0ea 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -1409,18 +1409,15 @@ (define-public template-glib "00x5yq1yidxxv6hmlvblpp2k0vf60s0xzyi0psplbmss70bpl5iv")))) (build-system meson-build-system) (arguments - `(#:configure-flags '("-D" "gtk_doc=true"))) - (inputs - `(("gettext" ,gettext-minimal) - ("glib" ,glib) - ("gobject-introspection" ,gobject-introspection))) + (list #:configure-flags #~'("-D" "gtk_doc=true"))) + (inputs (list gettext-minimal glib gobject-introspection)) (native-inputs - `(("bison" ,bison) - ("flex" ,flex) - ("glib:bin" ,glib "bin") ;; For glib-mkenums - ("gtk-doc" ,gtk-doc/stable) - ("pkg-config" ,pkg-config) - ("vala" ,vala))) + (list bison + flex + `(,glib "bin") ;for glib-mkenums + gtk-doc/stable + pkg-config + vala)) (home-page "https://gitlab.gnome.org/GNOME/template-glib") (synopsis "Library for template expansion") (description -- cgit v1.2.3 From 5aac9ebe8cd044aa3aa9d53fc5891a5e4dd8a16b Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Fri, 27 Oct 2023 19:38:50 +0200 Subject: gnu: appstream-glib: Update to 0.8.2. * gnu/packages/glib.scm (appstream-glib): Update to 0.8.2. [inputs]: Replace libsoup with curl. Change-Id: Icea8c8330351127d0cc85e74716ebd3c3c4a88fa Signed-off-by: Liliana Marie Prikler --- gnu/packages/glib.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index af3f15b0ea..40de477d75 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -45,6 +45,7 @@ (define-module (gnu packages glib) #:use-module (gnu packages check) #:use-module (gnu packages compression) #:use-module (gnu packages cpp) + #:use-module (gnu packages curl) #:use-module (gnu packages docbook) #:use-module (gnu packages documentation) #:use-module (gnu packages elf) @@ -1293,7 +1294,7 @@ (define-public sdbus-c++ (define-public appstream-glib (package (name "appstream-glib") - (version "0.7.18") + (version "0.8.2") (source (origin (method url-fetch) (uri (string-append "https://people.freedesktop.org/~hughsient/" @@ -1301,7 +1302,7 @@ (define-public appstream-glib "appstream-glib-" version ".tar.xz")) (sha256 (base32 - "00j0kkgf224nzmrha72g8pd72mymhph7vaisj35i4ffy7cpd47na")))) + "15lbrmyx94cf6p6svq02yiskh31xidq092c711pqs16mml06a9bi")))) (build-system meson-build-system) (native-inputs `(("gettext" ,gettext-minimal) @@ -1318,7 +1319,7 @@ (define-public appstream-glib ("gtk+" ,gtk+) ("json-glib" ,json-glib) ("libarchive" ,libarchive) - ("libsoup" ,libsoup-minimal-2))) + ("curl" ,curl))) (arguments `(#:configure-flags (list "-Ddep11=false" -- cgit v1.2.3 From 7048d79dcd91b92111b9813382cfe0ec1be4f501 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Fri, 27 Oct 2023 19:39:50 +0200 Subject: gnu: appstream-glib: Update style. * gnu/packages/glib.scm (appstream-glib) [propagated-inputs]: Drop labels. [inputs, native-inputs]: Drop labels. Sort alphabetically. [arguments]: Convert to list of G-Expressions. [#:phases]: Remove trailing #t. [description]: Break long line. Change-Id: I504df11ec6fc5b9d9fe70e4e32e7910f93eeb81e Signed-off-by: Liliana Marie Prikler --- gnu/packages/glib.scm | 64 ++++++++++++++++++++++++++------------------------- 1 file changed, 33 insertions(+), 31 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 40de477d75..3f70808e3c 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -1305,42 +1305,44 @@ (define-public appstream-glib "15lbrmyx94cf6p6svq02yiskh31xidq092c711pqs16mml06a9bi")))) (build-system meson-build-system) (native-inputs - `(("gettext" ,gettext-minimal) - ("gsettings" ,gsettings-desktop-schemas) ; for ‘org.gnome.system.proxy’ - ("glib:bin" ,glib "bin") ; for glib-compile-resources - ("pkg-config" ,pkg-config))) + (list gettext-minimal + `(,glib "bin") ;for glib-compile-resources + gsettings-desktop-schemas ;for ‘org.gnome.system.proxy’ + pkg-config)) (propagated-inputs - `(("gcab" ,gcab) ; for .pc file - ("gdk-pixbuf" ,gdk-pixbuf) ; for .pc file - ("libuuid" ,util-linux "lib"))) ; for .pc file + (list gcab ;for .pc file + gdk-pixbuf ;same + `(,util-linux "lib"))) ;libuuid, for .pc file (inputs - `(("glib" ,glib) - ("gperf" ,gperf) - ("gtk+" ,gtk+) - ("json-glib" ,json-glib) - ("libarchive" ,libarchive) - ("curl" ,curl))) + (list curl + gperf + gtk+ + json-glib + libarchive + glib)) (arguments - `(#:configure-flags - (list "-Ddep11=false" - "-Dintrospection=false" ; avoid g-ir-scanner dependency - "-Drpm=false" - "-Dstemmer=false") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-tests - (lambda _ - (substitute* "libappstream-glib/as-self-test.c" - (("g_test_add_func.*as_test_store_local_appdata_func);") "")) - #t)) - (add-before 'check 'set-home - (lambda _ - ;; Some tests want write access there. - (setenv "HOME" "/tmp")))))) + (list + #:configure-flags + #~(list "-Ddep11=false" + "-Dintrospection=false" ; avoid g-ir-scanner dependency + "-Drpm=false" + "-Dstemmer=false") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-tests + (lambda _ + (substitute* "libappstream-glib/as-self-test.c" + (("g_test_add_func.*as_test_store_local_appdata_func);") "")))) + (add-before 'check 'set-home + (lambda _ + ;; Some tests want write access there. + (setenv "HOME" "/tmp")))))) (home-page "https://github.com/hughsie/appstream-glib") (synopsis "Library for reading and writing AppStream metadata") - (description "This library provides objects and helper methods to help -reading and writing @uref{https://www.freedesktop.org/wiki/Distributions/AppStream,AppStream} + (description + "This library provides objects and helper methods to help +reading and writing +@uref{https://www.freedesktop.org/wiki/Distributions/AppStream,AppStream} metadata.") (license license:lgpl2.1+))) -- cgit v1.2.3 From 2f5ba4dda3ff67e892b04d4db922b7317a3c910d Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Fri, 27 Oct 2023 19:40:50 +0200 Subject: gnu: sdbus-c++: Update to 1.4.0. * gnu/packages/glib.scm (sdbus-c++): Update to 1.4.0. Change-Id: Ied3879a562bfea385ff7f626f35389e380a44a63 Signed-off-by: Liliana Marie Prikler --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 3f70808e3c..e9393dd534 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -1256,7 +1256,7 @@ (define-public sdbus-c++ ;; file. (package (name "sdbus-c++") - (version "1.3.0") + (version "1.4.0") (source (origin (method git-fetch) (uri (git-reference @@ -1265,7 +1265,7 @@ (define-public sdbus-c++ (file-name (git-file-name name version)) (sha256 (base32 - "03maivi3nj4g5wcydk9ih703ivmqkc93yip47wlyjni6dhikzzsb")))) + "111l2rl0pg9r5cdrhqpac4v22cnq41skxxfk3cng81l0n05v1sh0")))) (build-system cmake-build-system) (arguments (list -- cgit v1.2.3 From 5346c72126244576e85e6f116053888c13c71c0b Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Fri, 27 Oct 2023 19:41:50 +0200 Subject: gnu: perl-glib-object-introspection: Update to 0.051. * gnu/packages/glib.scm (perl-glib-object-introspection): Update to 0.051. Change-Id: I7e6c79bca58d9054df186566ce2bf019764dc131 Signed-off-by: Liliana Marie Prikler --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index e9393dd534..9ab6002338 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -1085,14 +1085,14 @@ (define-public perl-glib (define-public perl-glib-object-introspection (package (name "perl-glib-object-introspection") - (version "0.049") + (version "0.051") (source (origin (method url-fetch) (uri (string-append "mirror://cpan/authors/id/X/XA/XAOC/" "Glib-Object-Introspection-" version ".tar.gz")) (sha256 - (base32 "0mxg6pz8qfyipw0ypr54alij0c4adzg94f62702b2a6hkp5jhij6")))) + (base32 "12802l87mx65lswiwlc394fkb74cmsqn88n2qy119b40rhfn2sb5")))) (build-system perl-build-system) (native-inputs (list perl-extutils-depends perl-extutils-pkgconfig)) -- cgit v1.2.3 From e41f35ba08c89afcea5bc2d458f185f8bef2e5a4 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Fri, 27 Oct 2023 19:42:51 +0200 Subject: gnu: perl-glib: Update to 1.3294. * gnu/packages/glib.scm (perl-glib): Update to 1.3294. Change-Id: I8cfc1d61e6c5d0b5e37f1eb210951c9c609650d9 Signed-off-by: Liliana Marie Prikler --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 9ab6002338..ba827e0531 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -1059,7 +1059,7 @@ (define-public python-pygobject (define-public perl-glib (package (name "perl-glib") - (version "1.3293") + (version "1.3294") (source (origin (method url-fetch) (uri (string-append @@ -1067,7 +1067,7 @@ (define-public perl-glib version ".tar.gz")) (sha256 (base32 - "005m3inz12xcsd5sr056cm1kbhmxsx2ly88ifbdv6p6cwz0s05kk")))) + "1fsw9sjfz1irlhnsk5n1xpb181vvq1dsxrw5vrsp066cdflga5fp")))) (build-system perl-build-system) (native-inputs (list perl-extutils-depends perl-extutils-pkgconfig)) -- cgit v1.2.3 From 54eb6d6e8ad2955bd84bb6502a241c2c4878dcdd Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Fri, 27 Oct 2023 19:43:51 +0200 Subject: gnu: python-pygobject: Update to 3.46.0. * gnu/packages/glib.scm (python-pygobject): Update to 3.46.0. [snippet]: Also remove test_overrides_gdk.py. Change-Id: Ia046b0a597097e27c48428ec893b241d17b9006d Signed-off-by: Liliana Marie Prikler --- gnu/packages/glib.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index ba827e0531..2c813fd594 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -1007,7 +1007,7 @@ (define-public glibmm-2.64 (define-public python-pygobject (package (name "python-pygobject") - (version "3.44.1") + (version "3.46.0") (source (origin (method url-fetch) @@ -1016,7 +1016,7 @@ (define-public python-pygobject "/pygobject-" version ".tar.xz")) (sha256 (base32 - "042pmpyaz7bsbr68znnwdqyhs3j3cajib0k45v1hrs8v6b8has1w")) + "1z6aagb46fhhdd0bb3zk6dfdw3s4y2fva0vv3jpwjj6mvar0hq22")) (modules '((guix build utils))) (snippet '(begin @@ -1025,7 +1025,8 @@ (define-public python-pygobject (with-directory-excursion "tests" ;; FIXME: These tests require Gdk and/or Gtk 4. (for-each delete-file - '("test_atoms.py" "test_overrides_gtk.py")) + '("test_atoms.py" "test_overrides_gtk.py" + "test_overrides_gdk.py")) #t))))) (build-system meson-build-system) (arguments -- cgit v1.2.3 From b125b9deee25940aaf743f984875c033b1fe380a Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Fri, 27 Oct 2023 19:44:52 +0200 Subject: gnu: python-pygobject: Update style. * gnu/packages/glib.scm (python-pygobject) [source]: Reindent. : Convert to G-Expression. Remove trailing #f. [arguments]: Convert to list of G-Expressions. [native-inputs]: Drop labels. Change-Id: I325de196b79cbdd0acaed3c40be42aa7335abcae Signed-off-by: Liliana Marie Prikler --- gnu/packages/glib.scm | 42 ++++++++++++++++++++---------------------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 2c813fd594..1012d2190b 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -1015,33 +1015,31 @@ (define-public python-pygobject (version-major+minor version) "/pygobject-" version ".tar.xz")) (sha256 - (base32 - "1z6aagb46fhhdd0bb3zk6dfdw3s4y2fva0vv3jpwjj6mvar0hq22")) + (base32 "1z6aagb46fhhdd0bb3zk6dfdw3s4y2fva0vv3jpwjj6mvar0hq22")) (modules '((guix build utils))) (snippet - '(begin - ;; We disable these tests in a snippet so that they are inherited - ;; by the Python 2 variant which is built differently. - (with-directory-excursion "tests" - ;; FIXME: These tests require Gdk and/or Gtk 4. - (for-each delete-file - '("test_atoms.py" "test_overrides_gtk.py" - "test_overrides_gdk.py")) - #t))))) + ;; We disable these tests in a snippet so that they are inherited + ;; by the Python 2 variant which is built differently. + #~(with-directory-excursion "tests" + ;; FIXME: These tests require Gdk and/or Gtk 4. + (for-each delete-file + '("test_atoms.py" "test_overrides_gtk.py" + "test_overrides_gdk.py")))))) (build-system meson-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (when tests? - ;; The default 90 seconds can be too low on slower machines. - (invoke "meson" "test" "--timeout-multiplier" "5"))))))) + (list + #:phases + #~(modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + ;; The default 90 seconds can be too low on slower machines. + (invoke "meson" "test" "--timeout-multiplier" "5"))))))) (native-inputs - `(("glib-bin" ,glib "bin") - ("pkg-config" ,pkg-config) - ("python-pytest" ,python-pytest) - ("python-wrapper" ,python-wrapper))) ; For patching shebangs + (list `(,glib "bin") + pkg-config + python-pytest + python-wrapper)) ; For patching shebangs (inputs (list python python-pycairo gobject-introspection)) (propagated-inputs -- cgit v1.2.3 From e4405f3e8bf3389df8871e24d0040667cb0d3dc9 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Fri, 27 Oct 2023 19:45:52 +0200 Subject: gnu: glib: Update to 2.78.0. * gnu/packages/glib.scm (glib): Update to 2.78.0. Change-Id: Ibfe1f44e15510ccb2e7fd002be63c5dceab34ca1 Signed-off-by: Liliana Marie Prikler --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 1012d2190b..ce11b9aeda 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -218,7 +218,7 @@ (define-public dbus-verbose (define glib (package (name "glib") - (version "2.76.1") + (version "2.78.0") (source (origin (method url-fetch) @@ -227,7 +227,7 @@ (define glib name "/" (string-take version 4) "/" name "-" version ".tar.xz")) (sha256 - (base32 "17x1zpr2avj8hjbpc6hp2sf2885lxac46v0kajsgan3929m0zp23")) + (base32 "0c3vagxl77wma85qinbj974jvw96n5bvch2m7hqcwxq8fa5spsj4")) (patches (search-patches "glib-appinfo-watch.patch" "glib-skip-failing-test.patch")) -- cgit v1.2.3 From b175ff304342c3bc3a6e4da6400655a0f7b0499c Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Fri, 27 Oct 2023 19:46:53 +0200 Subject: gnu: glibmm: Update to 2.78.0. * gnu/packages/glib.scm (glibmm): Update to 2.78.0. Change-Id: I6751a06ff21351564381421d414ddc94bd0a0046 Signed-off-by: Liliana Marie Prikler --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index ce11b9aeda..3f4d055074 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -937,7 +937,7 @@ (define-public libsigc++-2 (define glibmm (package (name "glibmm") - (version "2.76.0") + (version "2.78.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/glibmm/" @@ -945,7 +945,7 @@ (define glibmm "/glibmm-" version ".tar.xz")) (sha256 (base32 - "1cia8vrpwzn8zwalws42mga5hi965840m5s8dvfzv55xx86dhdw6")))) + "0l7gld1ghynlxdm55l8dn3w4lfbwgrkw7flbdnh04vwrchjqfbjx")))) (build-system meson-build-system) (outputs '("out" "doc")) (arguments -- cgit v1.2.3 From 7503c5ffca811fdc1fc24d281ab1cbd142bd8f2a Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Fri, 27 Oct 2023 19:47:53 +0200 Subject: gnu: libsigc++: Update to 3.6.0. * gnu/packages/glib.scm (libsigc++): Update to 3.6.0. Change-Id: Ib17c03b359122d46ccace887e7583e3e94ed76c3 Signed-off-by: Liliana Marie Prikler --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 3f4d055074..66f2a16448 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -866,7 +866,7 @@ (define-public libaccounts-glib (define libsigc++ (package (name "libsigc++") - (version "3.0.6") + (version "3.6.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/libsigc++/" @@ -874,7 +874,7 @@ (define libsigc++ name "-" version ".tar.xz")) (sha256 (base32 - "1kn57b039lg20182lnchl1ys27vf34brn43f895cal8nc7sdq3mp")))) + "05qf10lp5vxsi5fbzdphqhbzmys12mxvg4gh14p9zqynvwvkpln3")))) (build-system meson-build-system) (outputs '("out" "doc")) (arguments -- cgit v1.2.3 From a30f0ce3025e4dd12a05214275bcd14a26133c39 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Fri, 27 Oct 2023 19:48:56 +0200 Subject: gnu: libaccounts-glib: Update to 1.26. * gnu/packages/glib.scm (libaccounts-glib): Update to 1.26. Change-Id: I593ece04e448e6a19360f596b43ad06c2f1cc796 Signed-off-by: Liliana Marie Prikler --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 66f2a16448..aab5401c95 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -813,7 +813,7 @@ (define dbus-glib (define-public libaccounts-glib (package (name "libaccounts-glib") - (version "1.25") + (version "1.26") (source (origin (method git-fetch) (uri (git-reference @@ -822,7 +822,7 @@ (define-public libaccounts-glib (file-name (git-file-name name version)) (sha256 (base32 - "19rhk9f97m736d5ia26vfcbjp5kgi454558yhf9mrwm4iw5d9pk4")))) + "1fdvvzbz23q5c0jnzryinkmcymd0zcs2pdn4fvibg34pvybb4li9")))) (build-system meson-build-system) (native-inputs (list dbus `(,glib "bin") -- cgit v1.2.3 From 11ce76c936fed15529eed57141c158a904bc7ab5 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Fri, 27 Oct 2023 19:49:57 +0200 Subject: gnu: dbus-glib: Update to 0.112. * gnu/packages/glib.scm (dbus-glib): Update to 0.112. Change-Id: I9630b1ece91bd5f32fd96142403146506724c5ec Signed-off-by: Liliana Marie Prikler --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index aab5401c95..d34cb826fb 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -777,7 +777,7 @@ (define itstool (define dbus-glib (package (name "dbus-glib") - (version "0.110") + (version "0.112") (source (origin (method url-fetch) (uri @@ -785,7 +785,7 @@ (define dbus-glib version ".tar.gz")) (sha256 (base32 - "09g8swvc95bk1z6j8sw463p2v0dqmgm2zjfndf7i8sbcyq67dr3w")))) + "0fhlkdqyzbh89bdslwsfc5fbdvkiv6g840ami4rnwa6dvz60smbx")))) (build-system gnu-build-system) (arguments (if (%current-target-system) -- cgit v1.2.3 From 3101acd8f026f5f032b3239c58dd201c88bdc6aa Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Fri, 27 Oct 2023 19:50:57 +0200 Subject: gnu: gobject-introspection: Update to 1.78.1. * gnu/packages/glib.scm (gobject-introspection): Update to 1.78.1. Change-Id: If76a6305f176f08c1b389c52ecd9d265ece1459d Signed-off-by: Liliana Marie Prikler --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index d34cb826fb..3c1a2080d7 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -577,14 +577,14 @@ (define target-name (define gobject-introspection (package (name "gobject-introspection") - (version "1.76.1") + (version "1.78.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" "gobject-introspection/" (version-major+minor version) "/gobject-introspection-" version ".tar.xz")) (sha256 - (base32 "1grq6wmbi2nbnwffgvsljd481zm6darnk12dvkf02m9lcjzphq8r")) + (base32 "1d0vhi83q0xc7kg3zn32wy7n16f3dd5blicyh5v8w9gpkbcsnyxx")) (patches (search-patches "gobject-introspection-cc.patch" "gobject-introspection-girepository.patch" -- cgit v1.2.3 From 26485fc5750d2e067c45d49ab2aa20f481e1979a Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Fri, 27 Oct 2023 19:51:58 +0200 Subject: gnu: dbus: Update to 1.15.8. * gnu/packages/glib.scm (dbus): Update to 1.15.8. [arguments]: Convert to list of G-Expressions. [native-inputs]: Add autoconf, autoconf-archive, automake, libtool and which. Sort alphabetically. Change-Id: I1833eb51ab37f138ec4d007230d84b541d66170d Signed-off-by: Liliana Marie Prikler --- gnu/packages/glib.scm | 73 +++++++++++++++++++++++++++++---------------------- 1 file changed, 41 insertions(+), 32 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 3c1a2080d7..2e3c5f0e8b 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -37,6 +37,7 @@ (define-module (gnu packages glib) #:use-module (gnu packages) + #:use-module (gnu packages autotools) #:use-module (gnu packages backup) #:use-module (gnu packages base) #:use-module (gnu packages bash) @@ -106,7 +107,7 @@ (define-module (gnu packages glib) (define dbus (package (name "dbus") - (version "1.14.0") + (version "1.15.8") (source (origin (method url-fetch) (uri (string-append @@ -114,49 +115,57 @@ (define dbus version ".tar.xz")) (sha256 (base32 - "1m7bibavml4gx9d67j403l0kzd1a4z8lhrpxb2as3q4nfpiwrmyc")) + "016j3rqc8m62bg0h7z4rpvbvm5bg0hbjrld733f0aby8drz5kz44")) (patches (search-patches "dbus-helper-search-path.patch")))) (build-system gnu-build-system) (arguments - '(#:configure-flags - (list - ;; Install the system bus socket under /var. - "--localstatedir=/var" + (list + #:configure-flags + #~(list + ;; Install the system bus socket under /var. + "--localstatedir=/var" - ;; Install the session bus socket under /tmp. - "--with-session-socket-dir=/tmp" + ;; Install the session bus socket under /tmp. + "--with-session-socket-dir=/tmp" - ;; Build shared libraries only. - "--disable-static" + ;; Build shared libraries only. + "--disable-static" - ;; Use /etc/dbus-1 for system-wide config. - ;; Look for configuration file under - ;; /etc/dbus-1. This is notably required by - ;; 'dbus-daemon-launch-helper', which looks for - ;; the 'system.conf' file in that place, - ;; regardless of what '--config-file' was - ;; passed to 'dbus-daemon' on the command line; - ;; see . - "--sysconfdir=/etc") - #:phases - (modify-phases %standard-phases - (replace 'install - (lambda _ - ;; Don't try to create /var and /etc. - (invoke "make" - "localstatedir=/tmp/dummy" - "sysconfdir=/tmp/dummy" - "install")))))) + ;; Use /etc/dbus-1 for system-wide config. + ;; Look for configuration file under + ;; /etc/dbus-1. This is notably required by + ;; 'dbus-daemon-launch-helper', which looks for + ;; the 'system.conf' file in that place, + ;; regardless of what '--config-file' was + ;; passed to 'dbus-daemon' on the command line; + ;; see . + "--sysconfdir=/etc") + #:phases + #~(modify-phases %standard-phases + (replace 'install + (lambda _ + ;; Don't try to create /var and /etc. + (invoke "make" + "localstatedir=/tmp/dummy" + "sysconfdir=/tmp/dummy" + "install")))))) (native-inputs - (list pkg-config - ;; Dependencies to generate the doc. + ;; Some dependencies are required to generate the documentation. Also, + ;; quoting NEWS for 1.15.8: “Autotools-generated files are no longer + ;; included in the tarball release.” + (list autoconf + autoconf-archive + automake docbook-xml-4.4 docbook-xsl doxygen - xmlto + libtool libxml2 ;for XML_CATALOG_FILES libxslt - yelp-tools)) + which + xmlto + yelp-tools + pkg-config)) (inputs (list expat ;; Add a dependency on libx11 so that 'dbus-launch' has support for -- cgit v1.2.3 From 8cd5eebd11f8cf72c0b560e5bca538a8615edf83 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Mon, 23 Oct 2023 01:12:57 +0200 Subject: gnu: adwaita-icon-theme: Update to 44.0. * gnu/packages/gnome.scm (adwaita-icon-theme): Update to 44.0. Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a86ddc34b3..77908768b7 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2875,7 +2875,7 @@ (define-public icon-naming-utils (define-public adwaita-icon-theme (package (name "adwaita-icon-theme") - (version "43") + (version "44.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -2883,7 +2883,7 @@ (define-public adwaita-icon-theme name "-" version ".tar.xz")) (sha256 (base32 - "1iiflc6rfpshipl23mszlv2lzm8d1a7pxwsx2ma5bam669ywffif")))) + "0k3638gkdpjcr9pbsmpfj7vdqdm9s04j4d5sh1fx5v5z3dhcb2a8")))) (build-system gnu-build-system) (arguments (list #:make-flags -- cgit v1.2.3 From ea51a3885c56c669f8558592d0ac13a1aae0e548 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 31 Oct 2023 20:34:25 +0100 Subject: gnu: Add gmobile. * gnu/packages/gnome.scm (gmobile): New variable. * gnu/packages/patches/gmobile-make-it-installable.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it here. Change-Id: If36413dfa1ee1e6156f2652fa86282283b592b36 Signed-off-by: Liliana Marie Prikler --- gnu/local.mk | 1 + gnu/packages/gnome.scm | 27 +++++++ .../patches/gmobile-make-it-installable.patch | 89 ++++++++++++++++++++++ 3 files changed, 117 insertions(+) create mode 100644 gnu/packages/patches/gmobile-make-it-installable.patch diff --git a/gnu/local.mk b/gnu/local.mk index 9befa202ad..92b56289f2 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1318,6 +1318,7 @@ dist_patch_DATA = \ %D%/packages/patches/glibc-2.29-supported-locales.patch \ %D%/packages/patches/glibc-supported-locales.patch \ %D%/packages/patches/glslang-install-static-libs.patch \ + %D%/packages/patches/gmobile-make-it-installable.patch \ %D%/packages/patches/gmp-arm-asm-nothumb.patch \ %D%/packages/patches/gmp-faulty-test.patch \ %D%/packages/patches/gnash-fix-giflib-version.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 77908768b7..6761ffa5dc 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -12915,6 +12915,33 @@ (define-public jsonrpc-glib host to avoid parser overhead and memory-allocator fragmentation.") (license license:lgpl2.1+))) +(define-public gmobile + (package + (name "gmobile") + (version "0.0.3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.gnome.org/guidog/gmobile") + (commit (string-append "v" version)))) + (file-name (git-file-name "gmobile" version)) + (sha256 + (base32 + "0lr22nj4ypzxbjim1a7ay07nh4vx3dqc895qql437gda6x0rvn2p")) + (patches + (search-patches "gmobile-make-it-installable.patch")))) + (build-system meson-build-system) + (native-inputs + (list `(,glib "bin") ; for glib-compile-resources + pkg-config)) + (propagated-inputs + (list glib json-glib)) + (synopsis "Functions useful in mobile related, glib based projects") + (description "This package provides functions for mobiles.") + (home-page "https://gitlab.gnome.org/guidog/gmobile") + (license license:lgpl2.1+))) + (define-public feedbackd (package (name "feedbackd") diff --git a/gnu/packages/patches/gmobile-make-it-installable.patch b/gnu/packages/patches/gmobile-make-it-installable.patch new file mode 100644 index 0000000000..9db6554877 --- /dev/null +++ b/gnu/packages/patches/gmobile-make-it-installable.patch @@ -0,0 +1,89 @@ +From c1ea43a45f4588f21752b0ad679c43350a9c8905 Mon Sep 17 00:00:00 2001 +Message-ID: +From: Vivien Kraus +Date: Sun, 29 Oct 2023 19:00:44 +0100 +Subject: [PATCH] Install gmobile as a shared library. + +Tracked at https://gitlab.gnome.org/guidog/gmobile/-/issues/1 + +* src/meson.build: Install the header files. Import pkgconfig. +Generate a pkg-config definition. +(gm_lib): use "library", not "static_library". Install it. +(gmobile_gir): Install it. +* meson.build: Install gm-config.h. +--- + meson.build | 1 + + src/meson.build | 22 +++++++++++++++++++--- + 2 files changed, 20 insertions(+), 3 deletions(-) + +diff --git a/meson.build b/meson.build +index e9f6c62..51ebeac 100644 +--- a/meson.build ++++ b/meson.build +@@ -83,6 +83,7 @@ root_inc = include_directories('.') + configure_file( + output: 'gm-config.h', + configuration: config_h, ++ install_dir: get_option('includedir') + ) + + subdir('data') +diff --git a/src/meson.build b/src/meson.build +index ee98a39..3dedbe4 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -1,3 +1,5 @@ ++pkg = import('pkgconfig') ++ + gm_deps = [ + gio_dep, + glib_dep, +@@ -37,18 +39,33 @@ gm_c_args = [ + '-DG_LOG_DOMAIN="gmobile"', + ] + +-gm_lib = static_library( ++gm_lib = library( + 'gmobile', + gm_sources, + include_directories: root_inc, + c_args: gm_c_args, +- dependencies: gm_deps) ++ dependencies: gm_deps, ++ install: true) ++ ++pkg.generate(gm_lib) + + gmobile_dep = declare_dependency( + include_directories: [root_inc, include_directories('.')], + dependencies: gm_deps, + link_with: gm_lib) + ++install_headers( ++ 'gmobile.h', ++ 'gm-cutout.h', ++ 'gm-device-info.h', ++ 'gm-device-tree.h', ++ 'gm-display-panel.h', ++ 'gm-error.h', ++ 'gm-main.h', ++ 'gm-rect.h', ++ 'gm-svg-path.h', ++ 'gm-timeout.h') ++ + if get_option('gtk_doc') + gmobile_gir_extra_args = [ + '--c-include=gmobile.h', +@@ -66,7 +83,6 @@ if get_option('gtk_doc') + identifier_prefix: 'Gm', + link_with: gm_lib, + includes: ['Gio-2.0'], +- install: false, + extra_args: gmobile_gir_extra_args, + ) + endif + +base-commit: 382fc89472176d2f1d435517cad53d969d8b8eff +-- +2.41.0 + -- cgit v1.2.3 From a94ec292d21a2171db741ef748ed4c8b3ef65ada Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 31 Oct 2023 20:34:35 +0100 Subject: gnu: feedbackd: Update to 0.2.1. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/patches/feedbackd-use-system-gmobile.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it here. * gnu/packages/gnome.scm (feedbackd): Update to 0.2.1. [origin]: Add “feedbackd-use-system-gmobile.patch”. : Remove the gmobile submodule. [inputs]: Add gmobile. Change-Id: I06521c1673efb6aea1d163410fdf3d0206b57d8a Signed-off-by: Liliana Marie Prikler --- gnu/local.mk | 1 + gnu/packages/gnome.scm | 12 +++++-- .../patches/feedbackd-use-system-gmobile.patch | 42 ++++++++++++++++++++++ 3 files changed, 52 insertions(+), 3 deletions(-) create mode 100644 gnu/packages/patches/feedbackd-use-system-gmobile.patch diff --git a/gnu/local.mk b/gnu/local.mk index 92b56289f2..fc3e36fc18 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1155,6 +1155,7 @@ dist_patch_DATA = \ %D%/packages/patches/fasthenry-spFactor.patch \ %D%/packages/patches/fbreader-curl-7.62.patch \ %D%/packages/patches/fbreader-fix-icon.patch \ + %D%/packages/patches/feedbackd-use-system-gmobile.patch \ %D%/packages/patches/fenics-dolfin-algorithm.patch \ %D%/packages/patches/fenics-dolfin-demo-init.patch \ %D%/packages/patches/fenics-dolfin-boost.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 6761ffa5dc..0b461e4296 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -12945,7 +12945,7 @@ (define-public gmobile (define-public feedbackd (package (name "feedbackd") - (version "0.0.0+git20200527") + (version "0.2.1") (source (origin (method git-fetch) (uri (git-reference @@ -12954,12 +12954,18 @@ (define-public feedbackd (file-name (git-file-name name version)) (sha256 (base32 - "1wbkzxnqjydfgjvp7vz4ghczcz740zcb1yn90cb6gb5md4n6qx2y")))) + "1acwpb8cgzyvzriphrb42k3d7njwcn88j66i5wz75yx2sbfaf93q")) + (patches + (search-patches "feedbackd-use-system-gmobile.patch")) + (snippet + #~(begin + (use-modules (guix build utils)) + (delete-file-recursively "subprojects"))))) (build-system meson-build-system) (native-inputs (list `(,glib "bin") gobject-introspection pkg-config vala)) (inputs - (list dbus gsound json-glib libgudev)) + (list dbus gmobile gsound json-glib libgudev)) (propagated-inputs (list glib)) ; in Requires of libfeedback-0.0.pc (synopsis "Haptic/visual/audio feedback via DBus") diff --git a/gnu/packages/patches/feedbackd-use-system-gmobile.patch b/gnu/packages/patches/feedbackd-use-system-gmobile.patch new file mode 100644 index 0000000000..f0a0449472 --- /dev/null +++ b/gnu/packages/patches/feedbackd-use-system-gmobile.patch @@ -0,0 +1,42 @@ +From af9e72124b12ca481fd3592f9c8ea2649f7e4c80 Mon Sep 17 00:00:00 2001 +Message-ID: +From: Vivien Kraus +Date: Sun, 29 Oct 2023 19:12:27 +0100 +Subject: [PATCH] Look for a system-installed gmobile first. + +Meson lets projects use a dependency with fallback to a submodule, in +case the dependency is not installed. + +* meson.build (gmobile_subp): Convert to a dependency with subproject +fallback. +--- +I am waiting for Purism to approve my account before I can report this. + + meson.build | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/meson.build b/meson.build +index 8725e76..e5504be 100644 +--- a/meson.build ++++ b/meson.build +@@ -14,13 +14,13 @@ gio_unix = dependency('gio-unix-2.0', version: '>=2.50.0') + glib = dependency('glib-2.0', version: '>=2.50.0') + if get_option('daemon') + gobject = dependency('gobject-2.0', version: '>=2.50.0') +- gmobile_subp = subproject('gmobile', ++ gmobile = dependency('gmobile', ++ fallback: ['gmobile', 'gmobile_dep'], + default_options: [ + 'examples=false', + 'gtk_doc=false', + 'tests=false', + ]) +- gmobile = gmobile_subp.get_variable('gmobile_dep') + gsound = dependency('gsound') + gudev = dependency('gudev-1.0', version: '>=232') + json_glib = dependency('json-glib-1.0') + +base-commit: 853bd6d7ea8455efea063ba7c4f29ce8c203285f +-- +2.41.0 + -- cgit v1.2.3 From 037e30cf13ae0f42de5125357ef189a816e60643 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 31 Oct 2023 20:34:49 +0100 Subject: gnu: Add sofia-sip. * gnu/packages/telephony.scm (sofia-sip): New variable. Change-Id: I18dd31fa62f5cfe528d7558915135f17d49b798d Signed-off-by: Liliana Marie Prikler --- gnu/packages/telephony.scm | 80 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 80 insertions(+) diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index 42158784ca..dfa3343207 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -51,6 +51,7 @@ (define-module (gnu packages telephony) #:use-module (gnu packages base) #:use-module (gnu packages boost) #:use-module (gnu packages check) + #:use-module (gnu packages compression) #:use-module (gnu packages cpp) #:use-module (gnu packages databases) #:use-module (gnu packages sqlite) @@ -1088,3 +1089,82 @@ (define-public sipp (license (list license:gpl2+ ; sipp's main license license:bsd-3 ; send_packets.c, send_packets.h license:zlib)))) ; md5.c, md5.h + +(define-public sofia-sip + (package + (name "sofia-sip") + (version "1.13.16") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/freeswitch/sofia-sip") + (commit (string-append "v" version)))) + (file-name (git-file-name "sofia-sip" version)) + (sha256 + (base32 + "1hi9np49wcq91d1w93qi6by40qnr348hpzc2wkw3l955zh1n30lr")))) + (build-system gnu-build-system) + (arguments + (list + ;; run_addrinfo requires /etc/services for the 'echo' service. + #:make-flags #~'("XFAIL_TESTS = run_addrinfo" + ;; libsofia-sip-ua/nta/Makefile.am sets + ;; TESTS_ENVIRONMENT = $(SHELL), which is odd, because + ;; according to the Automake manual, it should be + ;; AM_TESTS_ENVIRONMENT, and it should end with a + ;; semicolon. + "TESTS_ENVIRONMENT = \ +export CHECK_NTA_VERBOSE=10; \ +export CHECK_NUA_VERBOSE=10; ") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-shebangs + (lambda _ + (patch-shebang "autogen.sh"))) + (add-after 'unpack 'disable-failing-test + (lambda _ + ;; run_test_nta is disabled because it fails randomly (not for a + ;; timeout-related reason). The test suite is otherwise very + ;; long, most tests backed by libcheck timeout even with a ×100 + ;; multiplier. The tests are disabled here rather than put to + ;; XFAIL_TESTS because it saves compilation time. (see: + ;; https://github.com/freeswitch/sofia-sip/issues/234) + (substitute* "libsofia-sip-ua/nta/Makefile.am" + (("TESTS =") + "TESTS = run_test_nta_api\n# Disabled: ")) + (substitute* "libsofia-sip-ua/nua/Makefile.am" + (("TESTS \\+=") + "TESTS +=\n# Disabled: ")) + ;; The glib tests both wait forever without a timeout. + (substitute* "libsofia-sip-ua-glib/su-glib/Makefile.am" + (("TESTS =") + "TESTS =\n# Disabled: ")) + ;; Another timeout failing test: + (substitute* "tests/Makefile.am" + (("TESTS = test_nua") + "TESTS =")) + ;; This test fails for unknown reason: + (substitute* "tests/Makefile.am" + (("TESTS \\+= check_dlopen_sofia check_sofia") + "TESTS += check_dlopen_sofia"))))))) + (inputs + (list glib + openssl + zlib)) + (native-inputs + (list autoconf + autoconf-archive + automake + check + libtool + pkg-config)) + (home-page "https://sofia-sip.sourceforge.net/") + (synopsis "SIP user-agent library") + (description "Sofia-SIP is a @acronym{SIP, Session Initiation Protocol} +User-Agent library, compliant with the +@url{https://datatracker.ietf.org/doc/html/rfc3261, IETF RFC3261} +specification. It can be used as a building block for @acronym{SIP} client +software foruses such as @acronym{VoIP, Voice over @acronym{IP, Internet +Protocol}}, @acronym{IM, Instant Messaging}, and many other real-time and +person-to-person communication services.") + (license license:lgpl2.1))) -- cgit v1.2.3 From 60632b0a147e011ffe8162a67a12f104a33f49d8 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 31 Oct 2023 20:34:54 +0100 Subject: gnu: Add libcallaudio. * gnu/packages/telephony.scm (libcallaudio): New variable. Change-Id: I41cfe14136858fe0b2a302a9ed8d624d44ad2a95 Signed-off-by: Liliana Marie Prikler --- gnu/packages/telephony.scm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/gnu/packages/telephony.scm b/gnu/packages/telephony.scm index dfa3343207..ef4baff81f 100644 --- a/gnu/packages/telephony.scm +++ b/gnu/packages/telephony.scm @@ -95,6 +95,7 @@ (define-module (gnu packages telephony) #:use-module (guix git-download) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) + #:use-module (guix build-system meson) #:use-module (guix build-system qt)) (define-public phonesim @@ -1168,3 +1169,27 @@ (define-public sofia-sip Protocol}}, @acronym{IM, Instant Messaging}, and many other real-time and person-to-person communication services.") (license license:lgpl2.1))) + +(define-public libcallaudio + (package + (name "libcallaudio") + (version "0.1.9") + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.com/mobian1/callaudiod/") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0qnllb28101c2ss1k3iwr04gljfyjqmbla5csj6vkq1y63aagr9s")))) + (build-system meson-build-system) + (inputs (list alsa-lib glib pulseaudio)) + (native-inputs + (list `(,glib "bin") ;for gdbus-codegen + pkg-config)) + (home-page "https://gitlab.com/mobian1/callaudiod") + (synopsis "Library for audio routing during voice calls") + (description "This package provides @command{callaudiod}, a daemon to +route audio during phone calls, and a library.") + (license license:gpl3+))) -- cgit v1.2.3 From 492e621a57e9c3fb340624c03fbf5bf1a8f7de6d Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 31 Oct 2023 20:35:00 +0100 Subject: gnu: Add libcall-ui. * gnu/packages/gnome.scm (libcall-ui): New variable. * gnu/packages/patches/libcall-ui-make-it-installable.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it here. Change-Id: I47c403d12c90f9371a8065d2d8d8e829225e5f0c Signed-off-by: Liliana Marie Prikler --- gnu/local.mk | 1 + gnu/packages/gnome.scm | 41 +++++++++++ .../patches/libcall-ui-make-it-installable.patch | 81 ++++++++++++++++++++++ 3 files changed, 123 insertions(+) create mode 100644 gnu/packages/patches/libcall-ui-make-it-installable.patch diff --git a/gnu/local.mk b/gnu/local.mk index fc3e36fc18..050cb71ef9 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1475,6 +1475,7 @@ dist_patch_DATA = \ %D%/packages/patches/json-c-0.12-CVE-2020-12762.patch \ %D%/packages/patches/julia-SOURCE_DATE_EPOCH-mtime.patch \ %D%/packages/patches/julia-Use-MPFR-4.2.patch \ + %D%/packages/patches/libcall-ui-make-it-installable.patch \ %D%/packages/patches/libftdi-fix-paths-when-FTDIPP-set.patch \ %D%/packages/patches/libgeotiff-fix-tests-with-proj-9.1.1.patch \ %D%/packages/patches/libobjc2-unbundle-robin-map.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 0b461e4296..b2de06803a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -13479,3 +13479,44 @@ (define-public xffm+ (home-page "http://xffm.org/") (license license:gpl3+) (properties '((upstream-name . "xffm"))))) + +(define-public libcall-ui + (package + (name "libcall-ui") + (version "0.1.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.gnome.org/World/Phosh/libcall-ui") + (commit "6798b38d4d66d069751151b3e9a202c6de8d7f3c"))) + (file-name (git-file-name "libcall-ui" version)) + (sha256 + (base32 + "0zfrxh77ag8garqj319amnxjcdyp3ig12dkxfkl6wbwn1mvyrwx8")) + (patches (search-patches "libcall-ui-make-it-installable.patch")))) + (build-system meson-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'pre-check + (lambda _ + (setenv "HOME" (getcwd)) + ;; Tests require a running X server. + (system "Xvfb :1 &") + (setenv "DISPLAY" ":1")))))) + (propagated-inputs ; All these in call-ui.pc. + (list glib + gtk+ + (@ (gnu packages telephony) libcallaudio) + libhandy)) + (native-inputs + (list `(,glib "bin") ; glib-mkenums + pkg-config + xorg-server-for-tests)) + (synopsis "Common User Interfaces for call handling") + (description "This package provides common user interfaces to make and +receive calls.") + (home-page "https://gitlab.gnome.org/World/Phosh/libcall-ui") + (license license:lgpl2.1+))) diff --git a/gnu/packages/patches/libcall-ui-make-it-installable.patch b/gnu/packages/patches/libcall-ui-make-it-installable.patch new file mode 100644 index 0000000000..078422913d --- /dev/null +++ b/gnu/packages/patches/libcall-ui-make-it-installable.patch @@ -0,0 +1,81 @@ +From 1a79c18e85232a6f56a58ec99271b92d5b0e6dca Mon Sep 17 00:00:00 2001 +Message-ID: <1a79c18e85232a6f56a58ec99271b92d5b0e6dca.1698606228.git.vivien@planete-kraus.eu> +From: Vivien Kraus +Date: Sun, 29 Oct 2023 19:42:55 +0100 +Subject: [PATCH] Install libcall-ui. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Tracked at https://gitlab.gnome.org/World/Phosh/libcall-ui/-/issues/27 + +* src/meson.build: Require pkgconfig. Install a pkg-config +definition. Install the headers. +(call_ui_lib): Install it. Use “library”, not “static_library”. +* meson.build (config_h): Install the config.h file. +(call_ui_enum_sources): Install the header file. +--- + meson.build | 1 + + src/meson.build | 22 +++++++++++++++++++--- + 2 files changed, 20 insertions(+), 3 deletions(-) + +diff --git a/meson.build b/meson.build +index 6d96178..80514ba 100644 +--- a/meson.build ++++ b/meson.build +@@ -93,6 +93,7 @@ configure_file( + input: 'cui-config.h.in', + output: 'cui-config.h', + configuration: config_h, ++ install_dir: get_option('includedir') + ) + + #subdir('data') +diff --git a/src/meson.build b/src/meson.build +index bdb347c..2f9fa0c 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -1,7 +1,11 @@ ++pkg = import('pkgconfig') ++ + call_ui_enum_headers = files(['cui-call.h', + ]) + call_ui_enum_sources = gnome.mkenums_simple('cui-enums', +- sources : call_ui_enum_headers) ++ sources : call_ui_enum_headers, ++ install_header: true, ++ install_dir: get_option('includedir')) + + call_ui_resources = gnome.compile_resources( + 'cui-resources', +@@ -50,11 +54,23 @@ call_ui_c_args = [ + '-DG_LOG_DOMAIN="Cui"', + ] + +-call_ui_lib = static_library('call-ui', ++call_ui_lib = library('call-ui', + call_ui_sources, + c_args: call_ui_c_args, + include_directories: [ root_inc, src_inc ], +- dependencies: call_ui_deps) ++ dependencies: call_ui_deps, ++ install: true) ++ ++pkg.generate(call_ui_lib) ++ ++install_headers( ++ 'call-ui.h', ++ 'cui-call.h', ++ 'cui-call-display.h', ++ 'cui-main.h', ++ 'cui-dialpad.h', ++ 'cui-keypad.h', ++) + + libcall_ui_dep = declare_dependency( + sources: call_ui_enum_sources, + +base-commit: 817d770cfa6876d37c4a6d09b00c9bdedfdce8b7 +-- +2.41.0 + -- cgit v1.2.3 From 1c41971e721dde203580ec17899beae546f1133a Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 31 Oct 2023 20:35:04 +0100 Subject: gnu: Add calls. * gnu/packages/gnome.scm (libcallaudio): New variable. * gnu/packages/patches/calls-disable-application-test.patch: New file. * gnu/packages/patches/calls-disable-sip-test.patch: New file. * gnu/local.mk (dist_patch_DATA): Register them here. Change-Id: I6f0485e4c73536c576713005cf7cd74610923a21 Signed-off-by: Liliana Marie Prikler --- gnu/local.mk | 2 + gnu/packages/gnome.scm | 65 ++++++++++++++++++- .../patches/calls-disable-application-test.patch | 72 ++++++++++++++++++++++ gnu/packages/patches/calls-disable-sip-test.patch | 44 +++++++++++++ 4 files changed, 182 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/calls-disable-application-test.patch create mode 100644 gnu/packages/patches/calls-disable-sip-test.patch diff --git a/gnu/local.mk b/gnu/local.mk index 050cb71ef9..27ff79f0f6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -989,6 +989,8 @@ dist_patch_DATA = \ %D%/packages/patches/calibre-no-updates-dialog.patch \ %D%/packages/patches/calibre-remove-test-sqlite.patch \ %D%/packages/patches/calibre-remove-test-unrar.patch \ + %D%/packages/patches/calls-disable-application-test.patch \ + %D%/packages/patches/calls-disable-sip-test.patch \ %D%/packages/patches/camlboot-dynamically-allocate-stack-signal.patch \ %D%/packages/patches/catdoc-CVE-2017-11110.patch \ %D%/packages/patches/ccextractor-add-missing-header.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b2de06803a..2958da2cd9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -212,6 +212,7 @@ (define-module (gnu packages gnome) #:use-module (gnu packages sqlite) #:use-module (gnu packages ssh) #:use-module (gnu packages swig) + #:use-module (gnu packages telephony) #:use-module (gnu packages tex) #:use-module (gnu packages time) #:use-module (gnu packages tls) @@ -13509,7 +13510,7 @@ (define-public libcall-ui (propagated-inputs ; All these in call-ui.pc. (list glib gtk+ - (@ (gnu packages telephony) libcallaudio) + libcallaudio libhandy)) (native-inputs (list `(,glib "bin") ; glib-mkenums @@ -13520,3 +13521,65 @@ (define-public libcall-ui receive calls.") (home-page "https://gitlab.gnome.org/World/Phosh/libcall-ui") (license license:lgpl2.1+))) + +(define-public calls + (package + (name "calls") + (version "45.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "1mvnrm5wbl69xbcjg8nxd6l6nj2fd3whbyh70axlm75c7l7d5j5r")) + (patches + (search-patches "calls-disable-application-test.patch" + "calls-disable-sip-test.patch")))) + (build-system meson-build-system) + (arguments + (list + #:glib-or-gtk? #t + #:configure-flags #~'("-Dgtk_doc=true") + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'pre-check + (lambda _ + (setenv "HOME" (getcwd)) + ;; Tests require a running X server. + (system "Xvfb :1 &") + (setenv "DISPLAY" ":1")))))) + (inputs + (list evolution-data-server + feedbackd + folks + glib + gom + gstreamer + gst-plugins-base + gst-plugins-good + gst-plugins-bad + gtk+ + libcall-ui + libgee + libpeas + libhandy + modem-manager + sofia-sip)) + (native-inputs + (list desktop-file-utils ;update-desktop-database + gettext-minimal + `(,glib "bin") ;glib-mkenums + gtk-doc ;gtkdoc-scan + `(,gtk+ "bin") ;gtk-update-icon-cache + pkg-config + python-docutils ;rst2man + vala + xorg-server-for-tests)) + (home-page "https://gitlab.gnome.org/GNOME/calls") + (synopsis "Phone dialer and call handler") + (description "Calls can make and answer phone calls using different +backends, such as ModemManager for phones and @acronym{SIP, Session Initiation +Protocol} for @acronym{VoIP, Voice over @acronym{IP, Internet Protocol}}.") + (license license:gpl3+))) diff --git a/gnu/packages/patches/calls-disable-application-test.patch b/gnu/packages/patches/calls-disable-application-test.patch new file mode 100644 index 0000000000..f06f747487 --- /dev/null +++ b/gnu/packages/patches/calls-disable-application-test.patch @@ -0,0 +1,72 @@ +From e0fdae20840ffe3aeca7190eb8b1bcae70f0c93b Mon Sep 17 00:00:00 2001 +From: Vivien Kraus +Date: Sun, 29 Oct 2023 21:03:27 +0100 +Subject: [PATCH] Disable the application test. + +The application test does not work in a Guix container, because an actual +sound card is required to run this integration test. + +* tests/meson.build: Disable test-application. +--- + tests/meson.build | 38 +++++++++++++++++++------------------- + 1 file changed, 19 insertions(+), 19 deletions(-) + +diff --git a/tests/meson.build b/tests/meson.build +index c9bdc3d..65f9b93 100644 +--- a/tests/meson.build ++++ b/tests/meson.build +@@ -165,24 +165,24 @@ test('dbus', t, env: test_env) + + dbus_run_session = find_program('dbus-run-session') + +-if dbus_run_session.found () +- test_sources = [ 'test-application.c' ] +- t = executable('application', test_sources, calls_resources, +- c_args : test_cflags, +- link_args: test_link_args, +- pie: true, +- link_with : [calls_vala, libcalls], +- dependencies: calls_deps, +- include_directories : [ +- calls_includes, +- ] +- ) +- test('application', +- dbus_run_session, +- args: t.full_path(), +- env: test_env, +- timeout : 300 +- ) +-endif ++# if dbus_run_session.found () ++# test_sources = [ 'test-application.c' ] ++# t = executable('application', test_sources, calls_resources, ++# c_args : test_cflags, ++# link_args: test_link_args, ++# pie: true, ++# link_with : [calls_vala, libcalls], ++# dependencies: calls_deps, ++# include_directories : [ ++# calls_includes, ++# ] ++# ) ++# test('application', ++# dbus_run_session, ++# args: t.full_path(), ++# env: test_env, ++# timeout : 300 ++# ) ++# endif + + endif + +base-commit: 936d36287324163b958c6ea0c4297c7a607ee18c +prerequisite-patch-id: 20f8a81da35ce1797635eb310e1f85ac5ff814f6 +prerequisite-patch-id: 96768617d0a8ee8c66faa00220a1612e0f527292 +prerequisite-patch-id: 444c1ee57c24ba4b8165497b0a5885844110c59b +prerequisite-patch-id: 9415b848ca9ee277bccbad7c3fff23230d5016f1 +prerequisite-patch-id: 3ca2a45be430041875b21f6c8dfac0bc17916abf +prerequisite-patch-id: e8302846f4650dba9e0072c18be3459ce903fe2e +-- +2.41.0 + diff --git a/gnu/packages/patches/calls-disable-sip-test.patch b/gnu/packages/patches/calls-disable-sip-test.patch new file mode 100644 index 0000000000..75e9294fc0 --- /dev/null +++ b/gnu/packages/patches/calls-disable-sip-test.patch @@ -0,0 +1,44 @@ +From 33b75bfcda3437b12b6155addeeddcea697a4270 Mon Sep 17 00:00:00 2001 +Message-ID: <33b75bfcda3437b12b6155addeeddcea697a4270.1698608762.git.vivien@planete-kraus.eu> +From: Vivien Kraus +Date: Sun, 29 Oct 2023 20:45:24 +0100 +Subject: [PATCH] Disable the direct call SIP test. + +* plugins/provider/tests/test-sip.c (main): Disable it. +--- + +This test passes in a guix shell --container --network but not in +guix shell --container. The most likely cause is it requires access to the +network. + + plugins/provider/tests/test-sip.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) + +diff --git a/plugins/provider/tests/test-sip.c b/plugins/provider/tests/test-sip.c +index 185d372..4e83d40 100644 +--- a/plugins/provider/tests/test-sip.c ++++ b/plugins/provider/tests/test-sip.c +@@ -442,8 +442,11 @@ main (int argc, + g_test_add ("/Calls/SIP/origin_call_lists", SipFixture, NULL, + setup_sip_origins, test_sip_origin_call_lists, tear_down_sip_origins); + +- g_test_add ("/Calls/SIP/calls_direct_call", SipFixture, NULL, +- setup_sip_origins, test_sip_call_direct_calls, tear_down_sip_origins); ++ /* The direct call fails in the Guix build environment, possibly ++ * because the network is more restricted. */ ++ ++ /* g_test_add ("/Calls/SIP/calls_direct_call", SipFixture, NULL, ++ setup_sip_origins, test_sip_call_direct_calls, tear_down_sip_origins); */ + + ret = g_test_run (); + + +base-commit: 936d36287324163b958c6ea0c4297c7a607ee18c +prerequisite-patch-id: 20f8a81da35ce1797635eb310e1f85ac5ff814f6 +prerequisite-patch-id: 96768617d0a8ee8c66faa00220a1612e0f527292 +prerequisite-patch-id: 444c1ee57c24ba4b8165497b0a5885844110c59b +prerequisite-patch-id: 9415b848ca9ee277bccbad7c3fff23230d5016f1 +prerequisite-patch-id: 3ca2a45be430041875b21f6c8dfac0bc17916abf +-- +2.41.0 + -- cgit v1.2.3 From a7e831a556accc2f937bf8d7f54977037b128f81 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 11 Nov 2023 01:19:20 +0100 Subject: gnu: gtk: Update to 4.12.3. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gtk.scm (gtk): Update to 4.12.3. [source]: Remove snippet. [arguments]<#:configure-flags>: Add “--no-suite=headless”. <#:phases>: Also patch text-color tests in gsk/nodeparser. Change-Id: Iedabfd12ae4f60f02ea21f427b85aeb6b17d03d6 --- gnu/packages/gtk.scm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 21a12689b7..6a0f5e0773 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1119,7 +1119,7 @@ (define-public gtk+ (define-public gtk (package (name "gtk") - (version "4.10.3") + (version "4.12.3") (source (origin (method url-fetch) @@ -1127,11 +1127,10 @@ (define-public gtk (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 - (base32 "1aff06l9v40j16s4s0qvdbj8cs54qxnh41d7w2v7wdwyswd48ia5")) + (base32 "128ahzsj016vz8brd8kplhfkxg2q7wy7kndibx2qfr68yrif530l")) (patches (search-patches "gtk4-respect-GUIX_GTK4_PATH.patch")) - (modules '((guix build utils))) - (snippet #~(begin (delete-file-recursively "subprojects/gi-docgen"))))) + (modules '((guix build utils))))) (build-system meson-build-system) (outputs '("out" "bin" "doc")) (arguments @@ -1157,6 +1156,7 @@ (define-public gtk "--suite=gtk" "--no-suite=failing" "--no-suite=flaky" + "--no-suite=headless" ; requires mutter… "--no-suite=gsk-compare-broadway") #:phases #~(modify-phases %standard-phases @@ -1179,6 +1179,9 @@ (define-public gtk (substitute* "meson.build" (("gtk_update_icon_cache: true") "gtk_update_icon_cache: false")) + (substitute* (find-files "testsuite/gsk/nodeparser/" + "^text-color.*\\.node$") + (("Noto Sans") "DejaVu Sans")) ;; Disable failing tests. (substitute* (find-files "testsuite" "meson.build") (("[ \t]*'empty-text.node',") "") -- cgit v1.2.3 From 02555467ce0d0f223d83fa0e78edf7779283c594 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 11 Nov 2023 01:37:59 +0100 Subject: gnu: libxmlb: Update to 0.3.14. * gnu/packages/xml.scm (libxmlb): Update to 0.3.14. Change-Id: I8571b3f46a5528d04cc2ea013ff2ab0ef4ba19da --- gnu/packages/xml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 01e48fda57..ec68deb31a 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -88,7 +88,7 @@ (define-module (gnu packages xml) (define-public libxmlb (package (name "libxmlb") - (version "0.3.12") + (version "0.3.14") (source (origin (method git-fetch) @@ -98,7 +98,7 @@ (define-public libxmlb (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0v9s2k5saxrs0ssjyg1zxaibybikvaw7fip6sy0b8ixzax9r5y0c")))) + (base32 "0qcp881s559wc73db91vjccrv0d3zva87l5jdp5w0ygzz6bmg5cn")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t)) -- cgit v1.2.3 From 4963d4c6bb8d238d7577dfd2cb0dc6d944ae7283 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 11 Nov 2023 01:38:07 +0100 Subject: gnu: appstream: Update to 0.16.4. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/freedesktop.scm (appstream): Update to 0.16.4. [arguments]<#:configure-flags>: Add “-Dsystemd=false”. <#:phases>: Adjust accordingly. Change-Id: I9c22cbd10681666c20e848dbc1e52ca08431d984 --- gnu/packages/freedesktop.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index d920afe1e7..0aeeadf5a3 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -139,7 +139,7 @@ (define-module (gnu packages freedesktop) (define-public appstream (package (name "appstream") - (version "0.15.6") + (version "0.16.4") (source (origin (method url-fetch) @@ -148,11 +148,12 @@ (define-public appstream "appstream/releases/" "AppStream-" version ".tar.xz")) (sha256 - (base32 "03pirmc5r4izl6mzff879g7pk1nxq03kgpr2yvnnqnlb6r0ckmi3")))) + (base32 "1val1b3dggn9g33q2r9q7wsl75a64x4lcvswvkcjjbvakkbj5xyl")))) (build-system meson-build-system) (arguments (list #:glib-or-gtk? #t + #:configure-flags #~(list "-Dsystemd=false") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-libstemmer @@ -165,7 +166,7 @@ (define-public appstream (add-after 'unpack 'disable-failing-tests (lambda _ (substitute* "tests/test-pool.c" - (("[ \t]*g_test_add_func \\(\"/AppStream/PoolRead?.*;") + (("[ \t]*g_test_add_func \\(\"/AppStream/Stemming.*;") "")))) (add-before 'check 'check-setup (lambda _ -- cgit v1.2.3 From 3c2f4ae41767d6cf2cc4a958dedd5abcc4ccab4d Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 11 Nov 2023 01:39:53 +0100 Subject: gnu: libadwaita: Update to 1.4.0. * gnu/packages/gnome.scm (libadwaita): Update to 1.4.0. Change-Id: I322caffb65a2b19f87e4c03a267a85c155d65124 --- gnu/packages/gnome.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 2958da2cd9..8b5af85d45 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -13375,7 +13375,7 @@ (define-public ocrfeeder (define-public libadwaita (package (name "libadwaita") - (version "1.3.4") + (version "1.4.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/libadwaita/" @@ -13383,7 +13383,7 @@ (define-public libadwaita "libadwaita-" version ".tar.xz")) (sha256 (base32 - "1gdimh85f5hb6jhnivjaai4m08nz4x9iif5rxdckn8b0lzrwl740")))) + "1hj7kxza6263x662v4ffndlz8dhfx19cz3y4iwhnhdflaj50j6p5")))) (build-system meson-build-system) (arguments `(#:phases @@ -13403,7 +13403,7 @@ (define-public libadwaita vala xorg-server-for-tests)) (propagated-inputs - (list gtk)) ;libadwaita-1.pc 'Requires' it + (list appstream gtk)) ;libadwaita-1.pc 'Requires' it (home-page "https://gnome.pages.gitlab.gnome.org/libadwaita/") (synopsis "Building blocks for GNOME applications") (description -- cgit v1.2.3 From be00aec4e43269aa3dcd807411b2c8f9c8b91e06 Mon Sep 17 00:00:00 2001 From: Jack Hill Date: Tue, 14 Nov 2023 16:50:53 -0500 Subject: gnu: webkitgtk: Update to 2.42.2. * gnu/packages/webkit.scm (webkitgtk): Update to 2.42.2. Change-Id: Id2a0cd7ec512a088ba6faf1a0eb7e7b500d95f7e Signed-off-by: Liliana Marie Prikler --- gnu/packages/webkit.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm index 7e0370abc0..527195dbff 100644 --- a/gnu/packages/webkit.scm +++ b/gnu/packages/webkit.scm @@ -127,13 +127,13 @@ (define-public wpebackend-fdo (define-public webkitgtk (package (name "webkitgtk") - (version "2.42.1") + (version "2.42.2") (source (origin (method url-fetch) (uri (string-append "https://www.webkitgtk.org/releases/" name "-" version ".tar.xz")) (sha256 - (base32 "1694dnqrjzcqh1hlpqspqz5xxvfd77af33f410ffaglxk34zlhbg")) + (base32 "066i1dswmrgvxfb1fyv93pkkl8zqy16ps62j6bvbkw97hqzal82p")) (patches (search-patches "webkitgtk-adjust-bubblewrap-paths.patch")))) (build-system cmake-build-system) -- cgit v1.2.3 From 088aacb66eebf3698c43f867dbfb66601970853a Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 30 Sep 2023 10:33:16 +0200 Subject: gnu: telepathy-glib: Disable parallel tests. * gnu/packages/glib.scm (telepathy-glib)[arguments]: Add #:parallel-tests?. Change-Id: I491b589b2e45c275ee3520436208beb5ee19964f --- gnu/packages/glib.scm | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 2e3c5f0e8b..ee44f8f403 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -1138,6 +1138,11 @@ (define telepathy-glib ;; EOFError: EOF read where object expected ;; make[2]: *** [Makefile:1906: _gen/register-dbus-glib-marshallers-body.h] Error 1 #:parallel-build? #f + ;; When spawned in parallel, the dbus daemons may fail to shut down + ;; cleanly. This issue appears to have been closed upstream due to low + ;; information, but still continues to haunt folks. See also + ;; . + #:parallel-tests? #f #:phases (modify-phases %standard-phases (add-after 'unpack 'disable-failing-tests -- cgit v1.2.3 From a5118e5d97da9f3381eccb87df12b2d34b15b7a2 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Mon, 23 Oct 2023 18:20:53 +0200 Subject: gnu: at-spi2-core: Update to 2.48.4. * gnu/packages/gtk.scm (at-spi2-core): Update to 2.48.4. (at-spi2-core-with-documentation)[#:phases]: Adjust accordingly. [native-inputs]: Remove docbook-xml-4.3 and gtk-doc/stable. Add gi-docgen, python, and python-sphinx. Change-Id: I3fc09c79f1ae5594fe9ad50e7212fbee11ce8a90 Co-authored-by: Liliana Marie Prikler --- gnu/packages/gtk.scm | 43 +++++++++++++++++++------------------------ 1 file changed, 19 insertions(+), 24 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 6a0f5e0773..67611efaae 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -106,6 +106,7 @@ (define-module (gnu packages gtk) #:use-module (gnu packages python) #:use-module (gnu packages python-build) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages sphinx) #:use-module (gnu packages gstreamer) #:use-module (gnu packages guile) #:use-module (gnu packages guile-xyz) @@ -792,7 +793,7 @@ (define-public at-spi2-core (hidden-package (package (name "at-spi2-core") - (version "2.45.90") + (version "2.48.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -800,7 +801,7 @@ (define-public at-spi2-core name "-" version ".tar.xz")) (sha256 (base32 - "03dba3c6m3sfapkkbbgzvbi1qcmrrlppydxjjs1m8ds9qb9hl1g9")))) + "05d5azffbglnvqzwk8ngg61jksm3brrwhmfpymsrccz8j8lv3v19")))) (build-system meson-build-system) (arguments (list @@ -816,10 +817,15 @@ (define-public at-spi2-core (lambda _ ;; xfconfd requires a writable HOME (setenv "HOME" (getenv "TMPDIR")) - ;; Run test-suite under a dbus session. - (setenv "XDG_DATA_DIRS" ;for finding org.xfce.Xfconf.service - (string-append #$output "/share:" - (getenv "XDG_DATA_DIRS"))) + ;; dbus-run-session may crash if XDG_DATA_DIRS has too + ;; many entries, maybe related to + ;; https://gitlab.freedesktop.org/dbus/dbus/-/issues/481. + (setenv "XDG_DATA_DIRS" + (string-append + #$output "/share:" + #$(this-package-native-input + "gsettings-desktop-schemas") + "/share")) ;; Don't fail on missing '/etc/machine-id'. (setenv "DBUS_FATAL_WARNINGS" "0") (with-directory-excursion (string-append "../at-spi2-core-" @@ -837,7 +843,8 @@ (define-public at-spi2-core ;; atspi-2.pc refers to all these. (list dbus glib libx11 libxi libxtst)) (native-inputs - (list gettext-minimal + (list findutils + gettext-minimal `(,glib "bin") gobject-introspection gsettings-desktop-schemas @@ -867,25 +874,13 @@ (define-public at-spi2-core-with-documentation (add-after 'unpack 'set-documentation-path (lambda _ ;; Ensure that the cross-references point to the "doc" output. - (substitute* "doc/libatspi/meson.build" - (("docpath =.*") - (string-append "docpath = '" #$output:doc - "/share/gtk-doc/html'\n"))))) - (add-before 'install 'prepare-doc-directory - (lambda _ - (mkdir-p (string-append #$output:doc "/share")))) - #$@(if (%current-target-system) - #~() - #~((add-after 'install 'move-documentation - (lambda _ - (copy-recursively - (string-append #$output "/share/gtk-doc") - (string-append #$output:doc "/share/gtk-doc")) - (delete-file-recursively - (string-append #$output "/share/gtk-doc")))))))))) + (substitute* "doc/meson.build" + (("docs_dir =.*") + (string-append "docs_dir = '" #$output:doc + "/share/doc'\n"))))))))) (native-inputs (modify-inputs (package-native-inputs at-spi2-core) - (append docbook-xml-4.3 gtk-doc/stable))) + (append gi-docgen python python-sphinx))) (properties (alist-delete 'hidden? (package-properties at-spi2-core))))) -- cgit v1.2.3 From d22cca3a6e38459a7186d9138acf7c2cebabbd69 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 14 Nov 2023 17:45:41 +0100 Subject: gnu: libical: Update to 3.0.17. * gnu/packages/calendar.scm (libical): Update to 3.0.17. Change-Id: Ifa230c4e514d7bc4ea01907928678e8bfb490783 Signed-off-by: Liliana Marie Prikler --- gnu/packages/calendar.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/calendar.scm b/gnu/packages/calendar.scm index 991995daf7..9586e463c2 100644 --- a/gnu/packages/calendar.scm +++ b/gnu/packages/calendar.scm @@ -123,7 +123,7 @@ (define-public date (define-public libical (package (name "libical") - (version "3.0.16") + (version "3.0.17") (source (origin (method url-fetch) (uri (string-append @@ -131,7 +131,7 @@ (define-public libical version "/libical-" version ".tar.gz")) (sha256 (base32 - "0cqc1wpalxmxjx8dmcaga9w8kd5l7944hqmidz43hifaf7fhaixl")))) + "06vqbxg4f3i03087grjncfy9pbvmlhg4v1ajhwr400l7nrnrmnmw")))) (build-system cmake-build-system) (arguments (list -- cgit v1.2.3 From 030474e3f95e8f3a37f75916efc501c569618841 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 14 Nov 2023 17:08:02 +0100 Subject: gnu: orca: Update to 44.2. * gnu/packages/gnome.scm (orca): Update to 44.2. [#:phases]: Also expand pgrep. [inputs]: Add procps. Replace at-spi2-atk with at-spi2-core. Change-Id: I05fdab970909edda44ca9957d2ad721f62e6bfec Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 21 +++++++++++++++------ 1 file changed, 15 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 8b5af85d45..a406eec09d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -11089,7 +11089,7 @@ (define-public python-pyatspi (define-public orca (package (name "orca") - (version "42.3") + (version "44.2") (source (origin (method url-fetch) (uri (string-append @@ -11098,17 +11098,25 @@ (define-public orca name "-" version ".tar.xz")) (sha256 (base32 - "097pyav3z5ssic8vwd7v1s7vynpycdpyfr324rr6c7mfzq5vmp7s")))) + "11jn925ga970y74did96ms78pc3lshkd9rd8v82i6zdzigxa7yvd")))) (build-system glib-or-gtk-build-system) (arguments '(#:phases (modify-phases %standard-phases - (add-before 'configure 'qualify-xkbcomp + (add-before 'configure 'qualify-programs (lambda* (#:key inputs #:allow-other-keys) (let ((xkbcomp (string-append - (assoc-ref inputs "xkbcomp") "/bin/xkbcomp"))) + (assoc-ref inputs "xkbcomp") "/bin/xkbcomp")) + (pgrep (string-append + (assoc-ref inputs "procps") "/bin/pgrep"))) (substitute* "src/orca/orca.py" - (("'xkbcomp'") (format #f "'~a'" xkbcomp)))))) + (("'xkbcomp'") (format #f "'~a'" xkbcomp))) + (substitute* "src/orca/debug.py" + (("'pgrep %s'") + (format #f "'~a %s'" pgrep))) + (substitute* "src/orca/orca_bin.py.in" + (("'pgrep -u %s -x orca'") + (format #f "'~a -u %s -x orca'" pgrep)))))) (add-after 'install 'wrap-orca (lambda* (#:key outputs #:allow-other-keys) (wrap-program (search-input-file outputs "bin/orca") @@ -11124,13 +11132,14 @@ (define-public orca pkg-config libxml2)) (inputs - (list at-spi2-atk + (list at-spi2-core bash-minimal gsettings-desktop-schemas gstreamer gst-plugins-base gst-plugins-good gtk+ + procps ; for pgrep python python-pygobject python-pyatspi -- cgit v1.2.3 From e1918fafec541e7f1c83ccd76d700ce8a4428f58 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Thu, 16 Nov 2023 23:16:58 +0100 Subject: gnu: gnome-calculator: Update to 44.0. * gnu/packages/gnome.scm (gnome-calculator): Update to 44.0. [inputs]: Replace libsoup-minimal-2 with libsoup. Remove libhandy. [propagated-inputs]: Add gee, glib, gtk. Change-Id: I86dcfedf2b50a0e250ed954e40ef570214f4a23c Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a406eec09d..8b3b3d83a9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10801,7 +10801,7 @@ (define-public libunique (define-public gnome-calculator (package (name "gnome-calculator") - (version "42.2") + (version "44.0") (source (origin (method url-fetch) @@ -10810,7 +10810,7 @@ (define-public gnome-calculator name "-" version ".tar.xz")) (sha256 (base32 - "1866qn0r9xp7b7j1436kry2k3bdh9ikhz2wm41jxcn1nljyb3nik")))) + "0hqhnwaw7zam0r7b61ir68710hxmc5rxb0172mz9lc48kwr67rql")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t @@ -10837,11 +10837,13 @@ (define-public gnome-calculator gtksourceview libadwaita libgee - libhandy - libsoup-minimal-2 + libsoup libxml2 mpc mpfr)) + (propagated-inputs + ;; Marked as requires.private in either .pc + (list libgee glib gtk)) (home-page "https://wiki.gnome.org/Apps/Calculator") (synopsis "Desktop calculator") (description -- cgit v1.2.3 From 51f8803488395cc0c89c4a8350c727c4dfd9f3e4 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Thu, 16 Nov 2023 23:18:12 +0100 Subject: gnu: gnome-calculator: Update style. * gnu/packages/gnome.scm (gnome-calculator) [arguments]: Convert to list of G-Expressions. Change-Id: I217aec53e66808cc11a26f5df58fd25355d898b0 Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 8b3b3d83a9..35f7766b2d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10813,18 +10813,19 @@ (define-public gnome-calculator "0hqhnwaw7zam0r7b61ir68710hxmc5rxb0172mz9lc48kwr67rql")))) (build-system meson-build-system) (arguments - '(#:glib-or-gtk? #t - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'skip-gtk-update-icon-cache - (lambda _ - (substitute* "meson.build" - (("gtk_update_icon_cache: true") - "gtk_update_icon_cache: false")))) - (add-before 'check 'pre-check - (lambda _ - ;; Tests require a writable HOME. - (setenv "HOME" (getcwd))))))) + (list + #:glib-or-gtk? #t + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'skip-gtk-update-icon-cache + (lambda _ + (substitute* "meson.build" + (("gtk_update_icon_cache: true") + "gtk_update_icon_cache: false")))) + (add-before 'check 'pre-check + (lambda _ + ;; Tests require a writable HOME. + (setenv "HOME" (getcwd))))))) (native-inputs (list gettext-minimal `(,glib "bin") ;for glib-compile-schemas, gio-2.0. -- cgit v1.2.3 From f64ec2b15132c46bcdf0546196646237890832f6 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 14 Nov 2023 12:28:18 +0100 Subject: gnu: gexiv2: Update to 0.14.2. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/gnome.scm (gexiv2): Update to 0.14.2. [#:configure-flags]: Remove. [inputs]: Move gobject-introspection… [native-inputs]: … here. Change-Id: I4f0dd10e05eb1e893241a5ebfb49c24d673f91dc Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 35f7766b2d..ab485cffb1 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7431,7 +7431,7 @@ (define-public libgee (define-public gexiv2 (package (name "gexiv2") - (version "0.14.0") + (version "0.14.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -7439,7 +7439,7 @@ (define-public gexiv2 name "-" version ".tar.xz")) (sha256 (base32 - "17nnsslj2wpizpx742w5lxdzcz5mx6jmsqcrli7zddi0zyk7k0p5")))) + "1gp07klqixpxjqiv84i2gmkb1pcf1gagyrl800sk92xyizs9q31a")))) (build-system meson-build-system) (arguments (list @@ -7447,14 +7447,11 @@ (define-public gexiv2 (guix build python-build-system)) #:modules '((guix build meson-build-system) ((guix build python-build-system) #:prefix python:) - (guix build utils)) - #:configure-flags - #~(list (string-append "-Dpython3_girdir=" - (python:site-packages %build-inputs %outputs) - "/gi/overrides")))) + (guix build utils)))) (native-inputs (list gcr-3 `(,glib "bin") + gobject-introspection pkg-config python python-pygobject @@ -7463,8 +7460,7 @@ (define-public gexiv2 ;; Listed in "Requires" section of gexiv2.pc (list exiv2)) (inputs - (list glib - gobject-introspection)) + (list glib)) (home-page "https://wiki.gnome.org/Projects/gexiv2") (synopsis "GObject wrapper around the Exiv2 photo metadata library") (description -- cgit v1.2.3 From fd25eae79c2a3924bb132592035c0cdd9f40b588 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Thu, 16 Nov 2023 17:45:10 +0100 Subject: gnu: Add libdex. * gnu/packages/glib.scm (libdex): New variable. Change-Id: I834e45aff5e933e3e30276bb11030f84718ce72f Signed-off-by: Liliana Marie Prikler --- gnu/packages/glib.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index ee44f8f403..b01b948fc6 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -1520,3 +1520,38 @@ (define-public dbus-test-runner (description "A small little utility to run a couple of executables under a new DBus session for testing.") (license license:gpl3))) + +(define-public libdex + (package + (name "libdex") + (version "0.4.1") + (source + (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major+minor version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 "0fj4bggygdxgfsdrhc3zg1y2065g0skpz1l2bqwl0jqn9m3zbdc1")))) + (build-system meson-build-system) + (arguments + (list #:configure-flags #~'("-D" "docs=true"))) + (native-inputs + (list gobject-introspection + gi-docgen + pkg-config + vala)) + (inputs + (list glib + libsoup)) + (home-page "https://gitlab.gnome.org/GNOME/libdex") + (synopsis "Library for future-based programming with glib") + (description + "Dex provides Future-based programming for GLib-based applications. + +It both integrates with and brings new features for application and library +authors who want to manage concurrent code. + +Dex also provides Fibers which allow writing synchronous looking code in C +that uses asynchronous and future-based APIs.") + (license license:lgpl2.1+))) -- cgit v1.2.3 From 1b39a2cdcfa7fbdc6ac48cfc18f7680a87c039e3 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Thu, 16 Nov 2023 17:54:22 +0100 Subject: gnu: libpanel: Update to 1.2.0. The fontconfig issue was apparently HOME that was not set. The build system required the documentation command to fail on any warning. * gnu/packages/gtk.scm (libpanel): Update to 1.2.0. [#:configure-flags]: Remove. [#:phases]: Reindent. : New phase. [native-inputs]: Reindent. Add gi-docgen. Change-Id: I2a11e9c3e8b480e5ebc9b4e3e4763804c9c6a28c Signed-off-by: Liliana Marie Prikler --- gnu/packages/gtk.scm | 32 +++++++++++++++++++------------- 1 file changed, 19 insertions(+), 13 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 67611efaae..b5246c8b3b 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -2928,7 +2928,7 @@ (define-public webp-pixbuf-loader (define-public libpanel (package (name "libpanel") - (version "1.0.2") + (version "1.2.0") (source (origin (method git-fetch) @@ -2937,20 +2937,26 @@ (define-public libpanel (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "10lkysbwg9w0lm1hj7lw4g7y9j8b88kmq07nfgx0r6f319znj12v")))) + (base32 "0wal073anl6iviyljyr8pw0m7av4ik6azpmrwzxw4snp95ib27aq")))) (build-system meson-build-system) (arguments - (list #:configure-flags #~(list "-Ddocs=disabled") ;fontconfig issue - #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'disable-gtk-update-icon-cache - (lambda _ - (substitute* "meson.build" - (("gtk_update_icon_cache: true") - "gtk_update_icon_cache: false"))))))) - (native-inputs (list `(,glib "bin") - gobject-introspection - pkg-config - vala)) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'disable-gtk-update-icon-cache + (lambda _ + (substitute* "meson.build" + (("gtk_update_icon_cache: true") + "gtk_update_icon_cache: false")))) + (add-before 'build 'set-home + (lambda _ + (setenv "HOME" (getcwd))))))) + (native-inputs + (list gi-docgen + `(,glib "bin") + gobject-introspection + pkg-config + vala)) (inputs (list glib gtk libadwaita)) (home-page "https://gitlab.gnome.org/GNOME/libpanel") (synopsis "Dock and panel library for GTK 4") -- cgit v1.2.3 From 28a5b4f2141d94e1787b2e2a9dce0f9caf6181bc Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Thu, 16 Nov 2023 18:04:24 +0100 Subject: gnu: jsonrpc-glib: Update to 3.44.0. The API documentation can be built with a special configure flag, if we add gi-docgen to the native inputs. * gnu/packages/gnome.scm (jsonrpc-glib): Update to 3.44.0. [#:configure-flags]: Add -Denable_gtk_doc=true. [native-inputs]: Add gi-docgen. Change-Id: Ifff092dfbc16dd70ca40524a625e67aca75aec2e Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ab485cffb1..e735a214f3 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -12897,7 +12897,7 @@ (define-public parlatype (define-public jsonrpc-glib (package (name "jsonrpc-glib") - (version "3.42.0") + (version "3.44.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -12905,13 +12905,17 @@ (define-public jsonrpc-glib name "-" version ".tar.xz")) (sha256 (base32 - "0sr71110gwbv08qwjh410fnhq6v5swn849y4gm314am8gjjqj692")))) + "01nfsny3612c6l5q7qaazjpbzin0h357xblc81sm3k6ha016lh39")))) (build-system meson-build-system) + (arguments + (list + #:configure-flags #~(list "-Denable_gtk_doc=true"))) (inputs (list glib json-glib)) (native-inputs - (list `(,glib "bin") ; for glib-genmarshal, etc. + (list gi-docgen + `(,glib "bin") ; for glib-genmarshal, etc. gobject-introspection pkg-config vala)) -- cgit v1.2.3 From d77e9e442063792dacf5d6e7d872f9900d266f1a Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Thu, 16 Nov 2023 18:12:24 +0100 Subject: gnu: libpeas: Update to 1.36.0. * gnu/packages/gnome.scm (libpeas): Update to 1.36.0. [arguments]: Convert to G-Expressions. [#:configure-flags]: Add -Dvapi=true and -Dgtk_doc=true. [native-inputs]: Add gi-docgen and vala. [propagated-inputs]: Add glib. Change-Id: I04f726d14662b5db17e3724ca482dc8402cee67b Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e735a214f3..0c3e61c652 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3078,7 +3078,7 @@ (define-public libnotify (define-public libpeas (package (name "libpeas") - (version "1.32.0") + (version "1.36.0") (source (origin (method url-fetch) @@ -3087,21 +3087,23 @@ (define-public libpeas name "-" version ".tar.xz")) (sha256 (base32 - "03ixrhfkywcb409dd0hybyb6i291phwy8si4kc17g29fl07m49fn")))) + "0k3v4c9xs7pxpckkagl9ba70nlxl2n23w6ixc8bqd3ndrk1bjz19")))) (build-system meson-build-system) (arguments - '(#:phases - (modify-phases %standard-phases - (add-before 'check 'start-xserver - (lambda* (#:key inputs #:allow-other-keys) - (let ((disp ":1")) - (setenv "DISPLAY" disp) - (setenv "XDG_CACHE_HOME" "/tmp/xdg-cache") - (setenv "XDG_CONFIG_HOME" "/tmp") - ;; Tests require a running X server. - (system (format #f "~a ~a &" - (search-input-file inputs "bin/Xvfb") - disp)))))))) + (list + #:configure-flags #~'("-Dvapi=true" "-Dgtk_doc=true") + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'start-xserver + (lambda* (#:key inputs #:allow-other-keys) + (let ((disp ":1")) + (setenv "DISPLAY" disp) + (setenv "XDG_CACHE_HOME" "/tmp/xdg-cache") + (setenv "XDG_CONFIG_HOME" "/tmp") + ;; Tests require a running X server. + (system (format #f "~a ~a &" + (search-input-file inputs "bin/Xvfb") + disp)))))))) (inputs (list gtk+ glade3 @@ -3110,12 +3112,14 @@ (define-public libpeas (native-inputs (list pkg-config gettext-minimal + gi-docgen `(,glib "bin") gobject-introspection - xorg-server-for-tests)) + xorg-server-for-tests + vala)) (propagated-inputs ;; The .pc file "Requires" gobject-introspection. - (list gobject-introspection)) + (list glib gobject-introspection)) (home-page "https://wiki.gnome.org/Projects/Libpeas") (synopsis "GObject plugin system") (description -- cgit v1.2.3 From 7bc6a2ef4d27195ebe1b968d1ae1d698aa40863d Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Thu, 16 Nov 2023 18:23:58 +0100 Subject: gnu: sysprof: Update to 3.48.0. * gnu/packages/gnome.scm (sysprof): Update to 3.48.0. [#:configure-flags]: Add -Dhelp=true. [propagated-inputs]: Add glib, json-glib and libadwaita. Change-Id: I0810ce009f01c53ca08cc7e3a6bea702f0a6c252 Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 0c3e61c652..bc3f6359b5 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -12996,7 +12996,7 @@ (define-public feedbackd (define-public sysprof (package (name "sysprof") - (version "3.45.1") + (version "3.48.0") (source (origin (method url-fetch) @@ -13004,12 +13004,13 @@ (define-public sysprof (version-major+minor version) "/" "sysprof-" version ".tar.xz")) (sha256 - (base32 "16nmr1qs7s2ylhwj58zj6b7in72nw7z72glaz746f2g7dbqs00k4")))) + (base32 "0s11jwkvdbnq2jyz26mwy47wcxfsbawg53zlackvabygcqd0in87")))) (build-system meson-build-system) (arguments (list #:configure-flags - #~(list (string-append "-Dsystemdunitdir=" #$output "/share/systemd")) + #~(list (string-append "-Dsystemdunitdir=" #$output "/share/systemd") + "-Dhelp=true") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'disable-post-install @@ -13020,7 +13021,8 @@ (define-public sysprof (("update_desktop_database: true") "update_desktop_database: false"))))))) (propagated-inputs - (list polkit)) + ;; Listed in sysprof-4.pc or sysprof-ui-5.pc + (list glib json-glib libadwaita polkit)) (inputs (list glib gtk -- cgit v1.2.3 From 93fd21717f4cbc4d416b354e6a77c7f8e3bdfe58 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Thu, 16 Nov 2023 20:49:05 +0100 Subject: gnu: gnome-builder: Update to 44.2. * gnu/packages/gnome.scm (gnome-builder): Update to 44.2. [#:configure-flags]: Add -Ddocs=true. [#:phases]: Also disable gtk-update-icon-cache in meson.build. Disable test-shortcuts. : New phase. : Only enable it when tests? is true. : New phase. [inputs]: Add d-spy, editorconfig-core-c, libdex, libpanel. Replace gtk+ with gtk, libhandy with libadwaita, libsoup-minimal-2 with libsoup, sysprof-3.44 with sysprof, vte with vte-with-gtk-4 and webkitgtk-with-libsoup2 with webkitgtk. Remove glade3. [propagated-inputs]: Replace gtksourceview-4 with gtksourceview. [native-inputs]: Add gi-docgen. Change-Id: I3ac149b76813e28d523fd67050efb0744771a296 Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 61 ++++++++++++++++++++++++++++++++++---------------- 1 file changed, 42 insertions(+), 19 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index bc3f6359b5..194a443484 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -13079,7 +13079,7 @@ (define-public sysprof-3.44 (define-public gnome-builder (package (name "gnome-builder") - (version "42.1") + (version "44.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -13087,57 +13087,80 @@ (define-public gnome-builder name "-" version ".tar.xz")) (sha256 (base32 - "02k78mamp1yf9y6wixd864hdf9saw83wdw01f80lhnw60avm2kax")))) + "1c192xzjv5hsbp1p3wil595810k49kgmf5a7lwf260izip3qk9ng")))) (build-system meson-build-system) (arguments (list #:glib-or-gtk? #t ;To wrap binaries and compile schemas - #:configure-flags #~(list "-Dnetwork_tests=false") + #:configure-flags #~(list "-Dnetwork_tests=false" "-Ddocs=true") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-meson (lambda* (#:key inputs #:allow-other-keys) + (substitute* "meson.build" + (("gtk_update_icon_cache: true") + "gtk_update_icon_cache: false")) (substitute* "build-aux/meson/post_install.py" + ;; The post_install script does not seem to respect the + ;; previous setting regarding gtk-update-icon-cache. (("gtk-update-icon-cache") "true") (("update-desktop-database") "true")) - (substitute* "src/libide/meson.build" - (("/usr/lib") - (string-append #$(this-package-input "python-pygobject") - "/lib"))))) - (add-before 'check 'pre-check + ;; This test is failing for unclear reasons. + (substitute* "src/tests/meson.build" + (("test\\('test-shortcuts'") + "# test('test-shortcuts'")))) + (add-before 'build 'set-home (lambda _ - (system "Xvfb :1 &") - (setenv "DISPLAY" ":1")))))) + ;; Required for documentation. + (setenv "HOME" (getcwd)))) + (add-before 'check 'pre-check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (system "Xvfb :1 &") + (setenv "DISPLAY" ":1")))) + (add-after 'glib-or-gtk-wrap 'wrap-typelib + (lambda* (#:key outputs #:allow-other-keys) + (wrap-program (search-input-file outputs "bin/gnome-builder") + `("GI_TYPELIB_PATH" suffix (,(getenv "GI_TYPELIB_PATH"))))))))) (inputs - (list cmark + (list bash-minimal ;for wrap-program + cmark clang devhelp-with-libsoup2 + d-spy + ;; Cyclic modular dependency + (module-ref + (resolve-interface + '(gnu packages text-editors)) + 'editorconfig-core-c) flatpak - glade3 gspell - gtk+ + gtk json-glib jsonrpc-glib + libadwaita libdazzle + libdex libgit2-glib - libhandy + libpanel libpeas libportal - libsoup-minimal-2 + libsoup llvm libostree python python-pygobject - sysprof-3.44 + sysprof template-glib - vte - webkitgtk-with-libsoup2)) + vte-with-gtk-4 + webkitgtk)) (propagated-inputs - (list gtksourceview-4)) ;needed for settings + (list gtksourceview)) ;needed for settings (native-inputs (list desktop-file-utils ;for desktop-file-validate `(,glib "bin") gettext-minimal + gi-docgen pkg-config python ;for meson scripts vala -- cgit v1.2.3 From 7b95445865b8687eff0f8af678cfd3a4da281066 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Thu, 16 Nov 2023 00:12:44 +0100 Subject: gnu: appstream: Load stemmer in all circumstances. If the default stemmer language is computed to be "en", such as in a Guix build container, then the stemmer would not be loaded. * gnu/packages/patches/appstream-load-stemmer-early.patch: New patch. * gnu/local.mk (dist_patch_DATA): Register it here. * gnu/packages/freedesktop.scm (appstream) [patches]: Use it here. [#:phases]: Remove. Change-Id: Iddd6ce5887247df46f670c49f9efc66772c82ff0 Signed-off-by: Liliana Marie Prikler --- gnu/local.mk | 1 + gnu/packages/freedesktop.scm | 9 +-- .../patches/appstream-force-reload-stemmer.patch | 89 ++++++++++++++++++++++ 3 files changed, 93 insertions(+), 6 deletions(-) create mode 100644 gnu/packages/patches/appstream-force-reload-stemmer.patch diff --git a/gnu/local.mk b/gnu/local.mk index a939b9be8d..5cb9874d9f 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -918,6 +918,7 @@ dist_patch_DATA = \ %D%/packages/patches/antlr3-3_1-fix-java8-compilation.patch \ %D%/packages/patches/antlr3-3_3-fix-java8-compilation.patch \ %D%/packages/patches/aoflagger-use-system-provided-pybind11.patch \ + %D%/packages/patches/appstream-force-reload-stemmer.patch \ %D%/packages/patches/apr-fix-atomics.patch \ %D%/packages/patches/apr-skip-getservbyname-test.patch \ %D%/packages/patches/ark-skip-xar-test.patch \ diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 0aeeadf5a3..25b7998d05 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -148,7 +148,9 @@ (define-public appstream "appstream/releases/" "AppStream-" version ".tar.xz")) (sha256 - (base32 "1val1b3dggn9g33q2r9q7wsl75a64x4lcvswvkcjjbvakkbj5xyl")))) + (base32 "1val1b3dggn9g33q2r9q7wsl75a64x4lcvswvkcjjbvakkbj5xyl")) + (patches + (search-patches "appstream-force-reload-stemmer.patch")))) (build-system meson-build-system) (arguments (list @@ -163,11 +165,6 @@ (define-public appstream (substitute* "meson.build" (("/usr/include") (dirname libstemmer.h)))))) - (add-after 'unpack 'disable-failing-tests - (lambda _ - (substitute* "tests/test-pool.c" - (("[ \t]*g_test_add_func \\(\"/AppStream/Stemming.*;") - "")))) (add-before 'check 'check-setup (lambda _ (setenv "HOME" (getcwd))))))) diff --git a/gnu/packages/patches/appstream-force-reload-stemmer.patch b/gnu/packages/patches/appstream-force-reload-stemmer.patch new file mode 100644 index 0000000000..a2cf84c8b1 --- /dev/null +++ b/gnu/packages/patches/appstream-force-reload-stemmer.patch @@ -0,0 +1,89 @@ +From 32182d7a7a67d0d204cd0a37bd211bfd0177bc27 Mon Sep 17 00:00:00 2001 +Message-ID: <32182d7a7a67d0d204cd0a37bd211bfd0177bc27.1700093066.git.vivien@planete-kraus.eu> +From: Matthias Klumpp +Date: Thu, 16 Nov 2023 00:59:15 +0100 +Subject: [PATCH] stemmer: Resolve potential issue where stemmer may never be + initialized + +If the initial locale was equal to the current stemming language, we may +never have initialized the stemmer (which could lead to crashes or +stemming being disabled). + +So we force the reload to always happen on initialization. +CC: #558 +--- + src/as-stemmer.c | 33 +++++++++++++++++++++------------ + 1 file changed, 21 insertions(+), 12 deletions(-) + +diff --git a/src/as-stemmer.c b/src/as-stemmer.c +index 63d45267..16ebd09b 100644 +--- a/src/as-stemmer.c ++++ b/src/as-stemmer.c +@@ -47,6 +47,8 @@ G_DEFINE_TYPE (AsStemmer, as_stemmer, G_TYPE_OBJECT) + + static gpointer as_stemmer_object = NULL; + ++static void as_stemmer_reload_internal (AsStemmer *stemmer, const gchar *locale, gboolean force); ++ + /** + * as_stemmer_finalize: + **/ +@@ -76,21 +78,14 @@ as_stemmer_init (AsStemmer *stemmer) + + /* we don't use the locale in XML, so it can be POSIX */ + locale = as_get_current_locale_posix (); +- stemmer->current_lang = as_utils_locale_to_language (locale); + +- as_stemmer_reload (stemmer, stemmer->current_lang); ++ /* force a reload for initialization */ ++ as_stemmer_reload_internal (stemmer, locale, TRUE); + #endif + } + +-/** +- * as_stemmer_reload: +- * @stemmer: A #AsStemmer +- * @locale: The stemming language as POSIX locale. +- * +- * Allows realoading the #AsStemmer with a different language. +- */ +-void +-as_stemmer_reload (AsStemmer *stemmer, const gchar *locale) ++static void ++as_stemmer_reload_internal (AsStemmer *stemmer, const gchar *locale, gboolean force) + { + #ifdef HAVE_STEMMING + g_autofree gchar *lang = NULL; +@@ -99,7 +94,7 @@ as_stemmer_reload (AsStemmer *stemmer, const gchar *locale) + /* check if we need to reload */ + lang = as_utils_locale_to_language (locale); + locker = g_mutex_locker_new (&stemmer->mutex); +- if (as_str_equal0 (lang, stemmer->current_lang)) { ++ if (!force && as_str_equal0 (lang, stemmer->current_lang)) { + g_mutex_locker_free (locker); + return; + } +@@ -119,6 +114,20 @@ as_stemmer_reload (AsStemmer *stemmer, const gchar *locale) + #endif + } + ++/** ++ * as_stemmer_reload: ++ * @stemmer: A #AsStemmer ++ * @locale: The stemming language as POSIX locale. ++ * ++ * Allows realoading the #AsStemmer with a different language. ++ * Does nothing if the stemmer is already using the selected language. ++ */ ++void ++as_stemmer_reload (AsStemmer *stemmer, const gchar *locale) ++{ ++ as_stemmer_reload_internal (stemmer, locale, FALSE); ++} ++ + /** + * as_stemmer_stem: + * @stemmer: A #AsStemmer +-- +2.41.0 + -- cgit v1.2.3 From 60db3a6b3f6e4d1bd751d04b7d9ad1e894febf93 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Thu, 16 Nov 2023 00:11:35 +0100 Subject: gnu: libxmlb: Add xz to propagated-inputs. liblzma is present in Requires.private in the pkg-config definition of xmlb. * gnu/packages/xml.scm (libxmlb) [propagated-inputs]: Add xz. Change-Id: I7189b47d879561ffd1902079d20054a287ffaf20 Signed-off-by: Liliana Marie Prikler --- gnu/packages/xml.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index ec68deb31a..c6ddae50ae 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm @@ -107,7 +107,7 @@ (define-public libxmlb (inputs (list appstream-glib glib)) (propagated-inputs - (list `(,zstd "lib"))) ; in Requires.private of xmlb.pc + (list xz `(,zstd "lib"))) ; in Requires.private of xmlb.pc (synopsis "Library to help create and query binary XML blobs") (description "Libxmlb library takes XML source, and converts it to a structured binary representation with a deduplicated string table; where the -- cgit v1.2.3 From e21f0cb7b7a87992004193cd56638ad961fe5928 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 25 Nov 2023 17:30:40 +0100 Subject: gnu: sysprof: Do not propagate libadwaita. It is perfectly reasonable to use sysprof without its UI. * gnu/packages/gnome.scm (sysprof)[propagated-inputs]: Remove libadwaita. Change-Id: Ib3291bb9897d7cafb91ed38d303ee25e2e18f507 Fixes: Mutter fails to build --- gnu/packages/gnome.scm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 194a443484..d354327497 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -13021,8 +13021,7 @@ (define-public sysprof (("update_desktop_database: true") "update_desktop_database: false"))))))) (propagated-inputs - ;; Listed in sysprof-4.pc or sysprof-ui-5.pc - (list glib json-glib libadwaita polkit)) + (list glib json-glib polkit)) (inputs (list glib gtk -- cgit v1.2.3 From 19c9e4df44a734e44bd3fa6bfa0520dd9eb6ba94 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 14 Nov 2023 12:08:50 +0100 Subject: gnu: folks: Update to 0.15.6. * gnu/packages/gnome.scm (folks): Update to 0.15.6. [#:phase 'skip-gtk-update-icon-cache]: Update for build system change. Change-Id: I6fd9ab5b4de5cd7fd12d49760b035092109d812c Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d354327497..249bee3e46 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10643,7 +10643,7 @@ (define-public gnome-shell-extensions (define-public folks (package (name "folks") - (version "0.15.5") + (version "0.15.6") (source (origin (method url-fetch) (uri (string-append @@ -10652,7 +10652,7 @@ (define-public folks "folks-" version ".tar.xz")) (sha256 (base32 - "11lhfn6b7gml4ckj2dkm6g889j21wpvj90srwjp85k9hcf4qmzqg")))) + "0j02hi6j7rn7qhfmb3abryyad020rdkh59n7w6dwwa9zal666rn8")))) (build-system meson-build-system) (arguments '(#:phases @@ -10660,8 +10660,9 @@ (define-public folks (add-after 'unpack 'skip-gtk-update-icon-cache ;; Don't create 'icon-theme.cache'. (lambda _ - (substitute* "meson_post_install.py" - (("gtk-update-icon-cache") "true"))))))) + (substitute* "meson.build" + (("gtk_update_icon_cache: true") + "gtk_update_icon_cache: false"))))))) (inputs (list bdb dbus-glib -- cgit v1.2.3 From 280aef16121e252a51c261db50a6f8b1743caad0 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 14 Nov 2023 01:06:36 +0100 Subject: gnu: d-spy: Update to 1.6.0. * gnu/packages/gnome.scm (d-spy): Update to 1.6.0. Change-Id: I63da8ea2970bf9bf3fed1936b22ce88247ce8b22 Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 249bee3e46..111edb59be 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7229,7 +7229,7 @@ (define-public d-feet (define-public d-spy (package (name "d-spy") - (version "1.4.0") + (version "1.6.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -7237,7 +7237,7 @@ (define-public d-spy name "-" version ".tar.xz")) (sha256 (base32 - "0wk7i3vyq4a98g29ms7vz3wy8xkk3pgw48g0fm65qk32xa679s7a")))) + "1zca9yn12a8phy2lzcsc7wak10r0j53m8d0fs1q69d1va48a5l52")))) (build-system meson-build-system) (arguments (list -- cgit v1.2.3 From d359c0fbec7f161138c9ae541548690d3fe51df7 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Mon, 20 Nov 2023 20:25:28 +0100 Subject: gnu: Add gtk-frdp. * gnu/packages/rdesktop.scm (gtk-frdp): New variable. Change-Id: I8ce190ca80245eff48af08e005e90e396e498e91 Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 111edb59be..e999739e3f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -13624,3 +13624,32 @@ (define-public calls backends, such as ModemManager for phones and @acronym{SIP, Session Initiation Protocol} for @acronym{VoIP, Voice over @acronym{IP, Internet Protocol}}.") (license license:gpl3+))) + +(define-public gtk-frdp + (package + (name "gtk-frdp") + ;; The latest published tag is 3.37.1, but it is very old: + ;; https://gitlab.gnome.org/GNOME/gtk-frdp/-/issues/39 + (version "3.37.1") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.gnome.org/GNOME/gtk-frdp") + (commit "62fc62c5ccb7634f0bc87c57a4673877c24c94ed"))) + (file-name (git-file-name "gtk-frdp" version)) + (sha256 + (base32 + "0msw7qpsyf9hkyq9ddhvl4g4vk1fnyi7g0bddca9x6p9d0arprqz")))) + (build-system meson-build-system) + (arguments + (list #:glib-or-gtk? #t)) + (inputs + (list freerdp fuse gtk+)) + (native-inputs + (list `(,glib "bin") gobject-introspection pkg-config vala)) + (home-page "https://gitlab.gnome.org/GNOME/gtk-frdp") + (synopsis "RDP viewer widget for Gtk") + (description "This library provides a widget to view +@acronym{RDP,Remote Desktop Protocol} sessions.") + (license license:gpl3+))) -- cgit v1.2.3 From 46f0e584523a729486c19b692e1aaf8a6a49fb10 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Mon, 20 Nov 2023 20:25:45 +0100 Subject: gnu: Add gnome-connections. * gnu/packages/gnome.scm (gnome-connections): New variable. Change-Id: If88a6e4c4f640a1175a8c98d13986f7520fe77b7 Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 49 +++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 49 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e999739e3f..603a301d78 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -13653,3 +13653,52 @@ (define-public gtk-frdp (description "This library provides a widget to view @acronym{RDP,Remote Desktop Protocol} sessions.") (license license:gpl3+))) + +(define-public gnome-connections + (package + (name "gnome-connections") + (version "44.1") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "0sv238bq0dhi68ksr3bcl4q44i3ishk5i10c2325qz879f92sshk")) + (snippet + #~(begin + (use-modules (guix build utils)) + (delete-file-recursively "subprojects"))))) + (build-system meson-build-system) + (arguments + (list + #:glib-or-gtk? #t + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-meson + (lambda _ + (substitute* "meson.build" + (("gtk_update_icon_cache: true") + "gtk_update_icon_cache: false") + (("update_desktop_database: true") + "update_desktop_database: false")))) + (add-after 'unpack 'disable-onboarding-dialog + (lambda _ + (substitute* "src/application.vala" + (("\\(new OnboardingDialog \\(main_window\\)\\).present \\(\\);") + "// Skip the onboarding dialog"))))))) + (inputs + (list gtk+ gtk-frdp gtk-vnc libhandy libsecret libxml2)) + (native-inputs + (list gettext-minimal + `(,glib "bin") + itstool + pkg-config + vala)) + (home-page "https://apps.gnome.org/Connections") + (synopsis "View and use other desktops") + (description "Connections allows the user to connect to different +real or virtual machines, using @acronym{VNC,Virtual Network Computing} +or @acronym{RDP,Remote Desktop Protocol}.") + (license license:gpl3+))) -- cgit v1.2.3 From 1fb33bf1a490c0c85b26f3c88239c12875303640 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Mon, 20 Nov 2023 18:59:16 +0100 Subject: gnu: gnome-characters: Update to 44.0. * gnu/packages/gnome.scm (gnome-characters): Update to 44.0. [#:phases]: Update to build system changes. [inputs]: Remove libhandy. [home-page]: Update. Change-Id: I416718a7b729b848cbefdb4cdd8677c3ae2fe88b Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 603a301d78..266edbaa8b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2068,7 +2068,7 @@ (define-public libgxps (define-public gnome-characters (package (name "gnome-characters") - (version "42.0") + (version "44.0") (source (origin (method url-fetch) @@ -2077,7 +2077,7 @@ (define-public gnome-characters "/gnome-characters-" version ".tar.xz")) (sha256 (base32 - "1y40g7k7yyzikbbxhf69q4c0221lga1cli1p617v99pq2swgz82x")))) + "02zm3w43lvsnld3681z9w1428pwdza2gv4k05vwsx461ih15rc85")))) (build-system meson-build-system) (arguments (list @@ -2085,7 +2085,11 @@ (define-public gnome-characters #:phases #~(modify-phases %standard-phases (add-after 'unpack 'disable-gtk-update-icon-cache (lambda _ - (setenv "DESTDIR" "/"))) + (substitute* "meson.build" + (("gtk_update_icon_cache: true") + "gtk_update_icon_cache: false") + (("update_desktop_database: true") + "update_desktop_database: false")))) (add-after 'install 'wrap (lambda* (#:key outputs #:allow-other-keys) ;; GNOME Characters needs Typelib files from GTK and @@ -2100,13 +2104,13 @@ (define-public gnome-characters pkg-config python-minimal)) (inputs - (list gjs + (list bash-minimal ;for wrap-program + gjs gnome-desktop gtk libadwaita - libhandy libunistring)) - (home-page "https://wiki.gnome.org/Apps/CharacterMap") + (home-page "https://wiki.gnome.org/Apps/Characters") (synopsis "Find and insert unusual characters") (description "Characters is a simple utility application to find and insert unusual characters. It allows you to quickly find the -- cgit v1.2.3 From c35abdaeeb74770b226097a661e504bf25a914c6 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 21 Nov 2023 07:32:04 +0100 Subject: gnu: gnome-contacts: Update to 44.0. * gnu/packages/gnome.scm (gnome-contacts): Update to 44.0. [arguments]: Convert to list of G-Expressions. [#:configure-flags]: Add -Ddocs=false. [inputs]: Replace evolution-data-server-3.44 with evolution-data-server. Replace gnome-online-accounts-3.44 with gnome-online-accounts. Remove libhandy. Add qrencode. [propagated-inputs]: Replace folks-with-libsoup2 with folks. Change-Id: Ib2e1f4a8db6877a203a963cb0d36d194bf62f60e Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 32 ++++++++++++++++++-------------- 1 file changed, 18 insertions(+), 14 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 266edbaa8b..0a160f4326 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2142,7 +2142,7 @@ (define-public gnome-common (define-public gnome-contacts (package (name "gnome-contacts") - (version "42.0") + (version "44.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/gnome-contacts/" @@ -2150,17 +2150,21 @@ (define-public gnome-contacts name "-" version ".tar.xz")) (sha256 (base32 - "05jj5kiab13crm18r166w7h31jpny7f3px98q7d2ix93vj7w60l8")))) + "1vbvvv8954j4znczqa41j892rvj36k21ah5f5lwgcsphq4xidlbx")))) (build-system meson-build-system) (arguments - `(#:glib-or-gtk? #t - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'skip-gtk-update-icon-cache - (lambda _ - (substitute* "meson.build" - (("gtk_update_icon_cache: true") - "gtk_update_icon_cache: false"))))))) + (list + #:glib-or-gtk? #t + ;; FIXME: Cannot build the Valadoc, because both gtk+ and gtk are in the + ;; same profile (evolution-data-server propagates both). + #:configure-flags #~'("-Ddocs=false") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'skip-gtk-update-icon-cache + (lambda _ + (substitute* "meson.build" + (("gtk_update_icon_cache: true") + "gtk_update_icon_cache: false"))))))) (native-inputs (list desktop-file-utils docbook-xml @@ -2172,19 +2176,19 @@ (define-public gnome-contacts libxslt pkg-config)) (inputs - (list evolution-data-server-3.44 + (list evolution-data-server gnome-desktop - gnome-online-accounts-3.44 + gnome-online-accounts gst-plugins-base gtk libadwaita libgee - libhandy libportal + qrencode telepathy-glib vala)) (propagated-inputs - (list folks-with-libsoup2 + (list folks telepathy-mission-control)) (synopsis "GNOME's integrated address book") (description -- cgit v1.2.3 From 40dbdb2395469521139745f6e8b894e9da6d0626 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 21 Nov 2023 08:05:43 +0100 Subject: gnu: gnome-control-center: Update to 44.4. * gnu/packages/gnome.scm (gnome-control-center): Update to 44.4. Change-Id: I04b830ef49c7a2e3770e210dc7f6f3555105af31 Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 0a160f4326..6b68707b25 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9038,7 +9038,7 @@ (define-public gnome-bluetooth (define-public gnome-control-center (package (name "gnome-control-center") - (version "44.3") + (version "44.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -9046,7 +9046,7 @@ (define-public gnome-control-center name "-" version ".tar.xz")) (sha256 (base32 - "0yhcm0c0ghkfqswqlkwcln3jpaz6jzvqaph2c3lgmv635w2nash6")) + "0mz134argczbkfnxzqsfa1vydx3v44wrldcczyzjanvrq7ia7hli")) (patches (search-patches "gnome-control-center-firmware-security.patch")))) -- cgit v1.2.3 From 2f224cf1c6d4ec29e637c26772e0a2eb6587353f Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 21 Nov 2023 18:51:37 +0100 Subject: gnu: gnome-music: Update to 44.0. When wrapping gnome-music, GST_PLUGIN_SYSTEM_PATH should not override the plugins installed by the user. * gnu/packages/gnome.scm (gnome-music): Update to 44.0. [#:phases]: Update path wrapping. [inputs]: Add bash-minimal. Replace libsoup-minimal-2 with libsoup. Change-Id: I9b8ac5ee65618baafc760be8f7ab3132f4d53345 Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 6b68707b25..a19ce64876 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -887,7 +887,7 @@ (define-public gnome-photos (define-public gnome-music (package (name "gnome-music") - (version "42.1") + (version "44.0") (source (origin (method url-fetch) @@ -897,7 +897,7 @@ (define-public gnome-music name "-" version ".tar.xz")) (sha256 (base32 - "0w42xnp6xy3sfakb4s0wq7xfg7p507whz5gzss5b2mkbm2k7yx67")))) + "0l8xiw1nv8agskrpgiyr7kinna3gms1hv5d64hh4fqifaz4smlcv")))) (build-system meson-build-system) (arguments `(#:glib-or-gtk? #t @@ -920,7 +920,7 @@ (define-public gnome-music (wrap-program (string-append out "/bin/gnome-music") `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))) - `("GST_PLUGIN_SYSTEM_PATH" = + `("GST_PLUGIN_SYSTEM_PATH" suffix (,(getenv "GST_PLUGIN_SYSTEM_PATH"))) `("GRL_PLUGIN_PATH" = (,(getenv "GRL_PLUGIN_PATH"))) @@ -934,7 +934,8 @@ (define-public gnome-music itstool pkg-config)) (inputs - (list gnome-online-accounts + (list bash-minimal + gnome-online-accounts grilo grilo-plugins gst-plugins-base @@ -946,7 +947,7 @@ (define-public gnome-music libadwaita libdazzle libmediaart - libsoup-minimal-2 + libsoup python-pycairo python-pygobject python -- cgit v1.2.3 From 5abfce62d0d7c37211693b04a9eb57c6e1427e1c Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 21 Nov 2023 18:56:29 +0100 Subject: gnu: gnome-music: Update style. * gnu/packages/gnome.scm (gnome-music) [arguments]: Convert to list of G-Expressions. Change-Id: I5cb724bc66dcfee14958753c0a129add55820db6 Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 53 +++++++++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a19ce64876..0b0f9af0fb 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -900,32 +900,33 @@ (define-public gnome-music "0l8xiw1nv8agskrpgiyr7kinna3gms1hv5d64hh4fqifaz4smlcv")))) (build-system meson-build-system) (arguments - `(#:glib-or-gtk? #t - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'skip-gtk-update-icon-cache - ;; Don't create 'icon-theme.cache'. - (lambda _ - (substitute* "meson.build" - (("gtk_update_icon_cache: true") - "gtk_update_icon_cache: false")))) - (add-after 'install 'wrap-gnome-music - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* - ((out (assoc-ref outputs "out")) - (pylib (string-append out "/lib/python" - ,(version-major+minor - (package-version python)) - "/site-packages"))) - (wrap-program (string-append out "/bin/gnome-music") - `("GI_TYPELIB_PATH" = - (,(getenv "GI_TYPELIB_PATH"))) - `("GST_PLUGIN_SYSTEM_PATH" suffix - (,(getenv "GST_PLUGIN_SYSTEM_PATH"))) - `("GRL_PLUGIN_PATH" = - (,(getenv "GRL_PLUGIN_PATH"))) - `("GUIX_PYTHONPATH" = - (,(getenv "GUIX_PYTHONPATH") ,pylib))))))))) + (list + #:glib-or-gtk? #t + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'skip-gtk-update-icon-cache + ;; Don't create 'icon-theme.cache'. + (lambda _ + (substitute* "meson.build" + (("gtk_update_icon_cache: true") + "gtk_update_icon_cache: false")))) + (add-after 'install 'wrap-gnome-music + (lambda* (#:key inputs outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (pylib (string-append out "/lib/python" + #$(version-major+minor + (package-version + (this-package-input "python"))) + "/site-packages"))) + (wrap-program (string-append out "/bin/gnome-music") + `("GI_TYPELIB_PATH" = + (,(getenv "GI_TYPELIB_PATH"))) + `("GST_PLUGIN_SYSTEM_PATH" suffix + (,(getenv "GST_PLUGIN_SYSTEM_PATH"))) + `("GRL_PLUGIN_PATH" = + (,(getenv "GRL_PLUGIN_PATH"))) + `("GUIX_PYTHONPATH" = + (,(getenv "GUIX_PYTHONPATH") ,pylib))))))))) (native-inputs (list desktop-file-utils gettext-minimal -- cgit v1.2.3 From 50d28c2a10969d2f2364de2fe67b445592d0997c Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 21 Nov 2023 18:53:56 +0100 Subject: gnu: gnome-font-viewer: Update to 44.0. * gnu/packages/gnome.scm (gnome-font-viewer): Update to 44.0. [inputs]: Remove libhandy. Change-Id: I5bab0a37e287ec935f3be280f0e04dbd4b27728a Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 0b0f9af0fb..66ba82a431 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2338,7 +2338,7 @@ (define-public gnome-disk-utility (define-public gnome-font-viewer (package (name "gnome-font-viewer") - (version "42.0") + (version "44.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/gnome-font-viewer/" @@ -2346,7 +2346,7 @@ (define-public gnome-font-viewer "/gnome-font-viewer-" version ".tar.xz")) (sha256 (base32 - "1k4dhk5dmkpxb5xpr9vrl7k2fdpi2fidzni1l2hhb891zzgvi8ng")))) + "15wzpdbx9wrw4r5l04srw89ak3j3jcmrvpbm27pw53121grisld1")))) (build-system meson-build-system) (arguments (list @@ -2372,7 +2372,6 @@ (define-public gnome-font-viewer gnome-desktop gtk libadwaita - libhandy libxml2)) (home-page "https://gitlab.gnome.org/GNOME/gnome-font-viewer") (synopsis "GNOME Fonts") -- cgit v1.2.3 From 872174fb0b72d48f11e36f2f40e0f885957638dd Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 21 Nov 2023 18:49:24 +0100 Subject: gnu: gnome-maps: Update to 44.5. * gnu/packages/geo.scm (gnome-maps): Update to 44.5. [inputs]: Replace gtk+ with gtk. Replace webkitgtk-for-gtk3 with webkitgtk. Remove libhandy. Change-Id: I8548878653120ea3cfc7554e2133880f46aeadf8 Signed-off-by: Liliana Marie Prikler --- gnu/packages/geo.scm | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm index f84fd12d86..a1992dec26 100644 --- a/gnu/packages/geo.scm +++ b/gnu/packages/geo.scm @@ -468,7 +468,7 @@ (define-public geos (define-public gnome-maps (package (name "gnome-maps") - (version "43.0") ;for libsoup 3 support + (version "44.5") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -476,7 +476,7 @@ (define-public gnome-maps name "-" version ".tar.xz")) (sha256 (base32 - "1r1l6ajs6zz316m8zac5r0l3qgdv616xh376bfn2fflcnz7wys08")))) + "026488yb6azwb2sm0yy0iaipk914l3agvb7d8azks4kyjqlslyb8")))) (build-system meson-build-system) (arguments (list @@ -518,18 +518,17 @@ (define-public gnome-maps glib-networking gnome-online-accounts gsettings-desktop-schemas - gtk+ + gtk libadwaita libgee libgweather4 - libhandy librsvg libsecret libshumate libsoup libxml2 rest-next - webkitgtk-for-gtk3)) + webkitgtk)) (synopsis "Graphical map viewer and wayfinding program") (description "GNOME Maps is a graphical map viewer. It uses map data from the OpenStreetMap project. It can provide directions for walking, bicycling, -- cgit v1.2.3 From 27d017be7aaea12db68529c3ebd5fd3dbd8642b4 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 21 Nov 2023 18:55:31 +0100 Subject: gnu: Add gnome-remote-desktop. * gnu/packages/gnome.scm (gnome-remote-desktop): New variable. Change-Id: I93d542ef04a703a0c9614968eb71ce85a83d62f4 Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 95 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 95 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 66ba82a431..c7d0bface1 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -146,6 +146,7 @@ (define-module (gnu packages gnome) #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages guile) + #:use-module (gnu packages hardware) #:use-module (gnu packages haskell-xyz) #:use-module (gnu packages ibus) #:use-module (gnu packages icu4c) @@ -13531,6 +13532,100 @@ (define-public xffm+ (license license:gpl3+) (properties '((upstream-name . "xffm"))))) +(define-public gnome-remote-desktop + (package + (name "gnome-remote-desktop") + (version "44.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "13kvr1f2vk0qfqr9alpz7wb542b5d5i9ypk74rnn7jsz3csgv7vs")))) + (build-system meson-build-system) + (arguments + (list #:configure-flags + #~'("-Dsystemd=false" + ;; RDP support requires CUDA (ffnvcodec) + "-Drdp=false" + ;; This is for the RDP back-end + "-Dfdk_aac=false" + ;; Enable VNC support + "-Dvnc=true") + #:glib-or-gtk? #t + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'shorten-vnc-test + (lambda _ + ;; The VNC test sets up the connection, parses a message + ;; from the server, and then waits forever. This + ;; modification lets it succeed once it has parsed a + ;; message from the server. + (substitute* "tests/test-client-vnc.c" + (("while \\(TRUE\\)") + "int ret = 0; while (ret == 0)") + (("int ret;") "")))) + (delete 'check) + (add-after 'install 'check + (assoc-ref %standard-phases + 'check)) + (add-before 'check 'pre-check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (setenv "HOME" "/tmp") + (setenv "XDG_RUNTIME_DIR" (string-append (getcwd) "/runtime-dir")) + (mkdir (getenv "XDG_RUNTIME_DIR")) + (chmod (getenv "XDG_RUNTIME_DIR") #o700) + (setenv "GSETTINGS_SCHEMA_DIR" + (string-append #$output "/share/glib-2.0/schemas")) + ;; Unless enabled by the user, the VNC server will not + ;; start. + (invoke "gsettings" + "set" + "org.gnome.desktop.remote-desktop.vnc" + "enable" "true") + ;; Pipewire is required. + (setenv "PIPEWIRE_DEBUG" "2") + (setenv "PIPEWIRE_LOG" "meson-logs/pipewire.log") + (invoke "pipewire" "--version") + (system "pipewire &"))))))) + (inputs + (list cairo + glib + libdrm + libepoxy + libgudev + libnotify + libsecret + ;; Cyclic modular dependency + (module-ref + (resolve-interface + '(gnu packages vnc)) + 'libvnc) + pipewire + tpm2-tss)) + (native-inputs + (list asciidoc + dbus + docbook-xsl + docbook-xml-4.3 + gettext-minimal + `(,glib "bin") + itstool + libxml2 + libxslt + mutter + pkg-config + python + python-dbus + python-pygobject)) + (home-page "https://gitlab.gnome.org/GNOME/gnome-remote-desktop") + (synopsis "Share GNOME desktop with remote sessions") + (description "This package provides a remote desktop server for GNOME.") + (license license:gpl2+))) + (define-public libcall-ui (package (name "libcall-ui") -- cgit v1.2.3 From bd53ac8b4de2d2bb529748be08eb2116d1cd89da Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 21 Nov 2023 18:50:23 +0100 Subject: gnu: gnome-photos: Update to 44.0. * gnu/packages/gnome.scm (gnome-photos): Update to 44.0. [inputs]: Add bash-minimal. Change-Id: I5ab3d9d07d167f4a3dafcc0a388232dea0379fc5 Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index c7d0bface1..8a190f3f48 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -814,7 +814,7 @@ (define-public gnome-recipes (define-public gnome-photos (package (name "gnome-photos") - (version "43.1") + (version "44.0") (source (origin (method url-fetch) @@ -824,7 +824,7 @@ (define-public gnome-photos name "-" version ".tar.xz")) (sha256 (base32 - "1axhabxrrmf4r2xw2hvrzwj62inkckpmrc0gfbjcrwic04d6gqgk")))) + "17l2bkdg8iracgw2mgx5vqfs3d6cdvd22mfdqq4jiinkjw1j33p7")))) (build-system meson-build-system) (arguments (list @@ -857,6 +857,7 @@ (define-public gnome-photos pkg-config)) (inputs (list babl + bash-minimal cairo gegl-0.4.44 geocode-glib -- cgit v1.2.3 From 32a29b828039ae2a36e96acc4d9e4fbc2eb0785d Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Thu, 23 Nov 2023 18:43:58 +0100 Subject: gnu: dbus-verbose: Update style. * gnu/packages/glib.scm (dbus-verbose) [arguments]: Convert to list of G-Expressions. Change-Id: I5880029cb3b53f617b2a1622a4f547a1ad16c564 Signed-off-by: Liliana Marie Prikler --- gnu/packages/glib.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index b01b948fc6..7b8cc3286d 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -217,7 +217,7 @@ (define-public dbus-verbose (name "dbus-verbose") (arguments (substitute-keyword-arguments (package-arguments dbus) ((#:configure-flags flags '()) - `(cons "--enable-verbose-mode" ,flags)))) + #~(cons "--enable-verbose-mode" #$flags)))) (synopsis "D-Bus with verbose mode enabled for debugging") (description "This variant D-Bus package is built with verbose mode, which eases debugging of D-Bus services by printing various debug information when -- cgit v1.2.3 From 6019da9df30f0c3ff3afc4ec967366330c290ed3 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Thu, 23 Nov 2023 19:14:00 +0100 Subject: gnu: gssdp: Update to 1.6.3. * gnu/packages/gnome.scm (gssdp): Update to 1.6.3. [#:configure-flags]: Add -Dgtk_doc=true. [native-inputs]: Add pandoc. Change-Id: Ib05c6bb40dd3967e9f2144bc065e598a40b59b85 Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 8a190f3f48..64efe94935 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1334,7 +1334,7 @@ (define-public gnome-online-miners (define-public gssdp (package (name "gssdp") - (version "1.5.2") + (version "1.6.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -1342,13 +1342,16 @@ (define-public gssdp name "-" version ".tar.xz")) (sha256 (base32 - "07hn2xma2yh17v7rlvcaibkn16bx4l9qig3mlb8hdp6qfiraqh7b")))) + "0iil7wgix0nzhf3i2w6g1wjqly49r9rsffca97ai9kr2vfpvbv9g")))) (build-system meson-build-system) + (arguments + (list #:configure-flags #~'("-Dgtk_doc=true"))) (native-inputs (list gettext-minimal `(,glib "bin") gi-docgen gobject-introspection + pandoc pkg-config vala)) (inputs -- cgit v1.2.3 From f158bd417ed63b2261fcde70ba7634a8021f6765 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Fri, 24 Nov 2023 00:20:12 +0100 Subject: gnu: libgee: Update to 0.20.6. * gnu/packages/gnome.scm (libgee): Update to 0.20.6. Change-Id: I102a31bb7b6bbeed340b14b5fd35b8f2e34c1ac9 Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 64efe94935..854fa88c10 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7414,7 +7414,7 @@ (define-public yelp-tools (define-public libgee (package (name "libgee") - (version "0.20.5") + (version "0.20.6") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/libgee/" @@ -7422,7 +7422,7 @@ (define-public libgee "libgee-" version ".tar.xz")) (sha256 (base32 - "060mbj6ihca315a6wqj47mfzm2881azwm5bl0vwjg9ymay4km1ii")))) + "0kbd8y70dd5q40i8gxzvhxkn9niqvp0x6knp4ihwqq0dw7sk9y0v")))) (build-system gnu-build-system) (arguments (list -- cgit v1.2.3 From 79ea7270ecf3c050d1eea86004902d65d00e70d1 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Fri, 24 Nov 2023 00:26:00 +0100 Subject: gnu: libgweather4: Update to 4.2.0. * gnu/packages/gnome.scm (libgweather4): Update to 4.2.0. Change-Id: Iaac8aae420a80858c8f39cb1ad8de9c5499410fa Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 854fa88c10..089665367e 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5886,7 +5886,7 @@ (define-public libgweather4 (package (inherit libgweather) (name "libgweather4") - (version "4.1.1") + (version "4.2.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/libgweather/" @@ -5894,7 +5894,7 @@ (define-public libgweather4 "libgweather-" version ".tar.xz")) (sha256 (base32 - "1wh3asniv5yiqp0dsk96as2bkx72hamh3ij2md8k0is9yd7ppbjm")))) + "00v2rb9dizfvcsq3bgrz68bsi1k04ln5fqhx1q06m5yql0nq32mg")))) (arguments (list #:configure-flags -- cgit v1.2.3 From 70eca40bc359acd644f525eaee1ea6e07d230de0 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Thu, 23 Nov 2023 22:43:46 +0100 Subject: gnu: gvfs: Update to 1.50.7. * gnu/packages/gnome.scm (gvfs): Update to 1.50.7. [#:configure-flags]: Add -Dman=true. [home-page]: Update. Change-Id: I93e5c3d19fa96eddd5ead3839e6eb100c16b712f Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 089665367e..61a948a2fc 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6953,7 +6953,7 @@ (define-public libgudev (define-public gvfs (package (name "gvfs") - (version "1.50.3") + (version "1.50.7") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/gvfs/" @@ -6961,13 +6961,14 @@ (define-public gvfs "gvfs-" version ".tar.xz")) (sha256 (base32 - "1z8332qg4kpa3lm3lbwb3xir4rba9ajsbqbq4yfh45mvjyg135v8")))) + "0cgjlxrs4qr08igqjpkhfxpzydj8m9y9n92z091knkj5170x5bbj")))) (build-system meson-build-system) (arguments (list #:glib-or-gtk? #t #:configure-flags #~(list "-Dsystemduserunitdir=no" "-Dtmpfilesdir=no" + "-Dman=true" ;; Otherwise, the RUNPATH will lack the final path component. (string-append "-Dc_link_args=-Wl,-rpath=" #$output "/lib/gvfs")))) @@ -7006,7 +7007,7 @@ (define-public gvfs openssh polkit udisks)) - (home-page "https://wiki.gnome.org/gvfs/") + (home-page "https://wiki.gnome.org/Projects/gvfs") (synopsis "Userspace virtual file system for GIO") (description "GVFS is a userspace virtual file system designed to work with the I/O -- cgit v1.2.3 From 1a4e51d1e4a04dfe8fd30789a3e712a9edca8abc Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Sun, 26 Nov 2023 16:27:31 +0100 Subject: gnu: python-pyatspi: Update to 2.46.0. * gnu/packages/gnome.scm (python-pyatspi): Update to 2.46.0. [arguments]: Convert to list of G-Expressions. Change-Id: I88c6b33154c21cd165e800b3a3e8a584eee50abd Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 61a948a2fc..03cd07749a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -11069,7 +11069,7 @@ (define-public gnome-system-monitor (define-public python-pyatspi (package (name "python-pyatspi") - (version "2.45.90") + (version "2.46.0") (source (origin (method url-fetch) (uri (string-append @@ -11078,16 +11078,17 @@ (define-public python-pyatspi "/pyatspi-" version ".tar.xz")) (sha256 (base32 - "1fggihg4xmwia0xgjkcraiqk76jvyrj1pcsw99rjh4yn3kygisrh")))) + "0bn6f1cn5z3fdg98irbm4265y0ri7fdr9s1m385ibaj77p7qjm6l")))) (build-system gnu-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'build 'fix-atk-load - (lambda _ - (substitute* "pyatspi/__init__.py" - (("from gi.repository import Atspi") - "gi.require_version('Gtk', '3.0') + (list + #:phases + #~(modify-phases %standard-phases + (add-before 'build 'fix-atk-load + (lambda _ + (substitute* "pyatspi/__init__.py" + (("from gi.repository import Atspi") + "gi.require_version('Gtk', '3.0') from gi.repository import Gtk from gi.repository import Atspi"))))))) (native-inputs -- cgit v1.2.3 From c98dfcd8318bcd422089399283b81264dcc4c8fa Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Sun, 26 Nov 2023 17:58:07 +0100 Subject: gnu: rygel: Update to 0.42.4. * gnu/packages/gnome.scm (rygel): Update to 0.42.4. [arguments]: Convert to list of G-Expressions. [propagated-inputs]: Add glib. Change-Id: I17da7894a9626cd056c7c86ac6747acc0828e1ba Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 03cd07749a..4264a05e7b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1683,7 +1683,7 @@ (define-public sushi (define-public rygel (package (name "rygel") - (version "0.41.2") + (version "0.42.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -1691,12 +1691,12 @@ (define-public rygel name "-" version ".tar.xz")) (sha256 (base32 - "0wivd60hn115ar3hsrsa595kpxzp8gwq30ksh32qlq8j9dhlq65i")))) + "1xq36f0n42yall67ibqzqsdpvljbdanhy0lvkc8ncark5nmdy433")))) (build-system meson-build-system) (arguments ;; Disable the tracker plugin. - '(#:configure-flags - (list "-Dplugins=external,gst-launch,lms,media-export, + (list #:configure-flags + #~'("-Dplugins=external,gst-launch,lms,media-export, mpris,playbin,ruih,tracker3"))) (native-inputs (list gettext-minimal @@ -1726,6 +1726,9 @@ (define-public rygel libxslt libunistring tracker)) + (propagated-inputs + ;; The .pc files require.private gmodule-2.0 + (list glib)) (synopsis "Share audio, video, and pictures with other devices") (description "Rygel is a home media solution (@dfn{UPnP AV MediaServer and -- cgit v1.2.3 From bc9b77f0b042bc42bc97df44c00bc45bfe5e004f Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Sun, 26 Nov 2023 18:04:43 +0100 Subject: gnu: simple-scan: Update to 44.0. A TODO item mentioned fixing icons, but they are visible. * gnu/packages/gnome.scm (simple-scan): Update to 44.0. Remove TODO item. Change-Id: Ib32bf25457cc2d82f0a473cfa8b6cca580a6bb6e Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4264a05e7b..af95967cc2 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7075,7 +7075,7 @@ (define-public gusb (define-public simple-scan (package (name "simple-scan") - (version "42.5") + (version "44.0") (source (origin (method url-fetch) @@ -7083,9 +7083,8 @@ (define-public simple-scan (version-major version) "/" "simple-scan-" version ".tar.xz")) (sha256 - (base32 "0l201qjig6bk34bw8d77jcbhjhn4swfqdj84sjlyy1p2x6jdzx85")))) + (base32 "15cfv56jcmjncwyf3w4ra0c77xwy0hkdzhpcx93zfizl8vyp1f1r")))) (build-system meson-build-system) - ;; TODO: Fix icons in home screen, About dialogue, and scan menu. (arguments '(#:glib-or-gtk? #t)) (native-inputs -- cgit v1.2.3 From 7d0f2433e1b9ae9d75b0e9c9a3c78e9752a24683 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Sun, 26 Nov 2023 18:58:48 +0100 Subject: gnu: vte: Update to 0.72.3. * gnu/packages/gnome.scm (vte): Update to 0.72.3. Change-Id: Id855baf348bd191cb0f44832bac1fb6948406310 Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index af95967cc2..dc3c70ab98 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4515,7 +4515,7 @@ (define-public vala-0.52 (define-public vte (package (name "vte") - (version "0.72.2") + (version "0.72.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/vte/" @@ -4523,7 +4523,7 @@ (define-public vte "vte-" version ".tar.xz")) (sha256 (base32 - "17hwfkb0vakjgf1gbmjma54hdrppzqfbfqj1jr9iz656hp8nz5pp")))) + "16v9xbngj17skipa4wjjjzwcxjb3qqad1cfi34v1sdwyy1ys617r")))) (build-system meson-build-system) (arguments (list #:configure-flags #~(list "-Dvapi=true" -- cgit v1.2.3 From e9b85cb0d40842f41a79eddb5464b9365f024a1c Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Sun, 26 Nov 2023 18:54:17 +0100 Subject: gnu: sushi: Update to 44.2. * gnu/packages/gnome.scm (sushi): Update to 44.2. [arguments]: Convert to list of G-Expressions. Change-Id: Ifd87eb3eed82b3fb2921d23fa27e161fe8361069 Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index dc3c70ab98..e48ea98827 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1628,7 +1628,7 @@ (define-public gnome-user-share (define-public sushi (package (name "sushi") - (version "42.0") + (version "44.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -1636,21 +1636,22 @@ (define-public sushi name "-" version ".tar.xz")) (sha256 (base32 - "0848gidl0ab8i5pa70mv8jzchmd9kqa8sn1lg977hyasyixdpn25")))) + "1sa3x8w8fhjj641yx5praabkqxfdsnafqnlb8jx2g451mvh2y03c")))) (build-system meson-build-system) (arguments - `(#:glib-or-gtk? #t - #:phases - (modify-phases %standard-phases - (add-after 'glib-or-gtk-wrap 'wrap-typelib - (lambda* (#:key outputs #:allow-other-keys) - (let ((prog (string-append (assoc-ref outputs "out") - "/bin/sushi"))) - ;; Put existing typelibs before sushi's deps, so as to - ;; correctly infer gdk-pixbuf. - (wrap-program prog - `("GI_TYPELIB_PATH" suffix - (,(getenv "GI_TYPELIB_PATH")))))))))) + (list + #:glib-or-gtk? #t + #:phases + #~(modify-phases %standard-phases + (add-after 'glib-or-gtk-wrap 'wrap-typelib + (lambda* (#:key outputs #:allow-other-keys) + (let ((prog (string-append (assoc-ref outputs "out") + "/bin/sushi"))) + ;; Put existing typelibs before sushi's deps, so as to + ;; correctly infer gdk-pixbuf. + (wrap-program prog + `("GI_TYPELIB_PATH" suffix + (,(getenv "GI_TYPELIB_PATH")))))))))) (native-inputs (list `(,glib "bin") gettext-minimal -- cgit v1.2.3 From 260b054aeaa0739bed1637742b6094c97dab47f2 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Sun, 26 Nov 2023 19:00:19 +0100 Subject: gnu: yelp: Update to 42.2. * gnu/packages/gnome.scm (yelp): Update to 42.2. [inputs]: Add bash-minimal and gtk+. Replace webkitgtk with webkitgtk-for-gtk3. Change-Id: Iea3fa0c9eb527b0de691809a19fce7654261e827 Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e48ea98827..6f0a948c34 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7327,7 +7327,7 @@ (define-public yelp-xsl (define-public yelp (package (name "yelp") - (version "42.1") + (version "42.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -7335,7 +7335,7 @@ (define-public yelp name "-" version ".tar.xz")) (sha256 (base32 - "0h9vf4fx056imjf8ibmn03wg1c3hniipy1nsm2jqi62lp1m19c95")))) + "0jxckvzmp3lzg62wrdp7f3c8hw6zbkwd0sy65ir9q259hw3zvid2")))) (build-system glib-or-gtk-build-system) (arguments (list #:phases @@ -7367,13 +7367,15 @@ (define-public yelp (propagated-inputs (list dconf)) (inputs - (list gsettings-desktop-schemas + (list bash-minimal + gsettings-desktop-schemas libhandy libxslt man-db ;for URIs like "man:ls" groff-minimal ;ditto + gtk+ sqlite - webkitgtk + webkitgtk-for-gtk3 yelp-xsl)) (home-page "https://wiki.gnome.org/Apps/Yelp") (synopsis "GNOME help browser") -- cgit v1.2.3 From 9cc9183472aad3d392e8d98a131c83851fee72c5 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 2 Dec 2023 00:38:43 +0100 Subject: gnu: Add python-meson-python. * gnu/packages/python-xyz.scm (python-meson-python): New variable. Change-Id: I43548f7d23b7a2f1c8caedacd72498c868c85ac3 --- gnu/packages/python-xyz.scm | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ce4f2f76ee..ec4a611223 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -275,6 +275,7 @@ (define-module (gnu packages python-xyz) #:use-module (guix build-system cargo) #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) + #:use-module (guix build-system meson) #:use-module (guix build-system pyproject) #:use-module (guix build-system python) #:use-module (guix download) @@ -12624,6 +12625,24 @@ (define-public python-pyproject-metadata (define-public python-pep621 (deprecated-package "python-pep621" python-pyproject-metadata)) +(define-public python-meson-python + (package + (name "python-meson-python") + (version "0.15.0") + (source + (origin + (method url-fetch) + (uri (pypi-uri "meson_python" version)) + (sha256 + (base32 "0vyjhjabvm41hqijifk33idbdl62i76kfyf884f9rs29rpp77nzx")))) + (build-system meson-build-system) + (propagated-inputs (list python-pyproject-metadata python-tomli)) + (home-page "https://github.com/mesonbuild/meson-python") + (synopsis "Meson Python build backend (PEP 517)") + (description "This package provides a PEP 517 build backend that makes +use of the Meson build system.") + (license license:expat))) + (define-public python-pyflakes (package (name "python-pyflakes") -- cgit v1.2.3 From 4c441dbb1466c634ca8f4a864320669e2db73b8d Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 2 Dec 2023 00:09:13 +0100 Subject: gnu: Add python-dbus-python. * gnu/packages/python-xyz.scm (python-dbus-python): New variable. Change-Id: I7d9ba58466e8a07119073209e47814fc9fc573cb --- gnu/packages/python-xyz.scm | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index ec4a611223..db113caae7 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -174,6 +174,7 @@ (define-module (gnu packages python-xyz) #:use-module (gnu packages base) #:use-module (gnu packages bash) #:use-module (gnu packages bdw-gc) + #:use-module (gnu packages build-tools) #:use-module (gnu packages check) #:use-module (gnu packages cmake) #:use-module (gnu packages compression) @@ -187,6 +188,7 @@ (define-module (gnu packages python-xyz) #:use-module (gnu packages djvu) #:use-module (gnu packages docker) #:use-module (gnu packages documentation) + #:use-module (gnu packages elf) #:use-module (gnu packages enchant) #:use-module (gnu packages file) #:use-module (gnu packages fonts) @@ -27336,6 +27338,39 @@ (define-public python-pykwalify for YAML and JSON.") (license license:expat))) +(define-public python-dbus-python + (package + (name "python-dbus-python") + (version "1.3.2") + (source + (origin + (method url-fetch) + (uri (pypi-uri "dbus-python" version)) + (sha256 + (base32 "1y28h90v2ib8zqhs3r2yr7ycg8ccwvw3gqkvadlm12v1129q2rxd")))) + (build-system pyproject-build-system) + (arguments + (list #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'patch-requirements + (lambda _ + (substitute* (list "pyproject.toml" "setup.py") + (("'(ninja|patchelf)',?") "")) + (substitute* "setup.cfg" + (("(ninja|patchelf)") ""))))))) + (inputs (list dbus glib)) + (propagated-inputs (list python-pygobject)) + (native-inputs (list pkg-config + python-meson-python + meson ninja patchelf + python-sphinx python-sphinx-rtd-theme + python-tappy + python-wheel)) + (home-page "https://dbus.freedesktop.org/doc/dbus-python/") + (synopsis "Python bindings for libdbus") + (description "This package provides Python bindings to libdbus, the +reference implementation of the D-Bus protocol.") + (license license:expat))) + (define-public python-dbusmock (package (name "python-dbusmock") -- cgit v1.2.3 From a62f59d32dedf7ff11d59daa1251f74c573dd0b5 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 2 Dec 2023 00:09:47 +0100 Subject: gnu: python-dbusmock: Update to 0.30.0. * gnu/packages/python-xyz.scm (python-dbusmock): Update to 0.30.0. [#:phases]: Adjust accordingly. [native-inputs]: Add upower. (python-dbus-minimal): New variable. * gnu/packages/gnome.scm (upower)[native-inputs]: Replace python-dbusmock with python-dbusmock-minimal. * gnu/packages/gtk.scm (at-spi2-core)[native-inputs]: Likewise. (at-spi2-core-with-documentation)[native-inputs]: Adjust accordingly. * gnu/packages/polkit.scm (polkit)[native-inputs]: Replace python-dbusmock with python-dbusmock-minimal. Change-Id: If0cd76da0495d052f94ee5d654436c4d1dd1e2c3 --- gnu/packages/gnome.scm | 2 +- gnu/packages/gtk.scm | 5 +++-- gnu/packages/polkit.scm | 2 +- gnu/packages/python-xyz.scm | 21 +++++++++++++++++---- 4 files changed, 22 insertions(+), 8 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index c6437ce450..8d2265b10d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5810,7 +5810,7 @@ (define-public upower python ;; For tests. python-dbus - python-dbusmock + python-dbusmock-minimal python-packaging python-pygobject umockdev diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index b5246c8b3b..761b65fd1f 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -849,7 +849,7 @@ (define-public at-spi2-core gobject-introspection gsettings-desktop-schemas pkg-config - python-dbusmock + python-dbusmock-minimal python-pytest python-wrapper)) (synopsis "Assistive Technology Service Provider Interface, core components") @@ -880,7 +880,8 @@ (define-public at-spi2-core-with-documentation "/share/doc'\n"))))))))) (native-inputs (modify-inputs (package-native-inputs at-spi2-core) - (append gi-docgen python python-sphinx))) + (append gi-docgen python python-sphinx) + (replace "python-dbusmock" python-dbusmock))) (properties (alist-delete 'hidden? (package-properties at-spi2-core))))) diff --git a/gnu/packages/polkit.scm b/gnu/packages/polkit.scm index 2f733dd703..337d9b9a73 100644 --- a/gnu/packages/polkit.scm +++ b/gnu/packages/polkit.scm @@ -158,7 +158,7 @@ (define-public polkit perl pkg-config python - python-dbusmock)) + python-dbusmock-minimal)) (home-page "https://www.freedesktop.org/wiki/Software/polkit/") (synopsis "Authorization API for privilege management") (description "Polkit is an application-level toolkit for defining and diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index db113caae7..44b3f89574 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -27374,14 +27374,14 @@ (define-public python-dbus-python (define-public python-dbusmock (package (name "python-dbusmock") - (version "0.25.0") + (version "0.30.0") (source (origin (method url-fetch) (uri (pypi-uri "python-dbusmock" version)) (sha256 (base32 - "1nwl0gzzds2g1w1gfxfzlgrkb5hr1rrdyn619ml25c6b1rjyfk3g")))) + "1hanz6x76jq66ypdirga5h15zjs67kwysl6rmsf0i22dbdqrxdfv")))) (build-system python-build-system) (arguments (list #:modules `((guix build python-build-system) @@ -27392,6 +27392,9 @@ (define-public python-dbusmock #~(modify-phases %standard-phases (add-after 'unpack 'patch-paths (lambda* (#:key inputs #:allow-other-keys) + (substitute* "tests/test_api.py" + (("/usr/bin/python3") + (which "python3"))) (substitute* "tests/test_code.py" (("/bin/bash") (which "bash"))) @@ -27418,11 +27421,11 @@ (define-public python-dbusmock status)) (loop))))))))))))) (native-inputs - (list dbus python-pytest which)) + (list dbus python-pytest upower which)) (inputs (list dbus)) (propagated-inputs - (list python-dbus python-pygobject)) + (list python-dbus-python python-pygobject)) (home-page "https://github.com/martinpitt/python-dbusmock") (synopsis "Python library for mock D-Bus objects") (description "python-dbusmock allows for the easy creation of mock objects on @@ -27432,6 +27435,16 @@ (define-public python-dbusmock services to what you expect in your tests.") (license license:lgpl3+))) +(define-public python-dbusmock-minimal + (package + (inherit python-dbusmock) + (name "python-dbusmock-minimal") + (arguments + (substitute-keyword-arguments (package-arguments python-dbusmock) + ((#:tests? _ #t) #f))) + (native-inputs (list which)) + (properties '((hidden? . #t))))) + (define-public python-jsonplus (package (name "python-jsonplus") -- cgit v1.2.3 From 63755bcf844745b251c312922e2a5744661427a3 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Fri, 1 Dec 2023 21:48:42 +0100 Subject: Revert "gnu: sysprof: Do not propagate libadwaita." This reverts commit e21f0cb7b7a87992004193cd56638ad961fe5928. It was introduced to fix a build failure in mutter, that no longer occurs with the updated python-dbusmock. Change-Id: I781fa2314afb0c1819e30ef404cf2e8da6652e3e --- gnu/packages/gnome.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 8d2265b10d..c7c220c101 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -13046,7 +13046,8 @@ (define-public sysprof (("update_desktop_database: true") "update_desktop_database: false"))))))) (propagated-inputs - (list glib json-glib polkit)) + ;; Listed in sysprof-4.pc or sysprof-ui-5.pc + (list glib json-glib libadwaita polkit)) (inputs (list glib gtk -- cgit v1.2.3 From 51923bf963f1808cabb118c4a9fe4ebfc27ebc0f Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Mon, 4 Dec 2023 18:22:17 +0100 Subject: gnu: gtk-frdp: Improve wording. * gnu/packages/gnome.scm (gtk-frdp) [description]: Add space after comma in @acronym. Change-Id: Ic3bc9b317ff54636fad0d073de1af2ffdabcd8f2 Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index c7c220c101..de5be90d92 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -13770,7 +13770,7 @@ (define-public gtk-frdp (home-page "https://gitlab.gnome.org/GNOME/gtk-frdp") (synopsis "RDP viewer widget for Gtk") (description "This library provides a widget to view -@acronym{RDP,Remote Desktop Protocol} sessions.") +@acronym{RDP, Remote Desktop Protocol} sessions.") (license license:gpl3+))) (define-public gnome-connections -- cgit v1.2.3 From bcaae2be224f10cc7381dc8610554247b1e5f663 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Mon, 4 Dec 2023 18:22:46 +0100 Subject: gnu: gnome-connections: Improve wording. * gnu/packages/gnome.scm (gnome-connections) [description]: Add space after comma in @acronym. Change-Id: Ib6c9e39057786e7bd135874238a9b7629e316200 Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index de5be90d92..57f2b24ea9 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -13818,6 +13818,6 @@ (define-public gnome-connections (home-page "https://apps.gnome.org/Connections") (synopsis "View and use other desktops") (description "Connections allows the user to connect to different -real or virtual machines, using @acronym{VNC,Virtual Network Computing} -or @acronym{RDP,Remote Desktop Protocol}.") +real or virtual machines, using @acronym{VNC, Virtual Network Computing} +or @acronym{RDP, Remote Desktop Protocol}.") (license license:gpl3+))) -- cgit v1.2.3 From 7936a763e1722950e90556be41709123371eadf8 Mon Sep 17 00:00:00 2001 From: Timmy Douglas Date: Sun, 3 Dec 2023 23:11:52 -0800 Subject: gnu: harfbuzz: Update to 8.3.0. * gnu/packages/gtk.scm (harfbuzz): Update to 8.3.0. Signed-off-by: Liliana Marie Prikler --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 761b65fd1f..9818746f58 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -259,7 +259,7 @@ (define-public cairo-xcb (define-public harfbuzz (package (name "harfbuzz") - (version "5.3.1") + (version "8.3.0") (source (origin (method url-fetch) (uri (string-append "https://github.com/harfbuzz/harfbuzz" @@ -267,7 +267,7 @@ (define-public harfbuzz version ".tar.xz")) (sha256 (base32 - "0ka3nkk2lks2lgakq02vyibwdziv11dkpa2brkx230asnyby0v2a")))) + "0izq2lpqxrf1l755nxrxkkiarywkx5j43asznankxplbxgm0358h")))) (build-system gnu-build-system) (outputs '("out" "bin")) ;160K, only hb-view depend on cairo -- cgit v1.2.3 From 2a6af3bb6f4c8d3f6c87b3c36cc1fb4f423a5400 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Sat, 25 Nov 2023 16:11:36 +0100 Subject: gnu: mutter: Update to 44.7. * gnu/packages/gnome.scm (mutter): Update to 44.7. [propagated-inputs]: Remove gtk+. Update comment. [source]: Remove patches. * gnu/local.mk (dist_patch_DATA): Unregister mutter-fix-inverted-test.patch. * gnu/packages/patches/mutter-fix-inverted-test.patch: Remove. Change-Id: Ibe2f578409c7e0bd3cd902525638be2dec124094 Signed-off-by: Liliana Marie Prikler --- gnu/local.mk | 1 - gnu/packages/gnome.scm | 12 +- .../patches/mutter-fix-inverted-test.patch | 290 --------------------- 3 files changed, 4 insertions(+), 299 deletions(-) delete mode 100644 gnu/packages/patches/mutter-fix-inverted-test.patch diff --git a/gnu/local.mk b/gnu/local.mk index 93477f830b..e9c147c6fc 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1677,7 +1677,6 @@ dist_patch_DATA = \ %D%/packages/patches/mupen64plus-ui-console-notice.patch \ %D%/packages/patches/mupen64plus-video-z64-glew-correct-path.patch \ %D%/packages/patches/musl-cross-locale.patch \ - %D%/packages/patches/mutter-fix-inverted-test.patch \ %D%/packages/patches/mutt-store-references.patch \ %D%/packages/patches/m17n-lib-1.8.0-use-pkg-config-for-freetype.patch \ %D%/packages/patches/nanosvg-prusa-slicer.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 57f2b24ea9..4a1dbf3ddc 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7809,7 +7809,7 @@ (define-public zenity (define-public mutter (package (name "mutter") - (version "44.3") + (version "44.7") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -7817,10 +7817,7 @@ (define-public mutter name "-" version ".tar.xz")) (sha256 (base32 - "0l85qyn6x5hyaaclzcbqd44xpd582gdindqfam8f9lsh46zvwp0q")) - ;; TODO: Remove on update as this was merged upstream. See - ;; . - (patches (search-patches "mutter-fix-inverted-test.patch")))) + "1a0j1ygph6bz83da4gr2z02xqf2l5y1x10482vyh3d34arqhph26")))) ;; NOTE: Since version 3.21.x, mutter now bundles and exports forked ;; versions of cogl and clutter. As a result, many of the inputs, ;; propagated-inputs, and configure flags used in cogl and clutter are @@ -7960,9 +7957,8 @@ (define-public mutter python-dbus python-dbusmock)) (propagated-inputs - (list gsettings-desktop-schemas ;required by libmutter.pc - gtk+ ;required by libmutter.pc - ;; mutter-clutter-1.0.pc and mutter-cogl-1.0.pc refer to these: + (list gsettings-desktop-schemas ;required by libmutter-12.pc + ;; mutter-clutter-12.pc and mutter-cogl-12.pc refer to these: at-spi2-core cairo eudev diff --git a/gnu/packages/patches/mutter-fix-inverted-test.patch b/gnu/packages/patches/mutter-fix-inverted-test.patch deleted file mode 100644 index 3676b31def..0000000000 --- a/gnu/packages/patches/mutter-fix-inverted-test.patch +++ /dev/null @@ -1,290 +0,0 @@ -From 5a83e8ef8250526a40e8e69c6398f990ab482b2f Mon Sep 17 00:00:00 2001 -From: Olivier Fourdan -Date: Fri, 2 Jun 2023 14:42:51 +0200 -Subject: [PATCH 1/5] cogl/gl-framebuffer: Fix spurious trailing spaces - -Purely cosmetic fix, no functional change. - -Part-of: ---- - cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c | 12 ++++++------ - cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c | 12 ++++++------ - 2 files changed, 12 insertions(+), 12 deletions(-) - -diff --git a/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c b/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c -index d6609bb2074..8d76f1578bf 100644 ---- a/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c -+++ b/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c -@@ -72,32 +72,32 @@ ensure_bits_initialized (CoglGlFramebufferBack *gl_framebuffer_back) - GLenum attachment, pname; - size_t offset; - } params[] = { -- { -+ { - .attachment = GL_BACK_LEFT, - .pname = GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE, - .offset = offsetof (CoglFramebufferBits, red), - }, -- { -+ { - .attachment = GL_BACK_LEFT, - .pname = GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE, - .offset = offsetof (CoglFramebufferBits, green), - }, -- { -+ { - .attachment = GL_BACK_LEFT, - .pname = GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE, - .offset = offsetof (CoglFramebufferBits, blue), - }, -- { -+ { - .attachment = GL_BACK_LEFT, - .pname = GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE, - .offset = offsetof (CoglFramebufferBits, alpha), - }, -- { -+ { - .attachment = GL_DEPTH, - .pname = GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE, - .offset = offsetof (CoglFramebufferBits, depth), - }, -- { -+ { - .attachment = GL_STENCIL, - .pname = GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE, - .offset = offsetof (CoglFramebufferBits, stencil), -diff --git a/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c b/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c -index c8db6a23a29..1ffc1d53509 100644 ---- a/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c -+++ b/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c -@@ -82,32 +82,32 @@ ensure_bits_initialized (CoglGlFramebufferFbo *gl_framebuffer_fbo) - GLenum attachment, pname; - size_t offset; - } params[] = { -- { -+ { - .attachment = GL_COLOR_ATTACHMENT0, - .pname = GL_FRAMEBUFFER_ATTACHMENT_RED_SIZE, - .offset = offsetof (CoglFramebufferBits, red), - }, -- { -+ { - .attachment = GL_COLOR_ATTACHMENT0, - .pname = GL_FRAMEBUFFER_ATTACHMENT_GREEN_SIZE, - .offset = offsetof (CoglFramebufferBits, green), - }, -- { -+ { - .attachment = GL_COLOR_ATTACHMENT0, - .pname = GL_FRAMEBUFFER_ATTACHMENT_BLUE_SIZE, - .offset = offsetof (CoglFramebufferBits, blue), - }, -- { -+ { - .attachment = GL_COLOR_ATTACHMENT0, - .pname = GL_FRAMEBUFFER_ATTACHMENT_ALPHA_SIZE, - .offset = offsetof (CoglFramebufferBits, alpha), - }, -- { -+ { - .attachment = GL_DEPTH_ATTACHMENT, - .pname = GL_FRAMEBUFFER_ATTACHMENT_DEPTH_SIZE, - .offset = offsetof (CoglFramebufferBits, depth), - }, -- { -+ { - .attachment = GL_STENCIL_ATTACHMENT, - .pname = GL_FRAMEBUFFER_ATTACHMENT_STENCIL_SIZE, - .offset = offsetof (CoglFramebufferBits, stencil), --- -GitLab - - -From a2203df9f43b9e501a972d23b3d5584005c03ce6 Mon Sep 17 00:00:00 2001 -From: Olivier Fourdan -Date: Fri, 2 Jun 2023 11:54:58 +0200 -Subject: [PATCH 2/5] cogl/gl-framebuffer: Fix inverted test in - ensure_bits_initialized() - -Cogl's feature COGL_PRIVATE_FEATURE_QUERY_FRAMEBUFFER_BITS is required -to use the GL_FRAMEBUFFER_ATTACHMENT_* queries. - -Unfortunately, the test for the availability of the private feature is -actually inverted in ensure_bits_initialized() which causes that whole -portion of code to be ignored, falling back to the glGetIntegerv() -method which isn't supported in core profiles. - -As Mesa has recently started to be more strict about these, this causes -the CI tests to fail in mutter. - -Part-of: ---- - cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c b/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c -index 1ffc1d53509..75a8b0c1fe2 100644 ---- a/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c -+++ b/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c -@@ -76,7 +76,7 @@ ensure_bits_initialized (CoglGlFramebufferFbo *gl_framebuffer_fbo) - COGL_FRAMEBUFFER_STATE_BIND); - - #ifdef HAVE_COGL_GL -- if (!_cogl_has_private_feature (ctx, COGL_PRIVATE_FEATURE_QUERY_FRAMEBUFFER_BITS)) -+ if (_cogl_has_private_feature (ctx, COGL_PRIVATE_FEATURE_QUERY_FRAMEBUFFER_BITS)) - { - const struct { - GLenum attachment, pname; --- -GitLab - - -From fad240f437d6b11f664c9c09aecabe5f5e703eca Mon Sep 17 00:00:00 2001 -From: Olivier Fourdan -Date: Mon, 5 Jun 2023 10:31:38 +0200 -Subject: [PATCH 3/5] cogl/gl-framebuffer: Match testing features - -The function ensure_bits_initialized() in cogl-gl-framebuffer-fbo.c -checks for COGL_PRIVATE_FEATURE_QUERY_FRAMEBUFFER_BITS whereas the same -in cogl-gl-framebuffer-back.c simply checks for the driver being -COGL_DRIVER_GL3. - -Change the later to use the COGL_PRIVATE_FEATURE_QUERY_FRAMEBUFFER_BITS -flag as well. - -Part-of: ---- - cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c b/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c -index 8d76f1578bf..f6a17e8f070 100644 ---- a/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c -+++ b/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c -@@ -66,7 +66,7 @@ ensure_bits_initialized (CoglGlFramebufferBack *gl_framebuffer_back) - COGL_FRAMEBUFFER_STATE_BIND); - - #ifdef HAVE_COGL_GL -- if (ctx->driver == COGL_DRIVER_GL3) -+ if (_cogl_has_private_feature (ctx, COGL_PRIVATE_FEATURE_QUERY_FRAMEBUFFER_BITS)) - { - const struct { - GLenum attachment, pname; --- -GitLab - - -From c3af4c1b1571b05f67d48b90d9ea7313f3ca6003 Mon Sep 17 00:00:00 2001 -From: Olivier Fourdan -Date: Fri, 2 Jun 2023 14:27:29 +0200 -Subject: [PATCH 4/5] cogl/gl-framebuffer: Fail without QUERY_FRAMEBUFFER_BITS - -glGetIntegerv() with GL_RED_BITS/GL_GREEN_BITS/GL_BLUE_BITS/etc. is not -supported with the GL core context, so there is no point in falling back -to that without supporting COGL_PRIVATE_FEATURE_QUERY_FRAMEBUFFER_BITS, -as this will cause an GL error. - -Part-of: ---- - cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c | 7 +------ - cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c | 7 +------ - 2 files changed, 2 insertions(+), 12 deletions(-) - -diff --git a/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c b/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c -index f6a17e8f070..0ccd2324077 100644 ---- a/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c -+++ b/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c -@@ -119,12 +119,7 @@ ensure_bits_initialized (CoglGlFramebufferBack *gl_framebuffer_back) - else - #endif /* HAVE_COGL_GL */ - { -- GE (ctx, glGetIntegerv (GL_RED_BITS, &bits->red)); -- GE (ctx, glGetIntegerv (GL_GREEN_BITS, &bits->green)); -- GE (ctx, glGetIntegerv (GL_BLUE_BITS, &bits->blue)); -- GE (ctx, glGetIntegerv (GL_ALPHA_BITS, &bits->alpha)); -- GE (ctx, glGetIntegerv (GL_DEPTH_BITS, &bits->depth)); -- GE (ctx, glGetIntegerv (GL_STENCIL_BITS, &bits->stencil)); -+ return FALSE; - } - - COGL_NOTE (FRAMEBUFFER, -diff --git a/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c b/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c -index 75a8b0c1fe2..524196207f5 100644 ---- a/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c -+++ b/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c -@@ -129,12 +129,7 @@ ensure_bits_initialized (CoglGlFramebufferFbo *gl_framebuffer_fbo) - else - #endif /* HAVE_COGL_GL */ - { -- GE (ctx, glGetIntegerv (GL_RED_BITS, &bits->red)); -- GE (ctx, glGetIntegerv (GL_GREEN_BITS, &bits->green)); -- GE (ctx, glGetIntegerv (GL_BLUE_BITS, &bits->blue)); -- GE (ctx, glGetIntegerv (GL_ALPHA_BITS, &bits->alpha)); -- GE (ctx, glGetIntegerv (GL_DEPTH_BITS, &bits->depth)); -- GE (ctx, glGetIntegerv (GL_STENCIL_BITS, &bits->stencil)); -+ return FALSE; - } - - if (!_cogl_has_private_feature (ctx, COGL_PRIVATE_FEATURE_ALPHA_TEXTURES) && --- -GitLab - - -From d65883e0d7d70987e3888b86222b109c35f5a7a2 Mon Sep 17 00:00:00 2001 -From: Olivier Fourdan -Date: Mon, 5 Jun 2023 10:38:41 +0200 -Subject: [PATCH 5/5] cogl/gl-framebuffer: Remove conditional on HAVE_COGL_GL - -By testing the features flag, we can get rid of the conditional build -on HAVE_COGL_GL entirely. - -Part-of: ---- - cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c | 2 -- - cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c | 2 -- - 2 files changed, 4 deletions(-) - -diff --git a/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c b/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c -index 0ccd2324077..94154d48efb 100644 ---- a/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c -+++ b/cogl/cogl/driver/gl/cogl-gl-framebuffer-back.c -@@ -65,7 +65,6 @@ ensure_bits_initialized (CoglGlFramebufferBack *gl_framebuffer_back) - framebuffer, - COGL_FRAMEBUFFER_STATE_BIND); - --#ifdef HAVE_COGL_GL - if (_cogl_has_private_feature (ctx, COGL_PRIVATE_FEATURE_QUERY_FRAMEBUFFER_BITS)) - { - const struct { -@@ -117,7 +116,6 @@ ensure_bits_initialized (CoglGlFramebufferBack *gl_framebuffer_back) - } - } - else --#endif /* HAVE_COGL_GL */ - { - return FALSE; - } -diff --git a/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c b/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c -index 524196207f5..3ea133d3143 100644 ---- a/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c -+++ b/cogl/cogl/driver/gl/cogl-gl-framebuffer-fbo.c -@@ -75,7 +75,6 @@ ensure_bits_initialized (CoglGlFramebufferFbo *gl_framebuffer_fbo) - framebuffer, - COGL_FRAMEBUFFER_STATE_BIND); - --#ifdef HAVE_COGL_GL - if (_cogl_has_private_feature (ctx, COGL_PRIVATE_FEATURE_QUERY_FRAMEBUFFER_BITS)) - { - const struct { -@@ -127,7 +126,6 @@ ensure_bits_initialized (CoglGlFramebufferFbo *gl_framebuffer_fbo) - } - } - else --#endif /* HAVE_COGL_GL */ - { - return FALSE; - } --- -GitLab - -- cgit v1.2.3 From f16d507c35015cf8522b4808dac46a25a01146f1 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 21 Nov 2023 22:19:53 +0100 Subject: gnu: gnome-shell: Update to 44.7. * gnu/packages/gnome.scm (gnome-shell): Update to 44.7. [inputs]: Add bash-minimal. Change-Id: I28a0f4b8ad3d31decbc915c2be4f47f64b98e09c Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4a1dbf3ddc..6e76b80312 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9167,7 +9167,7 @@ (define-public gnome-control-center (define-public gnome-shell (package (name "gnome-shell") - (version "44.3") + (version "44.7") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -9175,7 +9175,7 @@ (define-public gnome-shell name "-" version ".tar.xz")) (sha256 (base32 - "1grizh3fbks5dgizaj38300cz97ay81q0hlk1pvawkpfq9qlnsam")))) + "0gvhlvcw6rd8xa71qfxw39kyqgnv15x8xv8my6h5215kx3il1acb")))) (build-system meson-build-system) (arguments (let ((disallowed-references @@ -9315,6 +9315,7 @@ (define-public gnome-shell xorg-server-for-tests)) (inputs (list accountsservice + bash-minimal docbook-xsl evolution-data-server gcr -- cgit v1.2.3 From 83e03f9380ab5a8a07f2473ee7eafecc729be3c2 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Mon, 4 Dec 2023 18:27:05 +0100 Subject: gnu: rygel: Improve style. * gnu/packages/gnome.scm (rygel) [#:configure-flags]: Use the 'list' syntax istead of 'quote'. Change-Id: I173b5872ebfa82855055145923cd2f1a1b4d68d1 Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 6e76b80312..1eee97c2dd 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1697,7 +1697,7 @@ (define-public rygel (arguments ;; Disable the tracker plugin. (list #:configure-flags - #~'("-Dplugins=external,gst-launch,lms,media-export, + #~(list "-Dplugins=external,gst-launch,lms,media-export, mpris,playbin,ruih,tracker3"))) (native-inputs (list gettext-minimal -- cgit v1.2.3 From 5d9bb65ec28fb34d1d29b4df19cd478db4e5bc1e Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Sun, 3 Dec 2023 14:51:01 +0100 Subject: gnu: Add xdg-desktop-portal-gnome. * gnu/packages/gnome.scm (xdg-desktop-portal-gnome): New variable. Change-Id: I2925cf950b731c71e4ad4a01f28bce22c0cb54fb Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 38 ++++++++++++++++++++++++++++++++++++++ 1 file changed, 38 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 1eee97c2dd..d10c3c8a9b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -12863,6 +12863,44 @@ (define-public piper (simple-service 'ratbagd dbus-root-service-type (list libratbag))") (license license:gpl2))) +(define-public xdg-desktop-portal-gnome + (package + (name "xdg-desktop-portal-gnome") + (version "44.2") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/" name "/" + (version-major version) "/" + name "-" version ".tar.xz")) + (sha256 + (base32 + "08gznmr718na5p2j8fm7nim5862r2v0sjh68ql5yl0q356n1mvah")) + (snippet + #~(begin + (use-modules (guix build utils)) + (delete-file-recursively "subprojects"))))) + (build-system meson-build-system) + (arguments + (list + #:glib-or-gtk? #t + #:configure-flags #~'("-Dsystemduserunitdir=no"))) + (inputs + (list gnome-desktop + gsettings-desktop-schemas + libadwaita + libxml2 + xdg-desktop-portal + xdg-desktop-portal-gtk)) + (native-inputs + (list gettext-minimal + `(,glib "bin") + pkg-config)) + (home-page "https://gitlab.gnome.org/GNOME/xdg-desktop-portal-gnome") + (synopsis "GNOME backend for xdg-desktop-portal") + (description "xdg-desktop-portal-gnome implements a back-end for +@command{xdg-desktop-portal} that uses gtk and some more GNOME APIs.") + (license license:lgpl2.1+))) + (define-public parlatype (package (name "parlatype") -- cgit v1.2.3 From 65edc32d529a628f074fece8195c10e3815570f6 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Mon, 4 Dec 2023 19:16:16 +0100 Subject: gnu: gnome: Propagate xdg-desktop-portal-gnome. * gnu/packages/gnome.scm (gnome) [propagated-inputs]: Add xdg-desktop-portal-gnome. Change-Id: I2a911ec58a1c9992213e60d92a3dd955dd1a545e Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d10c3c8a9b..c22eaee5d1 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10134,6 +10134,7 @@ (define-public gnome simple-scan totem tracker-miners + xdg-desktop-portal-gnome yelp ;; Others. gnome-online-accounts -- cgit v1.2.3 From 5c43c2ddf3e34723a9b16fe6431f0bcd19fea7db Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 14 Nov 2023 12:10:25 +0100 Subject: gnu: gdk-pixbuf: Update to 2.42.10. * gnu/packages/gtk.scm (gdk-pixbuf): Update to 2.42.10. [#:configure-flags]: Add "-Dgtk_doc=true". [native-inputs]: Remove docbook-xml-4.3, docbook-xml, libxml2 and libxslt. Add gi-docgen and python-docutils. Change-Id: I2375beadad7f5d606fa6d973694a10679e07b689 Signed-off-by: Liliana Marie Prikler --- gnu/packages/gtk.scm | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 9818746f58..063fb70c1c 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -691,7 +691,7 @@ (define-public gtksourceview-3 (define-public gdk-pixbuf (package (name "gdk-pixbuf") - (version "2.42.8") + (version "2.42.10") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -699,12 +699,12 @@ (define-public gdk-pixbuf name "-" version ".tar.xz")) (sha256 (base32 - "1iplb43nn74pp3w1wjwwn522i9man6jia85k6j8v4494rcxfmb44")))) + "0jz4kziz5lirnjjvbspbqzsigk8vnqknng1fga89d81vs5snr6zf")))) (build-system meson-build-system) (outputs '("out" "debug")) (arguments `(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas - #:configure-flags '("-Dinstalled_tests=false") + #:configure-flags '("-Dinstalled_tests=false" "-Dgtk_doc=true") #:phases (modify-phases %standard-phases (add-before 'configure 'disable-failing-tests @@ -741,10 +741,8 @@ (define-public gdk-pixbuf pkg-config ;; For the documentation. - docbook-xml-4.3 - docbook-xsl - libxml2 ;for XML_CATALOG_FILES - libxslt)) ;for xsltproc + gi-docgen + python-docutils)) (native-search-paths ;; This file is produced by the gdk-pixbuf-loaders-cache-file ;; profile hook. -- cgit v1.2.3 From 092bc86a411bb43242332072d193a3a1084a0e8f Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 14 Nov 2023 12:35:10 +0100 Subject: gnu: glib-networking: Update to 2.76.1. * gnu/packages/gnome.scm (glib-networking): Update to 2.76.1. [patches]: Remove. [native-inputs]: Add glib-bin. * gnu/packages/patches/glib-networking-gnutls-binding.patch: Remove file. * gnu/local.mk (dist_patch_DATA): Unregister it. Change-Id: I1c7249995d07d975ac3d3df8ce1e07ffa4dc240f Signed-off-by: Liliana Marie Prikler --- gnu/local.mk | 1 - gnu/packages/gnome.scm | 9 ++++----- .../patches/glib-networking-gnutls-binding.patch | 21 --------------------- 3 files changed, 4 insertions(+), 27 deletions(-) delete mode 100644 gnu/packages/patches/glib-networking-gnutls-binding.patch diff --git a/gnu/local.mk b/gnu/local.mk index e9c147c6fc..01298a72d1 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1291,7 +1291,6 @@ dist_patch_DATA = \ %D%/packages/patches/ghostscript-no-header-creationdate.patch \ %D%/packages/patches/gklib-suitesparse.patch \ %D%/packages/patches/glib-appinfo-watch.patch \ - %D%/packages/patches/glib-networking-gnutls-binding.patch \ %D%/packages/patches/glib-skip-failing-test.patch \ %D%/packages/patches/glibc-2.33-riscv64-miscompilation.patch \ %D%/packages/patches/glibc-CVE-2019-7309.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index c22eaee5d1..52b34a5202 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4812,7 +4812,7 @@ (define-public libxklavier (define-public glib-networking (package (name "glib-networking") - (version "2.72.2") + (version "2.76.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/glib-networking/" @@ -4820,12 +4820,11 @@ (define-public glib-networking "glib-networking-" version ".tar.xz")) (sha256 (base32 - "0s42l6dkajciqc99zp6dc9l8yv9g8w7d8mgv97l7h7drgd60hand")) - (patches - (search-patches "glib-networking-gnutls-binding.patch")))) + "0ax4h0abi9yxrpmm1p491qjxc8d2k1kaa9hhzgyixrfxjjcqlsaw")))) (build-system meson-build-system) (native-inputs - (list pkg-config gettext-minimal)) + (list `(,glib "bin") ; for gio-querymodules + pkg-config gettext-minimal)) (inputs (list glib gnutls gsettings-desktop-schemas libproxy)) (home-page "https://wiki.gnome.org/Projects/GLib") diff --git a/gnu/packages/patches/glib-networking-gnutls-binding.patch b/gnu/packages/patches/glib-networking-gnutls-binding.patch deleted file mode 100644 index 91d0743056..0000000000 --- a/gnu/packages/patches/glib-networking-gnutls-binding.patch +++ /dev/null @@ -1,21 +0,0 @@ -Skip failing test in 'test_connection_binding_match_tls_unique' -in 'tls/tests/connection.c' when building glib-networking against -GnuTLS 3.7.2. The failure stems from the fact that -'gnutls_session_channel_binding' returns GNUTLS_E_INVALID_REQUEST -is known upstream: - - https://gitlab.gnome.org/GNOME/glib-networking/-/issues/164 - -diff --git a/tls/tests/connection.c b/tls/tests/connection.c -index 036df04..347c7a4 100644 ---- a/tls/tests/connection.c -+++ b/tls/tests/connection.c -@@ -3037,8 +3037,6 @@ main (int argc, - setup_connection, test_connection_missing_server_identity, teardown_connection); - g_test_add ("/tls/" BACKEND "/connection/peer-certificate-notify", TestConnection, NULL, - setup_connection, test_peer_certificate_notify, teardown_connection); -- g_test_add ("/tls/" BACKEND "/connection/binding/match-tls-unique", TestConnection, NULL, -- setup_connection, test_connection_binding_match_tls_unique, teardown_connection); - g_test_add ("/tls/" BACKEND "/connection/binding/match-tls-server-end-point", TestConnection, NULL, - setup_connection, test_connection_binding_match_tls_server_end_point, teardown_connection); - g_test_add ("/tls/" BACKEND "/connection/binding/match-tls-exporter", TestConnection, NULL, -- cgit v1.2.3 From bc80fe3a74b8d8d6f0a79175d0e1de43eb1a0998 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 14 Nov 2023 21:17:15 +0100 Subject: gnu: gnome-backgrounds: Update to 44.0. * gnu/packages/gnome.scm (gnome-backgrounds): Update to 44.0. Change-Id: Ica7b0d9a61685b5cb6535138d122788bca6a53aa Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 52b34a5202..91908fc460 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9824,7 +9824,7 @@ (define-public baobab (define-public gnome-backgrounds (package (name "gnome-backgrounds") - (version "42.0") + (version "44.0") (source (origin (method url-fetch) @@ -9833,7 +9833,7 @@ (define-public gnome-backgrounds name "-" version ".tar.xz")) (sha256 (base32 - "0p99q434c8qgj5wxcma9jj4dh1ff9x984ncs31vmz725kyhf2zsc")))) + "0kp09gh537wj7j9a0dc25fv441sfr4x0q6ja89m2lpqkhyrr70sa")))) (build-system meson-build-system) (native-inputs (list gettext-minimal)) (home-page "https://gitlab.gnome.org/GNOME/gnome-backgrounds") -- cgit v1.2.3 From 9df8f1d05dcdc145a4525f634751460f2a683e52 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Thu, 23 Nov 2023 19:22:13 +0100 Subject: gnu: gtk+: Update to 3.24.38. * gnu/packages/gtk.scm (gtk+): Update to 3.24.38. Change-Id: I98ddc6cbdaacc665bf3f924e7ae47f1ef139bcc5 Signed-off-by: Liliana Marie Prikler --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 063fb70c1c..e05b795535 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -992,7 +992,7 @@ (define-public gtk+ (package (inherit gtk+-2) (name "gtk+") - (version "3.24.37") + (version "3.24.38") (source (origin (method url-fetch) @@ -1001,7 +1001,7 @@ (define-public gtk+ name "-" version ".tar.xz")) (sha256 (base32 - "0mvzzgjrzzir7nzx379yz3swzk3pn1s283hgzm8l2yakq2sg0ib7")) + "1rwfvm2098pkwnnxjm70ig44x1a2fbwa8i2ma3cbs9cb077xw4ff")) (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch" "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch")))) ;; There is no "doc" output, because adding gtk-doc here would introduce a -- cgit v1.2.3 From b0d91b147b1fbde5cf59cddb1e71cabefec564f5 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Thu, 23 Nov 2023 19:32:01 +0100 Subject: gnu: gtkmm-3: Update to 3.24.8. * gnu/packages/gtk.scm (gtkmm-3): Update to 3.24.8. Change-Id: I7a3785da22d7bdbf8aed349dae7ac69c0d070c84 Signed-off-by: Liliana Marie Prikler --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index e05b795535..83c700025b 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1873,7 +1873,7 @@ (define-public gtkmm-3 (package (inherit gtkmm) (name "gtkmm") - (version "3.24.6") + (version "3.24.8") (source (origin (method url-fetch) @@ -1882,7 +1882,7 @@ (define-public gtkmm-3 (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 - (base32 "1mhi3ws43l051fha4zssfpykraa1qc2hd408l2xk65jfjhp18gjb")))) + (base32 "1i4ql0j6id6g34w5nbhd7vjak7l3s50lqgdjaj2ranrfj9j0r56j")))) (propagated-inputs `(("atkmm-2.28" ,atkmm-2.28) ("cairomm-1.14" ,cairomm-1.14) -- cgit v1.2.3 From dbedf8dfdc3cfc47c84f9479a06dc23cd00f44d0 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Fri, 24 Nov 2023 00:08:44 +0100 Subject: gnu: json-glib: Update to 1.6.6. * gnu/packages/gnome.scm (json-glib-minimal): Update to 1.6.6. [arguments]: Convert to list of G-Expressions. [#:configure-flags]: Add -Dgtk_doc=disabled. [native-inputs]: Drop labels. (json-glib) [#:configure-flags]: Remove -Ddocs=true. Unless cross-compiling, add -Dgtk_doc=enabled and -Dintrospection=enabled. [#:phases] : Replace /share/gtk-doc with /share/doc. [native-inputs]: Add gi-docgen. Remove docbook-xml-4.3, docbook-xsl, gtk-doc, libxslt. Change-Id: Ib88f2fb59a776312bf3b452eecfe201e272a3888 Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 91908fc460..b28434f77f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4697,7 +4697,7 @@ (define-public dconf (define-public json-glib-minimal (package (name "json-glib-minimal") - (version "1.6.2") + (version "1.6.6") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/json-glib/" @@ -4705,14 +4705,16 @@ (define-public json-glib-minimal "/json-glib-" version ".tar.xz")) (sha256 (base32 - "092g2dyy1hhl0ix9kp33wcab0pg1qicnsv0cj5ms9g9qs336cgd3")))) + "03j9ba2sccbz954smk3n1swwnvpzl8yhwwin6vixvxligaz9iv4n")))) (build-system meson-build-system) (arguments - `(#:glib-or-gtk? #t)) ; To wrap binaries and/or compile schemas + (list #:glib-or-gtk? #t ;to wrap binaries, compile schemas + #:configure-flags #~(list "-Dgtk_doc=disabled"))) (native-inputs - `(("gettext" ,gettext-minimal) - ("glib" ,glib "bin") ;for glib-mkenums and glib-genmarshal - ("pkg-config" ,pkg-config))) + (list + gettext-minimal + `(,glib "bin") ;for glib-mkenums and glib-genmarshal + pkg-config)) (inputs (list bash-minimal)) (propagated-inputs @@ -4731,8 +4733,7 @@ (define-public json-glib (arguments (substitute-keyword-arguments (package-arguments json-glib-minimal) ((#:configure-flags _) - #~(list "-Ddocs=true" - "-Dman=true" + #~(list "-Dman=true" #$@(if (%current-target-system) ;; If enabled, gtkdoc-scangobj will try to execute a ;; cross-compiled binary. @@ -4740,7 +4741,8 @@ (define-public json-glib ;; Trying to build introspection data when cross-compiling ;; causes errors during linking. "-Dintrospection=disabled") - #~()))) + #~("-Dgtk_doc=enabled" + "-Dintrospection=enabled")))) ((#:phases phases '%standard-phases) #~(modify-phases #$phases ;; When cross-compiling, there are no docs to move. @@ -4753,16 +4755,13 @@ (define-public json-glib (lambda _ (mkdir-p (string-append #$output:doc "/share")) (rename-file - (string-append #$output "/share/gtk-doc") + (string-append #$output "/share/doc") (string-append #$output:doc - "/share/gtk-doc")))))))))) + "/share/doc")))))))))) (native-inputs (modify-inputs (package-native-inputs json-glib-minimal) - (prepend docbook-xml-4.3 - docbook-xsl - gobject-introspection - gtk-doc - libxslt))))) + (prepend gi-docgen + gobject-introspection))))) (define-public libxklavier (package -- cgit v1.2.3 From 37439e68efea89b4a0bd94e2a4eff0c677b9bd9c Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Fri, 24 Nov 2023 00:37:08 +0100 Subject: gnu: libnotify: Update to 0.8.3. * gnu/packages/gnome.scm (libnotify): Update to 0.8.3. [native-inputs]: Add gi-docgen. [home-page]: Update. Change-Id: Iba93cbb21d14a2e3c040daf62f42232bbb8ad808 Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index b28434f77f..1fa3d80873 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3048,7 +3048,7 @@ (define-public hicolor-icon-theme (define-public libnotify (package (name "libnotify") - (version "0.7.9") + (version "0.8.3") (source (origin (method url-fetch) @@ -3057,7 +3057,7 @@ (define-public libnotify name "-" version ".tar.xz")) (sha256 (base32 - "0qa7cx6ra5hwqnxw95b9svgjg5q6ynm8y843iqjszxvds5z53h36")))) + "1h7nn9pz797bfmpz3d0s46yjv4ydppnzwifzdx0d6shm8vwkx3zf")))) (build-system meson-build-system) (arguments (list @@ -3081,10 +3081,11 @@ (define-public libnotify gobject-introspection ;; For the documentation. + gi-docgen gtk-doc/stable libxslt docbook-xsl)) - (home-page "https://developer-next.gnome.org/libnotify/") + (home-page "https://gitlab.gnome.org/GNOME/libnotify/") (synopsis "GNOME desktop notification library") (description "Libnotify is a library that sends desktop notifications to a -- cgit v1.2.3 From 030018f923487791951ce59efe4f80a06bc73d18 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Fri, 24 Nov 2023 00:58:22 +0100 Subject: gnu: libsoup: Update to 3.4.4. * gnu/packages/gnome.scm (libsoup): Update to 3.4.4. [native-inputs]: Add gettext-minimal. Change-Id: I8da30149b9211d147aab2664b11a5c66acb461f0 Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 1fa3d80873..4da80c67bb 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5110,7 +5110,7 @@ (define-public libsoup-minimal-2 (define-public libsoup (package/inherit libsoup-minimal (name "libsoup") - (version "3.1.4") + (version "3.4.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/libsoup/" @@ -5118,7 +5118,7 @@ (define-public libsoup "libsoup-" version ".tar.xz")) (sha256 (base32 - "0m5mf2ahb462jzr40d916swv3040h9500jcmr87vnilpr4zrj584")))) + "1an5n2sa70f40my4g20lk38s5ib99c32bzzg8gm91v9nbxr6f719")))) (outputs (cons "doc" (package-outputs libsoup-minimal))) (arguments (substitute-keyword-arguments (package-arguments libsoup-minimal) @@ -5148,7 +5148,7 @@ (define-public libsoup (rename-file (string-append #$output "/share/doc") (string-append #$output:doc "/share/doc")))))))) (native-inputs (modify-inputs (package-native-inputs libsoup-minimal) - (prepend gi-docgen))))) + (prepend gettext-minimal gi-docgen))))) (define-public libsecret (package -- cgit v1.2.3 From 89f79f7129ddfa4140f32440de369afa499025f4 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Sat, 2 Dec 2023 16:08:01 +0100 Subject: gnu: libsoup-minimal: Update to 3.4.4. The option to build documentation has changed between libsoup 2 and libsoup 3. The failing socket test has been moved to a different file. libsoup-minimal-2 introduces a new phase to disable tests, however the 'adjust-tests phase of libsoup-minimal must be removed. For simplicity, we use the 'adjust-tests name for the phase of all variants. * gnu/packages/gnome.scm (libsoup-minimal): Update to 3.4.4. [#:configure-flags]: Change name of docs option. [#:phases]: Change the file name of socket test. (libsoup-minimal-2) [arguments]: Override #:configure-flags. [#:phases]: Override 'adjust-tests. (libsoup) [version]: Remove field. [source]: Remove field. [#:configure-flags]: Replace -Ddocs=disabled with -Ddocs=enabled. Change-Id: Iace1bf0f1d805a0eed7e484a7cd496ac04631b32 Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 27 ++++++++++++--------------- 1 file changed, 12 insertions(+), 15 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 4da80c67bb..38ed25a5e4 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5021,7 +5021,7 @@ (define-public libshumate (define-public libsoup-minimal (package (name "libsoup-minimal") - (version "3.0.7") + (version "3.4.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/libsoup/" @@ -5029,17 +5029,17 @@ (define-public libsoup-minimal "libsoup-" version ".tar.xz")) (sha256 (base32 - "1j7p3cz6hwi9js9rp0pbas7cdln97yg9v2l1nv5imhcr6p7r1pzb")))) + "1an5n2sa70f40my4g20lk38s5ib99c32bzzg8gm91v9nbxr6f719")))) (build-system meson-build-system) (arguments - `(#:configure-flags '("-Dgtk_doc=false") + `(#:configure-flags '("-Ddocs=disabled") #:phases (modify-phases %standard-phases (add-after 'unpack 'adjust-tests (lambda _ ;; This test fails due to missing /etc/nsswitch.conf ;; in the build environment. - (substitute* "tests/socket-test.c" + (substitute* "tests/unix-socket-test.c" ((".*/sockets/unconnected.*") "")) ;; These fail because "subdomain.localhost" does not resolve in @@ -5095,9 +5095,13 @@ (define-public libsoup-minimal-2 "04rgv6hkyhgi7lak9865yxgbgky6gc635p7w6nhcbj64rx0prdz4")))) (arguments (substitute-keyword-arguments (package-arguments libsoup-minimal) + ((#:configure-flags configure-flags) + ;; The option name changed between libsoup 2 and libsoup 3. + #~(cons "-Dgtk_doc=false" + (delete "-Ddocs=disabled" #$configure-flags))) ((#:phases phases) `(modify-phases ,phases - (add-after 'unpack 'disable-failing-tests + (replace 'adjust-tests (lambda _ ;; Disable the SSL test, failing since 2.68 and resolved in ;; libsoup 3. @@ -5110,20 +5114,13 @@ (define-public libsoup-minimal-2 (define-public libsoup (package/inherit libsoup-minimal (name "libsoup") - (version "3.4.4") - (source (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/libsoup/" - (version-major+minor version) "/" - "libsoup-" version ".tar.xz")) - (sha256 - (base32 - "1an5n2sa70f40my4g20lk38s5ib99c32bzzg8gm91v9nbxr6f719")))) (outputs (cons "doc" (package-outputs libsoup-minimal))) (arguments (substitute-keyword-arguments (package-arguments libsoup-minimal) ((#:configure-flags configure-flags) - #~(delete "-Dgtk_doc=false" #$configure-flags)) + #~(cons "-Ddocs=enabled" + ;; The default value is 'auto', meaning it could be skipped. + (delete "-Ddocs=disabled" #$configure-flags))) ((#:phases phases) #~(modify-phases #$phases (replace 'adjust-tests -- cgit v1.2.3 From 49b1ff08df50b7454a091003d0cf5132b7a112e6 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Sat, 2 Dec 2023 16:09:40 +0100 Subject: gnu: libsoup-minimal: Update style. * gnu/packages/gnome.scm (libsoup-minimal) [arguments]: Convert to list of G-Expressions. * gnu/packages/gnome.scm (libsoup-minimal-2) [arguments]: Convert to list of G-Expressions. Change-Id: I72ebe6614eac3ee032057ffeb76dff5d8d821a8e Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 53 +++++++++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 26 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 38ed25a5e4..e92a244061 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5032,25 +5032,26 @@ (define-public libsoup-minimal "1an5n2sa70f40my4g20lk38s5ib99c32bzzg8gm91v9nbxr6f719")))) (build-system meson-build-system) (arguments - `(#:configure-flags '("-Ddocs=disabled") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'adjust-tests - (lambda _ - ;; This test fails due to missing /etc/nsswitch.conf - ;; in the build environment. - (substitute* "tests/unix-socket-test.c" - ((".*/sockets/unconnected.*") "")) - - ;; These fail because "subdomain.localhost" does not resolve in - ;; the build environment. Moreover, the hsts-test suite fails on - ;; i686-linux because of errors from `session_get_uri' like - ;; "Unexpected status 200 OK (expected 301 Moved Permanently)" - ;; (see: https://gitlab.gnome.org/GNOME/libsoup/-/issues/239). - (substitute* "tests/meson.build" - ((".*'name': 'hsts'.*") "")) - (substitute* "tests/hsts-db-test.c" - ((".*/hsts-db/subdomains.*") ""))))))) + (list + #:configure-flags #~(list "-Ddocs=disabled") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'adjust-tests + (lambda _ + ;; This test fails due to missing /etc/nsswitch.conf + ;; in the build environment. + (substitute* "tests/unix-socket-test.c" + ((".*/sockets/unconnected.*") "")) + + ;; These fail because "subdomain.localhost" does not resolve in + ;; the build environment. Moreover, the hsts-test suite fails on + ;; i686-linux because of errors from `session_get_uri' like + ;; "Unexpected status 200 OK (expected 301 Moved Permanently)" + ;; (see: https://gitlab.gnome.org/GNOME/libsoup/-/issues/239). + (substitute* "tests/meson.build" + ((".*'name': 'hsts'.*") "")) + (substitute* "tests/hsts-db-test.c" + ((".*/hsts-db/subdomains.*") ""))))))) (native-inputs (list `(,glib "bin") ;for glib-mkenums gobject-introspection @@ -5100,13 +5101,13 @@ (define-public libsoup-minimal-2 #~(cons "-Dgtk_doc=false" (delete "-Ddocs=disabled" #$configure-flags))) ((#:phases phases) - `(modify-phases ,phases - (replace 'adjust-tests - (lambda _ - ;; Disable the SSL test, failing since 2.68 and resolved in - ;; libsoup 3. - (substitute* "tests/meson.build" - (("[ \t]*\\['ssl', true, \\[\\]\\],") "")))))))) + #~(modify-phases #$phases + (replace 'adjust-tests + (lambda _ + ;; Disable the SSL test, failing since 2.68 and resolved in + ;; libsoup 3. + (substitute* "tests/meson.build" + (("[ \t]*\\['ssl', true, \\[\\]\\],") "")))))))) (native-inputs (modify-inputs (package-native-inputs libsoup-minimal) (replace "vala" vala-0.52))))) -- cgit v1.2.3 From 87794254ab92782424257d21e826e8a052e038d1 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Fri, 24 Nov 2023 23:31:31 +0100 Subject: gnu: mm-common: Update to 1.0.5. * gnu/packages/gnome.scm (mm-common): Update to 1.0.5. [arguments]: Convert to list of G-Expressions. [native-inputs]: Drop labels. [source]: Remove mm-common-reproducible-tarball.patch. * gnu/local.mk (dist_patch_DATA): Unregister it. * gnu/packages/patches/mm-common-reproducible-tarball.patch: Delete. Change-Id: If7331e87949bf9e94348757d46a9a3a0459608f0 Signed-off-by: Liliana Marie Prikler --- gnu/local.mk | 1 - gnu/packages/gnome.scm | 31 +++++++---------- .../patches/mm-common-reproducible-tarball.patch | 40 ---------------------- 3 files changed, 13 insertions(+), 59 deletions(-) delete mode 100644 gnu/packages/patches/mm-common-reproducible-tarball.patch diff --git a/gnu/local.mk b/gnu/local.mk index 01298a72d1..d54f59c5e6 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1664,7 +1664,6 @@ dist_patch_DATA = \ %D%/packages/patches/mit-krb5-hurd.patch \ %D%/packages/patches/mixxx-link-qtscriptbytearray-qtscript.patch \ %D%/packages/patches/mixxx-system-googletest-benchmark.patch \ - %D%/packages/patches/mm-common-reproducible-tarball.patch \ %D%/packages/patches/mpc123-initialize-ao.patch \ %D%/packages/patches/mpg321-CVE-2019-14247.patch \ %D%/packages/patches/mpg321-gcc-10.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e92a244061..194c569544 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1140,7 +1140,7 @@ (define-public metacity (define-public mm-common (package (name "mm-common") - (version "1.0.3") + (version "1.0.5") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/mm-common/" @@ -1148,26 +1148,21 @@ (define-public mm-common "mm-common-" version ".tar.xz")) (sha256 (base32 - "1x8yvjy0yg17qyhmqws8xh2k8dvzrhpwqz7j1cfwzalrb1i9c5g8")) - (patches - (search-patches - "mm-common-reproducible-tarball.patch")))) + "1am5dmz7862hr2p4xbkdikpvd4kc0hdzqv73wjyjjshiyhlnsp3h")))) (build-system meson-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "util/mm-common-prepare.in" - (("ln") (search-input-file inputs "/bin/ln")) - (("cp") (search-input-file inputs "/bin/cp")) - (("sed") (search-input-file inputs "/bin/sed")) - (("cat") (search-input-file inputs "/bin/cat")))))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "util/mm-common-prepare.in" + (("ln") (search-input-file inputs "/bin/ln")) + (("cp") (search-input-file inputs "/bin/cp")) + (("sed") (search-input-file inputs "/bin/sed")) + (("cat") (search-input-file inputs "/bin/cat")))))))) (native-inputs - `(("coreutils" ,coreutils) - ("gettext" ,gettext-minimal) - ("pkg-config" ,pkg-config) - ("sed" ,sed))) + (list coreutils gettext-minimal pkg-config sed)) (inputs (list python)) (synopsis "Module of GNOME C++ bindings") diff --git a/gnu/packages/patches/mm-common-reproducible-tarball.patch b/gnu/packages/patches/mm-common-reproducible-tarball.patch deleted file mode 100644 index f0890aaf57..0000000000 --- a/gnu/packages/patches/mm-common-reproducible-tarball.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 024c121c844a4ec920133eb3f7e6b6ee8044c0b6 Mon Sep 17 00:00:00 2001 -From: Vagrant Cascadian -Date: Sat, 12 Dec 2020 04:05:56 +0000 -Original-Patch: https://bugs.debian.org/977177 -Subject: [PATCH] Set uid, username, gid, and group name on files in - generated tarball. - -The user and group may otherwise vary between builds on different systems. - ---- - util/meson_aux/skeletonmm-tarball.py | 16 +++++++++++++++- - 1 file changed, 15 insertions(+), 1 deletion(-) - -diff --git a/util/meson_aux/skeletonmm-tarball.py b/util/meson_aux/skeletonmm-tarball.py -index db9e650..89049b6 100755 ---- a/util/meson_aux/skeletonmm-tarball.py -+++ b/util/meson_aux/skeletonmm-tarball.py -@@ -39,10 +39,18 @@ elif output_file.endswith('.gz'): - else: - mode = 'w' - -+def reproducible(tarinfo): -+ # Set consistent user and group on files in the tar archive -+ tarinfo.uid = 0 -+ tarinfo.uname = 'root' -+ tarinfo.gid = 0 -+ tarinfo.gname = 'root' -+ return tarinfo -+ - with tarfile.open(output_file, mode=mode) as tar_file: - os.chdir(source_dir) # Input filenames are relative to source_dir. - for file in sys.argv[3:]: -- tar_file.add(file) -+ tar_file.add(file, filter=reproducible) - # Errors raise exceptions. If an exception is raised, Meson+ninja will notice - # that the command failed, despite exit(0). - sys.exit(0) --- -2.29.2 - -- cgit v1.2.3 From fa1610a60c01c7b7d9842ae68a05fb9e40781d00 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Sun, 26 Nov 2023 16:18:15 +0100 Subject: gnu: pangomm@2.46: Update to 2.46.3. * gnu/packages/gtk.scm (pangomm-2.46): Update to 2.46.3 Change-Id: I53c19722ba403790b8e110433fc31753817b5d22 Signed-off-by: Liliana Marie Prikler --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 83c700025b..03aa35a5e3 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1720,7 +1720,7 @@ (define-public pangomm-2.46 (package (inherit pangomm) (name "pangomm") - (version "2.46.2") + (version "2.46.3") (source (origin (method url-fetch) @@ -1729,7 +1729,7 @@ (define-public pangomm-2.46 (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 - (base32 "1x56xb4k1d9g88a1d9rlcvy97mmj39rib6c3wfzpff04vjs2li2p")))) + (base32 "0ya3yb36d745m5ccgwhgxl8xjh82hiys3lvk08zqyq0s8x6y03s1")))) (propagated-inputs (list cairomm-1.14 glibmm-2.64 pango)))) -- cgit v1.2.3 From 34f0b66193f4aefde3ff6da2cc7c852ed0301fd1 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Sun, 26 Nov 2023 19:01:46 +0100 Subject: gnu: yelp-tools: Update to 42.1. yelp-tools has changed its version scheme, so its download URL changed. * gnu/packages/gnome.scm (yelp-tools): Update to 42.1. [source]: Update origin uri. [build-system]: Change to meson-build-system. [#:configure-flags]: Set -Dhelp=true. [propagated-inputs]: Drop labels. [native-inputs]: Add gettext-minimal, python, python-lxml. Change-Id: Ibc091329275959219fdcb1af47d34e40128da889 Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 194c569544..a3dcd9ac9a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7380,26 +7380,26 @@ (define-public yelp (define-public yelp-tools (package (name "yelp-tools") - (version "3.32.2") + (version "42.1") (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 "1yg8f5g5wadhmy4yfd9yjhvd8vll4gq4l86ibp0b42qbxnsmcf0q")))) - (build-system gnu-build-system) + (base32 "01gr255nlb77462040499qx50sik17x2b2jhzncmn56l4106lj9y")))) + (build-system meson-build-system) + (arguments + (list #:configure-flags #~'("-Dhelp=true"))) (native-inputs - (list pkg-config)) + (list gettext-minimal pkg-config python python-lxml)) (inputs (list yelp-xsl)) (propagated-inputs ;; Needed by `yelp-build', `yelp-check' or 'yelp.m4'. - `(("itstool" ,itstool) - ("xmllint" ,libxml2) - ("xsltproc" ,libxslt))) + (list itstool libxml2 libxslt)) (synopsis "Yelp documentation tools") (description "Yelp-tools is a collection of scripts and build utilities to help create, -- cgit v1.2.3 From 514e92748f275d11282eff23bca0f1f34b50f4fc Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Sun, 26 Nov 2023 19:02:21 +0100 Subject: gnu: yelp-xsl: Update to 42.1. * gnu/packages/gnome.scm (yelp-xsl): Update to 42.1. [description]: Ensure sentences are separated with 2 spaces. Change-Id: I3f808880593b0e6fc700d7eef588572e116805f3 Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index a3dcd9ac9a..926586f05f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7280,7 +7280,7 @@ (define-public d-spy (define-public yelp-xsl (package (name "yelp-xsl") - (version "41.0") + (version "42.1") (source (origin (method url-fetch) @@ -7289,7 +7289,7 @@ (define-public yelp-xsl (version-major version) "/" name "-" version ".tar.xz")) (sha256 - (base32 "19d46rkajvr0f04560vlrzwvac88x5j8ilvzwkawbn5vjg069kf8")))) + (base32 "1kav039g62q35h508shdbrcjcfkdsc7k6wcr2g780c35n58f32r3")))) (build-system gnu-build-system) (arguments '(#:configure-flags '("--enable-doc"))) @@ -7304,7 +7304,7 @@ (define-public yelp-xsl 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 +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 -- cgit v1.2.3 From 92982ecca4efe857666d8b94ad95d2cc7d2ab54b Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Sat, 16 Dec 2023 18:18:57 +0100 Subject: gnu: vala: Update to 0.56.14. * gnu/packages/gnome.scm (vala): Update to 0.56.14. Change-Id: I7701c7f68fcac9421de11673c7b15379185be213 Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 926586f05f..16ee2f290d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4444,7 +4444,7 @@ (define-public seahorse (define-public vala (package (name "vala") - (version "0.56.13") + (version "0.56.14") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/vala/" @@ -4452,7 +4452,7 @@ (define-public vala "vala-" version ".tar.xz")) (sha256 (base32 - "01xfarnhpp30wmv9mwayw8751glwppl0sva79j3y9qf76qq25229")))) + "0mzmldhf6474dp2jkxj160kkafdz32c2l5f8xnm05p4vr9lc50lk")))) (build-system glib-or-gtk-build-system) (arguments (list -- cgit v1.2.3 From a4441ff3f0e9cf42e23c8c842fd5fa5846ff536d Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Sat, 2 Dec 2023 15:04:51 +0100 Subject: gnu: accountsservice: Update to 23.13.9. * gnu/packages/freedesktop.scm (accountsservice): Update to 23.13.9. [native-inuputs]: Add glibc-locales. * gnu/packages/patches/accountsservice-extensions.patch: Adjust to changes in the upstream code style. Change-Id: I19678b5ce36549a832099109b13cdaf91539b20a Signed-off-by: Liliana Marie Prikler --- gnu/packages/freedesktop.scm | 5 +++-- gnu/packages/patches/accountsservice-extensions.patch | 5 ++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm index 25b7998d05..a934b3ac17 100644 --- a/gnu/packages/freedesktop.scm +++ b/gnu/packages/freedesktop.scm @@ -1746,7 +1746,7 @@ (define-public udisks (define-public accountsservice (package (name "accountsservice") - (version "22.08.8") + (version "23.13.9") (source (origin (method url-fetch) @@ -1754,7 +1754,7 @@ (define-public accountsservice "accountsservice/accountsservice-" version ".tar.xz")) (sha256 - (base32 "14d3lwik048h62qrzg1djdd2sqmxf3m1r859730pvzhrd6krg6ch")) + (base32 "0kwjkff5m7gnzpns6cy27az90w7sxzwzygyzwy90kyi4mvg4rnmd")) (patches (search-patches "accountsservice-extensions.patch")))) (build-system meson-build-system) (arguments @@ -1795,6 +1795,7 @@ (define-public accountsservice docbook-xsl gettext-minimal `(,glib "bin") ; for gdbus-codegen, etc. + glibc-locales ;for tests gobject-introspection gtk-doc libxml2 ;for XML_CATALOG_FILES diff --git a/gnu/packages/patches/accountsservice-extensions.patch b/gnu/packages/patches/accountsservice-extensions.patch index 2cfab580e3..8027a28a44 100644 --- a/gnu/packages/patches/accountsservice-extensions.patch +++ b/gnu/packages/patches/accountsservice-extensions.patch @@ -5,7 +5,7 @@ diff --git a/src/extensions.c b/src/extensions.c index 038dcb2..830465d 100644 --- a/src/extensions.c +++ b/src/extensions.c -@@ -121,16 +121,7 @@ daemon_read_extension_directory (GHashTable *ifaces, +@@ -122,15 +122,7 @@ daemon_read_extension_directory (GHashTable *ifaces, continue; } @@ -13,8 +13,7 @@ index 038dcb2..830465d 100644 - const gchar * const prefix = "../../dbus-1/interfaces/"; - if (g_str_has_prefix (symlink, prefix) && g_str_equal (symlink + strlen (prefix), name)) { - daemon_read_extension_file (ifaces, filename); -- } -- else { +- } else { - g_warning ("Found accounts service vendor extension symlink %s, but it must be exactly " - "equal to '../../dbus-1/interfaces/%s' for forwards-compatibility reasons.", - filename, name); -- cgit v1.2.3 From 3a94efb31ea8dec56c58ada46de54d39f324aba3 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Sat, 16 Dec 2023 18:19:35 +0100 Subject: gnu: gnome-bluetooth: Update to 42.7. * gnu/packages/gnome.scm (gnome-bluetooth): Update to 42.7. Change-Id: I09a76fe404ec5a5ff70693e22e4ade321510f423 Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ebc9717cd1..c66d42db0f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9040,7 +9040,7 @@ (define-public libgtop (define-public gnome-bluetooth (package (name "gnome-bluetooth") - (version "42.6") + (version "42.7") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/gnome-bluetooth/" @@ -9048,7 +9048,7 @@ (define-public gnome-bluetooth "gnome-bluetooth-" version ".tar.xz")) (sha256 (base32 - "1l2rp8nwsn9mbdj3gv3z4ks0q0jrbavh28mn4vdib1vi3rpzwr2q")))) + "0sgqplr7agyw20m20cx7kv20bamv5cqzbsl8wl2v2fzcvcligpwl")))) (build-system meson-build-system) (native-inputs (list gettext-minimal -- cgit v1.2.3 From 3030e4104e8330f0591169e16fd9727b1bd56aeb Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Sat, 16 Dec 2023 18:20:17 +0100 Subject: gnu: nautilus: Update to 44.3.1. * gnu/packages/gnome.scm (nautilus): Update to 44.3.1. Change-Id: I267623213231cdead9c8ea2548bff1844d79878c Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index c66d42db0f..8fd4619236 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9720,7 +9720,7 @@ (define-public tracker-miners (define-public nautilus (package (name "nautilus") - (version "44.2.1") + (version "44.3.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -9728,7 +9728,7 @@ (define-public nautilus name "-" version ".tar.xz")) (sha256 (base32 - "0k0yyh7sqan68c8n0ahwlw0xyiq25f57inm5qrpsgxr78w12zinr")) + "05njbaq98y00n1z1smg1pdip3shr84q8a10wssm8sjbv7sirwj75")) (patches (search-patches "nautilus-extension-search-path.patch")))) (build-system meson-build-system) -- cgit v1.2.3 From 12c2307451f3d60f1303fd53927bd8428849cc58 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 14 Nov 2023 01:01:22 +0100 Subject: gnu: cheese: Update to 44.1. The build system changed how it disables icon-theme.cache. * gnu/packages/gnome.scm (cheese): Update to 44.1. [#:phases]: Update. Change-Id: I95044d29da019345d14b5fe8f1671f0f7046fba3 Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 8fd4619236..f64c502cdb 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -11409,7 +11409,7 @@ (define-public gnome-video-effects (define-public cheese (package (name "cheese") - (version "43.0") + (version "44.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -11417,7 +11417,7 @@ (define-public cheese version ".tar.xz")) (sha256 (base32 - "02vzcvk2s6cwvdw6v6qmlq3znamy6zwv7l6nlbqjfwrj7i54qmvl")))) + "13pnz35yvwvmk1iyhcp1a94yal4rh610rxmsp3rdsm4yr728a8az")))) (arguments (list #:glib-or-gtk? #t #:phases @@ -11425,8 +11425,9 @@ (define-public cheese (add-after 'unpack 'skip-gtk-update-icon-cache (lambda _ ;; Don't create 'icon-theme.cache'. - (substitute* "meson_post_install.py" - (("gtk-update-icon-cache") (which "true"))))) + (substitute* "meson.build" + (("gtk_update_icon_cache: true") + "gtk_update_icon_cache: false")))) (add-after 'install 'wrap-cheese (lambda* (#:key inputs outputs #:allow-other-keys) (wrap-program (search-input-file outputs "bin/cheese") -- cgit v1.2.3 From 9ee9aad22c7491219e680b52762e2d90365b05b8 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 21 Nov 2023 23:45:44 +0100 Subject: gnu: grilo: Update to 0.3.16. * gnu/packages/gnome.scm (grilo): Update to 0.3.16. [native-inputs]: Add python. [home-page]: Update. Change-Id: Iaf391b1246e74b58536a0470ea68bd53fefe2f93 Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f64c502cdb..eb262e82b0 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6546,7 +6546,7 @@ (define-public gnome-klotski (define-public grilo (package (name "grilo") - (version "0.3.15") + (version "0.3.16") (source (origin (method url-fetch) @@ -6554,7 +6554,7 @@ (define-public grilo (version-major+minor version) "/" "grilo-" version ".tar.xz")) (sha256 - (base32 "0bbvaxw2das8826663z23y0acbdmcvggwdh64ws9jrk56vvsqlpk")))) + (base32 "15mxffs7f7ndzimpvpq4lj48km5p6i9gyqxa4ggq1qpcqpl80ic8")))) (build-system meson-build-system) (arguments (list #:phases #~(modify-phases %standard-phases @@ -6569,6 +6569,7 @@ (define-public grilo pkg-config gobject-introspection gtk-doc/stable + python vala)) (inputs (list cyrus-sasl @@ -6583,7 +6584,7 @@ (define-public grilo (variable "GRL_PLUGIN_PATH") (files (list (string-append "lib/grilo-" (version-major+minor version))))))) - (home-page "https://wiki.gnome.org/action/show/Projects/Grilo") + (home-page "https://wiki.gnome.org/Projects/Grilo") (synopsis "Framework for discovering and browsing media") (description "Grilo is a framework focused on making media discovery and browsing easy -- cgit v1.2.3 From f17e549043b7c1d41d0f7200b09c23d218528498 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 21 Nov 2023 23:46:27 +0100 Subject: gnu: grilo-plugins: Update to 0.3.16. * gnu/packages/gnome.scm (grilo-plugins): Update to 0.3.16. [arguments]: Convert to a list of G-Expressions. [home-page]: Update. Change-Id: I20876f9b594f8d33f2c85e313656791fb3b6812b Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index eb262e82b0..2b819c42af 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6594,7 +6594,7 @@ (define-public grilo (define-public grilo-plugins (package (name "grilo-plugins") - (version "0.3.15") + (version "0.3.16") (source (origin (method url-fetch) @@ -6602,7 +6602,7 @@ (define-public grilo-plugins (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 - (base32 "0cxbxg7i9qd1pyfjj7c15x9lawvaw5608jk2apcrac7rakcw6645")))) + (base32 "1jydhk822sigyda3mswn59j9s01dy81f553382i8nsvcb2z4svzy")))) (build-system meson-build-system) (native-inputs (list gettext-minimal @@ -6628,20 +6628,21 @@ (define-public grilo-plugins tracker tracker-miners)) (arguments - `(#:glib-or-gtk? #t - ;;Disable lua-factory as it needs missing dependencies - #:configure-flags '("-Denable-lua-factory=no") - #:phases - (modify-phases %standard-phases - (add-before 'configure 'set-shell - (lambda _ - (setenv "SHELL" (which "bash")))) - ;; Disable the tracker test that requires the UPower daemon. - (add-before 'configure 'fix-tests - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "tests/tracker3/meson.build" - (("'test_tracker3'.*") ""))))))) - (home-page "https://live.gnome.org/Grilo") + (list + #:glib-or-gtk? #t + ;;Disable lua-factory as it needs missing dependencies + #:configure-flags #~'("-Denable-lua-factory=no") + #:phases + #~(modify-phases %standard-phases + (add-before 'configure 'set-shell + (lambda _ + (setenv "SHELL" (which "bash")))) + ;; Disable the tracker test that requires the UPower daemon. + (add-before 'configure 'fix-tests + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "tests/tracker3/meson.build" + (("'test_tracker3'.*") ""))))))) + (home-page "https://wiki.gnome.org/Projects/Grilo") (synopsis "Plugins for the Grilo media discovery library") (description "Grilo is a framework focused on making media discovery and browsing easy -- cgit v1.2.3 From 23be219c05ab6d03b3f98e6907992340c31931a8 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 14 Nov 2023 12:09:51 +0100 Subject: gnu: gcr: Update to 4.1.0. * gnu/packages/gnome.scm (gcr): Update to 4.1.0. Change-Id: I95cb59b6850190573f6b3464bce1dbe8fc0f9354 Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 2b819c42af..7028940555 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2390,7 +2390,7 @@ (define-public gnome-font-viewer (define-public gcr (package (name "gcr") - (version "4.0.0") + (version "4.1.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -2398,7 +2398,7 @@ (define-public gcr name "-" version ".tar.xz")) (sha256 (base32 - "0z7cviri25qy2v042hw6x731bj1azpx8plrd7ssbmrqf9y95an64")))) + "10x3yg0vp22lpib4hfivr7140wn6iv0qha3f46wikaab50lsvslw")))) (build-system meson-build-system) (arguments (list -- cgit v1.2.3 From d6f883e534397f8578f741527e7f7397838b0b06 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 21 Nov 2023 23:28:52 +0100 Subject: gnu: gnome-user-docs: Update to 44.6. * gnu/packages/gnome.scm (gnome-user-docs): Update to 44.6. [home-page]: Update from redirection. Change-Id: I8c0989881be2cadac8453dc5d1df6c97857822eb Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 7028940555..002c63d2a8 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1938,7 +1938,7 @@ (define-public gnome-commander (define-public gnome-user-docs (package (name "gnome-user-docs") - (version "42.0") + (version "44.6") (source (origin (method url-fetch) @@ -1946,7 +1946,7 @@ (define-public gnome-user-docs (version-major version) "/gnome-user-docs-" version ".tar.xz")) (sha256 - (base32 "01g9smkk2sj3yrih2wjn6vx9av855n7w6nqf9wpxvfq086h7vcmj")))) + (base32 "0ds2mccrgmb4jgw196jjm7xzlvnir8k80g1v55sd4nn00prc1b9g")))) (build-system gnu-build-system) (native-inputs (list gettext-minimal itstool pkg-config libxml2)) @@ -1955,7 +1955,7 @@ (define-public gnome-user-docs "The GNOME User Documentation explains how to use the GNOME desktop and its components. It covers usage and setup of the core GNOME programs by end-users and system administrators.") - (home-page "https://live.gnome.org/DocumentationProject") + (home-page "https://wiki.gnome.org/DocumentationProject") (license license:cc-by3.0))) (define-public dia -- cgit v1.2.3 From 413da336f7d17a1ea5c307ed16efc48f4e46d548 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 14 Nov 2023 01:09:50 +0100 Subject: gnu: eog: Update to 44.3. * gnu/packages/gnome.scm (eog): Update to 44.3. Change-Id: I3088d9213fe044746d8043d01c0243ce19e616e9 Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 002c63d2a8..94862a470f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -6835,7 +6835,7 @@ (define-public rhythmbox (define-public eog (package (name "eog") - (version "42.3") + (version "44.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -6843,7 +6843,7 @@ (define-public eog name "-" version ".tar.xz")) (sha256 (base32 - "0fpl8wz1j10r59m20d61b7wmp8ga48dd7svqv1a2ip66ig1b7h9h")))) + "134xvb2fcfh6ciyk2f3rh7khh7b2n8lr13sc977zhbs39c7xgcnn")))) (build-system meson-build-system) (arguments (list -- cgit v1.2.3 From 9fa740331a086c7c95c82d00370d07a3a52af1d4 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Wed, 15 Nov 2023 17:17:05 +0100 Subject: gnu: gnome-boxes: Update to 44.3. * gnu/packages/gnome.scm (gnome-boxes): Update to 44.3. Change-Id: I7e8f0faa0c5d2366f49fd38eb565c2c711d2a14c Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 94862a470f..87fad17c3f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -12405,7 +12405,7 @@ (define-public polari (define-public gnome-boxes (package (name "gnome-boxes") - (version "43.3") + (version "44.3") (source (origin (method url-fetch) @@ -12413,7 +12413,7 @@ (define-public gnome-boxes (version-major version) "/" "gnome-boxes-" version ".tar.xz")) (sha256 - (base32 "14zd5ii3igy0am4zqw2jg1xshf2zxsy96yv5pss2vf6rh3svmnzf")))) + (base32 "0wg1fgp44wnv8cx39rinia2ix4mw6rqaczkq797g0xf8w2w432k4")))) (build-system meson-build-system) (arguments (list #:glib-or-gtk? #t -- cgit v1.2.3 From c47ecfa6f90816e442b45f88fcc4ee4f4dcbbf14 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Thu, 23 Nov 2023 21:08:57 +0100 Subject: gnu: gupnp: Update to 1.6.6. * gnu/packages/gnome.scm (gupnp): Update to 1.6.6. [arguments]: Convert to list of G-Expressions. [#:configure-flags]: Add -Dgtk_doc=true. [native-inputs]: Add gi-docgen. Change-Id: Ia173720a9b888b4064417f1df79508a8c5b7fb14 Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 87fad17c3f..def9c787ce 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1381,7 +1381,7 @@ (define-public gssdp-1.4 (define-public gupnp (package (name "gupnp") - (version "1.5.4") + (version "1.6.6") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -1389,17 +1389,20 @@ (define-public gupnp name "-" version ".tar.xz")) (sha256 (base32 - "0y0v0m6afnx879hjvhj2lrawp9qhpyp8mbds0yp544imghajk0wq")))) + "0kx0ymsab4x927ir2a5f7mfk9sck5kswbig6n38r4dwbqzl51p69")))) (build-system meson-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-before 'check 'pre-check - (lambda _ - ;; Tests require a writable HOME. - (setenv "HOME" (getcwd))))))) + (list + #:configure-flags #~'("-Dgtk_doc=true") + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'pre-check + (lambda _ + ;; Tests require a writable HOME. + (setenv "HOME" (getcwd))))))) (native-inputs (list gettext-minimal + gi-docgen `(,glib "bin") gobject-introspection gtk-doc/stable -- cgit v1.2.3 From 44c0e30e9c4efd964e4fd52c8aa1225f3e7d0511 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 21 Nov 2023 23:34:41 +0100 Subject: gnu: gnome-weather: Update to 44.0. * gnu/packages/gnome.scm (gnome-weather): Update to 44.0. Change-Id: I674f6b735d3d5917fb1f15f85d3ffa9c1e2fa221 Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index def9c787ce..ba5b9efc66 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10040,7 +10040,7 @@ (define-public libgovirt (define-public gnome-weather (package (name "gnome-weather") - (version "42.0") + (version "44.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -10048,7 +10048,7 @@ (define-public gnome-weather name "-" version ".tar.xz")) (sha256 (base32 - "0rdl0ywdk8jlq819wr1sbdzdvsasz11pp30fylzvprakv28yd7jp")))) + "1brvjawwc69a49697mp0dq4glpvvvcsnx4i8ysfnjhahg2n3h3bb")))) (build-system meson-build-system) (arguments (list -- cgit v1.2.3 From 6a4151e41139c00f2e10d7569c4ff078a98b7a81 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 21 Nov 2023 22:41:58 +0100 Subject: gnu: gnome-shell-extensions: Update to 44.0. * gnu/packages/gnome.scm (gnome-shell-extensions): Update to 44.0. Change-Id: Id5664a9f86f7a64179975cd9c5cbf7b6521c5844 Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ba5b9efc66..21bb776eb0 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10672,7 +10672,7 @@ (define-public gnome-tweaks (define-public gnome-shell-extensions (package (name "gnome-shell-extensions") - (version "42.3") + (version "44.0") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -10680,7 +10680,7 @@ (define-public gnome-shell-extensions name "-" version ".tar.xz")) (sha256 (base32 - "1z3k4bvq8f2s0q9q7i093w4hrz289lci7xlib20aqa4z5sivxhhf")))) + "1aq1n75m1svsv0ppg66n9qch26rhjxcv3q33a3skf7hsydr5wd4c")))) (build-system meson-build-system) (arguments '(#:configure-flags '("-Dextension_set=all"))) -- cgit v1.2.3 From b8175bc85a9709e29b60a0b56bafa56ca790383b Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 21 Nov 2023 22:56:37 +0100 Subject: gnu: gnome-system-monitor: Update to 44.0. * gnu/packages/gnome.scm (gnome-system-monitor): Update to 44.0. Change-Id: I1b4c0f16ec48ee5dfb07ad255ceb9252e0160945 Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 21bb776eb0..de80b6f836 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -11067,7 +11067,7 @@ (define-public bluefish (define-public gnome-system-monitor (package (name "gnome-system-monitor") - (version "42.0") + (version "44.0") (source (origin (method url-fetch) @@ -11076,7 +11076,7 @@ (define-public gnome-system-monitor name "-" version ".tar.xz")) (sha256 (base32 - "1p3mq32pfd9260aql5nys806g0c4nrswacwqs8ms40920ci9s8qk")))) + "0vjyqk76k2gzhxc9hcbg0zjwk11wgqz2ji6yr322fa59vgnvgfn2")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t -- cgit v1.2.3 From 0831c72df618ef15bee719a0a2ccc123fc31837d Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Fri, 5 Jan 2024 09:56:46 +0100 Subject: gnu: dbus-service: only symlink /run/dbus the first time Due to an error in the nesting of S-Expressions, the re-linking of /var/run/dbus to /run/dbus would occur even if it was already a correct symlink. It should only happen if the symlink is different. * gnu/services/dbus.scm (dbus-activation): Adjust accordingly. Signed-off-by: Liliana Marie Prikler --- gnu/services/dbus.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/services/dbus.scm b/gnu/services/dbus.scm index 1edcc6eb9e..8dee91a3f7 100644 --- a/gnu/services/dbus.scm +++ b/gnu/services/dbus.scm @@ -210,9 +210,9 @@ (define (dbus-activation config) (begin (rename-file (string-append "/var/run/dbus/" next) (string-append "/run/dbus/" next)) - (loop (readdir dir)))))))) - (rmdir "/var/run/dbus") - (symlink "/run/dbus" "/var/run/dbus"))) + (loop (readdir dir))))))) + (rmdir "/var/run/dbus") + (symlink "/run/dbus" "/var/run/dbus")))) (else (format (current-error-port) "Failed to symlink /run/dbus to /var/run/dbus: ~s~%" -- cgit v1.2.3 From b369dc272eeba4eafb2bc7dc56f7b3cf09fb0961 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 14 Nov 2023 12:03:36 +0100 Subject: gnu: epiphany: Update to 44.7. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Soup2 is not supported anymore, we do not need to disable it explicitely. * gnu/packages/gnome.scm (epiphany): Update to 44.7. [#:phases]: Update for build system changes. : Partially disable web_view_test. : Remove. : Replace with a new phase. : New phase. [#:configure-flags]: Remove “-Dsoup2=disabled”. [inputs]: Replace gcr-3 with gcr and webkitgtk-for-gtk3 with webkitgtk. Add bash-minimal, gstreamer, gst-plugins-base, gst-plugins-good, and libadwaita. Remove libdazzle and libhandy. Change-Id: I95ab6551a1b38254191801549be9dba0abb04593 Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 61 +++++++++++++++++++++++++++++++++++++------------- 1 file changed, 45 insertions(+), 16 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 84f1d2be11..d17676f53b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7135,7 +7135,7 @@ (define-public simple-scan (define-public epiphany (package (name "epiphany") - (version "42.5") + (version "44.7") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/epiphany/" @@ -7143,7 +7143,7 @@ (define-public epiphany "epiphany-" version ".tar.xz")) (sha256 (base32 - "0mln4iym0fqkri959650cccdhq3r4d4kfn8yld0vvdmzskmak4a6")))) + "1srdbn2rls4c0dvrjk0djfmxxnrd012jbji8aavslgkf8cs5mya4")))) (build-system meson-build-system) (arguments (list @@ -7153,8 +7153,9 @@ (define-public epiphany (add-after 'unpack 'skip-gtk-update-icon-cache ;; Don't create 'icon-theme.cache'. (lambda _ - (substitute* "post_install.py" - (("gtk-update-icon-cache") "true")))) + (substitute* "meson.build" + (("gtk_update_icon_cache: true") + "gtk_update_icon_cache: false")))) (add-after 'unpack 'disable-failing-tests (lambda _ (substitute* "tests/meson.build" @@ -7162,17 +7163,42 @@ (define-public epiphany ;; supports overriding the ftp schema web_app_utils fails due ;; to missing network access. (("(embed_shell|web_app_utils)_test,") - "find_program('sh'), args: ['-c', 'exit 77'],")))) - (add-before 'check 'pre-check - (lambda _ - ;; Tests require a running X server. - (system "Xvfb :1 &") - (setenv "DISPLAY" ":1")))) + "find_program('sh'), args: ['-c', 'exit 77'],") + ;; web_view_test partially fails, because it can’t run bwrap. + (("web_view_test,") + (string-append + "web_view_test, args: [" + (string-join + (map (lambda (test) + (string-append "'-s', '/embed/ephy-web-view/" test "'")) + '("load_url" + "provisional_load_failure_updates_back_forward_list" + "error-pages-not-stored-in-history")) + ", ") + "],"))))) + (replace 'check + (lambda* (#:key parallel-tests? tests? #:allow-other-keys) + (when tests? + (setenv "MESON_TESTTHREADS" + (if parallel-tests? + (number->string (parallel-job-count)) + "1")) + (setenv "XDG_CACHE_HOME" (getcwd)) + ;; Tests require a running X server. + (system "Xvfb :1 &") + (setenv "DISPLAY" ":1") + (invoke "dbus-run-session" "--" + "meson" "test" "--print-errorlogs" "-t" "0")))) + (add-after 'install 'gst-wrap + (lambda* (#:key inputs outputs #:allow-other-keys) + (let ((out (assoc-ref outputs "out")) + (gst-plugin-path (getenv "GST_PLUGIN_SYSTEM_PATH"))) + (wrap-program (string-append out "/bin/epiphany") + `("GST_PLUGIN_SYSTEM_PATH" ":" suffix (,gst-plugin-path))))))) #:configure-flags ;; Otherwise, the RUNPATH will lack the final 'epiphany' path component. #~(list (string-append "-Dc_link_args=-Wl,-rpath=" - #$output "/lib/epiphany") - "-Dsoup2=disabled"))) ;use libsoup 3 + #$output "/lib/epiphany")))) (propagated-inputs (list dconf)) (native-inputs (list desktop-file-utils ; for update-desktop-database @@ -7184,15 +7210,18 @@ (define-public epiphany xorg-server-for-tests)) (inputs (list avahi - gcr-3 + bash-minimal ; for wrap-program + gcr glib-networking gnome-desktop gsettings-desktop-schemas + gst-plugins-base + gst-plugins-good + gstreamer iso-codes json-glib + libadwaita libarchive - libdazzle - libhandy libnotify libportal (librsvg-for-system) ; for loading SVG files @@ -7201,7 +7230,7 @@ (define-public epiphany libxslt nettle ; for hogweed sqlite - webkitgtk-for-gtk3)) + webkitgtk)) (home-page "https://wiki.gnome.org/Apps/Web") (synopsis "GNOME web browser") (description -- cgit v1.2.3 From 17c2e26068c5c36eb8ee1ec39a8695ef66f75c55 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Sat, 13 Jan 2024 18:23:56 +0100 Subject: gnu: vala-language-server: Update to 0.48.7. * gnu/packages/gnome-xyz.scm (vala-language-server): Update to 0.48.7. Change-Id: I101091d73f0e26aab5e9fa8eb0dadaa3489f7dc3 Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 100018a2dc..a49442bdbe 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -1790,7 +1790,7 @@ (define-public vala-language-server ;; Note to maintainer: VLS must be built with a Vala toolchain the same ;; version or newer. Therefore when you update this package you may need ;; to update Vala too. - (version "0.48.3") + (version "0.48.7") (source (origin (method git-fetch) (uri (git-reference @@ -1798,7 +1798,7 @@ (define-public vala-language-server (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "1gnvc91gdp3wj9r3r3xxfr09f9lw39cfypn2q5f0443dhhmp059j")))) + (base32 "1ini6nd5yim6mql13b9mb15gs02gm08x7zphd0vlv9jxl2646pjn")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t)) (inputs -- cgit v1.2.3 From 47cb05757d64777bc34b9fd776f3ab069d5857fd Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 16 Jan 2024 22:30:13 +0100 Subject: gnu: gnome-shell-extension-dash-to-dock: Update to 79. * gnu/packages/gnome-xyz.scm (gnome-shell-extension-dash-to-dock): Update to 79. [arguments]: Convert to list of G-Expressions. [native-inputs]: Drop labels. Change-Id: I327027d8a0ffc2bc7d234fe6517724fd218b947c Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome-xyz.scm | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index a49442bdbe..c32dd3f3ee 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -722,7 +722,7 @@ (define-public gnome-shell-extension-topicons-redux (define-public gnome-shell-extension-dash-to-dock (package (name "gnome-shell-extension-dash-to-dock") - (version "73") + (version "79") (source (origin (method git-fetch) (uri (git-reference @@ -731,23 +731,25 @@ (define-public gnome-shell-extension-dash-to-dock version)))) (sha256 (base32 - "1l0isbrgfc8v46l1yc5l4myz7qnlxzyfyiifipp86z9d79d8klzw")) + "0fsfhgpg8441x28jzhjspb9i9c5502c2fcgdvfggcsmz0sf3v95y")) (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments - '(#:tests? #f - #:make-flags (list (string-append "INSTALLBASE=" - (assoc-ref %outputs "out") - "/share/gnome-shell/extensions")) - #:phases - (modify-phases %standard-phases - (delete 'bootstrap) - (delete 'configure)))) + (list + #:tests? #f + #:make-flags #~(list (string-append "INSTALLBASE=" + #$output + "/share/gnome-shell/extensions")) + #:phases + #~(modify-phases %standard-phases + (delete 'bootstrap) + (delete 'configure)))) (native-inputs - `(("glib:bin" ,glib "bin") - ("intltool" ,intltool) - ("pkg-config" ,pkg-config) - ("sassc" ,sassc))) + (list + `(,glib "bin") + intltool + pkg-config + sassc)) (propagated-inputs (list glib)) (synopsis "Transforms GNOME's dash into a dock") -- cgit v1.2.3 From 369b5274d902df03cd55348a83e581ccd5a6a918 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 16 Jan 2024 22:31:43 +0100 Subject: gnu: gnome-shell-extension-dash-to-panel: Update to 56. * gnu/packages/gnome-xyz.scm (gnome-shell-extension-dash-to-panel): Update to 56. [arguments]: Convert to list of G-Expressions. [native-inputs]: Add `(,glib "bin"). [propagated-inputs]: Remove `(,glib "bin"). Change-Id: I24a83766b750feb1004bbaf2f5badc9e21f1c30e Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome-xyz.scm | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index c32dd3f3ee..d8be063846 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -953,7 +953,7 @@ (define-public gnome-shell-extension-just-perfection (define-public gnome-shell-extension-dash-to-panel (package (name "gnome-shell-extension-dash-to-panel") - (version "56") + (version "56") ;Compatible with GNOME 44 (source (origin (method git-fetch) (uri (git-reference @@ -965,22 +965,24 @@ (define-public gnome-shell-extension-dash-to-panel (file-name (git-file-name name version)))) (build-system gnu-build-system) (arguments - `(#:tests? #f - #:make-flags (list (string-append "INSTALLBASE=" - (assoc-ref %outputs "out") - "/share/gnome-shell/extensions") - (string-append "VERSION=" - ,(package-version - gnome-shell-extension-dash-to-panel))) + (list + #:tests? #f + #:make-flags #~(list (string-append "INSTALLBASE=" + #$output + "/share/gnome-shell/extensions") + (string-append "VERSION=" + #$version)) #:phases - (modify-phases %standard-phases - (delete 'bootstrap) - (delete 'configure)))) + #~(modify-phases %standard-phases + (delete 'bootstrap) + (delete 'configure)))) (native-inputs - (list intltool pkg-config)) + (list + `(,glib "bin") + intltool + pkg-config)) (propagated-inputs - (list glib - `(,glib "bin"))) + (list glib)) (synopsis "Icon taskbar for GNOME Shell") (description "This extension moves the dash into the gnome main panel so that the application launchers and system tray are combined -- cgit v1.2.3 From a9afe8f0464c954a36531071e5f0d97a96089445 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 16 Jan 2024 22:35:39 +0100 Subject: gnu: gnome-shell-extension-unite-shell: Update to 72. * gnu/packages/gnome-xyz.scm (gnome-shell-extension-unite-shell): Update to 72. Change-Id: Ie91c004cb0ab3f81d8ad7c4a15bb357d939d8508 Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index d8be063846..473167d07e 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -541,7 +541,7 @@ (define-public portfolio (define-public gnome-shell-extension-unite-shell (package (name "gnome-shell-extension-unite-shell") - (version "69") + (version "72") ;Listed as compatible on extensions.gnome.org (source (origin (method git-fetch) (uri (git-reference @@ -550,7 +550,7 @@ (define-public gnome-shell-extension-unite-shell (file-name (git-file-name name version)) (sha256 (base32 - "10yh6ylyp43ykcza180iak08wfypay3raqf3p0vrj9ngm98qzq70")))) + "006m54ribfbqij0p3zzglzqjw1rbvw0f9468j7p6zdaf43vdvhgc")))) (build-system copy-build-system) (native-inputs (list `(,glib "bin") gettext-minimal)) (inputs (list xprop)) -- cgit v1.2.3 From a7ff2e20e74d526f1591aa4a2a7196f8e0a86835 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 16 Jan 2024 22:40:57 +0100 Subject: gnu: gnome-shell-extension-appindicator: Update to 53. * gnu/packages/gnome-xyz.scm (gnome-shell-extension-appindicator): Update to 53. Change-Id: Ifc3ae680b8f1d66068ce03e94d991de0d479da4e Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 473167d07e..0f575e3d3f 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -579,7 +579,7 @@ (define-public gnome-shell-extension-unite-shell (define-public gnome-shell-extension-appindicator (package (name "gnome-shell-extension-appindicator") - (version "42") + (version "53") (source (origin (method git-fetch) (uri (git-reference @@ -588,7 +588,7 @@ (define-public gnome-shell-extension-appindicator (commit (string-append "v" version)))) (sha256 (base32 - "1lf3aqb924nzhj87rhy2zvm5pcfqcklhfw21m6ic3i7wzd9r7cnc")) + "0lyfznsq5x287vpz133y593s7s4mz9i4x2491sgqvir891zwsivy")) (file-name (git-file-name name version)))) (build-system meson-build-system) (native-inputs (list jq gnu-gettext -- cgit v1.2.3 From efd3dc654ad88e40cb78dbe804cd7627a5153b8a Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 16 Jan 2024 22:41:28 +0100 Subject: gnu: gnome-shell-extension-clipboard-indicator: Update to 47. * gnu/packages/gnome-xyz.scm (gnome-shell-extension-clipboard-indicator): Update to 47. [arguments]: Convert to a list of G-Expressions. Change-Id: Ie982a1820dab1f01b2e8198cd6914d1e676865ad Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome-xyz.scm | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 0f575e3d3f..7d7475c9be 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -603,7 +603,7 @@ (define-public gnome-shell-extension-appindicator (define-public gnome-shell-extension-clipboard-indicator (package (name "gnome-shell-extension-clipboard-indicator") - (version "42") + (version "47") (source (origin (method git-fetch) (uri (git-reference @@ -615,7 +615,7 @@ (define-public gnome-shell-extension-clipboard-indicator (file-name (git-file-name name version)) (sha256 (base32 - "0wf2k33pbwjdf8i4y3aw32fgvjbh751qh7504lwhnl02rcq5dc88")) + "00v0v454y6hblzsx06aaysxbs6aky89vnkf7ydzxrddns24c2wix")) (modules '((guix build utils))) (snippet ;; Remove pre-compiled settings schemas and translations from @@ -628,15 +628,16 @@ (define-public gnome-shell-extension-clipboard-indicator (find-files "locale" "\\.mo$")))))) (build-system copy-build-system) (arguments - '(#:install-plan - '(("." "share/gnome-shell/extensions/clipboard-indicator@tudmotu.com" - #:include-regexp ("\\.css$" "\\.compiled$" "\\.js(on)?$" "\\.mo$" "\\.xml$"))) - #:phases - (modify-phases %standard-phases - (add-before 'install 'compile-schemas - (lambda _ - (with-directory-excursion "schemas" - (invoke "glib-compile-schemas" "."))))))) + (list + #:install-plan + #~'(("." "share/gnome-shell/extensions/clipboard-indicator@tudmotu.com" + #:include-regexp ("\\.css$" "\\.compiled$" "\\.js(on)?$" "\\.mo$" "\\.xml$"))) + #:phases + #~(modify-phases %standard-phases + (add-before 'install 'compile-schemas + (lambda _ + (with-directory-excursion "schemas" + (invoke "glib-compile-schemas" "."))))))) (native-inputs (list `(,glib "bin") gettext-minimal)) (home-page "https://github.com/Tudmotu/gnome-shell-extension-clipboard-indicator") -- cgit v1.2.3 From b2b488b108fd3f7ac2b2728b091f06a0bf82e715 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 16 Jan 2024 22:47:02 +0100 Subject: gnu: gnome-shell-extensions-customize-ibus: Update to 86. * gnu/packages/gnome-xyz.scm (gnome-shell-extension-customize-ibus): Update to 86. [arguments]: Convert to list of G-Expressions. [native-inputs]: Drop labels. [propagated-inputs]: Add ibus. Change-Id: I48dbc2bd9a8dea7e7a2b161089b433e1d72a8ff1 Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome-xyz.scm | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 7d7475c9be..9a6eea8cb2 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -61,6 +61,7 @@ (define-module (gnu packages gnome-xyz) #:use-module (gnu packages glib) #:use-module (gnu packages gnome) #:use-module (gnu packages gtk) + #:use-module (gnu packages ibus) #:use-module (gnu packages inkscape) #:use-module (gnu packages image) #:use-module (gnu packages pkg-config) @@ -649,7 +650,7 @@ (define-public gnome-shell-extension-clipboard-indicator (define-public gnome-shell-extension-customize-ibus (package (name "gnome-shell-extension-customize-ibus") - (version "82") + (version "86") (source (origin (method git-fetch) @@ -658,21 +659,23 @@ (define-public gnome-shell-extension-customize-ibus (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "00brnyahphl4ql9yh74wpb9kmzyb4b5k4rkw40hvxvqw4qwgs24r")))) + (base32 "1psnbhqbqrp68dri0q98y7ikwz9z3701lcy8vvgixb2bh71y7519")))) (build-system gnu-build-system) (arguments - `(#:make-flags - (list (string-append "VERSION=" ,version) - (string-append "INSTALLBASE=" (assoc-ref %outputs "out") - "/share/gnome-shell/extensions")) + (list + #:make-flags + #~(list (string-append "VERSION=" #$version) + (string-append "INSTALLBASE=" #$output + "/share/gnome-shell/extensions")) #:tests? #f ; No test target #:phases - (modify-phases %standard-phases + #~(modify-phases %standard-phases (delete 'bootstrap) (delete 'configure)))) (native-inputs - `(("gettext" ,gettext-minimal) - ("glib:bin" ,glib "bin"))) + (list gettext-minimal `(,glib "bin"))) + (propagated-inputs + (list ibus)) (home-page "https://github.com/openSUSE/Customize-IBus") (synopsis "GNOME Shell Extension for IBus Customization") (description "Customize IBus provides full customization of appearance, -- cgit v1.2.3 From 38d9f8c074059a0645aa54c72e25ebdeb04031b5 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 16 Jan 2024 22:59:14 +0100 Subject: gnu: gnome-shell-extension-gsconnect: Update to 55. * gnu/packages/gnome-xyz.scm (gnome-shell-extension-gsconnect): Update to 55. [arguments]: Convert to list of G-Expressions. [#:configure-flags]: Do not set settings_schemadir nor post_install anymore. [#:phase 'skip-post-installation]: New phase. [inputs]: Drop labels. [native-inputs]: Drop labels. Change-Id: I63933e43815826a8ab91a472ecda235173486dae Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome-xyz.scm | 134 ++++++++++++++++++++++----------------------- 1 file changed, 67 insertions(+), 67 deletions(-) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 9a6eea8cb2..db28f0a5d5 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -766,7 +766,7 @@ (define-public gnome-shell-extension-dash-to-dock (define-public gnome-shell-extension-gsconnect (package (name "gnome-shell-extension-gsconnect") - (version "50") ; See GNOME Shell supported versions in metadata.json + (version "55") (source (origin (method git-fetch) (uri (git-reference @@ -776,77 +776,77 @@ (define-public gnome-shell-extension-gsconnect (file-name (git-file-name name version)) (sha256 (base32 - "0vg87fdihs5kp7apgyd32ldjmwzmrxaimsc005yjyy8m3f65sjmr")))) + "158qbjl6m807g0fy15dvhwwwy6z8r0g7kh9gjyhm7n3y14v5p8wz")))) (build-system meson-build-system) (arguments - `(#:tests? #f ;; every test fails - #:configure-flags - (let* ((out (assoc-ref %outputs "out")) - (name+version (strip-store-file-name out)) - (gschema-dir (string-append out - "/share/gsettings-schemas/" - name+version - "/glib-2.0/schemas")) - (gnome-shell (assoc-ref %build-inputs "gnome-shell")) - (openssh (assoc-ref %build-inputs "openssh")) - (openssl (assoc-ref %build-inputs "openssl"))) - (list - (string-append "-Dgnome_shell_libdir=" gnome-shell "/lib") - (string-append "-Dgsettings_schemadir=" gschema-dir) - (string-append "-Dopenssl_path=" openssl "/bin/openssl") - (string-append "-Dsshadd_path=" openssh "/bin/ssh-add") - (string-append "-Dsshkeygen_path=" openssh "/bin/ssh-keygen") - (string-append "-Dsession_bus_services_dir=" out "/share/dbus-1/services") - "-Dpost_install=true")) - #:phases - (modify-phases %standard-phases - (add-before 'configure 'fix-paths - (lambda* (#:key inputs #:allow-other-keys) - (let* ((glib (assoc-ref inputs "glib:bin")) - (gapplication (string-append glib "/bin/gapplication")) - (gi-typelib-path (getenv "GI_TYPELIB_PATH"))) - (substitute* "data/org.gnome.Shell.Extensions.GSConnect.desktop.in" - (("gapplication") gapplication)) - (for-each - (lambda (file) - (substitute* file - (("'use strict';") - (string-append "'use strict';\n\n" - "'" gi-typelib-path "'.split(':').forEach(" - "path => imports.gi.GIRepository.Repository." - "prepend_search_path(path));")))) - '("src/extension.js" "src/prefs.js")) - #t))) - (add-after 'install 'wrap-daemons - (lambda* (#:key inputs outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (service-dir - (string-append out "/share/gnome-shell/extensions" - "/gsconnect@andyholmes.github.io/service")) + (list + #:tests? #f ;; every test fails + #:configure-flags + #~(let ((out #$output) + (gnome-shell #$(this-package-input "gnome-shell")) + (openssh #$(this-package-input "openssh")) + (openssl #$(this-package-input "openssl"))) + (list + (string-append "-Dgnome_shell_libdir=" gnome-shell "/lib") + (string-append "-Dopenssl_path=" openssl "/bin/openssl") + (string-append "-Dsshadd_path=" openssh "/bin/ssh-add") + (string-append "-Dsshkeygen_path=" openssh "/bin/ssh-keygen") + (string-append "-Dsession_bus_services_dir=" out "/share/dbus-1/services"))) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'skip-post-installation + (lambda _ + (substitute* "meson.build" + (("gtk_update_icon_cache: true") + "gtk_update_icon_cache: false") + (("update_desktop_database: true") + "update_desktop_database: false")))) + (add-before 'configure 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (let ((gapplication (search-input-file inputs "/bin/gapplication")) (gi-typelib-path (getenv "GI_TYPELIB_PATH"))) - (wrap-program (string-append service-dir "/daemon.js") - `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))) - #t)))))) + (substitute* "data/org.gnome.Shell.Extensions.GSConnect.desktop.in" + (("gapplication") gapplication)) + (for-each + (lambda (file) + (substitute* file + (("'use strict';") + (string-append "'use strict';\n\n" + "'" gi-typelib-path "'.split(':').forEach(" + "path => imports.gi.GIRepository.Repository." + "prepend_search_path(path));")))) + '("src/extension.js" "src/prefs.js"))))) + (add-after 'install 'wrap-daemons + (lambda _ + (let* ((out #$output) + (service-dir + (string-append out "/share/gnome-shell/extensions" + "/gsconnect@andyholmes.github.io/service")) + (gi-typelib-path (getenv "GI_TYPELIB_PATH"))) + (wrap-program (string-append service-dir "/daemon.js") + `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))))))))) (inputs - `(("at-spi2-core" ,at-spi2-core) - ("caribou" ,caribou) - ("evolution-data-server" ,evolution-data-server) - ("gjs" ,gjs) - ("glib" ,glib) - ("glib:bin" ,glib "bin") - ("gsound" ,gsound) - ("gnome-shell" ,gnome-shell) - ("gtk+" ,gtk+) - ("nautilus" ,nautilus) - ("openssh" ,openssh) - ("openssl" ,openssl) - ("python-pygobject" ,python-pygobject) - ("upower" ,upower))) + (list + at-spi2-core + caribou + evolution-data-server + gjs + glib + `(,glib "bin") ;for /bin/gapplication + gsound + gnome-shell + gtk+ + nautilus + openssh + openssl + python-pygobject + upower)) (native-inputs - `(("gettext" ,gettext-minimal) - ("gobject-introspection" ,gobject-introspection) - ("libxml2" ,libxml2) - ("pkg-config" ,pkg-config))) + (list + gettext-minimal + gobject-introspection + libxml2 + pkg-config)) (home-page "https://github.com/GSConnect/gnome-shell-extension-gsconnect/wiki") (synopsis "Connect GNOME Shell with your Android phone") (description "GSConnect is a complete implementation of KDE Connect -- cgit v1.2.3 From 72b1f2d33522e6ef681a3d3ef1a370a9f415e989 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Wed, 17 Jan 2024 23:25:46 +0100 Subject: gnu: gnome-shell-extension-just-perfection: Update to 26.0. * gnu/packages/gnome-xyz.scm (gnome-shell-extension-just-perfection): Update to 26.0. [arguments]: Convert to list of G-Expressions. Change-Id: Ib02ab984310705bfa435ab1ea8d47c74a6162db0 Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome-xyz.scm | 59 +++++++++++++++++++++++----------------------- 1 file changed, 30 insertions(+), 29 deletions(-) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index db28f0a5d5..8501654419 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -906,7 +906,7 @@ (define-public gnome-shell-extension-hide-app-icon (define-public gnome-shell-extension-just-perfection (package (name "gnome-shell-extension-just-perfection") - (version "22.0") + (version "26.0") (source (origin (method git-fetch) (uri (git-reference @@ -915,36 +915,37 @@ (define-public gnome-shell-extension-just-perfection (file-name (git-file-name name version)) (sha256 (base32 - "0r4rflppcp05kwhzmh07dzi7znc4kch4nc8mzw61arj3qsfq2qqj")))) + "0dvq2mb04b557g9nz4pm90x2c2jc1dwwbg2is1gkx38yk0dsj6r3")))) (build-system copy-build-system) (arguments - `(#:install-plan - '(("src" - "share/gnome-shell/extensions/just-perfection-desktop@just-perfection" - #:include-regexp ("\\.css$" "\\.compiled$" "\\.js(on)?$" "\\.ui$")) - ("locale" - "share/gnome-shell/extensions/just-perfection-desktop@just-perfection/")) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'drop-executable-bits - (lambda _ - (for-each - (lambda (file) - (let ((stat (lstat file))) - (chmod file (logand (stat:mode stat) (lognot #o111))))) - (find-files "." #:directories? #f)))) - (add-before 'install 'build - (lambda _ - (invoke "glib-compile-schemas" "src/schemas") - (for-each - (lambda (file) - (let* ((base (basename file)) - (noext (substring base 0 (- (string-length base) 3))) - (dest (string-append "locale/" noext "/LC_MESSAGES/")) - (out (string-append dest "just-perfection.mo"))) - (mkdir-p dest) - (invoke "msgfmt" "-c" file "-o" out))) - (find-files "po" "\\.po$"))))))) + (list + #:install-plan + #~'(("src" + "share/gnome-shell/extensions/just-perfection-desktop@just-perfection" + #:include-regexp ("\\.css$" "\\.compiled$" "\\.js(on)?$" "\\.ui$")) + ("locale" + "share/gnome-shell/extensions/just-perfection-desktop@just-perfection/")) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'drop-executable-bits + (lambda _ + (for-each + (lambda (file) + (let ((stat (lstat file))) + (chmod file (logand (stat:mode stat) (lognot #o111))))) + (find-files "." #:directories? #f)))) + (add-before 'install 'build + (lambda _ + (invoke "glib-compile-schemas" "src/schemas") + (for-each + (lambda (file) + (let* ((base (basename file)) + (noext (substring base 0 (- (string-length base) 3))) + (dest (string-append "locale/" noext "/LC_MESSAGES/")) + (out (string-append dest "just-perfection.mo"))) + (mkdir-p dest) + (invoke "msgfmt" "-c" file "-o" out))) + (find-files "po" "\\.po$"))))))) (native-inputs (list `(,glib "bin") gettext-minimal)) (home-page "https://gitlab.gnome.org/jrahmatzadeh/just-perfection") -- cgit v1.2.3 From 8f4f7bd654f22b601e402f4d51a7f076b72f7993 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Wed, 17 Jan 2024 17:20:41 +0100 Subject: gnu: Deprecate gnome-shell-extension-hide-app-icon. This extension does not work with GNOME 44, and has not received any work. However, Just Perfection seems to have an option to hide application icons. * gnu/packages/gnome-xyz.scm (gnome-shell-extension-hide-app-icon): Deprecate in favor of gnome-shell-extension-just-perfection. Change-Id: I6af14b6c9e1db7176d9be6bec2b90f77e7db36c1 Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome-xyz.scm | 52 ++++------------------------------------------ 1 file changed, 4 insertions(+), 48 deletions(-) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 8501654419..460f11db90 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -855,54 +855,6 @@ (define-public gnome-shell-extension-gsconnect control.") (license license:gpl2))) -(define-public gnome-shell-extension-hide-app-icon - (let ((commit "4188aa5f4ba24901a053a0c3eb0d83baa8625eab") - (revision "0")) - (package - (name "gnome-shell-extension-hide-app-icon") - (version (git-version "2.7" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url (string-append "https://github.com/michael-rapp" - "/gnome-shell-extension-hide-app-icon.git")) - (commit commit))) - (sha256 - (base32 - "1i28n4bz6wrhn07vpxkr6l1ljyn7g8frp5xrr11z3z32h2hxxcd6")) - (file-name (git-file-name name version)))) - (build-system gnu-build-system) - (arguments - '(#:tests? #f ; no test target - #:make-flags (list (string-append "EXTENSIONS_DIR=" - (assoc-ref %outputs "out") - "/share/gnome-shell/extensions")) - #:phases - (modify-phases %standard-phases - (delete 'configure) ; no configure script - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out")) - (pre "/share/gnome-shell/extensions/") - (dir "hide-app-icon@mrapp.sourceforge.com")) - (copy-recursively dir (string-append out pre dir)) - #t)))))) - (native-inputs - (list `(,glib "bin") intltool)) - (propagated-inputs - (list glib)) - (synopsis "Hide app icon from GNOME's panel") - (description "This extension hides the icon and/or title of the -currently focused application in the top panel of the GNOME shell.") - (home-page - "https://github.com/michael-rapp/gnome-shell-extension-hide-app-icon/") - (license - ;; README.md and LICENSE.txt disagree -- the former claims v3, the - ;; latter v2. No mention of "or later" in either place or in the code. - (list license:gpl2 - license:gpl3))))) - (define-public gnome-shell-extension-just-perfection (package (name "gnome-shell-extension-just-perfection") @@ -955,6 +907,10 @@ (define-public gnome-shell-extension-just-perfection certain elements or change animation speeds.") (license license:gpl3))) +(define-public gnome-shell-extension-hide-app-icon + (deprecated-package "gnome-shell-extension-hide-app-icon" + gnome-shell-extension-just-perfection)) + (define-public gnome-shell-extension-dash-to-panel (package (name "gnome-shell-extension-dash-to-panel") -- cgit v1.2.3 From b086d1ba9ea6e036ff7afe5bc4cf92a9dec70374 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Wed, 17 Jan 2024 22:35:17 +0100 Subject: gnu: gnome-shell-extension-blur-my-shell: Update to 47. * gnu/packages/gnome-xyz.scm (gnome-shell-extension-blur-my-shell): Update to 47. Change-Id: I528579d9bd02361501977cbad6f9e752403ff37e Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 460f11db90..de7f4a5f86 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -1222,7 +1222,7 @@ (define-public gnome-shell-extension-burn-my-windows (define-public gnome-shell-extension-blur-my-shell (package (name "gnome-shell-extension-blur-my-shell") - (version "44") + (version "47") (source (origin (method git-fetch) @@ -1232,7 +1232,7 @@ (define-public gnome-shell-extension-blur-my-shell (file-name (git-file-name name version)) (sha256 (base32 - "0h7yfvrrg5r821mzrp42c09jws06mw6v9avvkfykqj8n8qnslmyx")))) + "1a8prh6893zk8rnfi9q7waga2x7kx564jzmsdyhiffdbazbv8p6y")))) (build-system copy-build-system) (arguments '(#:install-plan -- cgit v1.2.3 From 839388b0333ec5d70b1ef08c9c5d4753084f365a Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Wed, 17 Jan 2024 22:57:17 +0100 Subject: gnu: gnome-shell-extension-burn-my-windows: Update to 40. * gnu/packages/gnome-xyz.scm (gnome-shell-extension-burn-my-windows): Update to 40. [arguments]: Convert to list of G-Expressions. Change-Id: Ib9551096437aeea0ff56e5e1ea6371ab72d61b02 Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome-xyz.scm | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index de7f4a5f86..f221da2c98 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -1183,7 +1183,7 @@ (define-public gnome-shell-extension-jiggle (define-public gnome-shell-extension-burn-my-windows (package (name "gnome-shell-extension-burn-my-windows") - (version "22") + (version "40") (source (origin (method git-fetch) @@ -1192,25 +1192,26 @@ (define-public gnome-shell-extension-burn-my-windows (commit (string-append "v" version)))) (sha256 (base32 - "185xrf330d9bflmk0l61cnzlylnppb2v4yz6v6ygkk4zpwyil8np")) + "16n6ilszdn67835clqlr4flna69x9k00k5qrm55765dv2ny9jdcq")) (file-name (git-file-name name version)))) (build-system copy-build-system) (arguments - `(#:install-plan - '(("." ,(string-append - "share/gnome-shell/extensions/" - "burn-my-windows@schneegans.github.com") - #:include-regexp ("\\.js(on)?$" "\\.css$" "\\.ui$" "\\.png$" - "\\.xml$" "\\.compiled$" "\\.gresource$"))) - #:phases - (modify-phases %standard-phases - (add-before 'install 'compile-resources - (lambda _ - (invoke "make" "resources/burn-my-windows.gresource"))) - (add-before 'install 'compile-schemas - (lambda _ - (with-directory-excursion "schemas" - (invoke "glib-compile-schemas" "."))))))) + (list + #:install-plan + #~'(("." #$(string-append + "share/gnome-shell/extensions/" + "burn-my-windows@schneegans.github.com") + #:include-regexp ("\\.js(on)?$" "\\.css$" "\\.ui$" "\\.png$" + "\\.xml$" "\\.compiled$" "\\.gresource$"))) + #:phases + #~(modify-phases %standard-phases + (add-before 'install 'compile-resources + (lambda _ + (invoke "make" "resources/burn-my-windows.gresource"))) + (add-before 'install 'compile-schemas + (lambda _ + (with-directory-excursion "schemas" + (invoke "glib-compile-schemas" "."))))))) (native-inputs (list `(,glib "bin"))) ; for glib-compile-resources (home-page "https://github.com/Schneegans/Burn-My-Windows") -- cgit v1.2.3 From 1d45b532441b559404415ee793d57af3e3a809a4 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Wed, 17 Jan 2024 23:19:27 +0100 Subject: gnu: gnome-shell-extension-radio: Update to 21. * gnu/packages/gnome-xyz.scm (gnome-shell-extension-radio): Update to 21. Change-Id: I11aab4c80c96d1237112bb9a089763bd3c331d1a Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index f221da2c98..da2537a6e8 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -1262,7 +1262,7 @@ (define-public gnome-shell-extension-blur-my-shell (define-public gnome-shell-extension-radio (package (name "gnome-shell-extension-radio") - (version "20") + (version "21") (source (origin (method git-fetch) (uri (git-reference @@ -1272,7 +1272,7 @@ (define-public gnome-shell-extension-radio (file-name (git-file-name name version)) (sha256 (base32 - "01dmziad9g7bs3hr59aaz3mivkc6rqfyb9bz2v202zk22vcr5a2y")))) + "1ghk95q3lhliz3his58hh2ql4p9csh6llzip412vwf29zdkr58s2")))) (build-system copy-build-system) (arguments (list -- cgit v1.2.3 From 3a0d32a155087d465ae5e6fd9425ef82706b2aa8 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Wed, 17 Jan 2024 23:30:24 +0100 Subject: gnu: gnome-shell-extension-night-theme-switcher: Update to 74. * gnu/packages/gnome-xyz.scm (gnome-shell-extension-night-theme-switcher): Update to 74. Change-Id: I712dad785d3d303252f35b4c73185b83b6e01e54 Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome-xyz.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index da2537a6e8..3775a6c54a 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -1018,7 +1018,7 @@ (define-public gnome-shell-extension-paperwm (define-public gnome-shell-extension-night-theme-switcher (package (name "gnome-shell-extension-night-theme-switcher") - (version "65") + (version "74") (source (origin (method git-fetch) @@ -1027,7 +1027,7 @@ (define-public gnome-shell-extension-night-theme-switcher "https://gitlab.com/rmnvgr/nightthemeswitcher-gnome-shell-extension") (commit version))) (sha256 - (base32 "0qhi2g2lh6m8vhrmmfi60977f0i4k9x1zj68lrvpzzlqndz8cgh9")) + (base32 "1hiydjyn7shc32i81r70sqip9p3hhig7pqq1h7hsz9bc4qlyri7b")) (file-name (git-file-name name version)))) (build-system meson-build-system) (native-inputs (list pkg-config (list glib "bin"))) -- cgit v1.2.3 From 1f9339fce4a81757fb18372aa974217d8e03c551 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Thu, 18 Jan 2024 19:19:02 +0100 Subject: gnu: Add gnome-shell-extension-v-shell. * gnu/packages/gnome-xyz.scm (gnome-shell-extension-v-shell): New variable. Change-Id: Ib7e3cf5cffed621e2ccd54c84004c5ab8504fa9a Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome-xyz.scm | 36 ++++++++++++++++++++++++++++++++++++ 1 file changed, 36 insertions(+) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 3775a6c54a..cf5d55f150 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -1099,6 +1099,42 @@ (define-public gpaste copies you now want to paste.") (license license:bsd-2))) +(define-public gnome-shell-extension-v-shell + (package + (name "gnome-shell-extension-v-shell") + (version "37") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/G-dH/vertical-workspaces") + (commit (string-append "v" version)))) + (sha256 + (base32 + "1h9f3g1dswxkka0yyj51610w86mwl46ylch19b51gj5mmxlyvzlv")) + (file-name (git-file-name name version)))) + (build-system copy-build-system) + (arguments + (list + #:install-plan + #~'(("." #$(string-append + "share/gnome-shell/extensions/" + "vertical-workspaces@G-dH.github.com") + #:include-regexp ("\\.js(on)?$" "\\.css$" "\\.ui$" "\\.png$" + "\\.xml$" "\\.compiled$" "\\.gresource$"))) + #:phases + #~(modify-phases %standard-phases + (add-before 'install 'build + (lambda _ + (invoke "make" "all")))))) + (native-inputs + (list gettext-minimal `(,glib "bin"))) + (home-page "https://github.com/G-dH/vertical-workspaces") + (synopsis "Shell configuration with horizontal or vertical workspaces") + (description "V-Shell (Vertical Workspaces) lets the user configure different parts of the +shell, including panels, corners, workspaces.") + (license license:gpl3))) + (define-public gnome-shell-extension-vertical-overview (package (name "gnome-shell-extension-vertical-overview") -- cgit v1.2.3 From 49897f2dde7f469c83c496fad2699d3a05f72701 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Thu, 18 Jan 2024 19:19:26 +0100 Subject: gnu: Deprecate gnome-shell-extension-vertical-overview. * gnu/packages/gnome-xyz.scm (gnome-shell-extension-vertical-overview): Replace with gnome-shell-extension-v-shell. Change-Id: I1c6539fd6532046f8445ee33b286645b9e68a053 Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome-xyz.scm | 39 ++------------------------------------- 1 file changed, 2 insertions(+), 37 deletions(-) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index cf5d55f150..b6c1f6d3cb 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -1136,43 +1136,8 @@ (define-public gnome-shell-extension-v-shell (license license:gpl3))) (define-public gnome-shell-extension-vertical-overview - (package - (name "gnome-shell-extension-vertical-overview") - (version "10") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/RensAlthuis/vertical-overview") - (commit (string-append "v" version)))) - (sha256 - (base32 - "1sqkbg93qqrq47wyfnh2flg7dpsmv5c2pmkx8kgqhnbl7j2kgi0l")) - (file-name (git-file-name name version)) - (snippet - '(begin (delete-file "schemas/gschemas.compiled"))))) - (build-system copy-build-system) - (arguments - `(#:install-plan - '(("." ,(string-append - "share/gnome-shell/extensions/" - "vertical-overview@RensAlthuis.github.com") - #:include-regexp ("\\.js(on)?$" "\\.css$" "\\.ui$" "\\.png$" - "\\.xml$" "\\.compiled$"))) - #:phases - (modify-phases %standard-phases - (add-before 'install 'compile-schemas - (lambda _ - (with-directory-excursion "schemas" - (invoke "glib-compile-schemas" "."))))))) - (native-inputs - (list `(,glib "bin"))) ; for glib-compile-resources - (home-page "https://github.com/RensAlthuis/vertical-overview") - (synopsis "Provides a vertical overview in Gnome 40 and upper") - (description "This Gnome extension replaces the new horizontally oriented -Gnome overview with something that resembles the old vertically oriented -style.") - (license license:gpl3))) + (deprecated-package "gnome-shell-extension-vertical-overview" + gnome-shell-extension-v-shell)) (define-public gnome-shell-extension-jiggle (package -- cgit v1.2.3 From 2e7d78b1f02a8eae82c34e5183134c9d1a0d02b3 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Thu, 18 Jan 2024 22:14:09 +0100 Subject: gnu: sdbus-c++: Fix generated sdbus-c++.pc. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/glib.scm (sdbus-c++) [#:phases]: Add ‘fix-elogind-requirement’. Change-Id: Id29369178f164fc60e6882aa664556924cf4bfa7 Signed-off-by: Liliana Marie Prikler --- gnu/packages/glib.scm | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 7b8cc3286d..eee5251d03 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -1289,11 +1289,20 @@ (define-public sdbus-c++ ;; Do not install tests. "-DTESTS_INSTALL_PATH=/tmp" "-DCMAKE_VERBOSE_MAKEFILE=ON") - #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'do-not-install-tests - (lambda _ - (substitute* "tests/CMakeLists.txt" - (("/etc/dbus-1/system.d") "/tmp"))))))) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'do-not-install-tests + (lambda _ + (substitute* "tests/CMakeLists.txt" + (("/etc/dbus-1/system.d") "/tmp")))) + (add-after 'unpack 'fix-elogind-requirement + (lambda _ + ;; sdbus-c++.pc requires 'elogind', but it should + ;; require 'libelogind'. Fixed after 1.4.0 with + ;; fb9e4ae37152648a67814458d3ff673b1d3ca089 + (substitute* "pkgconfig/sdbus-c++.pc.in" + (("@LIBSYSTEMD@") + "libelogind"))))))) (native-inputs (list googletest pkg-config)) (inputs (list expat)) (propagated-inputs (list elogind)) ;required by sdbus-c++.pc -- cgit v1.2.3 From f5f345153ce02f3c1e5db9d77d8337de648d2540 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Mon, 22 Jan 2024 22:02:42 +0100 Subject: gnu: duplicity: Wrap for GI_TYPELIB_PATH. * gnu/packages/backup.scm (duplicity) [native-inputs]: Add gobject-introspection. [inputs]: Add bash-minimal. [#:phases]: Add 'gi-wrap. Change-Id: If9d6a6bb0e855a4d775c1e4adb3b07f71be43090 Signed-off-by: Liliana Marie Prikler --- gnu/packages/backup.scm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/gnu/packages/backup.scm b/gnu/packages/backup.scm index 3126464347..e627531102 100644 --- a/gnu/packages/backup.scm +++ b/gnu/packages/backup.scm @@ -118,6 +118,7 @@ (define-public duplicity (build-system python-build-system) (native-inputs (list gettext-minimal ; for msgfmt + gobject-introspection util-linux ; setsid command, for the tests par2cmdline python-fasteners @@ -132,7 +133,8 @@ (define-public duplicity (propagated-inputs (list python-lockfile python-pygobject python-urllib3)) (inputs - (list dbus ; dbus-launch (Gio backend) + (list bash-minimal ; to run the wrapped program + dbus ; dbus-launch (Gio backend) librsync lftp gnupg ; gpg executable needed @@ -172,7 +174,12 @@ (define-public duplicity "share/zoneinfo")) ;; Some things respect TMPDIR, others hard-code /tmp, and the ;; defaults don't match up, breaking test_restart. Fix it. - (setenv "TMPDIR" "/tmp")))))) + (setenv "TMPDIR" "/tmp"))) + (add-after 'wrap 'gi-wrap + (lambda _ + (let ((prog (string-append #$output "/bin/duplicity"))) + (wrap-program prog + `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))))))))) (home-page "https://duplicity.gitlab.io/duplicity-web/") (synopsis "Encrypted backup using rsync algorithm") (description -- cgit v1.2.3 From 3aef72ec5bf1027bc557daab7010848d80711a28 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Sun, 14 Jan 2024 13:11:03 +0100 Subject: gnu: deja-dup: update to 45.2. * gnu/packages/gnome.scm (deja-dup): Update to 45.2. [arguments]: Convert to list of G-Expressions. Change-Id: I60823287827b0690796fec7955bcf9682acd88b3 Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 73 +++++++++++++++++++++++++------------------------- 1 file changed, 37 insertions(+), 36 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3d89f06d6a..75e2e0efb8 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1823,50 +1823,51 @@ (define-public gnome-menus (define-public deja-dup (package (name "deja-dup") - (version "43.4") + (version "45.2") (source (origin (method url-fetch) (uri (string-append "https://gitlab.gnome.org/World/deja-dup/-/archive/" version "/deja-dup-" version ".tar.bz2")) (sha256 (base32 - "1mr2g009w0zm5rj8dg1k77c7zdwylih2yszm8vh8wkw6al6bzfh3")))) + "000cwy1haiglkvn5plmhrs2a1fhpcpw6z4mdzck7ybmky795amza")))) (build-system meson-build-system) (arguments - `(#:glib-or-gtk? #t - #:configure-flags - (list - ;; Otherwise, the RUNPATH will lack the final path component. - (string-append "-Dc_link_args=-Wl,-rpath=" - (assoc-ref %outputs "out") "/lib/deja-dup")) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-paths - (lambda* (#:key inputs #:allow-other-keys) - (let ((python (assoc-ref inputs "python"))) - (substitute* '("libdeja/duplicity/DuplicityInstance.vala" - "libdeja/tests/scripts/instance-error.test") - (("/bin/rm") - (which "rm"))) - (substitute* "libdeja/tests/runner.vala" - (("/bin/sh") - (which "sh"))) - (substitute* "libdeja/tests/scripts/instance-error.test" - (("`which python3`") - (string-append python "/bin/python3")))))) - (add-after 'unpack 'patch-libgpg-error - (lambda* (#:key inputs #:allow-other-keys) - (let ((libgpg-error (assoc-ref inputs "libgpg-error"))) - (substitute* "meson.build" - (("(gpgerror_libs = ).*" _ var) - (format #f "~a '-L~a/lib -lgpg-error'\n" var libgpg-error)))))) - (add-after 'install 'wrap-program - (lambda* (#:key inputs outputs #:allow-other-keys) - ;; Add duplicity to the search path - (wrap-program (string-append (assoc-ref outputs "out") - "/bin/deja-dup") - `("PATH" ":" prefix - (,(string-append (assoc-ref inputs "duplicity") "/bin"))))))))) + (list + #:glib-or-gtk? #t + #:configure-flags + #~(list + ;; Otherwise, the RUNPATH will lack the final path component. + (string-append "-Dc_link_args=-Wl,-rpath=" + (assoc-ref %outputs "out") "/lib/deja-dup")) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-paths + (lambda* (#:key inputs #:allow-other-keys) + (let ((python (assoc-ref inputs "python"))) + (substitute* '("libdeja/duplicity/DuplicityInstance.vala" + "libdeja/tests/scripts/instance-error.test") + (("/bin/rm") + (which "rm"))) + (substitute* "libdeja/tests/runner.vala" + (("/bin/sh") + (which "sh"))) + (substitute* "libdeja/tests/scripts/instance-error.test" + (("`which python3`") + (string-append python "/bin/python3")))))) + (add-after 'unpack 'patch-libgpg-error + (lambda* (#:key inputs #:allow-other-keys) + (let ((libgpg-error (assoc-ref inputs "libgpg-error"))) + (substitute* "meson.build" + (("(gpgerror_libs = ).*" _ var) + (format #f "~a '-L~a/lib -lgpg-error'\n" var libgpg-error)))))) + (add-after 'install 'wrap-program + (lambda* (#:key inputs outputs #:allow-other-keys) + ;; Add duplicity to the search path + (wrap-program (string-append (assoc-ref outputs "out") + "/bin/deja-dup") + `("PATH" ":" prefix + (,(dirname (search-input-file inputs "/bin/duplicity")))))))))) (inputs (list bash-minimal duplicity -- cgit v1.2.3 From 4947b773535db94521b92f6ce2244da384743d54 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 3 Feb 2024 20:42:36 +0100 Subject: gnu: tor-browsers: Use freedesktop module. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The shared-mime-info package has been moved from gnome to freedesktop, causing the variable to be unbound where this module is not imported. * gnu/packages/tor-browsers.scm : Add #:use-module (gnu packages freedesktop). Fixes: Unbound variable ‘shared-mime-info’. --- gnu/packages/tor-browsers.scm | 1 + 1 file changed, 1 insertion(+) diff --git a/gnu/packages/tor-browsers.scm b/gnu/packages/tor-browsers.scm index fbae549224..f0a8296970 100644 --- a/gnu/packages/tor-browsers.scm +++ b/gnu/packages/tor-browsers.scm @@ -45,6 +45,7 @@ (define-module (gnu packages tor-browsers) #:use-module (gnu packages browser-extensions) #:use-module (gnu packages compression) #:use-module (gnu packages cups) + #:use-module (gnu packages freedesktop) #:use-module (gnu packages fontutils) #:use-module (gnu packages gl) #:use-module (gnu packages glib) -- cgit v1.2.3 From f26235a50cc93abf3b65b188e2c19d996aed646f Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Fri, 19 Jan 2024 23:50:34 +0100 Subject: gnu: gnome-menus: Build GObject Introspection data. * gnu/packages/gnome.scm (gnome-menus) [native-inputs]: Add gobject-introspection. Change-Id: I8cf485955dbad29cec781af9b5fada4c5bcb1ba6 --- gnu/packages/gnome.scm | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 526833eaf5..6919576eae 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1812,8 +1812,19 @@ (define-public gnome-menus (base32 "07xvaf8s0fiv0035nk8zpzymn5www76w2a1vflrgqmp9plw8yd6r")))) (build-system gnu-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-introspection-install-dir + (lambda _ + (substitute* "libmenu/Makefile.in" + (("@INTROSPECTION_GIRDIR@") + (string-append #$output "/share/gir-1.0/")) + (("@INTROSPECTION_TYPELIBDIR@") + (string-append #$output "/lib/girepository-1.0/")))))))) (native-inputs - (list gettext-minimal glib pkg-config)) + (list gettext-minimal glib gobject-introspection pkg-config)) (synopsis "Menu support for GNOME desktop") (description "GNOME Menus contains the libgnome-menu library, the layout configuration files for the GNOME menu, as well as a simple menu editor.") -- cgit v1.2.3 From 5243985aa2509b7dc3236d88b5c22626e2a76be9 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Fri, 19 Jan 2024 23:36:05 +0100 Subject: gnu: gnome-shell-extensions: Wrap the extensions. The top-level modules that are wrapped are the /extension.js and /prefs.js of every extension sub-directory. The GI_TYPELIB_PATH used contains glib for every extension, and gnome-menus for Applications Menu. * gnu/packages/gnome.scm (gnome-shell-extensions) [#:phases]: Add 'wrap-extensions. [native-inputs]: Add gobject-introspection. [inputs]: Add gnome-menus and glib. [propagated-imputs]: Remove glib. Change-Id: I58b79ca92fbceebb9bbb150102fa428022e3eb63 --- gnu/packages/gnome.scm | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 6919576eae..e98f4ac15f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10726,13 +10726,35 @@ (define-public gnome-shell-extensions "1aq1n75m1svsv0ppg66n9qch26rhjxcv3q33a3skf7hsydr5wd4c")))) (build-system meson-build-system) (arguments - '(#:configure-flags '("-Dextension_set=all"))) + (list + #:configure-flags #~'("-Dextension_set=all") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'wrap-extensions + (lambda _ + (use-modules (ice-9 textual-ports) + (guix build utils)) + (for-each + (lambda (file-to-wrap) + (with-atomic-file-replacement file-to-wrap + (lambda (source wrapped) + (format wrapped "'~a'.split(':').forEach(" + (getenv "GI_TYPELIB_PATH")) + (display + (string-append + "path => imports.gi.GIRepository.Repository" + ".prepend_search_path(path));\n") + wrapped) + (dump-port source wrapped)))) + (find-files "extensions" "(extension|prefs)\\.js"))))))) (native-inputs (list `(,glib "bin") gettext-minimal + gobject-introspection ; to set GI_TYPELIB_PATH pkg-config)) - (propagated-inputs - (list glib)) + (inputs + (list glib + gnome-menus)) ; for Applications Menu (synopsis "Extensions for GNOME Shell") (description "GNOME Shell extensions modify and extend GNOME Shell functionality and behavior.") -- cgit v1.2.3 From f84c88f5c4f4001d8883fce108342e85f5208831 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Wed, 17 Jan 2024 23:32:42 +0100 Subject: gnu: gnome-shell-extension-noannoyance: Switch to fork. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The NoAnnoyance “v2” project has not been ported to GNOME 44, so we switch to a maintained fork. The version number is computed in continuity with NoAnnoyance v2. * gnu/packages/gnome-xyz.scm (gnome-shell-extension-noannoyance): Switch to the fork. Bump version to 17 and revision to 6. [arguments]: Convert to list of G-Expressions. Change-Id: Ic74d832020dfe3857e1abf450f5d7876cc921a28 --- gnu/packages/gnome-xyz.scm | 25 ++++++++++++++++--------- 1 file changed, 16 insertions(+), 9 deletions(-) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index da674e4856..d6bf3f6227 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -952,26 +952,33 @@ (define-public gnome-shell-extension-dash-to-panel (license license:gpl2+))) (define-public gnome-shell-extension-noannoyance - (let ((revision "1") - (commit "b759d10fd2799bc084007fdd927b62637c3dbd2c")) + ;; There are different forks of the NoAnnoyance extension. This is the one + ;; named “NoAnnoyance (fork)” at + ;; https://extensions.gnome.org/extension/6109/noannoyance-fork/ because it + ;; supports newer GNOME Shell versions than the previously used “NoAnnoyance + ;; v2”. + (let ((commit "5e9e6a1878d2a1d961f5d59505f15339c5b7e17e") + ;; “NoAnnoyance v2” version 17 correlates with + ;; c6804a47063659f9f48d13a0942b78ce98aac72b, from which we count + ;; commits. + (revision "6")) (package (name "gnome-shell-extension-noannoyance") - ;; XXX: There is no version noted anywhere in the source. Thus, infer it - ;; from . - (version (git-version "16" revision commit)) + (version (git-version "17" revision commit)) (source (origin (method git-fetch) (uri (git-reference - (url "https://github.com/bdaase/noannoyance") + (url "https://github.com/jirkavrba/noannoyance") (commit commit))) (sha256 (base32 - "0hh7fdqvx54h9j41ia2jl0nq1d5i66k7blw41ya6hkh7201r4anp")) + "0br9zrwvn499kh3db84hhw1kl02jpchwb5ldfp892p15vwih8yrf")) (file-name (git-file-name name version)))) (build-system copy-build-system) (arguments - '(#:install-plan - '(("." "share/gnome-shell/extensions/noannoyance@daase.net")))) + (list + #:install-plan + #~'(("." "share/gnome-shell/extensions/noannoyance@vrba.dev")))) (synopsis "Remove 'Window is ready' annotation") (description "One of the many extensions that remove this message. It uses ES6 syntax and claims to be more actively maintained than others.") -- cgit v1.2.3 From a10ad22d7a1de1d06d578c6cfad6381fb5ec47a3 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Wed, 17 Jan 2024 23:42:21 +0100 Subject: gnu: gnome-shell-extension-topicons-redux: Deprecate. This extension has not been ported to GNOME 44. The appindicator extension exhibits a similar feature. * gnu/packages/gnome-xyz.scm (gnome-shell-extension-topicons-redux): Deprecate in favor of gnome-shell-extension-appindicator. Change-Id: I3152f0f0117db56ce89dad659cc779a1ba174378 --- gnu/packages/gnome-xyz.scm | 41 ++--------------------------------------- 1 file changed, 2 insertions(+), 39 deletions(-) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index d6bf3f6227..d369e92c23 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -683,45 +683,8 @@ (define-public gnome-shell-extension-customize-ibus (license license:gpl3+))) (define-public gnome-shell-extension-topicons-redux - (package - (name "gnome-shell-extension-topicons-redux") - (version "6") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://gitlab.com/pop-planet/TopIcons-Redux.git") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 "1dli9xb545n3xlj6q4wl0y5gzkm903zs47p8fiq71pdvbr6v38rj")))) - (build-system gnu-build-system) - (native-inputs - (list `(,glib "bin"))) - (arguments - `(#:tests? #f ;no test defined in the project - #:phases - (modify-phases %standard-phases - (delete 'configure) - (delete 'build) - (replace 'install - (lambda* (#:key outputs #:allow-other-keys) - (let ((out (assoc-ref outputs "out"))) - (invoke "make" - "install" - (string-append - "INSTALL_PATH=" - out - "/share/gnome-shell/extensions")))))))) - (home-page "https://gitlab.com/pop-planet/TopIcons-Redux") - (synopsis "Display legacy tray icons in the GNOME Shell top panel") - (description "Many applications, such as chat clients, downloaders, and -some media players, are meant to run long-term in the background even after you -close their window. These applications remain accessible by adding an icon to -the GNOME Shell Legacy Tray. However, the Legacy Tray was removed in GNOME -3.26. TopIcons Redux brings those icons back into the top panel so that it's -easier to keep track of applications running in the background.") - (license license:gpl2+))) + (deprecated-package "gnome-shell-extension-topicons-redux" + gnome-shell-extension-appindicator)) (define-public gnome-shell-extension-dash-to-dock (package -- cgit v1.2.3 From e1d944d122c2a763f715c39b6c84fa6bc5e371ca Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Wed, 17 Jan 2024 23:26:28 +0100 Subject: gnu: Remove gnome-shell-extension-jiggle. This extension has not been made compatible with GNOME 44. * gnu/packages/gnome-xyz.scm (gnome-shell-extension-jiggle): Remove variable. Change-Id: I9afa9c2fe110ba883524eb9ca9acab42fbdd8f00 --- gnu/packages/gnome-xyz.scm | 42 ------------------------------------------ 1 file changed, 42 deletions(-) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index d369e92c23..7a672c507b 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -1109,48 +1109,6 @@ (define-public gnome-shell-extension-vertical-overview (deprecated-package "gnome-shell-extension-vertical-overview" gnome-shell-extension-v-shell)) -(define-public gnome-shell-extension-jiggle - (package - (name "gnome-shell-extension-jiggle") - (version "8") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/jeffchannell/jiggle/") - (commit version))) - (sha256 - (base32 - "1wbdx2bp22bdwj51ckgivwglkmckr7z8kfwvc8nv4y376hjz5jxz")) - (file-name (git-file-name name version)) - (snippet - '(begin (delete-file "schemas/gschemas.compiled"))))) - (build-system copy-build-system) - (arguments - `(#:install-plan - '(("." ,(string-append - "share/gnome-shell/extensions/" - "jiggle@jeffchannell.com") - #:include-regexp ("\\.js(on)?$" "\\.css$" "\\.ui$" "\\.png$" - "\\.xml$" "\\.compiled$"))) - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-version - (lambda _ - (substitute* "metadata.json" - (("\"40.0\"") "\"40\", \"41\"")))) - (add-before 'install 'compile-schemas - (lambda _ - (with-directory-excursion "schemas" - (invoke "glib-compile-schemas" "."))))))) - (native-inputs - (list `(,glib "bin"))) ; for glib-compile-resources - (home-page "https://github.com/jeffchannell/jiggle") - (synopsis "Mouse cursor enlargement for small and fast movements") - (description "Jiggle is a Gnome Shell extension that highlights the cursor -position when the mouse is moved rapidly.") - (license license:gpl2))) - (define-public gnome-shell-extension-burn-my-windows (package (name "gnome-shell-extension-burn-my-windows") -- cgit v1.2.3 From c5a130f4b3860709b92a5bde7c4a63dc3a6a72ca Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Wed, 17 Jan 2024 23:45:19 +0100 Subject: gnu: Remove gnome-shell-extension-transparent-window. This extension has not been ported to GNOME 44. The master branch has compatibility for 43 but not 44. * gnu/packages/gnome-xyz.scm (gnome-shell-extension-transparent-window): Remove variable. Change-Id: If57da6bb16f53968f5f694392a69118b85b3823c --- gnu/packages/gnome-xyz.scm | 31 ------------------------------- 1 file changed, 31 deletions(-) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 7a672c507b..7aa4275ceb 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -1253,37 +1253,6 @@ (define-public gnome-shell-extension-sound-output-device-chooser Speakers etc. of the same device are also displayed for selection.") (license license:gpl3+))) -(define-public gnome-shell-extension-transparent-window - (let ((commit "cc9bc70c192dd565fa6f1d1b28d9a20f99684f2a") - (revision "45")) - (package - (name "gnome-shell-extension-transparent-window") - (version (git-version "0" revision commit)) - (source - (origin - (method git-fetch) - (uri (git-reference - (url (string-append "https://github.com/pbxqdown/" - "gnome-shell-extension-transparent-window")) - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1f9iqqjpmmylqz0ws8cy5rs475bwzi7jy44q9ip44ig2acz2wxzp")))) - (build-system copy-build-system) - (arguments - (list - #:install-plan - #~'(("." - #$(string-append "/share/gnome-shell/extensions" - "/transparent-window@pbxqdown.github.com"))))) - (home-page - "https://github.com/pbxqdown/gnome-shell-extension-transparent-window") - (synopsis "Change the opacity of windows in GNOME Shell") - (description "This extension adds keybindings to change the opacity -of windows.") - (license license:expat)))) - (define-public gnome-shell-extension-vitals (package (name "gnome-shell-extension-vitals") -- cgit v1.2.3 From 6d3c414f11e5ec9eb029fbfd20fb08731c2b9aab Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Wed, 17 Jan 2024 23:40:18 +0100 Subject: gnu: Remove gnome-shell-extension-sound-output-device-chooser. This extension has not been ported to GNOME 44, because you can switch the audio output directly in the shell. * gnu/packages/gnome-xyz.scm (gnome-shell-extension-sound-output-device-chooser): Remove variable. Change-Id: Iae51c7d284b85f630b5874445c6695b32b5d523e --- gnu/packages/gnome-xyz.scm | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 7aa4275ceb..72f1ffe5ab 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -1220,38 +1220,6 @@ (define-public gnome-shell-extension-radio directly inside GNOME Shell. It can manage stations and play streams.") (license license:gpl3+))) -(define-public gnome-shell-extension-sound-output-device-chooser - (package - (name "gnome-shell-extension-sound-output-device-chooser") - (version "43") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/kgshank/gse-sound-output-device-chooser") - (commit version))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1qk6ypyqbv8zwwlky6cgk9hgp1zh32jmzw4wza200g4v94ifkwm9")))) - (build-system gnu-build-system) - (arguments - (list - #:tests? #f ; no check target - #:make-flags #~(list (string-append "INSTALL_DIR=" - #$output - "/share/gnome-shell/extensions")) - #:phases - #~(modify-phases %standard-phases (delete 'configure)))) - (native-inputs (list gettext-minimal `(,glib "bin"))) - (inputs (list python)) - (home-page - "https://extensions.gnome.org/extension/906/sound-output-device-chooser") - (synopsis "Sound output chooser for GNOME Shell") - (description "This extension shows a list of sound output and input devices -in the status menu below the volume slider. Various active ports like HDMI, -Speakers etc. of the same device are also displayed for selection.") - (license license:gpl3+))) (define-public gnome-shell-extension-vitals (package -- cgit v1.2.3 From ce302c99bdc7b2df69577faf2abecf72f0ec3234 Mon Sep 17 00:00:00 2001 From: Dariqq Date: Mon, 5 Feb 2024 18:49:06 +0000 Subject: gnu: brltty: Fix python package install. The python package is not being installed properly due to install directory not being in PYTHONPATH. * gnu/packages/accessibility.scm (brltty)[phases]: Add set-pythonpath-phase. [modules, imported-modules]: Add (guix build python-build-system). Change-Id: Ia9a24f872d82c3e582413eb1d9fc4df3e0979916 Signed-off-by: Christopher Baines --- gnu/packages/accessibility.scm | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/gnu/packages/accessibility.scm b/gnu/packages/accessibility.scm index 0b5fb79f13..1b5fd6db50 100644 --- a/gnu/packages/accessibility.scm +++ b/gnu/packages/accessibility.scm @@ -129,6 +129,11 @@ (define-public brltty "PYTHON_ROOT=/" (string-append "TCL_DIR=" #$output "/lib") "INSTALL_WRITABLE_DIRECTORY=no-thanks") + #:imported-modules `((guix build python-build-system) + ,@%glib-or-gtk-build-system-modules) + #:modules '((guix build utils) + (guix build glib-or-gtk-build-system) + ((guix build python-build-system) #:prefix python:)) #:phases #~(modify-phases %standard-phases (add-after 'unpack 'fix-errors @@ -142,7 +147,10 @@ (define-public brltty (string-append "extra_link_args = ['-Wl,-rpath=" #$output "/lib'], " - "extra_compile_args = ")))))))) + "extra_compile_args = "))))) + (add-before 'install 'set-pythonpath + (assoc-ref python:%standard-phases + 'add-install-to-pythonpath))))) (native-inputs (list clisp python-cython -- cgit v1.2.3 From 952c691b51f8f5d56df69686c2785414709c7949 Mon Sep 17 00:00:00 2001 From: Dariqq Date: Mon, 5 Feb 2024 18:49:07 +0000 Subject: gnu: orca: Add optional dependencies. * gnu/packages/gnome.scm (orca)[inputs]: Add brltty, liblouis and liblouis:python. Change-Id: Idb375693a8cca7ffd89f591c50e2651d63e4ea62 Signed-off-by: Christopher Baines --- gnu/packages/gnome.scm | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e98f4ac15f..26aeefff4c 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -95,6 +95,7 @@ (define-module (gnu packages gnome) #:use-module (gnu packages) + #:use-module (gnu packages accessibility) #:use-module (gnu packages admin) #:use-module (gnu packages aidc) #:use-module (gnu packages aspell) @@ -11259,12 +11260,15 @@ (define-public orca libxml2)) (inputs (list at-spi2-core + brltty bash-minimal gsettings-desktop-schemas gstreamer gst-plugins-base gst-plugins-good gtk+ + liblouis + `(,liblouis "python") procps ; for pgrep python python-pygobject -- cgit v1.2.3 From b51b2191a94504d02e62a358c9160bb1b4c42de2 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Fri, 16 Feb 2024 11:53:43 +0100 Subject: gnu: Split gnome into more meta-packages. * gnu/packages/gnome.scm (gnome-meta-package): New syntax rule. (gnome-meta-core-services, gnome-meta-core-shell, gnome-meta-core-utilities) (gnome-essential-extras): New variables. (gnome): Implement in terms of the former. --- gnu/packages/gnome.scm | 236 ++++++++++++++++++++++++++++--------------------- 1 file changed, 136 insertions(+), 100 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 7397148c2b..9778a0b461 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10154,108 +10154,144 @@ (define-public gnome-weather (home-page "https://wiki.gnome.org/Apps/Weather") (license license:gpl2+))) -(define-public gnome - (package - (name "gnome") - (version (package-version gnome-shell)) - (source #f) - (build-system trivial-build-system) - (arguments '(#:builder (begin (mkdir %output) #t))) - (propagated-inputs - `(,@(if (string-prefix? "x86_64" (%current-system)) - ;; XXX: EoG requires librsvg-next, which depends on Rust, which currently - ;; only works on x86_64, so exclude it on other architectures. - (list eog) - '()) - ,@(list - ;; GNOME-Core-OS-Services. - accountsservice - network-manager - packagekit - upower - ;; GNOME-Core-Shell. - adwaita-icon-theme - gdm - glib-networking - gnome-backgrounds - gnome-bluetooth - gnome-color-manager - gnome-control-center - gnome-desktop - gnome-initial-setup - gnome-keyring - gnome-menus - gnome-session - gnome-settings-daemon - gnome-shell - gnome-shell-extensions - gnome-themes-extra - gnome-user-docs - gnome-user-share - gsettings-desktop-schemas - gvfs - mutter - orca - rygel - sushi - ;; GNOME-Core-Utilities. - baobab - cheese - epiphany - evince - file-roller - gnome-calculator - gnome-calendar - gnome-characters - gnome-clocks - gnome-console - gnome-contacts - gnome-disk-utility - gnome-font-viewer - gnome-maps - gnome-music - gnome-photos - gnome-screenshot - gnome-system-monitor - gnome-text-editor - gnome-weather - nautilus - simple-scan - totem - tracker-miners - xdg-desktop-portal-gnome - yelp - ;; Others. - gnome-online-accounts - hicolor-icon-theme - - ;; Packages not part of GNOME proper but that are needed for a good - ;; experience. See . - ;; XXX: Find out exactly which ones are needed and why. - at-spi2-core - dbus - dconf - desktop-file-utils - font-abattis-cantarell - font-dejavu - gnome-default-applications - gst-plugins-base - gst-plugins-good - gucharmap - pinentry-gnome3 - pulseaudio - shared-mime-info - system-config-printer - xdg-user-dirs - yelp - zenity))) - (synopsis "The GNU desktop environment") - (home-page "https://www.gnome.org/") - (description - "GNOME is the graphical desktop for GNU. It includes a wide variety of +(define-syntax gnome-meta-package + (lambda (x) + (syntax-case x () + ((_ field ...) + (with-syntax ((base (datum->syntax x 'base))) + #'(let ((base + (package + (name #f) ; we're hidden by default, so don't worry + (version (package-version gnome-shell)) + (source #f) + (build-system trivial-build-system) + (arguments + (list #:builder + #~(begin (format (current-warning-port) + "Building ~a is useless. \ +Refer to its propagated inputs instead.\n" + #$(package-name this-package)) + (mkdir #$output)))) + (home-page "https://www.gnome.org") + (synopsis "The GNU desktop environment") + (description "\ +GNOME is the graphical desktop for GNU. It includes a wide variety of applications for browsing the web, editing text and images, creating documents and diagrams, playing media, scanning, and much more.") - (license license:gpl2+))) + (license license:gpl2+) + (properties `((hidden? . #t)))))) + (package (inherit base) + field ...))))))) + +(define-public gnome-meta-core-services + (gnome-meta-package + (name "gnome-meta-core-services") + (propagated-inputs (list accountsservice + network-manager + packagekit + upower)))) + +(define-public gnome-meta-core-shell + (gnome-meta-package + (name "gnome-meta-core-shell") + (propagated-inputs (list adwaita-icon-theme + gdm + glib-networking + gnome-backgrounds + gnome-bluetooth + gnome-color-manager + gnome-control-center + gnome-desktop + gnome-initial-setup + gnome-keyring + gnome-menus + gnome-session + gnome-settings-daemon + gnome-shell + gnome-shell-extensions + gnome-themes-extra + gnome-user-docs + gnome-user-share + gsettings-desktop-schemas + gvfs + mutter + orca + rygel + sushi)))) + +(define-public gnome-meta-core-utilities + (gnome-meta-package + (name "gnome-meta-core-utilities") + (propagated-inputs + (append + ;; XXX: EoG requires librsvg-next, which depends on Rust, which currently + ;; only works on x86_64, so exclude it on other architectures. + (if (string-prefix? "x86_64" (%current-system)) + (list eog) + '()) + (list baobab + cheese + epiphany + evince + file-roller + gnome-calculator + gnome-calendar + gnome-characters + gnome-clocks + gnome-console + gnome-contacts + gnome-disk-utility + gnome-font-viewer + gnome-maps + gnome-music + gnome-photos + gnome-screenshot + gnome-system-monitor + gnome-text-editor + gnome-weather + nautilus + simple-scan + totem + tracker-miners + xdg-desktop-portal-gnome + yelp))))) + +(define-public gnome-essential-extras + (gnome-meta-package + (name "gnome-essential-extras") + (propagated-inputs (list at-spi2-core + dbus + dconf + desktop-file-utils + font-abattis-cantarell + font-dejavu + gnome-default-applications + gnome-online-accounts + gst-plugins-base + gst-plugins-good + gucharmap + hicolor-icon-theme + pinentry-gnome3 + pulseaudio + shared-mime-info + system-config-printer + xdg-user-dirs + yelp + zenity)) + (description "This package provides a list of packages required for +a good GNOME experience, mixed from core dependencies and other implicitly +relied-on packages."))) + +(define-public gnome + (gnome-meta-package + (name "gnome") + (propagated-inputs + (append-map package-propagated-inputs + (list gnome-meta-core-services + gnome-meta-core-shell + gnome-meta-core-utilities + gnome-essential-extras))) + (properties (list)))) (define-public byzanz ;; The last stable release of Byzanz was in 2011, but there have been many -- cgit v1.2.3 From 0bce55ca5343eb006c3a7c95f00eb74efc277f76 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Fri, 16 Feb 2024 12:02:42 +0100 Subject: gnu: gnome: Add core packages for GNOME 44. * gnu/packages/gnome.scm (gnome-meta-core-shell): Add gnome-remote-desktop. (gnome-meta-core-utilities): Add gnome-connections. --- gnu/packages/gnome.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 9778a0b461..5c6eb2288a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10205,6 +10205,7 @@ (define-public gnome-meta-core-shell gnome-initial-setup gnome-keyring gnome-menus + gnome-remote-desktop gnome-session gnome-settings-daemon gnome-shell @@ -10238,6 +10239,7 @@ (define-public gnome-meta-core-utilities gnome-calendar gnome-characters gnome-clocks + gnome-connections gnome-console gnome-contacts gnome-disk-utility -- cgit v1.2.3 From 523f3def65ab061a87f4fc9e6f9008e6a78fafb5 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Thu, 25 Jan 2024 16:35:17 +0100 Subject: services: Modularise gnome-desktop-configuration. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/services/gnome.scm (extract-propagated-inputs): New variable. (gnome-desktop-configuration): Add ‘core-services’, ‘shell’, ‘utilities’, and ‘extra-packages’. Deprecate ‘gnome’. (gnome-desktop-configuration-core-services, gnome-desktop-configuration-shell) (gnome-desktop-configuration-utilities) (gnome-desktop-configuration-extra-packages): Export publicly. (gnome-udev-rules, gnome-polkit-settings): Adjust accordingly. (gnome-profile): New variable. (gnome-desktop-service-type): Adjust accordingly. --- gnu/services/desktop.scm | 97 +++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 83 insertions(+), 14 deletions(-) diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index 5b79fbcda1..0667acfaba 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -37,6 +37,7 @@ (define-module (gnu services desktop) #:use-module (gnu services) #:use-module (gnu services shepherd) #:use-module (gnu services base) + #:use-module (gnu services configuration) #:use-module (gnu services dbus) #:use-module (gnu services avahi) #:use-module (gnu services xorg) @@ -60,6 +61,7 @@ (define-module (gnu services desktop) #:use-module (gnu packages kde) #:use-module (gnu packages kde-frameworks) #:use-module (gnu packages kde-plasma) + #:use-module (gnu packages pulseaudio) #:use-module (gnu packages xfce) #:use-module (gnu packages avahi) #:use-module (gnu packages xdisorg) @@ -73,6 +75,7 @@ (define-module (gnu services desktop) #:use-module (gnu packages nfs) #:use-module (gnu packages enlightenment) #:use-module (guix deprecation) + #:use-module (guix diagnostics) #:use-module (guix records) #:use-module (guix packages) #:use-module (guix store) @@ -81,6 +84,7 @@ (define-module (gnu services desktop) #:use-module (guix gexp) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) + #:use-module (srfi srfi-35) #:use-module (ice-9 format) #:use-module (ice-9 match) #:export ( @@ -139,6 +143,10 @@ (define-module (gnu services desktop) gnome-desktop-configuration gnome-desktop-configuration? + gnome-desktop-configuration-core-services + gnome-desktop-configuration-shell + gnome-desktop-configuration-utilities + gnome-desktop-configuration-extra-packages gnome-desktop-service gnome-desktop-service-type @@ -1382,11 +1390,34 @@ (define sane-service-type ;;; GNOME desktop service. ;;; -(define-record-type* gnome-desktop-configuration - make-gnome-desktop-configuration - gnome-desktop-configuration? - (gnome gnome-desktop-configuration-gnome - (default gnome))) +(define-maybe/no-serialization package) + +(define (extract-propagated-inputs package) + ;; Drop input labels. Attempt to support outputs. + (map + (match-lambda + ((_ (? package? pkg)) pkg) + ((_ (? package? pkg) output) (list pkg output))) + (package-propagated-inputs package))) + +(define-configuration/no-serialization gnome-desktop-configuration + (core-services + (list-of-packages (extract-propagated-inputs gnome-meta-core-services)) + "A list of packages that the GNOME Shell and applications may rely on.") + (shell + (list-of-packages (extract-propagated-inputs gnome-meta-core-shell)) + "A list of packages that constitute the GNOME Shell, without applications.") + (utilities + (list-of-packages (extract-propagated-inputs gnome-meta-core-utilities)) + "A list of packages that serve as applications to use on top of the \ +GNOME Shell.") + (gnome (maybe-package) "Deprecated. Do not use.") + (extra-packages + (list-of-packages (extract-propagated-inputs gnome-essential-extras)) + "A list of GNOME-adjacent packages to also include. This field is intended +for users to add their own packages to their GNOME experience. Note, that it +already includes some packages that are considered essential by some (most?) +GNOME users.")) (define (gnome-package gnome name) "Return the package NAME among the GNOME package inputs. NAME can be a @@ -1400,18 +1431,56 @@ (define (gnome-packages gnome names) (define (gnome-udev-rules config) "Return the list of GNOME dependencies that provide udev rules." - (let ((gnome (gnome-desktop-configuration-gnome config))) - (gnome-packages gnome '("gnome-settings-daemon")))) + (let* ((gnome (gnome-desktop-configuration-gnome config)) + (shell (gnome-desktop-configuration-shell config))) + (or (any (match-lambda + ((and pkg (= package-name "gnome-settings-daemon")) + (list pkg)) + (_ #f)) + shell) + (and (maybe-value-set? gnome) + (gnome-packages gnome '("gnome-settings-daemon"))) + (raise + (condition + (&error-location + (location (gnome-desktop-configuration-source-location config))) + (&message (message (G_ "Missing gnome-settings-daemon")))))))) (define (gnome-polkit-settings config) "Return the list of GNOME dependencies that provide polkit actions and rules." - (let ((gnome (gnome-desktop-configuration-gnome config))) - (gnome-packages gnome - '("gnome-settings-daemon" - "gnome-control-center" - "gnome-system-monitor" - "gvfs")))) + (let ((gnome (gnome-desktop-configuration-gnome config)) + (shell (gnome-desktop-configuration-shell config))) + (or (any (match-lambda ((and pkg (= package-name "gvfs")) (list pkg)) + (_ #f)) + shell) + (and (maybe-value-set? gnome) + (gnome-packages gnome + '("gnome-settings-daemon" + "gnome-control-center" + "gnome-system-monitor" + "gvfs"))) + (raise + (condition + (&error-location + (location (gnome-desktop-configuration-source-location config))) + (&message (message (G_ "Missing gvfs")))))))) + +(define (gnome-profile config) + "Return a list of packages propagated through CONFIG." + (append + (gnome-desktop-configuration-core-services config) + (gnome-desktop-configuration-shell config) + (gnome-desktop-configuration-utilities config) + (let ((gnome-meta (gnome-desktop-configuration-gnome config))) + (if (maybe-value-set? gnome-meta) + (begin + (warning + (gnome-desktop-configuration-source-location config) + (G_ "Using a meta-package for gnome-desktop is discouraged.~%")) + (list gnome-meta)) + (list))) + (gnome-desktop-configuration-extra-packages config))) (define gnome-desktop-service-type (service-type @@ -1422,7 +1491,7 @@ (define gnome-desktop-service-type (service-extension polkit-service-type gnome-polkit-settings) (service-extension profile-service-type - (compose list gnome-desktop-configuration-gnome)))) + gnome-profile))) (default-value (gnome-desktop-configuration)) (description "Run the GNOME desktop environment."))) -- cgit v1.2.3 From 07bfe15383bd8b46668f31562aa9a2ca32e59b93 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Mon, 5 Feb 2024 18:05:41 +0100 Subject: services: Extend udev capabilities of gnome-desktop-service. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Our udev service is capable of handling both rules and hardware databases. This patch makes it so that gnome can install any such needed rules or databases, while also allowing users to supply a list of names to ignore (via regular expressions). * gnu/services/desktop.scm (gnome-desktop-configuration): Add udev-ignorelist. (gnome-udev-resources): Rename to… (gnome-udev-configuration-files): … this. Account for udev-ignorelist. (gnome-desktop-service-type): Adjust accordingly. Change-Id: I6df4b896652581c42a35ea3ba1e4849ad72d12ef --- gnu/services/desktop.scm | 54 ++++++++++++++++++++++++++++++++---------------- 1 file changed, 36 insertions(+), 18 deletions(-) diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index 0667acfaba..0631571c49 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -82,6 +82,7 @@ (define-module (gnu services desktop) #:use-module (guix ui) #:use-module (guix utils) #:use-module (guix gexp) + #:use-module (guix modules) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) #:use-module (srfi srfi-35) @@ -147,6 +148,7 @@ (define-module (gnu services desktop) gnome-desktop-configuration-shell gnome-desktop-configuration-utilities gnome-desktop-configuration-extra-packages + gnome-desktop-configuration-udev-ignorelist gnome-desktop-service gnome-desktop-service-type @@ -1417,7 +1419,13 @@ (define-configuration/no-serialization gnome-desktop-configuration "A list of GNOME-adjacent packages to also include. This field is intended for users to add their own packages to their GNOME experience. Note, that it already includes some packages that are considered essential by some (most?) -GNOME users.")) +GNOME users.") + (udev-ignorelist + (list-of-strings '()) + "A list of regular expressions denoting udev rules or hardware file names +provided by any package that should not be installed. By default, every udev +rule and hardware file specified by any package referenced in the other fields +are installed.")) (define (gnome-package gnome name) "Return the package NAME among the GNOME package inputs. NAME can be a @@ -1429,22 +1437,32 @@ (define (gnome-packages gnome names) "Return the package NAMES among the GNOME package inputs." (map (cut gnome-package gnome <>) names)) -(define (gnome-udev-rules config) - "Return the list of GNOME dependencies that provide udev rules." - (let* ((gnome (gnome-desktop-configuration-gnome config)) - (shell (gnome-desktop-configuration-shell config))) - (or (any (match-lambda - ((and pkg (= package-name "gnome-settings-daemon")) - (list pkg)) - (_ #f)) - shell) - (and (maybe-value-set? gnome) - (gnome-packages gnome '("gnome-settings-daemon"))) - (raise - (condition - (&error-location - (location (gnome-desktop-configuration-source-location config))) - (&message (message (G_ "Missing gnome-settings-daemon")))))))) +(define (gnome-udev-configuration-files config) + "Return the GNOME udev rules and hardware files as computed from its +dependencies by filtering out the ignorelist." + (list + (computed-file + "gnome-udev-configurations" + (with-imported-modules + (source-module-closure '((guix build utils) + (guix build union))) + #~(begin + (use-modules (guix build utils) + (guix build union)) + ;; If rules.d or hwdb.d is not a proper directory but a symlink, + ;; then it will not be possible to delete individual files in this + ;; directory. + (union-build #$output + (search-path-as-list + (list "lib/udev" "libexec/udev") + (list #$@(gnome-profile config))) + #:create-all-directories? #t) + (for-each + (lambda (pattern) + (for-each + delete-file-recursively + (find-files #$output pattern))) + (list #$@(gnome-desktop-configuration-udev-ignorelist config)))))))) (define (gnome-polkit-settings config) "Return the list of GNOME dependencies that provide polkit actions and @@ -1487,7 +1505,7 @@ (define gnome-desktop-service-type (name 'gnome-desktop) (extensions (list (service-extension udev-service-type - gnome-udev-rules) + gnome-udev-configuration-files) (service-extension polkit-service-type gnome-polkit-settings) (service-extension profile-service-type -- cgit v1.2.3 From acaa89ae427074d96f47c7cc678712d09d9822f1 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Fri, 16 Feb 2024 13:08:11 +0100 Subject: services: Extend polkit capabilities of gnome-desktop-service. As with our udev extension, this makes it so that all inputs are considered modulo a new ignorelist. * gnu/services/desktop.scm (gnome-desktop-configuration): Add polkit-ignorelist. (gnome-polkit-settings): Adjust accordingly. --- gnu/services/desktop.scm | 44 +++++++++++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 17 deletions(-) diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index 0631571c49..b3c0f4fc41 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -1425,7 +1425,12 @@ (define-configuration/no-serialization gnome-desktop-configuration "A list of regular expressions denoting udev rules or hardware file names provided by any package that should not be installed. By default, every udev rule and hardware file specified by any package referenced in the other fields -are installed.")) +are installed.") + (polkit-ignorelist + (list-of-strings '()) + "A list of regular expressions denoting polkit rules provided by any package +that should not be installed. By default, every polkit rule added by any package +referenced in the other fields are installed.")) (define (gnome-package gnome name) "Return the package NAME among the GNOME package inputs. NAME can be a @@ -1467,22 +1472,27 @@ (define (gnome-udev-configuration-files config) (define (gnome-polkit-settings config) "Return the list of GNOME dependencies that provide polkit actions and rules." - (let ((gnome (gnome-desktop-configuration-gnome config)) - (shell (gnome-desktop-configuration-shell config))) - (or (any (match-lambda ((and pkg (= package-name "gvfs")) (list pkg)) - (_ #f)) - shell) - (and (maybe-value-set? gnome) - (gnome-packages gnome - '("gnome-settings-daemon" - "gnome-control-center" - "gnome-system-monitor" - "gvfs"))) - (raise - (condition - (&error-location - (location (gnome-desktop-configuration-source-location config))) - (&message (message (G_ "Missing gvfs")))))))) + (list + (computed-file + "gnome-polkit-settings" + (with-imported-modules + (source-module-closure '((guix build utils) + (guix build union))) + #~(let ((output (string-append #$output "/share/polkit-1"))) + (use-modules (guix build utils) + (guix build union)) + (mkdir-p (dirname output)) + (union-build output + (search-path-as-list + (list "share/polkit-1") + (list #$@(gnome-profile config))) + #:create-all-directories? #t) + (for-each + (lambda (pattern) + (for-each + delete-file-recursively + (find-files output pattern))) + (list #$@(gnome-desktop-configuration-polkit-ignorelist config)))))))) (define (gnome-profile config) "Return a list of packages propagated through CONFIG." -- cgit v1.2.3 From 96634bb878f43841f8b3e298216072a3f43b7975 Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Fri, 16 Feb 2024 13:35:56 +0100 Subject: services: desktop: Remove unused imports. These imports were needed for a short time to consider two variants of finding udev/polkit configuration files. They are no longer needed, since the respective procedures use all packages now. * gnu/services/desktop.scm: Strip use of (guix diagnostics) and (srfi srfi-35). --- gnu/services/desktop.scm | 2 -- 1 file changed, 2 deletions(-) diff --git a/gnu/services/desktop.scm b/gnu/services/desktop.scm index b3c0f4fc41..02a7802d58 100644 --- a/gnu/services/desktop.scm +++ b/gnu/services/desktop.scm @@ -75,7 +75,6 @@ (define-module (gnu services desktop) #:use-module (gnu packages nfs) #:use-module (gnu packages enlightenment) #:use-module (guix deprecation) - #:use-module (guix diagnostics) #:use-module (guix records) #:use-module (guix packages) #:use-module (guix store) @@ -85,7 +84,6 @@ (define-module (gnu services desktop) #:use-module (guix modules) #:use-module (srfi srfi-1) #:use-module (srfi srfi-26) - #:use-module (srfi srfi-35) #:use-module (ice-9 format) #:use-module (ice-9 match) #:export ( -- cgit v1.2.3 From a7ab8e4f4893c1220eefe831d24bd9cf7064d39f Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Thu, 25 Jan 2024 16:55:44 +0100 Subject: gnu: Deprecate gnome meta-package. GNOME is not a "one size fits all" environment, but with the introduction of World, Circle, and to some extent Developer Extras and recent explorations of mobile form factors much more customizable towards the needs of users. As such, it is silly to insist on a single meta-package to make everyone happy. * gnu/packages/gnome.scm (gnome): Deprecate. --- gnu/packages/gnome.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 5c6eb2288a..c3707ea632 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -237,6 +237,7 @@ (define-module (gnu packages gnome) #:use-module (guix build-system meson) #:use-module (guix build-system python) #:use-module (guix build-system trivial) + #:use-module (guix deprecation) #:use-module (guix download) #:use-module (guix git-download) #:use-module ((guix licenses) #:prefix license:) @@ -10284,7 +10285,7 @@ (define-public gnome-essential-extras a good GNOME experience, mixed from core dependencies and other implicitly relied-on packages."))) -(define-public gnome +(define-deprecated/public gnome #f (gnome-meta-package (name "gnome") (propagated-inputs -- cgit v1.2.3 From a13f69f0d680fa2b1e70269293e022859be29b9c Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Sat, 17 Feb 2024 09:19:28 +0100 Subject: gnu: gnome: Update synopsis and description. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Gnome no longer considers itself “The GNU desktop environment”™, so let's reflect that. * gnu/packages/gnome.scm (gnome-meta-package)[synopsis]: Shorten to “Graphical desktop environment”. [description]: Adjust accordingly. --- gnu/packages/gnome.scm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index c3707ea632..65fd9a5665 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10174,11 +10174,11 @@ (define-syntax gnome-meta-package #$(package-name this-package)) (mkdir #$output)))) (home-page "https://www.gnome.org") - (synopsis "The GNU desktop environment") - (description "\ -GNOME is the graphical desktop for GNU. It includes a wide variety of -applications for browsing the web, editing text and images, creating -documents and diagrams, playing media, scanning, and much more.") + (synopsis "Graphical desktop environment") + (description "GNOME is a graphical desktop environment. +It includes a wide variety of applications with a common interface for +browsing the web, editing text and images, creating documents and diagrams, +playing media, scanning, and much more.") (license license:gpl2+) (properties `((hidden? . #t)))))) (package (inherit base) -- cgit v1.2.3 From 9e1b0e72302567f3913445bfda4abe260a956953 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Sat, 3 Feb 2024 13:45:15 +0100 Subject: gnu: mm-common: Update to 1.0.6. * gnu/packages/gnome.scm (mm-common): Update to 1.0.6. Change-Id: I5e7ffc18f2743e2d1e3a4547bf8f788d11b1d642 Reviewed-by: Maxim Cournoyer Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 65fd9a5665..e20148d0c1 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1142,7 +1142,7 @@ (define-public metacity (define-public mm-common (package (name "mm-common") - (version "1.0.5") + (version "1.0.6") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/mm-common/" @@ -1150,7 +1150,7 @@ (define-public mm-common "mm-common-" version ".tar.xz")) (sha256 (base32 - "1am5dmz7862hr2p4xbkdikpvd4kc0hdzqv73wjyjjshiyhlnsp3h")))) + "1rv211kalivq8zlq7s7bd3dhm4f33jhrwf1vxrfbrnmwgl1lcp5m")))) (build-system meson-build-system) (arguments (list -- cgit v1.2.3 From 925842e1460c9a992d42cd2734579587bcdf975b Mon Sep 17 00:00:00 2001 From: John Kehayias Date: Sun, 18 Feb 2024 20:30:31 +0000 Subject: gnu: glibmm-2.64: Rename and update to 2.66.6. * gnu/packages/glib.scm (glibmm-2.64): Rename to ... (glibmm-2.66): ... this. Update to 2.66.6. * gnu/packages/animation.scm (etl)[inputs]: Adjust accordingly. (synfig)[propagated-inputs]: Likewise. * gnu/packages/electronics.scm (libsigrok)[propagated-inputs]: Likewise. * gnu/packages/gnome-xyz.scm (eiciel)[inputs]: Likewise. * gnu/packages/gnome.scm (libxml++-3, libxml++-2)[propagated-inputs]: Likewise. * gnu/packages/gtk.scm (pangomm-2.46, atkmm-2.28, gtkmm-2)[propagated-inputs]: Likewise. Change-Id: I878e740e085a483970a4ef6e0fa7dd19000863eb Signed-off-by: Liliana Marie Prikler --- gnu/packages/animation.scm | 4 ++-- gnu/packages/electronics.scm | 2 +- gnu/packages/glib.scm | 6 +++--- gnu/packages/gnome-xyz.scm | 2 +- gnu/packages/gnome.scm | 4 ++-- gnu/packages/gtk.scm | 6 +++--- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/gnu/packages/animation.scm b/gnu/packages/animation.scm index d6bd3fd03d..3bcf1cc8f0 100644 --- a/gnu/packages/animation.scm +++ b/gnu/packages/animation.scm @@ -109,7 +109,7 @@ (define-public etl (base32 "1jnahpxvrdxrll7b7av3zxabm5j3nlz6m3vg4sib2278v1wf91yc")))) (build-system gnu-build-system) - (inputs (list glibmm-2.64)) + (inputs (list glibmm-2.66)) (native-inputs (list pkg-config)) (home-page "https://www.synfig.org") (synopsis "Extended C++ template library") @@ -149,7 +149,7 @@ (define-public synfig fftw fontconfig freetype - glibmm-2.64 + glibmm-2.66 imagemagick libxml++-2 libsigc++ diff --git a/gnu/packages/electronics.scm b/gnu/packages/electronics.scm index 83a92abc4e..aaf762b02b 100644 --- a/gnu/packages/electronics.scm +++ b/gnu/packages/electronics.scm @@ -210,7 +210,7 @@ (define-public libsigrok ;; and "glib" in Requires (propagated-inputs (list glib - glibmm-2.64 + glibmm-2.66 libserialport libusb libftdi diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index eee5251d03..aef2b7a941 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -995,11 +995,11 @@ (define glibmm useful for C++.") (license license:lgpl2.1+))) - (define-public glibmm-2.64 + (define-public glibmm-2.66 (package (inherit glibmm) (name "glibmm") - (version "2.64.5") + (version "2.66.6") (source (origin (method url-fetch) @@ -1008,7 +1008,7 @@ (define-public glibmm-2.64 (version-major+minor version) "/glibmm-" version ".tar.xz")) (sha256 - (base32 "11m37sbx0i18cl17d0fkq0bik4bbzlb5n8kcl651jhci5ipci3sh")))) + (base32 "0bqm9vqwhas69q6n89wd2xgxvrlkpxra13dzsx8m67hqk0jp8n2k")))) (propagated-inputs (modify-inputs (package-propagated-inputs glibmm) (replace "libsigc++" libsigc++-2))))) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 72f1ffe5ab..0784937c63 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -1560,7 +1560,7 @@ (define-public eiciel (native-inputs (list gettext-minimal pkg-config)) (inputs - (list acl attr glibmm-2.64 gtkmm-3 nautilus)) + (list acl attr glibmm-2.66 gtkmm-3 nautilus)) (home-page "https://rofi.roger-ferrer.org/eiciel") (synopsis "Manage extended file attributes") (description "Eiciel is a plugin for nautilus to graphically edit ACL and diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index e20148d0c1..70b0a7f797 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8832,7 +8832,7 @@ (define-public libxml++-3 (sha256 (base32 "07f6l9ka63dnc85npxq5g7bn1ja7lad0w2wixqdlyabdvc4l2hp5")))) (propagated-inputs (modify-inputs (package-propagated-inputs libxml++) - (append glibmm-2.64))))) + (append glibmm-2.66))))) ;; This is the last release providing the 2.6 API, hence the name. (define-public libxml++-2 @@ -8850,7 +8850,7 @@ (define-public libxml++-2 (sha256 (base32 "05slsbhc25z7kwlc28ydl3dfyp7rgbmz1fxj9z6gcvpg3hkghj2m")))) (propagated-inputs (modify-inputs (package-propagated-inputs libxml++) - (append glibmm-2.64))))) + (append glibmm-2.66))))) (define-public gdm (package diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index eacc7fc5ed..bdce1bc493 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1736,7 +1736,7 @@ (define-public pangomm-2.46 (sha256 (base32 "0ya3yb36d745m5ccgwhgxl8xjh82hiys3lvk08zqyq0s8x6y03s1")))) (propagated-inputs - (list cairomm-1.14 glibmm-2.64 pango)))) + (list cairomm-1.14 glibmm-2.66 pango)))) (define-public atkmm (package @@ -1804,7 +1804,7 @@ (define-public atkmm-2.28 (base32 "1b8vycqzr3lfvk2l73f4kk74hj48081zbh9r1r2ilr3h8xh7cs0i")))) (propagated-inputs (modify-inputs (package-propagated-inputs atkmm) - (replace "glibmm" glibmm-2.64))))) + (replace "glibmm" glibmm-2.66))))) (define-public gtkmm (package @@ -1914,7 +1914,7 @@ (define-public gtkmm-2 (strip-keyword-arguments '(#:configure-flags) (package-arguments gtkmm))) (propagated-inputs - (list atkmm-2.28 cairomm-1.14 glibmm-2.64 gtk+-2 pangomm-2.46)))) + (list atkmm-2.28 cairomm-1.14 glibmm-2.66 gtk+-2 pangomm-2.46)))) (define-public gtksourceviewmm (package -- cgit v1.2.3 From 18acf69acf8884aa74556f5b2cfc4057461ebc99 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Sat, 3 Feb 2024 13:46:27 +0100 Subject: gnu: python-pyatspi: Update to 2.46.1. * gnu/packages/gnome.scm (python-pyatspi): Update to 2.46.1. Change-Id: I8f60e27b3d65dd1f7614b94102c8005bcb369833 Reviewed-by: Maxim Cournoyer Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 70b0a7f797..fe39a512fc 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -11225,7 +11225,7 @@ (define-public gnome-system-monitor (define-public python-pyatspi (package (name "python-pyatspi") - (version "2.46.0") + (version "2.46.1") (source (origin (method url-fetch) (uri (string-append @@ -11234,7 +11234,7 @@ (define-public python-pyatspi "/pyatspi-" version ".tar.xz")) (sha256 (base32 - "0bn6f1cn5z3fdg98irbm4265y0ri7fdr9s1m385ibaj77p7qjm6l")))) + "06q4zca83hk4iify8amcb9hfxs3qvlczhjsw7p8hg72f8dbnl7zr")))) (build-system gnu-build-system) (arguments (list -- cgit v1.2.3 From df3813c7679952ab806e8bcd47a434fa9af21d41 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Sat, 3 Feb 2024 18:28:06 +0100 Subject: gnu: rygel: Update to 0.42.5. * gnu/packages/gnome.scm (rygel): Update to 0.42.5. Change-Id: I348840583dcf57aa241a5a1cb7842babe0b7c659 Reviewed-by: Maxim Cournoyer Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index fe39a512fc..646ea8df68 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1684,7 +1684,7 @@ (define-public sushi (define-public rygel (package (name "rygel") - (version "0.42.4") + (version "0.42.5") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -1692,7 +1692,7 @@ (define-public rygel name "-" version ".tar.xz")) (sha256 (base32 - "1xq36f0n42yall67ibqzqsdpvljbdanhy0lvkc8ncark5nmdy433")))) + "17yqnw802vp92cs7ci7kjrixbj446gcriai2dggal4375qnn0cqi")))) (build-system meson-build-system) (arguments ;; Disable the tracker plugin. -- cgit v1.2.3 From 1552d23a224615eebd2f37fefc068a6250a2ae15 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Sat, 3 Feb 2024 13:45:35 +0100 Subject: gnu: vte: Update to 0.72.4. * gnu/packages/gnome.scm (vte): Update to 0.72.4. Change-Id: I57b6c871ff9a690998709b3c8e51aa73f2cdea72 Reviewed-by: Maxim Cournoyer Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 646ea8df68..040d01377d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4550,7 +4550,7 @@ (define-public vala-0.52 (define-public vte (package (name "vte") - (version "0.72.3") + (version "0.72.4") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/vte/" @@ -4558,7 +4558,7 @@ (define-public vte "vte-" version ".tar.xz")) (sha256 (base32 - "16v9xbngj17skipa4wjjjzwcxjb3qqad1cfi34v1sdwyy1ys617r")))) + "0p4apgwi8v7ccid2bif6zdffk09jl90yy66awhff9jairakbckf7")))) (build-system meson-build-system) (arguments (list #:configure-flags #~(list "-Dvapi=true" -- cgit v1.2.3 From 1feb21d57b59f84cabdc182a880edf8730840967 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Wed, 14 Feb 2024 22:29:28 +0100 Subject: gnu: atkmm@2.28: Update to 2.28.4. * gnu/packages/gtk.scm (atkmm-2.28): Update to 2.28.4. Change-Id: If4b333b02785c9a5712816ea048b1943b582c2e3 Reviewed-by: Maxim Cournoyer Signed-off-by: Liliana Marie Prikler --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index bdce1bc493..2224af0e75 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1792,7 +1792,7 @@ (define-public atkmm-2.28 (package (inherit atkmm) (name "atkmm") - (version "2.28.1") + (version "2.28.4") (source (origin (method url-fetch) @@ -1801,7 +1801,7 @@ (define-public atkmm-2.28 (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 - (base32 "1b8vycqzr3lfvk2l73f4kk74hj48081zbh9r1r2ilr3h8xh7cs0i")))) + (base32 "1cysiz908phkagwnls44xxa60xls7r3fw540zcg00g7q520jl50a")))) (propagated-inputs (modify-inputs (package-propagated-inputs atkmm) (replace "glibmm" glibmm-2.66))))) -- cgit v1.2.3 From 6a5c2b622d63e1d121c975b59fa2662bb24ab26f Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Wed, 14 Feb 2024 22:29:53 +0100 Subject: gnu: pangomm@2.46: Update to 2.46.4. * gnu/packages/gtk.scm (pangomm-2.46): Update to 2.46.4. Change-Id: Ia1dcb94f35eb80a7cd79cae5245acbc4069e006b Reviewed-by: Maxim Cournoyer Signed-off-by: Liliana Marie Prikler --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 2224af0e75..086183da8e 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -1725,7 +1725,7 @@ (define-public pangomm-2.46 (package (inherit pangomm) (name "pangomm") - (version "2.46.3") + (version "2.46.4") (source (origin (method url-fetch) @@ -1734,7 +1734,7 @@ (define-public pangomm-2.46 (version-major+minor version) "/" name "-" version ".tar.xz")) (sha256 - (base32 "0ya3yb36d745m5ccgwhgxl8xjh82hiys3lvk08zqyq0s8x6y03s1")))) + (base32 "08nvd36s2fqksrkh573cn4gz90cpyl91azrpp7j4shi62mk1c85r")))) (propagated-inputs (list cairomm-1.14 glibmm-2.66 pango)))) -- cgit v1.2.3 From d3f0233227a7128786ce2dc9c7a2b1cb17160656 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Sat, 3 Feb 2024 13:46:51 +0100 Subject: gnu: gtk+: Update to 3.24.41. * gnu/packages/gtk.scm (gtk+): Update to 3.24.41. Change-Id: I3dcaecb7485fa91e23fb6231f9fb51ef916da10e Reviewed-by: Maxim Cournoyer Signed-off-by: Liliana Marie Prikler --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 086183da8e..a00ce71b81 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -993,7 +993,7 @@ (define-public gtk+ (package (inherit gtk+-2) (name "gtk+") - (version "3.24.38") + (version "3.24.41") (source (origin (method url-fetch) @@ -1002,7 +1002,7 @@ (define-public gtk+ name "-" version ".tar.xz")) (sha256 (base32 - "1rwfvm2098pkwnnxjm70ig44x1a2fbwa8i2ma3cbs9cb077xw4ff")) + "1ymna7b8p668wxbca1pgjqpw02ya4p86yaa9pja7l27kg9463nj7")) (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch" "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch")))) ;; There is no "doc" output, because adding gtk-doc here would introduce a -- cgit v1.2.3 From 720d6d5444933134f545962caa7d54dde1bf6083 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Wed, 14 Feb 2024 22:30:48 +0100 Subject: gnu: gnome-initial-setup: Update to 44.8. * gnu/packages/gnome.scm (gnome-initial-setup): Update to 44.8. Change-Id: I4fb3fa75605f70469db5c05cc9b19b87e74f1636 Reviewed-by: Maxim Cournoyer Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 040d01377d..3b943fe408 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -1533,7 +1533,7 @@ (define-public libmediaart (define-public gnome-initial-setup (package (name "gnome-initial-setup") - (version "44.0") + (version "44.8") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/gnome-initial-setup/" @@ -1541,7 +1541,7 @@ (define-public gnome-initial-setup "/gnome-initial-setup-" version ".tar.xz")) (sha256 (base32 - "1zxv0i6lwcnjs4m0ny08wxbfz25ygnwkbh4l3dkrhapqr1nzqg2r")))) + "0y61y3rvz1hqmhjxl9mjwxcdvdxslyaghajav6l79a9yxi859508")))) (build-system meson-build-system) (arguments (list -- cgit v1.2.3 From bb88baf5668a7355e23f76f960fe977192310903 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Wed, 14 Feb 2024 22:31:09 +0100 Subject: gnu: gcr@3: Update to 3.41.2. * gnu/packages/gnome.scm (gcr-3): Update to 3.41.2. Change-Id: I793d145775c4153386e7931ceb497d518248a120 Reviewed-by: Maxim Cournoyer Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3b943fe408..53a688a53b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -2481,7 +2481,7 @@ (define-public gcr-3 (package (inherit gcr) (name "gcr") - (version "3.41.1") + (version "3.41.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -2489,7 +2489,7 @@ (define-public gcr-3 name "-" version ".tar.xz")) (sha256 (base32 - "0kx2pv272p0qc0nq1287gciyn34d95yxg41vq3lzxfzyqaijhwdv")))) + "1dqsgrb62fgmy4w63bjl3b525nil4idrrdcscia1h3isaly0zlds")))) (arguments (substitute-keyword-arguments (package-arguments gcr) ((#:phases phases) -- cgit v1.2.3 From 901e60cc7ab1806bc1af20aff74ff10b9cac6974 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Wed, 14 Feb 2024 22:31:33 +0100 Subject: gnu: libgsf: Update to 1.14.52. * gnu/packages/gnome.scm (libgsf): Update to 1.14.52. Change-Id: I96522e57c7f659aff596108be6258fdbcc465321 Reviewed-by: Maxim Cournoyer Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 53a688a53b..92f35766be 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3457,7 +3457,7 @@ (define-public libcroco (define-public libgsf (package (name "libgsf") - (version "1.14.50") + (version "1.14.52") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -3465,7 +3465,7 @@ (define-public libgsf name "-" version ".tar.xz")) (sha256 (base32 - "0llf5rpg2rg9pdz8j38dl5z82zi9kmsn639wb2fhcfc3fz820v3f")))) + "1w5whjq1yf6c3k0gijfkc44zrr9gamxlr8yaddfy1h7sp4ack0ci")))) (build-system glib-or-gtk-build-system) (outputs '("out" "bin" "doc")) (arguments -- cgit v1.2.3 From 80790ccc1ec80b5f98ad59a646111b846ffc7d91 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Wed, 14 Feb 2024 22:31:55 +0100 Subject: gnu: epiphany: Update to 44.8. * gnu/packages/gnome.scm (epiphany): Update to 44.8. Change-Id: I20a627aca1ac2044d613340b6d0c7493f76a3128 Reviewed-by: Maxim Cournoyer Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 92f35766be..3867cfd010 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7151,7 +7151,7 @@ (define-public simple-scan (define-public epiphany (package (name "epiphany") - (version "44.7") + (version "44.8") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/epiphany/" @@ -7159,7 +7159,7 @@ (define-public epiphany "epiphany-" version ".tar.xz")) (sha256 (base32 - "1srdbn2rls4c0dvrjk0djfmxxnrd012jbji8aavslgkf8cs5mya4")))) + "1n3df2skvgmjw9sybhn811l4b58ibwxc0dc208wpvxg060pyhpfk")))) (build-system meson-build-system) (arguments (list -- cgit v1.2.3 From 01a58b9d6751eafc1da024f8bd2729c44d4c9b09 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Wed, 14 Feb 2024 22:32:27 +0100 Subject: gnu: gjs: Update to 1.76.3. * gnu/packages/gnome.scm (gjs): Update to 1.76.3. Change-Id: Ia77c6dd8c1d50e95761c066d60e856a6dce1d497 Reviewed-by: Maxim Cournoyer Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 3867cfd010..d2f5bcaf1f 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7717,7 +7717,7 @@ (define-public gnome-session (define-public gjs (package (name "gjs") - (version "1.76.2") + (version "1.76.3") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -7725,7 +7725,7 @@ (define-public gjs name "-" version ".tar.xz")) (sha256 (base32 - "1m15qscx2z862gfkb9pxg30bz8ka0h774l2azs5dfvzaagbckn7p")) + "0knkbczic9874r2mnhc8yh9w63bmj574b7528ql0x3lf40nzcjx5")) (modules '((guix build utils))) (snippet '(begin -- cgit v1.2.3 From 305547e92164985278a0a3d343b1792f0274146d Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Sat, 3 Feb 2024 13:45:52 +0100 Subject: gnu: mutter: Update to 44.9. * gnu/packages/gnome.scm (mutter): Update to 44.9. Change-Id: Id8e49adac5630068adc32c9ebe629498600589a3 Reviewed-by: Maxim Cournoyer Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index d2f5bcaf1f..ed27413025 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7872,7 +7872,7 @@ (define-public zenity (define-public mutter (package (name "mutter") - (version "44.7") + (version "44.9") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -7880,7 +7880,7 @@ (define-public mutter name "-" version ".tar.xz")) (sha256 (base32 - "1a0j1ygph6bz83da4gr2z02xqf2l5y1x10482vyh3d34arqhph26")))) + "0b7wzaj67qzrhgclvqk10fwk4524j4qppl88822mxxlqr40frfnk")))) ;; NOTE: Since version 3.21.x, mutter now bundles and exports forked ;; versions of cogl and clutter. As a result, many of the inputs, ;; propagated-inputs, and configure flags used in cogl and clutter are -- cgit v1.2.3 From e2989e9d6fab5786197a99cb1f2587ba03e1c1e3 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Wed, 14 Feb 2024 22:33:08 +0100 Subject: gnu: gnome-bluetooth: Update to 42.8. * gnu/packages/gnome.scm (gnome-bluetooth): Update to 42.8. Change-Id: I432125711173212c5faee245ecf0ef77fc7d5147 Reviewed-by: Maxim Cournoyer Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index ed27413025..dec43fb882 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9100,7 +9100,7 @@ (define-public libgtop (define-public gnome-bluetooth (package (name "gnome-bluetooth") - (version "42.7") + (version "42.8") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/gnome-bluetooth/" @@ -9108,7 +9108,7 @@ (define-public gnome-bluetooth "gnome-bluetooth-" version ".tar.xz")) (sha256 (base32 - "0sgqplr7agyw20m20cx7kv20bamv5cqzbsl8wl2v2fzcvcligpwl")))) + "1ny2zhak2n09i47m2a8q1rfgr2ag10kclda56qsi16rcrbl43hkn")))) (build-system meson-build-system) (native-inputs (list gettext-minimal -- cgit v1.2.3 From 5cabec17d636c22e946d669be512279dd1506721 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Sat, 3 Feb 2024 13:46:08 +0100 Subject: gnu: gnome-shell: Update to 44.9. * gnu/packages/gnome.scm (gnome-shell): Update to 44.9. Change-Id: I1160153fa4cbe3f93e9cfab983f518a405e32297 Reviewed-by: Maxim Cournoyer Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index dec43fb882..5cca679672 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9257,7 +9257,7 @@ (define-public gnome-control-center (define-public gnome-shell (package (name "gnome-shell") - (version "44.7") + (version "44.9") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -9265,7 +9265,7 @@ (define-public gnome-shell name "-" version ".tar.xz")) (sha256 (base32 - "0gvhlvcw6rd8xa71qfxw39kyqgnv15x8xv8my6h5215kx3il1acb")))) + "0k5pxbwwqi1fqpvja77xl0fv7y46gaz17p29f74wpzyb61g16rhp")))) (build-system meson-build-system) (arguments (let ((disallowed-references -- cgit v1.2.3 From 93d7ed475556f2afd89917fb7e608370fd9e5eec Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Wed, 14 Feb 2024 22:33:59 +0100 Subject: gnu: folks: Update to 0.15.7. * gnu/packages/gnome.scm (folks): Update to 0.15.7. Change-Id: Idba35c67f771bb4228cb6c48133dda4dac2c7d8c Reviewed-by: Maxim Cournoyer Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 5cca679672..5774cc7ad1 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10814,7 +10814,7 @@ (define-public gnome-shell-extensions (define-public folks (package (name "folks") - (version "0.15.6") + (version "0.15.7") (source (origin (method url-fetch) (uri (string-append @@ -10823,7 +10823,7 @@ (define-public folks "folks-" version ".tar.xz")) (sha256 (base32 - "0j02hi6j7rn7qhfmb3abryyad020rdkh59n7w6dwwa9zal666rn8")))) + "0wbq6h7hv8048c2m554b385qp4i99svaxxp7balwl4ijysg223qj")))) (build-system meson-build-system) (arguments '(#:phases -- cgit v1.2.3 From 67937cfc8dba83dae0c176ffa5ed264e459c8044 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Wed, 14 Feb 2024 22:34:29 +0100 Subject: gnu: libhandy: Update to 1.8.3. * gnu/packages/gnome.scm (libhandy): Update to 1.8.3. Change-Id: I5e836a5d91fe83bfc5774ca32c72b7387cb0bbc0 Reviewed-by: Maxim Cournoyer Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 5774cc7ad1..65f41ccb54 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -12103,7 +12103,7 @@ (define-public terminator (define-public libhandy (package (name "libhandy") - (version "1.8.2") + (version "1.8.3") (source (origin (method git-fetch) @@ -12112,7 +12112,7 @@ (define-public libhandy (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "031bmrxc62p86fpk1x8kg4zljxf5bd2cgq8bsm7nrk5yipha2xvy")))) + (base32 "0p80py59mg9hjk2pzp0595cv64ankaqdvqsxlhrsgzsfx940r9nc")))) (build-system meson-build-system) (arguments (list #:configure-flags -- cgit v1.2.3 From 5d09104962e7b9e18c3cc2646d5e3d6be2749a52 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Wed, 21 Feb 2024 22:47:52 +0100 Subject: gnu: eiciel: Update to 0.10.0. * gnu/packages/gnome-xyz.scm (eiciel): Update to 0.10.0. [arguments]: Convert to a list of G-Expressions. [#:phases]: Add 'skip-gtk-update-icon-cache. [native-inputs]: Add glib:bin and itstool. [inputs]: Replace glibmm-2.66 with glibmm and gtkmm-3 with gtkmm. Change-Id: I15905fef340fc1047bc24724a8147155af961e61 Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome-xyz.scm | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/gnu/packages/gnome-xyz.scm b/gnu/packages/gnome-xyz.scm index 0784937c63..d81cf034a1 100644 --- a/gnu/packages/gnome-xyz.scm +++ b/gnu/packages/gnome-xyz.scm @@ -1539,7 +1539,7 @@ (define-public postmarketos-theme (define-public eiciel (package (name "eiciel") - (version "0.9.13.1") + (version "0.10.0") (source (origin (method git-fetch) (uri (git-reference @@ -1548,19 +1548,27 @@ (define-public eiciel (file-name (git-file-name name version)) (sha256 (base32 - "0rhhw0h1hyg5kvxhjxkdz03vylgax6912mg8j4lvcz6wlsa4wkvj")))) + "0lhnrxhbg80pqjy9f8yiqi7x48rb6m2cmkffv25ssjynsmdnar0s")))) (build-system meson-build-system) (arguments - `(#:glib-or-gtk? #t - #:tests? #f ; no tests - #:configure-flags - (list (string-append "-Dnautilus-extension-dir=" - (assoc-ref %outputs "out") - "/lib/nautilus/site-extensions")))) + (list + #:glib-or-gtk? #t + #:tests? #f ; no tests + #:configure-flags + #~(list (string-append "-Dnautilus-extension-dir=" + #$output + "/lib/nautilus/site-extensions")) + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'skip-gtk-update-icon-cache + (lambda _ + (substitute* "meson.build" + (("gtk_update_icon_cache : true") + "gtk_update_icon_cache : false"))))))) (native-inputs - (list gettext-minimal pkg-config)) + (list gettext-minimal `(,glib "bin") itstool pkg-config)) (inputs - (list acl attr glibmm-2.66 gtkmm-3 nautilus)) + (list acl attr glibmm gtkmm nautilus)) (home-page "https://rofi.roger-ferrer.org/eiciel") (synopsis "Manage extended file attributes") (description "Eiciel is a plugin for nautilus to graphically edit ACL and -- cgit v1.2.3 From 57308dff6694fa52a3e1e58cbe43f9317712d8ed Mon Sep 17 00:00:00 2001 From: Dariqq Date: Tue, 20 Feb 2024 19:58:48 +0000 Subject: gnu: gdm: Wrap inputs to enable accessibility settings. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit GDM needs the data directories of at-spi2-core for the accessibility dbus, and dconf in order to change settings. An icon is provided in gnome-control-center, that could be put into gdm-service-type instead, but let's wrap it here for good measure. * gnu/packages/gnome.scm (gdm)[inputs]: Add at-spi2-core, dconf, and gnome-control-center. [#:phases]: Add ‘wrap-accessibility-dependencies’. Change-Id: Ibfe8f1aee9c8fe0c06f895de121f0f84defe4773 Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 65f41ccb54..f428bfeb78 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -77,6 +77,7 @@ ;;; Copyright © 2023 Juliana Sims ;;; Copyright © 2023 Dominik Delgado Steuter ;;; Copyright © 2023 Zhu Zihao +;;; Copyright © 2024 Dariqq ;;; ;;; This file is part of GNU Guix. ;;; @@ -9042,7 +9043,18 @@ (define-public gdm (for-each (lambda (desktop) (symlink desktop (basename desktop))) (find-files - (string-append settings "/etc/xdg")))))))))) + (string-append settings "/etc/xdg"))))))) + ;; GDM needs some additional programs available via XDG_DATA_DIRS, + ;; to make accessibility settings and related services available. + (add-after 'install 'wrap-accessibility-dependencies + (lambda _ + (wrap-program (string-append #$output "/bin/gdm") + `("XDG_DATA_DIRS" ":" prefix + #$(map (lambda (input) + (file-append (this-package-input input) "/share")) + '("at-spi2-core" + "dconf" + "gnome-control-center"))))))))) (native-inputs (list `(,glib "bin") ;for glib-compile-schemas, etc. dconf @@ -9065,7 +9077,12 @@ (define-public gdm iso-codes libcanberra libgudev - linux-pam)) + linux-pam + + ;; accessibility dependencies + at-spi2-core + dconf + gnome-control-center)) (synopsis "Display manager for GNOME") (home-page "https://wiki.gnome.org/Projects/GDM/") (description -- cgit v1.2.3 From 06d01c610e3bee61e38a177aecda5982d5b338ae Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Thu, 22 Feb 2024 18:07:59 +0100 Subject: services: gdm: Enable wayland by default. * gnu/services/xorg.scm (): Change the default value for wayland? from '#f' to '#t'. Change-Id: Ic966dfc462b1140894aa6c38c23e229d6252d340 Signed-off-by: Liliana Marie Prikler --- gnu/services/xorg.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/services/xorg.scm b/gnu/services/xorg.scm index 1ee15ea90c..66bd58c403 100644 --- a/gnu/services/xorg.scm +++ b/gnu/services/xorg.scm @@ -1046,7 +1046,7 @@ (define-record-type* (default (xinitrc))) (xdmcp? gdm-configuration-xdmcp? (default #f)) - (wayland? gdm-configuration-wayland? (default #f)) + (wayland? gdm-configuration-wayland? (default #t)) (wayland-session gdm-configuration-wayland-session (default gdm-wayland-session-wrapper))) -- cgit v1.2.3 From f7e60666e716c7dd462a05223391df5000485817 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Sun, 25 Feb 2024 18:55:37 +0100 Subject: news: Add entry for hwdb support in udev-service-type. * etc/news.scm: Add entry. Change-Id: I3c27b10eab501cca6ed0e32a1b30d92f212266b4 Signed-off-by: Liliana Marie Prikler --- etc/news.scm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/etc/news.scm b/etc/news.scm index 3e8c88499f..e3c33e8475 100644 --- a/etc/news.scm +++ b/etc/news.scm @@ -20,6 +20,9 @@ ;; Copyright © 2022 Thiago Jung Bauermann ;; Copyright © 2024 Oleg Pykhalov ;; Copyright © 2024 Wilko Meyer +;; Copyright © 2024 Hilton Chain +;; Copyright © 2024 Liliana Marie Prikler +;; Copyright © 2024 Vivien Kraus ;; ;; Copying and distribution of this file, with or without modification, are ;; permitted in any medium without royalty provided the copyright notice and @@ -28,6 +31,24 @@ (channel-news (version 0) + (entry (commit "498db4de1f09414adf68a3a383f0178434035179") + (title + (en "The udev service also manages hardware configuration files") + (de "Udev verwaltet nun auch Hardwarekonfigurationen") + (fr "Le service udev gère maintenant les configurations de matériel") + (zh "udev 服務現可管理硬件配置文件")) + (body + (en "The @code{udev-service-type} can now be configured and extended +with eudev hardware configuration files (named @dfn{hwdb} by the eudev +project).") + (de "Der Udev-Dienst kann nun mit Hardwaredatenbanken (auch als +@dfn{hwdb} bekannt) konfiguriert und erweitert werden.") + (fr "Le type de service @code{udev-service-type} peut maintenant être +configuré et étendu avec des fichiers de configuration de matériel (appelés +@dfn{hwdb} par le projet eudev).") + (zh "現可使用 eudev 的硬件配置文件（@dfn{hwdb}）設置及拓展 +@code{udev-service-type}。"))) + (entry (commit "10a193596368443f441077525ebbddf787d91e4b") (title (en "Linux-libre 4.14 removed due to end of upstream support") -- cgit v1.2.3 From df42803ce984e3fe4ba94aa5353d1cb9b0ef29c9 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Sun, 25 Feb 2024 18:56:33 +0100 Subject: news: Add entry for GDM defaulting to Wayland. * etc/news.scm: Add entry. Change-Id: Icddcf269ff59a7ee2a14680ed95a167758ecddaf Signed-off-by: Liliana Marie Prikler --- etc/news.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/etc/news.scm b/etc/news.scm index e3c33e8475..ebc1352f88 100644 --- a/etc/news.scm +++ b/etc/news.scm @@ -31,6 +31,21 @@ (channel-news (version 0) + (entry (commit "06d01c610e3bee61e38a177aecda5982d5b338ae") + (title + (en "The GNOME Display Manager uses Wayland by default") + (de "GNOME Display Manager nutzt nun Wayland als Vorgabe") + (fr "GDM utilise Wayland par défaut") + (zh "GNOME 顯示管理器（GDM）服務默認啓用 Wayland 支持")) + (body + (en "The @code{gdm-service-type} is configured to use Wayland instead +of Xorg by default.") + (de "Der Dienst @code{gdm-service-type} verwendet nun Wayland +als Vorgabe anstelle von Xorg.") + (fr "Le service @code{gdm-service-type} est configuré par défaut pour +utiliser Wayland au lieu de Xorg.") + (zh "@code{gdm-service-type} 預設已由 Xorg 改爲 Wayland。"))) + (entry (commit "498db4de1f09414adf68a3a383f0178434035179") (title (en "The udev service also manages hardware configuration files") -- cgit v1.2.3 From f469a45362afd3b41bc1b70277fb66a14df99a2d Mon Sep 17 00:00:00 2001 From: Liliana Marie Prikler Date: Mon, 26 Feb 2024 20:46:24 +0100 Subject: news: Add entry for changes in GNOME 44 and its desktop service. * etc/news.scm: Add entry. --- etc/news.scm | 39 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/etc/news.scm b/etc/news.scm index ebc1352f88..b4e8697bf7 100644 --- a/etc/news.scm +++ b/etc/news.scm @@ -31,6 +31,45 @@ (channel-news (version 0) + (entry (commit "523f3def65ab061a87f4fc9e6f9008e6a78fafb5") + (title + (en "GNOME updated to version 44 with a more modular desktop service") + (de "GNOME auf Version 44 aktualisiert mit modularem Dienst") + (fr "Mise à jour de GNOME en version 44 avec un service plus modulaire") + (zh "GNOME 44 更新，帶來更加模塊化的桌面服務")) + (body + (en "The @code{gnome-desktop-service-type} now differentiates between +shell, utilities, and extra-packages among other fields to bring more structure +in its configuration. + +With the update to GNOME 44, some shell extensions have been deprecated and +others removed. If any @code{gnome-shell-extension-@dots{}} package causes +an error while running your usual update routine, make sure to remove it from +your profile.") + (de "Der Dienst @code{gnome-desktop-service-type} unterscheidet nun +unter anderem zwischen den Feldern shell, utilities und extra-packages, und +bringt so etwas mehr Struktur in die Konfiguration. + +Mit dem Update zu GNOME 44 wurden einige Erweiterungen als obsolet deklariert +und andere entfernt. Falls ein Paket, dessen Name mit +@code{gnome-shell-extension-} beginnt, zu einem Fehler während Ihrer +Update-Routine führt, entfernen Sie es von Ihrem Profil.") + (fr "Le service @code{gnome-desktop-service-type} sépare +maintenant les champs @code{shell}, @code{utilities} et @code{extra- +packages} (entre autres) pour donner plus de structure à sa +configuration. + +Pendant la mise à jour vers GNOME 44, certaines extensions du shell ont +été dépréciées et d’autres supprimées. Si un paquet nommé +@code{gnome-shell-extension-@dots{}} émet une erreur quand vous +effectuez la mise à jour, vous devriez l’enlever de votre profil.") + (zh "@code{gnome-desktop-service-type} 設置新增 @code{shell}、 +@code{utilities}、@code{extra-packages} 等字段，使得 GNOME 桌面配置更加模塊化。 + +隨着 GNOME 44 更新，一些 GNOME Shell 拓展已被棄用或刪除。更新中若有關於 +@code{gnome-shell-extension-@dots{}} 軟件包的錯誤，請將對應軟件包從 profile 中 +刪除。"))) + (entry (commit "06d01c610e3bee61e38a177aecda5982d5b338ae") (title (en "The GNOME Display Manager uses Wayland by default") -- cgit v1.2.3 From fbdb2cf57ae66e929e24a7f0b53dbfa09417b6ea Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Fri, 1 Mar 2024 18:35:41 +0100 Subject: gnu: gnome-terminal: Update to 3.48.3. * gnu/packages/gnome.scm (gnome-terminal): Update to 3.48.3. [source]: Use the git-fetch method. Change-Id: I44dee8cec5afbd4f5e7e486b54f893ce6a3e1d06 Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 23 +++++++++++++---------- 1 file changed, 13 insertions(+), 10 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f428bfeb78..9cd7c6ba5d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5475,16 +5475,19 @@ (define-public gnome-console (define-public gnome-terminal (package (name "gnome-terminal") - (version "3.44.1") - (source - (origin - (method url-fetch) - (uri (string-append "mirror://gnome/sources/" name "/" - (version-major+minor version) "/" - name "-" version ".tar.xz")) - (sha256 - (base32 - "0yykb64yi1h0g65q890jf5awjr2sdvfda4xbxnmajcgj3zp20vzv")))) + (version "3.48.3") + ;; download.gnome.org does not have any version for gnome-terminal more + ;; recent than 3.44.1, but the repository has several tags newer than + ;; that. + (source (origin + (method git-fetch) + (uri (git-reference + (url "https://gitlab.gnome.org/GNOME/gnome-terminal") + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1cqh35j57a5ni4xlfjzl46kim6nbhqvxx3jql3gjk414z359i0j6")))) (build-system meson-build-system) (arguments (list -- cgit v1.2.3 From 71a3dca25cd25f63c8fc17498a9a729e545f1890 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Fri, 1 Mar 2024 18:37:54 +0100 Subject: gnu: nautilus: Update search path specification. * gnu/packages/gnome.scm (nautilus) [native-search-paths]: Change the extensions directory from lib/nautilus/site-extensions to lib/nautilus/extensions-4. Change-Id: I16ea81406b53c251e1dd6922fc8fcc0aab60ce96 Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 9cd7c6ba5d..d09eefe655 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9880,7 +9880,7 @@ (define-public nautilus (native-search-paths (list (search-path-specification (variable "NAUTILUS_EXTENSION_PATH") - (files '("lib/nautilus/site-extensions"))))) + (files '("lib/nautilus/extensions-4"))))) (synopsis "File manager for GNOME") (home-page "https://wiki.gnome.org/Apps/Nautilus") (description -- cgit v1.2.3 From e334ffc89927c58d11fe77a4b2121acd66756dfb Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Sat, 9 Mar 2024 09:54:40 +0100 Subject: gnu: girara: Update style. * gnu/packages/gtk.scm (girara)[arguments]: Convert to list of G-Expressions. [native-inputs]: Move after arguments. [propagated-inputs]: Move after arguments. Change-Id: I79a6f59f6ea671433f1a66a10cb79203f0b9bbae Signed-off-by: Liliana Marie Prikler Reviewed-by: Maxim Cournoyer --- gnu/packages/gtk.scm | 47 +++++++++++++++++++++++++---------------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index a00ce71b81..033c5aee0f 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -2142,30 +2142,33 @@ (define-public girara (file-name (git-file-name name version)) (sha256 (base32 "0k93pi0lkf941vanvh1habm6n5wl1n63726j5kqxh34wdlv4mv4s")))) - (native-inputs `(("pkg-config" ,pkg-config) - ("check" ,check) - ("gettext" ,gettext-minimal) - ("glib:bin" ,glib "bin") - ("xorg-server" ,xorg-server-for-tests))) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'start-xserver + ;; Tests require a running X server. + (lambda* (#:key inputs #:allow-other-keys) + (let ((xorg-server (assoc-ref inputs "xorg-server")) + (display ":1")) + (setenv "DISPLAY" display) + + ;; On busy machines, tests may take longer than + ;; the default of four seconds. + (setenv "CK_DEFAULT_TIMEOUT" "20") + + ;; Don't fail due to missing '/etc/machine-id'. + (setenv "DBUS_FATAL_WARNINGS" "0") + (zero? (system (string-append xorg-server "/bin/Xvfb " + display " &"))))))))) + (native-inputs + (list pkg-config + check + gettext-minimal + `(,glib "bin") + xorg-server-for-tests)) ;; Listed in 'Requires.private' of 'girara.pc'. (propagated-inputs (list gtk+)) - (arguments - `(#:phases (modify-phases %standard-phases - (add-before 'check 'start-xserver - ;; Tests require a running X server. - (lambda* (#:key inputs #:allow-other-keys) - (let ((xorg-server (assoc-ref inputs "xorg-server")) - (display ":1")) - (setenv "DISPLAY" display) - - ;; On busy machines, tests may take longer than - ;; the default of four seconds. - (setenv "CK_DEFAULT_TIMEOUT" "20") - - ;; Don't fail due to missing '/etc/machine-id'. - (setenv "DBUS_FATAL_WARNINGS" "0") - (zero? (system (string-append xorg-server "/bin/Xvfb " - display " &"))))))))) (build-system meson-build-system) (home-page "https://pwmt.org/projects/girara/") (synopsis "Library for minimalistic gtk+3 user interfaces") -- cgit v1.2.3 From 843d74a408fd5b0809f9583829b7a8ec4e73da53 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Sat, 9 Mar 2024 08:33:09 +0100 Subject: gnu: girara: Update to 0.4.3. * gnu/packages/gtk.scm (girara): Update to 0.4.3. Change-Id: I3c977cd33fa6d20fce3bb575ae2ad887b3061966 Signed-off-by: Liliana Marie Prikler Reviewed-by: Maxim Cournoyer --- gnu/packages/gtk.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index 033c5aee0f..950476815f 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -2132,7 +2132,7 @@ (define-public perl-pango (define-public girara (package (name "girara") - (version "0.3.7") + (version "0.4.3") (source (origin (method git-fetch) @@ -2141,7 +2141,7 @@ (define-public girara (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0k93pi0lkf941vanvh1habm6n5wl1n63726j5kqxh34wdlv4mv4s")))) + (base32 "0cbcs3810frgdmal5ia9pf3rk3k5h4xyzw1d2ia3rcg4nms5gcpx")))) (arguments (list #:phases -- cgit v1.2.3 From ea67a6e256a766f2edebbdb43f665138db8481f6 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Sat, 9 Mar 2024 08:48:36 +0100 Subject: gnu: orbit2: Update style. * gnu/packages/gnome.scm (orbit2) [arguments]: Convert to list of G-Expressions. [native-inputs]: Write the native-input list on one line. Change-Id: I6a09616719c07cbb48195cf0c59d8b799c404d47 Signed-off-by: Liliana Marie Prikler Reviewed-by: Maxim Cournoyer --- gnu/packages/gnome.scm | 54 +++++++++++++++++++++++++------------------------- 1 file changed, 27 insertions(+), 27 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 13cad0add2..fa911e1e59 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3800,35 +3800,35 @@ (define-public orbit2 "0l3mhpyym9m5iz09fz0rgiqxl2ym6kpkwpsp1xrr4aa80nlh1jam")))) (build-system gnu-build-system) (arguments - `(;; The "timeout-server" test hangs when run in parallel. - #:parallel-tests? #f - #:configure-flags - '(;; We don't need static libraries, plus they don't build reproducibly - ;; (non-deterministic ordering of .o files in the archive.) - "--disable-static" - - ;; The programmer kindly gives us a hook to turn off deprecation - ;; warnings ... - "DISABLE_DEPRECATED_CFLAGS=-DGLIB_DISABLE_DEPRECATION_WARNINGS") - ;; ... which they then completly ignore !! - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-parallel-build - ;; Parallel build fails because of a failed dependency, - ;; https://bugzilla.gnome.org/show_bug.cgi?id=732274 - (lambda _ - (substitute* "src/services/name/Makefile.am" - (("orbit_name_server_2_DEPENDENCIES = \\$(DEPS) CosNaming.h") - "orbit_name_server_2_DEPENDENCIES = \ + (list + ;; The "timeout-server" test hangs when run in parallel. + #:parallel-tests? #f + #:configure-flags + #~'(;; We don't need static libraries, plus they don't build reproducibly + ;; (non-deterministic ordering of .o files in the archive.) + "--disable-static" + + ;; The programmer kindly gives us a hook to turn off deprecation + ;; warnings ... + "DISABLE_DEPRECATED_CFLAGS=-DGLIB_DISABLE_DEPRECATION_WARNINGS") + ;; ... which they then completly ignore !! + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-parallel-build + ;; Parallel build fails because of a failed dependency, + ;; https://bugzilla.gnome.org/show_bug.cgi?id=732274 + (lambda _ + (substitute* "src/services/name/Makefile.am" + (("orbit_name_server_2_DEPENDENCIES = \\$(DEPS) CosNaming.h") + "orbit_name_server_2_DEPENDENCIES = \ $(DEPS) CosNaming.h libname-server-2.a")))) - (add-before 'configure 'ignore-deprecations - (lambda _ - (substitute* "linc2/src/Makefile.in" - (("-DG_DISABLE_DEPRECATED") - "-DGLIB_DISABLE_DEPRECATION_WARNINGS"))))))) + (add-before 'configure 'ignore-deprecations + (lambda _ + (substitute* "linc2/src/Makefile.in" + (("-DG_DISABLE_DEPRECATED") + "-DGLIB_DISABLE_DEPRECATION_WARNINGS"))))))) (inputs (list glib libidl)) - (native-inputs - (list pkg-config)) + (native-inputs (list pkg-config)) (home-page "https://projects.gnome.org/orbit2/") (synopsis "CORBA 2.4-compliant Object Request Broker") (description "ORBit2 is a CORBA 2.4-compliant Object Request Broker (orb) -- cgit v1.2.3 From eefcc7cafa0dc79eb6bed47601da9e03c6865636 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Sat, 9 Mar 2024 08:52:29 +0100 Subject: gnu: orbit2: Propagate inputs. * gnu/packages/gnome.scm (orbit2) [inputs]: Move to 'propagated-inputs'. Change-Id: I09e613cb4fee7962c50f62459ad6272bb7ffaea4 Signed-off-by: Liliana Marie Prikler Reviewed-by: Maxim Cournoyer --- gnu/packages/gnome.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index fa911e1e59..8b69a231af 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3827,7 +3827,8 @@ (define-public orbit2 (substitute* "linc2/src/Makefile.in" (("-DG_DISABLE_DEPRECATED") "-DGLIB_DISABLE_DEPRECATION_WARNINGS"))))))) - (inputs (list glib libidl)) + ;; These are required in the installed pkg-config files. + (propagated-inputs (list glib libidl)) (native-inputs (list pkg-config)) (home-page "https://projects.gnome.org/orbit2/") (synopsis "CORBA 2.4-compliant Object Request Broker") -- cgit v1.2.3 From fe2b2f860e1fd7dfdc333f65893e65f131e290c7 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Sat, 9 Mar 2024 09:43:19 +0100 Subject: gnu: orbit2: Fix bug on 32-bit systems. * gnu/packages/patches/orbit2-fix-array-allocation-32bit.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it here. * gnu/packages/gnome.scm (orbit2): Use it here. Change-Id: I72e10fc9d8a5421a7ec6b4ccf1425008b322ea3f Signed-off-by: Liliana Marie Prikler Reviewed-by: Maxim Cournoyer --- gnu/local.mk | 1 + gnu/packages/gnome.scm | 4 ++- .../orbit2-fix-array-allocation-32bit.patch | 40 ++++++++++++++++++++++ 3 files changed, 44 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/orbit2-fix-array-allocation-32bit.patch diff --git a/gnu/local.mk b/gnu/local.mk index dcd320fec4..9fbfc754a0 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1781,6 +1781,7 @@ dist_patch_DATA = \ %D%/packages/patches/opentaxsolver-file-browser-fix.patch \ %D%/packages/patches/open-zwave-hidapi.patch \ %D%/packages/patches/orangeduck-mpc-fix-pkg-config.patch \ + %D%/packages/patches/orbit2-fix-array-allocation-32bit.patch \ %D%/packages/patches/orpheus-cast-errors-and-includes.patch \ %D%/packages/patches/osip-CVE-2017-7853.patch \ %D%/packages/patches/ots-no-include-missing-file.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 8b69a231af..103065141e 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -3797,7 +3797,9 @@ (define-public orbit2 upstream-name "-" version ".tar.bz2"))) (sha256 (base32 - "0l3mhpyym9m5iz09fz0rgiqxl2ym6kpkwpsp1xrr4aa80nlh1jam")))) + "0l3mhpyym9m5iz09fz0rgiqxl2ym6kpkwpsp1xrr4aa80nlh1jam")) + (patches + (search-patches "orbit2-fix-array-allocation-32bit.patch")))) (build-system gnu-build-system) (arguments (list diff --git a/gnu/packages/patches/orbit2-fix-array-allocation-32bit.patch b/gnu/packages/patches/orbit2-fix-array-allocation-32bit.patch new file mode 100644 index 0000000000..377c09d0a5 --- /dev/null +++ b/gnu/packages/patches/orbit2-fix-array-allocation-32bit.patch @@ -0,0 +1,40 @@ +From 28067b88ad91e794675734bc92bd9c8653b4a46a Mon Sep 17 00:00:00 2001 +Message-ID: <28067b88ad91e794675734bc92bd9c8653b4a46a.1709973702.git.vivien@planete-kraus.eu> +From: Vivien Kraus +Date: Sat, 9 Mar 2024 09:36:56 +0100 +Subject: [PATCH] corba-loc: Do not allocate more tokens than necessary. + +To split the list of locations, the code calls g_strsplit with the +last argument set to G_MAXINT. It means that g_strsplit will try to +allocate a huge array (G_MAXINT + 1, for the final NULL), mostly +filled with NULL. Unfortunately, on 32-bit systems, this is one past +the authorized length for an array. Previous versions of glib would +not care, but the new version now raises an error if this happens. + +To get an array of the appropriate size, we can just pass -1 to the +last argument. + +* src/orb/orb-core/corba-loc.c (ORBit_corbaloc_parse): Replace +G_MAXINT with -1. +--- + src/orb/orb-core/corba-loc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/orb/orb-core/corba-loc.c b/src/orb/orb-core/corba-loc.c +index abfcaa29..6492d392 100644 +--- a/src/orb/orb-core/corba-loc.c ++++ b/src/orb/orb-core/corba-loc.c +@@ -309,7 +309,7 @@ ORBit_corbaloc_parse (const gchar *corbaloc) + if (!(objkey = orbit_url_decode (okey))) + goto ret_error; + +- if (!(token = g_strsplit (loc, ",", G_MAXINT))) ++ if (!(token = g_strsplit (loc, ",", -1))) + goto ret_error; + + /* [ 'iiop' ] ':' [ '//' ] [ version '@' ] host [ ':' port ] */ + +base-commit: 144be2e9860286c83f009e7689250e0af977cc5e +-- +2.41.0 + -- cgit v1.2.3 From 64785a7941b5544f80c7f9cd286452fba296596a Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Tue, 12 Mar 2024 18:12:06 +0100 Subject: gnu: libgda: Disable failing tests. * gnu/packages/patches/libgda-disable-data-proxy-test.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it here. * gnu/packages/gnome.scm (libgda): Use it here. Change-Id: I0a86fb75b1ad048eca99408750b26f4b8ff448c1 Signed-off-by: Christopher Baines --- gnu/local.mk | 1 + gnu/packages/gnome.scm | 1 + .../patches/libgda-disable-data-proxy-test.patch | 59 ++++++++++++++++++++++ 3 files changed, 61 insertions(+) create mode 100644 gnu/packages/patches/libgda-disable-data-proxy-test.patch diff --git a/gnu/local.mk b/gnu/local.mk index 2e269faf51..a2f41c7e95 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1582,6 +1582,7 @@ dist_patch_DATA = \ %D%/packages/patches/libcyaml-libyaml-compat.patch \ %D%/packages/patches/libexpected-use-provided-catch2.patch \ %D%/packages/patches/libgda-cve-2021-39359.patch \ + %D%/packages/patches/libgda-disable-data-proxy-test.patch \ %D%/packages/patches/libgda-fix-build.patch \ %D%/packages/patches/libgda-fix-missing-initialization.patch \ %D%/packages/patches/libgda-skip-postgresql-tests.patch \ diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 97e7f25532..7e7d77a3a2 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -13505,6 +13505,7 @@ (define-public libgda (sha256 (base32 "0w564z7krgjk19r39mi5qn4kggpdg9ggbyn9pb4aavb61r14npwr")) (patches (search-patches "libgda-cve-2021-39359.patch" + "libgda-disable-data-proxy-test.patch" "libgda-fix-build.patch" "libgda-fix-missing-initialization.patch" "libgda-skip-postgresql-tests.patch")))) diff --git a/gnu/packages/patches/libgda-disable-data-proxy-test.patch b/gnu/packages/patches/libgda-disable-data-proxy-test.patch new file mode 100644 index 0000000000..b93f9d3f9b --- /dev/null +++ b/gnu/packages/patches/libgda-disable-data-proxy-test.patch @@ -0,0 +1,59 @@ +From c0bb1ed662011207ee13d5a20a70f9b55166aa13 Mon Sep 17 00:00:00 2001 +From: Daniel Espinosa +Date: Wed, 1 Nov 2023 15:00:40 -0500 +Subject: [PATCH] GdaDataProxy: is no thread save so disabling its test + +Has been difficutl to reproduce the problem when this test +is running in Ci, so disabling until we can re-implement it +is the better choice +--- + libgda/gda-data-proxy.h | 4 +++- + tests/data-models/meson.build | 17 +++++++++-------- + 2 files changed, 12 insertions(+), 9 deletions(-) + +diff --git a/libgda/gda-data-proxy.h b/libgda/gda-data-proxy.h +index 4c31ab69b..ba0fa72b3 100644 +--- a/libgda/gda-data-proxy.h ++++ b/libgda/gda-data-proxy.h +@@ -77,7 +77,9 @@ struct _GdaDataProxyClass + * @stability: Stable + * @see_also: #GdaDataModel + * +- * This object stores modifications to be made to a #GdaDataModel object which is proxied until the modifications are actually ++ * This object, is no thread save, so use with care. ++ * ++ * This object stores modifications to be made to a #GdaDataModel object which is proxied until the modifications are actually + * written to the #GdaDataModel, it can also filter the proxied data model to show only a subset (a defined number of continuous + * rows or by a filter to apply). + * +diff --git a/tests/data-models/meson.build b/tests/data-models/meson.build +index a8c6a29d8..e0ec8692a 100644 +--- a/tests/data-models/meson.build ++++ b/tests/data-models/meson.build +@@ -61,14 +61,15 @@ tchkdp = executable('check_data_proxy', + ], + install: false + ) +-test('DataProxy', tchkdp, +- timeout: 100, +- workdir: meson.current_build_dir(), +- env: [ +- 'GDA_TOP_SRC_DIR='+gda_top_src, +- 'GDA_TOP_BUILD_DIR='+gda_top_build +- ] +- ) ++# This test is no thread save so disabling ++#test('DataProxy', tchkdp, ++# timeout: 100, ++# workdir: meson.current_build_dir(), ++# env: [ ++# 'GDA_TOP_SRC_DIR='+gda_top_src, ++# 'GDA_TOP_BUILD_DIR='+gda_top_build ++# ] ++# ) + + tchkmc = executable('check_model_copy', + ['check_model_copy.c'] + common_sources, +-- +GitLab + -- cgit v1.2.3 From c6b653f24c2154e9aa654a7e6a3a017fef960339 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Thu, 14 Mar 2024 18:29:27 +0100 Subject: gnu: Add glibmm-2.76. * gnu/packages/glib.scm (glibmm-2.76): New variable. Change-Id: I6d38e7640f9362ca7b6d26611db914da74ead53d Signed-off-by: Christopher Baines --- gnu/packages/glib.scm | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index aef2b7a941..5848ebc7aa 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -995,6 +995,20 @@ (define glibmm useful for C++.") (license license:lgpl2.1+))) +(define-public glibmm-2.76 + (package + (inherit glibmm) + (name "glibmm") + (version "2.76.0") + (source (origin + (method url-fetch) + (uri (string-append "mirror://gnome/sources/glibmm/" + (version-major+minor version) + "/glibmm-" version ".tar.xz")) + (sha256 + (base32 + "1cia8vrpwzn8zwalws42mga5hi965840m5s8dvfzv55xx86dhdw6")))))) + (define-public glibmm-2.66 (package (inherit glibmm) -- cgit v1.2.3 From aa9aebce615f014070797e7068baca40b4f25c37 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Wed, 13 Mar 2024 17:45:07 +0100 Subject: gnu: telegram-desktop: Build with glibmm@2.76. * gnu/packages/telegram.scm (telegram-desktop): Use glibmm-2.76 instead of glibmm. Change-Id: I0ec4ebc549dd867db22d68ee6317d1630cf1bfd8 Signed-off-by: Christopher Baines --- gnu/packages/telegram.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/telegram.scm b/gnu/packages/telegram.scm index 7d02824efa..358374a5bb 100644 --- a/gnu/packages/telegram.scm +++ b/gnu/packages/telegram.scm @@ -500,7 +500,7 @@ (define-public telegram-desktop fcitx5-qt ffmpeg glib - glibmm + glibmm-2.76 gtk+ hime hunspell -- cgit v1.2.3 From 939bd33365f3a9bcba3277c97a806bc672fc4c44 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Wed, 13 Mar 2024 12:06:56 +0100 Subject: gnu: zathura: Update to 0.5.4. Build with updated girara. * gnu/packages/pdf.scm (zathura): Update to 0.5.4. * gnu/packages/patches/zathura-use-struct-initializers.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it here. * gnu/packages/pdf.scm (zathura): Use it here. Change-Id: I5975d993b92a1a77ed35df2206acb93219138cff Signed-off-by: Christopher Baines --- gnu/local.mk | 1 + .../patches/zathura-use-struct-initializers.patch | 68 ++++++++++++++++++++++ gnu/packages/pdf.scm | 5 +- 3 files changed, 72 insertions(+), 2 deletions(-) create mode 100644 gnu/packages/patches/zathura-use-struct-initializers.patch diff --git a/gnu/local.mk b/gnu/local.mk index a2f41c7e95..900c98ac1b 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -2229,6 +2229,7 @@ dist_patch_DATA = \ %D%/packages/patches/xygrib-fix-finding-data.patch \ %D%/packages/patches/xygrib-newer-proj.patch \ %D%/packages/patches/yggdrasil-extra-config.patch \ + %D%/packages/patches/zathura-use-struct-initializers.patch \ %D%/packages/patches/zig-0.9-riscv-support.patch \ %D%/packages/patches/zig-do-not-link-against-librt.patch \ %D%/packages/patches/zig-use-baseline-cpu-by-default.patch \ diff --git a/gnu/packages/patches/zathura-use-struct-initializers.patch b/gnu/packages/patches/zathura-use-struct-initializers.patch new file mode 100644 index 0000000000..9a808a4bc3 --- /dev/null +++ b/gnu/packages/patches/zathura-use-struct-initializers.patch @@ -0,0 +1,68 @@ +From c05328185292d6f6a4459024cdb563c63bfad230 Mon Sep 17 00:00:00 2001 +Message-ID: +From: Sebastian Ramacher +Date: Mon, 29 Jan 2024 21:05:22 +0100 +Subject: [PATCH] Use struct initializers + +--- + zathura/page-widget.c | 4 ++-- + zathura/shortcuts.c | 12 +++++------- + 2 files changed, 7 insertions(+), 9 deletions(-) + +diff --git a/zathura/page-widget.c b/zathura/page-widget.c +index 216381e..ac85dcf 100644 +--- a/zathura/page-widget.c ++++ b/zathura/page-widget.c +@@ -1426,8 +1426,8 @@ cb_menu_image_save(GtkMenuItem* item, ZathuraPage* page) + } + + /* set command */ +- char* export_command = g_strdup_printf(":export image-p%d-%d ", page_id, image_id); +- girara_argument_t argument = { 0, export_command }; ++ char* export_command = g_strdup_printf(":export image-p%d-%d ", page_id, image_id); ++ girara_argument_t argument = {.n = 0, .data = export_command}; + sc_focus_inputbar(priv->zathura->ui.session, &argument, NULL, 0); + g_free(export_command); + +diff --git a/zathura/shortcuts.c b/zathura/shortcuts.c +index 8836cd2..35b5990 100644 +--- a/zathura/shortcuts.c ++++ b/zathura/shortcuts.c +@@ -513,7 +513,7 @@ sc_rotate(girara_session_t* session, girara_argument_t* argument, + zathura_document_set_rotation(zathura->document, (rotation + angle * t) % 360); + + /* update scale */ +- girara_argument_t new_argument = { zathura_document_get_adjust_mode(zathura->document), NULL }; ++ girara_argument_t new_argument = {.n = zathura_document_get_adjust_mode(zathura->document), .data = NULL}; + sc_adjust_window(zathura->ui.session, &new_argument, NULL, 0); + + /* render all pages again */ +@@ -1372,7 +1372,7 @@ sc_toggle_presentation(girara_session_t* session, girara_argument_t* + zathura->shortcut.toggle_presentation_mode.zoom = zathura_document_get_zoom(zathura->document); + + /* adjust window */ +- girara_argument_t argument = { ZATHURA_ADJUST_BESTFIT, NULL }; ++ girara_argument_t argument = {.n = ZATHURA_ADJUST_BESTFIT, .data = NULL}; + sc_adjust_window(session, &argument, NULL, 0); + + /* hide status and inputbar */ +@@ -1390,13 +1390,11 @@ sc_toggle_presentation(girara_session_t* session, girara_argument_t* + return false; + } + +-bool +-sc_quit(girara_session_t* session, girara_argument_t* UNUSED(argument), +- girara_event_t* UNUSED(event), unsigned int UNUSED(t)) +-{ ++bool sc_quit(girara_session_t* session, girara_argument_t* UNUSED(argument), girara_event_t* UNUSED(event), ++ unsigned int UNUSED(t)) { + g_return_val_if_fail(session != NULL, false); + +- girara_argument_t arg = { GIRARA_HIDE, NULL }; ++ girara_argument_t arg = {.n = GIRARA_HIDE, .data = NULL}; + girara_isc_completion(session, &arg, NULL, 0); + + cb_destroy(NULL, NULL); +-- +2.41.0 + diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 47518e73d1..f595a5b7e0 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -703,7 +703,7 @@ (define-public zathura-pdf-poppler (define-public zathura (package (name "zathura") - (version "0.5.2") + (version "0.5.4") (source (origin (method url-fetch) (uri @@ -711,7 +711,8 @@ (define-public zathura version ".tar.xz")) (sha256 (base32 - "15314m9chmh5jkrd9vk2h2gwcwkcffv2kjcxkd4v3wmckz5sfjy6")))) + "0ckgamf98sydq543arp865jg1afwzhpzcsbhv6zrch2dm5x7y0x3")) + (patches (search-patches "zathura-use-struct-initializers.patch")))) (native-inputs (list pkg-config gettext-minimal -- cgit v1.2.3 From 7ba325f21b8d58a5409986a0f3f92ef81f721712 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Wed, 13 Mar 2024 12:10:18 +0100 Subject: gnu: zathura: Update style. * gnu/packages/pdf.scm (zathura) [arguments]: Convert to list of G-Expressions. (zathura): Reorder fields. Change-Id: Icb1e983570c6ba3d391c2ee49c1b102246c8080f Signed-off-by: Christopher Baines --- gnu/packages/pdf.scm | 38 ++++++++++++++++++++------------------ 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index f595a5b7e0..7cece2b2c2 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -713,6 +713,26 @@ (define-public zathura (base32 "0ckgamf98sydq543arp865jg1afwzhpzcsbhv6zrch2dm5x7y0x3")) (patches (search-patches "zathura-use-struct-initializers.patch")))) + (build-system meson-build-system) + (arguments + (list + #:phases + #~(modify-phases %standard-phases + (add-before 'check 'start-xserver + ;; Tests require a running X server. + (lambda* (#:key inputs #:allow-other-keys) + (let ((display ":1")) + (setenv "DISPLAY" display) + + ;; On busy machines, tests may take longer than + ;; the default of four seconds. + (setenv "CK_DEFAULT_TIMEOUT" "20") + + ;; Don't fail due to missing '/etc/machine-id'. + (setenv "DBUS_FATAL_WARNINGS" "0") + (zero? (system (string-append + (search-input-file inputs "/bin/Xvfb") + " " display " &"))))))))) (native-inputs (list pkg-config gettext-minimal @@ -734,24 +754,6 @@ (define-public zathura (list (search-path-specification (variable "ZATHURA_PLUGINS_PATH") (files '("lib/zathura"))))) - (build-system meson-build-system) - (arguments - `(#:phases (modify-phases %standard-phases - (add-before 'check 'start-xserver - ;; Tests require a running X server. - (lambda* (#:key inputs #:allow-other-keys) - (let ((display ":1")) - (setenv "DISPLAY" display) - - ;; On busy machines, tests may take longer than - ;; the default of four seconds. - (setenv "CK_DEFAULT_TIMEOUT" "20") - - ;; Don't fail due to missing '/etc/machine-id'. - (setenv "DBUS_FATAL_WARNINGS" "0") - (zero? (system (string-append - (search-input-file inputs "/bin/Xvfb") - " " display " &"))))))))) (home-page "https://pwmt.org/projects/zathura/") (synopsis "Lightweight keyboard-driven PDF viewer") (description "Zathura is a customizable document viewer. It provides a -- cgit v1.2.3 From 1caa0eeee5042f33bc0bb66dc38bed7513cad0fb Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Sat, 9 Mar 2024 09:58:58 +0100 Subject: gnu: girara: Build with json-glib. * gnu/packages/gtk.scm (girara) [propagated-inputs]: Add json-glib. Change-Id: I5bfe5a516885153014fce1c6643ac5799f0100e1 Signed-off-by: Christopher Baines --- gnu/packages/gtk.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index b9d6ed2893..f43eece4f2 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -2130,6 +2130,8 @@ (define-public perl-pango (license license:lgpl2.1+))) (define-public girara + ;; TODO: Move propagated inputs to inputs after core-updates is merged (as + ;; of 2024-03) (package (name "girara") (version "0.4.3") @@ -2168,7 +2170,7 @@ (define-public girara `(,glib "bin") xorg-server-for-tests)) ;; Listed in 'Requires.private' of 'girara.pc'. - (propagated-inputs (list gtk+)) + (propagated-inputs (list gtk+ json-glib)) (build-system meson-build-system) (home-page "https://pwmt.org/projects/girara/") (synopsis "Library for minimalistic gtk+3 user interfaces") -- cgit v1.2.3 From 2c958acffb869e334ba05df03e122ffb87c49afb Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Mon, 18 Mar 2024 20:26:33 +0100 Subject: gnu: folks: Update to 0.15.8. * gnu/packages/gnome.scm (folks): Update to 0.15.8. Change-Id: I36ceb7d70e315a22352495e3470ce9fd7e126196 Signed-off-by: Christopher Baines --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 7e7d77a3a2..f82ca3e30a 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -10841,7 +10841,7 @@ (define-public gnome-shell-extensions (define-public folks (package (name "folks") - (version "0.15.7") + (version "0.15.8") (source (origin (method url-fetch) (uri (string-append @@ -10850,7 +10850,7 @@ (define-public folks "folks-" version ".tar.xz")) (sha256 (base32 - "0wbq6h7hv8048c2m554b385qp4i99svaxxp7balwl4ijysg223qj")))) + "1hj9brran2azy3scyf913svhxjrmya83fi7x239h33rp7vxnljlm")))) (build-system meson-build-system) (arguments '(#:phases -- cgit v1.2.3 From b69a7a862fc182e3fbc79f5320dfb58b87c64a1b Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Mon, 18 Mar 2024 20:28:45 +0100 Subject: gnu: gnome-online-accounts: Update to 3.48.1. * gnu/packages/gnome.scm (gnome-online-accounts): Update to 3.48.1. Change-Id: I779bc5ae3978b59489abd8c3c54944c035674fc6 Signed-off-by: Christopher Baines --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f82ca3e30a..f6a5c4088d 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -8096,7 +8096,7 @@ (define-public mutter (define-public gnome-online-accounts (package (name "gnome-online-accounts") - (version "3.48.0") + (version "3.48.1") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -8104,7 +8104,7 @@ (define-public gnome-online-accounts name "-" version ".tar.xz")) (sha256 (base32 - "1gvmc4k5vm4qd97yfkd5a4sixz0pfq9nblss42c2mmyvzzybk2s1")))) + "12kza6wss01kcka1zc2bck4hwgc55vzwwdxabk75qndzhh8cg81y")))) (build-system meson-build-system) (arguments (list -- cgit v1.2.3 From ff3a9b8717469f0bbfde319010d4029ce0a8b1ef Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Mon, 18 Mar 2024 20:29:48 +0100 Subject: gnu: gnome-shell: Update to 44.10. * gnu/packages/gnome.scm (gnome-shell): Update to 44.10. Change-Id: Ib4591ac6b34af33e63468eddd21015b823a6f8da Signed-off-by: Christopher Baines --- gnu/packages/gnome.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f6a5c4088d..5432ebc27b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -9284,7 +9284,7 @@ (define-public gnome-control-center (define-public gnome-shell (package (name "gnome-shell") - (version "44.9") + (version "44.10") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -9292,7 +9292,7 @@ (define-public gnome-shell name "-" version ".tar.xz")) (sha256 (base32 - "0k5pxbwwqi1fqpvja77xl0fv7y46gaz17p29f74wpzyb61g16rhp")))) + "01pw9qnnvh64x56z1gqh0qk6vfn0ihh4zijq23f4bpz9wszlbpwf")))) (build-system meson-build-system) (arguments (let ((disallowed-references -- cgit v1.2.3 From ebe30c375495e7232551b32b6771f3c06a676f41 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Mon, 18 Mar 2024 20:34:20 +0100 Subject: gnu: template-glib: Update to 3.36.2. * gnu/packages/glib.scm (template-glib): Update to 3.36.2. Change-Id: Ib945eb6748143cb9b921758215ce00e721f288b0 Signed-off-by: Christopher Baines --- gnu/packages/glib.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index 5848ebc7aa..bff8bec81f 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -1437,7 +1437,7 @@ (define perl-net-dbus-glib (define-public template-glib (package (name "template-glib") - (version "3.36.1") + (version "3.36.2") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/" name "/" @@ -1445,7 +1445,7 @@ (define-public template-glib name "-" version ".tar.xz")) (sha256 (base32 - "00x5yq1yidxxv6hmlvblpp2k0vf60s0xzyi0psplbmss70bpl5iv")))) + "0j4rc4jvxk5pzmx5831s90m9g4cfyp10hxd1ndiyg34806jg6800")))) (build-system meson-build-system) (arguments (list #:configure-flags #~'("-D" "gtk_doc=true"))) -- cgit v1.2.3 From a9951a74a591a9b22ee2d93d8efe0523c6c42c97 Mon Sep 17 00:00:00 2001 From: Efraim Flashner Date: Thu, 21 Mar 2024 14:06:42 +0200 Subject: gnu: tuba: Update to 0.6.3. * gnu/packages/mastodon.scm (tuba): Update to 0.6.3. Change-Id: I842cc661f5ba9574c2a913308afd1c2b7c8a9697 --- gnu/packages/mastodon.scm | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gnu/packages/mastodon.scm b/gnu/packages/mastodon.scm index cbeccdb402..84f7603bd8 100644 --- a/gnu/packages/mastodon.scm +++ b/gnu/packages/mastodon.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2019-2023 Efraim Flashner +;;; Copyright © 2019-2024 Efraim Flashner ;;; Copyright © 2019 Tobias Geerinckx-Rice ;;; Copyright © 2021 Taiju HIGASHI ;;; @@ -87,7 +87,7 @@ (define-public toot (define-public tuba (package (name "tuba") - (version "0.4.1") + (version "0.6.3") (source (origin (method git-fetch) @@ -96,7 +96,7 @@ (define-public tuba (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0v2ihp1dkp13jklp3kysv4blflhx3w0hwcyink4mb7hwsaqy0xnm")))) + (base32 "1s1iq9bwv6wp4dyvrdjdbmj9sqj9zxa0c78swcw7nhmm3fksh3vz")))) (build-system meson-build-system) (arguments (list -- cgit v1.2.3 From 5b26305e0ea63ff0291d48588968e7ba6a6d2eda Mon Sep 17 00:00:00 2001 From: Herman Rimm Date: Fri, 15 Mar 2024 19:33:27 +0100 Subject: gnu: libsecret: Update to 0.21.4. * gnu/packages/gnome.scm (libsecret): Update. Change-Id: I8a785f1fa9ff9ddde6dfda9a52abd0405b5ab448 Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 5432ebc27b..5e7c0e93df 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -5191,7 +5191,7 @@ (define-public libsoup (define-public libsecret (package (name "libsecret") - (version "0.20.5") + (version "0.21.4") (source (origin (method url-fetch) (uri (string-append @@ -5200,7 +5200,7 @@ (define-public libsecret "libsecret-" version ".tar.xz")) (sha256 (base32 - "0k9bs47rzb3dwvznb4179d6nw7rbzjdyd4y8hx6vazfd1wscxcrz")))) + "081bj59ws08kb261cd1w1mkdkhfbzsjbbkkrm6wllvdyhgbhhg8n")))) (build-system meson-build-system) (arguments (list @@ -5208,12 +5208,6 @@ (define-public libsecret #~(list "-Dgtk_doc=false") ;requires gi-docgen #:phases #~(modify-phases %standard-phases - (add-after 'unpack 'disable-problematic-tests - (lambda _ - (substitute* "libsecret/meson.build" - ;; The test-collection test fails non-deterministically (see: - ;; https://gitlab.gnome.org/GNOME/libsecret/-/issues/80). - ((".*'test-collection',.*") "")))) (delete 'check) (add-after 'install 'check (lambda* (#:key tests? test-options #:allow-other-keys) -- cgit v1.2.3 From f7ba5df8b092d2e8d227c07b94676532b066bac9 Mon Sep 17 00:00:00 2001 From: Herman Rimm Date: Fri, 15 Mar 2024 19:34:21 +0100 Subject: gnu: seahorse: Update to 43.0. * gnu/packages/gnome.scm (seahorse): Update. Change-Id: I13ce7c9e2cfb7c0b8d575148a502d81ddf30d13d Signed-off-by: Liliana Marie Prikler --- gnu/packages/gnome.scm | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 5e7c0e93df..1e7a125e6b 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -4434,7 +4434,7 @@ (define-public drawing (define-public seahorse (package (name "seahorse") - (version "42.0") + (version "43.0") (source (origin (method url-fetch) @@ -4442,7 +4442,7 @@ (define-public seahorse (version-major version) "/" name "-" version ".tar.xz")) (sha256 - (base32 "0c6nafhn4gcjwd1xbs5bjq9785114fc0pbhxbwp7wynyz3msq365")))) + (base32 "0bc3xbjzwa4245m6nqzl3v6hzp9hyfbf50iwgwi5hdjglzxin7av")))) (build-system meson-build-system) (arguments '(#:glib-or-gtk? #t @@ -4451,8 +4451,11 @@ (define-public seahorse (add-after 'unpack 'skip-gtk-update-icon-cache ;; Don't create 'icon-theme.cache'. (lambda _ - (substitute* "build-aux/meson_post_install.py" - (("gtk-update-icon-cache") "true")))) + (substitute* "meson.build" + (("gtk_update_icon_cache: true") + "gtk_update_icon_cache: false") + (("update_desktop_database: true") + "update_desktop_database: false")))) (add-before 'check 'pre-check (lambda _ ;; Tests require a writable HOME. @@ -4468,7 +4471,7 @@ (define-public seahorse libhandy libpwquality libsecret - libsoup-minimal-2)) + libsoup-minimal)) (native-inputs (list gettext-minimal `(,glib "bin") -- cgit v1.2.3 From beec25533869437b95735965ac130ea5f59f5aa0 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Sat, 23 Mar 2024 09:29:29 +0100 Subject: gnu: shotwell: Update to 0.32.6. * gnu/packages/gnome.scm (shotwell): Update to 0.32.6. [arguments]: Convert to list of G-Expressions. [#:phase 'skip-gtk-update-icon-cache]: Adjust to build system change. [inputs]: Add libportal. Change-Id: I5167d13d8514e278732459d1705f0041e3797894 Signed-off-by: Christopher Baines --- gnu/packages/gnome.scm | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index 1e7a125e6b..42f758f8d8 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm @@ -7567,7 +7567,7 @@ (define-public gexiv2 (define-public shotwell (package (name "shotwell") - (version "0.31.5") + (version "0.32.6") (source (origin (method url-fetch) (uri (string-append "mirror://gnome/sources/shotwell/" @@ -7575,17 +7575,20 @@ (define-public shotwell "shotwell-" version ".tar.xz")) (sha256 (base32 - "06awlix23y1cd89n6v9vip48cg08fjq8v6zaw38k5clrrv38y11v")))) + "1dkh5bczf9k86akl70inpc2z98qkhg8g44jb2kc8rqcimkzs95vm")))) (build-system meson-build-system) (arguments - '(#:glib-or-gtk? #t - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'skip-gtk-update-icon-cache - (lambda _ - (substitute* "build-aux/meson/postinstall.py" - (("gtk-update-icon-cache") (which "true")) - (("update-desktop-database") (which "true")))))))) + (list + #:glib-or-gtk? #t + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'skip-gtk-update-icon-cache + (lambda _ + (substitute* "meson.build" + (("gtk_update_icon_cache: true") + "gtk_update_icon_cache: false") + (("update_desktop_database: true") + "update_desktop_database: false"))))))) (propagated-inputs (list dconf)) (native-inputs @@ -7601,6 +7604,7 @@ (define-public shotwell gst-plugins-base gstreamer json-glib + libportal libgdata libgee libgphoto2 -- cgit v1.2.3 From f8c6cc02eeff8142a9202009698b89b308a5a245 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Sat, 23 Mar 2024 10:43:15 +0100 Subject: gnu: conan: Disable flaky test. * gnu/packages/package-management.scm (conan)[#:phase]: Also disable test_basic_parallel_install. Change-Id: I405246aa102cc2847ac157576dce5c46aa49b506 Signed-off-by: Christopher Baines --- gnu/packages/package-management.scm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/gnu/packages/package-management.scm b/gnu/packages/package-management.scm index e9dd7427d3..8fb53fd357 100644 --- a/gnu/packages/package-management.scm +++ b/gnu/packages/package-management.scm @@ -1386,6 +1386,8 @@ (define system #$(or (%current-target-system) ;; https://github.com/conan-io/conan/issues/13577). "and not test_other_client_can_link_autotools " "and not test_autotools_lib_template " + ;; Sometimes fail: https://github.com/conan-io/conan/issues/15936 + "and not test_basic_parallel_install " (if (not (string-prefix? "x86_64" system)) ;; These tests either assume the machine is ;; x86_64, or require a cross-compiler to target -- cgit v1.2.3 From 85c99aa1cf5e9a54143118e498c5a8562e6140d9 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Sat, 23 Mar 2024 09:45:17 +0100 Subject: gnu: pdfpc: Fix build with vala 0.56. * gnu/packages/patches/pdfpc-build-with-vala-0.56.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it here. * gnu/packages/pdf.scm (pdfpc): Use it here. [inputs]: Drop labels. Change-Id: Ib762da3dd23612f952215a2f8d383552e7bc050c Signed-off-by: Christopher Baines --- gnu/local.mk | 1 + .../patches/pdfpc-build-with-vala-0.56.patch | 40 ++++++++++++++++++++++ gnu/packages/pdf.scm | 30 ++++++++-------- 3 files changed, 57 insertions(+), 14 deletions(-) create mode 100644 gnu/packages/patches/pdfpc-build-with-vala-0.56.patch diff --git a/gnu/local.mk b/gnu/local.mk index 2ea9806b7e..5cc134d3d3 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1795,6 +1795,7 @@ dist_patch_DATA = \ %D%/packages/patches/pam-krb5-CVE-2020-10595.patch \ %D%/packages/patches/pango-skip-libthai-test.patch \ %D%/packages/patches/password-store-tree-compat.patch \ + %D%/packages/patches/pdfpc-build-with-vala-0.56.patch \ %D%/packages/patches/petri-foo-0.1.87-fix-recent-file-not-exist.patch \ %D%/packages/patches/plasma-framework-fix-KF5PlasmaMacros.cmake.patch \ %D%/packages/patches/plasp-fix-normalization.patch \ diff --git a/gnu/packages/patches/pdfpc-build-with-vala-0.56.patch b/gnu/packages/patches/pdfpc-build-with-vala-0.56.patch new file mode 100644 index 0000000000..e9a4060248 --- /dev/null +++ b/gnu/packages/patches/pdfpc-build-with-vala-0.56.patch @@ -0,0 +1,40 @@ +From 18beaecbbcc066e0d4c889b3aa3ecaa7351f7768 Mon Sep 17 00:00:00 2001 +Message-ID: <18beaecbbcc066e0d4c889b3aa3ecaa7351f7768.1711183363.git.vivien@planete-kraus.eu> +From: Evgeny Stambulchik +Date: Tue, 25 Apr 2023 16:11:25 +0300 +Subject: [PATCH] Create Lists of nullable types + +--- +This is the pull request for issue 686, merged in master, not released +yet. + + src/classes/drawings/drawing_commands.vala | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/classes/drawings/drawing_commands.vala b/src/classes/drawings/drawing_commands.vala +index 77e56e6..c305a8c 100644 +--- a/src/classes/drawings/drawing_commands.vala ++++ b/src/classes/drawings/drawing_commands.vala +@@ -54,8 +54,8 @@ namespace pdfpc { + } + + public void clear() { +- this.drawing_commands = new List(); +- this.redo_commands = new List(); ++ this.drawing_commands = new List(); ++ this.redo_commands = new List(); + } + + public void add_line(bool is_eraser, +@@ -70,7 +70,7 @@ namespace pdfpc { + + // After adding a new line you can no longer redo the old + // path. +- this.redo_commands = new List(); // clear ++ this.redo_commands = new List(); // clear + + bool new_path = true; + double epsilon = 1e-4; // Less than 0.1 pixel for a 1000x1000 img +-- +2.41.0 + diff --git a/gnu/packages/pdf.scm b/gnu/packages/pdf.scm index 36ebf8547d..44187c192c 100644 --- a/gnu/packages/pdf.scm +++ b/gnu/packages/pdf.scm @@ -1526,22 +1526,24 @@ (define-public pdfpc (commit (string-append "v" version)))) (file-name (git-file-name name version)) (sha256 - (base32 "0kj84sf5hgr2v2ra6dxmxqcr173h17cpnhg9lcq36shdbdnncwg4")))) + (base32 "0kj84sf5hgr2v2ra6dxmxqcr173h17cpnhg9lcq36shdbdnncwg4")) + (patches + (search-patches "pdfpc-build-with-vala-0.56.patch")))) (build-system cmake-build-system) (arguments '(#:tests? #f)) ; no test target - (inputs - `(("cairo" ,cairo) - ("discount" ,discount) ; libmarkdown - ("qrencode" ,qrencode) - ("gtk+" ,gtk+) - ("gstreamer" ,gstreamer) - ("gst-plugins-base" ,gst-plugins-base) - ("json-glib" ,json-glib) - ("libgee" ,libgee) - ("poppler" ,poppler) - ("pango" ,pango) - ("vala" ,vala) - ("webkitgtk" ,webkitgtk-with-libsoup2))) + (inputs (list + cairo + discount ; libmarkdown + qrencode + gtk+ + gstreamer + gst-plugins-base + json-glib + libgee + poppler + pango + vala + webkitgtk-with-libsoup2)) (native-inputs (list pkg-config)) (home-page "https://pdfpc.github.io/") -- cgit v1.2.3 From 19cd76e3f7a7da7f42e5d576b624897570218928 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Sat, 23 Mar 2024 08:12:48 +0100 Subject: gnu: duc: Fix build. * gnu/packages/patches/duc-fix-test-sh.patch: New file. * gnu/local.mk (dist_patch_DATA): Register it here. * gnu/packages/disk.scm (duc): Use it here. Change-Id: I664614dc35fb88f8ee63dbe727a38f17f4af0f8e Signed-off-by: Christopher Baines --- gnu/local.mk | 1 + gnu/packages/disk.scm | 4 +- gnu/packages/patches/duc-fix-test-sh.patch | 70 ++++++++++++++++++++++++++++++ 3 files changed, 74 insertions(+), 1 deletion(-) create mode 100644 gnu/packages/patches/duc-fix-test-sh.patch diff --git a/gnu/local.mk b/gnu/local.mk index 5cc134d3d3..6f191a1bfb 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1114,6 +1114,7 @@ dist_patch_DATA = \ %D%/packages/patches/dstat-fix-crash-when-specifying-delay.patch \ %D%/packages/patches/dstat-skip-devices-without-io.patch \ %D%/packages/patches/dtc-meson-cell-overflow.patch \ + %D%/packages/patches/duc-fix-test-sh.patch \ %D%/packages/patches/dune-common-skip-failing-tests.patch \ %D%/packages/patches/dune-grid-add-missing-include-cassert.patch \ %D%/packages/patches/dune-istl-fix-solver-playground.patch \ diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index b0117d77ce..ea18a98ab6 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -1562,7 +1562,9 @@ (define-public duc (file-name (git-file-name name version)) (sha256 (base32 - "0sglcn38rgn6y3m5ahngizyn3x2rzhqjphs7g0ppnlinkz56rcv4")))) + "0sglcn38rgn6y3m5ahngizyn3x2rzhqjphs7g0ppnlinkz56rcv4")) + (patches + (search-patches "duc-fix-test-sh.patch")))) (build-system gnu-build-system) (arguments `(#:phases diff --git a/gnu/packages/patches/duc-fix-test-sh.patch b/gnu/packages/patches/duc-fix-test-sh.patch new file mode 100644 index 0000000000..8b79e4bd03 --- /dev/null +++ b/gnu/packages/patches/duc-fix-test-sh.patch @@ -0,0 +1,70 @@ +From a84835e481d9b5fcfc101bb1fa5aba38a245b6f3 Mon Sep 17 00:00:00 2001 +Message-ID: +From: Fabio Natali +Date: Wed, 30 Aug 2023 11:35:40 +0100 +Subject: [PATCH] Fix test.sh which used to fail in some circumstances + +duc's behaviour may legitimately vary depending on the system it is being run +on. The test.sh script used to fail in some circumstances as it was too strict +and it did not account for some legitimate behaviour differences. + +Fix: update `test.sh' variable +--- + +This is a squash of pull request https://github.com/zevv/duc/pull/318, +waiting to be merged. + + test.sh | 22 ++++++++++++++++------ + 1 file changed, 16 insertions(+), 6 deletions(-) + +diff --git a/test.sh b/test.sh +index eb592be..7668499 100755 +--- a/test.sh ++++ b/test.sh +@@ -130,8 +130,8 @@ fi + # Actual tests are below. If you add test cases above, these need to be tweaked. + #--------------------------------------------------------------------------------- + +- +-cat ${DUC_TEST_DIR}.out | grep -q "Indexed 77 files and 47 directories, (91869B apparent, 540672B actual)" ++# An exact match is expected on the apparent size; the actual size may vary. ++cat ${DUC_TEST_DIR}.out | grep -q "Indexed 77 files and 47 directories, (91869B apparent, [0-9]*B actual)" + + if [ "$?" = "0" ]; then + echo "report: ok" +@@ -153,16 +153,26 @@ if [ "$?" != "0" ]; then + exit 1 + fi + +-testsum="33e2be27a9e70e81d4006a2d7b555948" ++# When two or more hard links point to the same file and when running duc with ++# the `--check-hard-links' option, only one of the hard links will be ++# counted. However, duc may pick up and display a different hard link depending ++# on the system it is being run on. Since our tests include three hard links to ++# the same file, we should be expecting three possible outcomes, all equally ++# valid, each corresponding to one of the following MD5 checksums. ++testsum0="78dbf880ef6917ea665fddb5ebb44428" ++testsum1="38ab7b7d1ec6ac57d672c5618371386d" ++testsum2="33e2be27a9e70e81d4006a2d7b555948" + md5sum ${DUC_TEST_DIR}.out > /tmp/.duc.md5sum +-grep -q $testsum /tmp/.duc.md5sum ++grep -q "$testsum0\|$testsum1\|$testsum2" /tmp/.duc.md5sum + + if [ "$?" = "0" ]; then + echo "md5sum: ok" + else + echo "md5sum: failed" +- echo "expected: " +- echo "$testsum ${DUC_TEST_DIR}.out" ++ echo "expected one of: " ++ echo "$testsum0 ${DUC_TEST_DIR}.out" ++ echo "$testsum1 ${DUC_TEST_DIR}.out" ++ echo "$testsum2 ${DUC_TEST_DIR}.out" + echo "got: " + cat /tmp/.duc.md5sum + exit 1 + +base-commit: b8f9659688a38476df9f613be3342bb8e2d65402 +-- +2.41.0 + -- cgit v1.2.3 From 939ed8515c75ee6501dd0278f6d18c235b05adc3 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Sat, 23 Mar 2024 08:13:49 +0100 Subject: gnu: duc: Update style. * gnu/packages/disk.scm (duc) [arguments]: Convert to list of G-Expressions. Change-Id: Iefcdcc55b1e71f7e866cb04795ef74f3b675cfce Signed-off-by: Christopher Baines --- gnu/packages/disk.scm | 55 ++++++++++++++++++++++++++------------------------- 1 file changed, 28 insertions(+), 27 deletions(-) diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index ea18a98ab6..2e2c5739cc 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -1567,33 +1567,34 @@ (define-public duc (search-patches "duc-fix-test-sh.patch")))) (build-system gnu-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out"))) - (substitute* "src/duc/cmd-ui.c" - (("ncursesw/ncurses.h") "ncurses.h")) - (substitute* "examples/index.cgi" - (("/usr/local/bin/duc") - (string-append out "/bin/duc")))))) - (add-after 'install 'install-examples - (lambda* (#:key outputs #:allow-other-keys) - (let* ((out (assoc-ref outputs "out")) - (doc (string-append out "/share/doc/" ,name "-" ,version))) - (copy-recursively "examples" (string-append doc "/examples"))))) - (replace 'check - (lambda* (#:key tests? #:allow-other-keys) - (substitute* "test.sh" - ;; Keep the test logs where --keep-failed can see them. - (("^(DUC_TEST_DIR=).*" _ assign) - (format #f "~a~a/test-directory~%" assign (getcwd))) - ;; XXX ‘actual size’ differed on my system (a consistent 348160 - ;; bytes where the tests expect 540672). However, the ‘apparent - ;; size’ matches, as does the actual test output. Good enough…? - ((" [0-9]*B actual") " [0-9]*B actual")) - (when tests? - (invoke "./test.sh"))))))) ; no ‘check’ target + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out"))) + (substitute* "src/duc/cmd-ui.c" + (("ncursesw/ncurses.h") "ncurses.h")) + (substitute* "examples/index.cgi" + (("/usr/local/bin/duc") + (string-append out "/bin/duc")))))) + (add-after 'install 'install-examples + (lambda* (#:key outputs #:allow-other-keys) + (let* ((out (assoc-ref outputs "out")) + (doc (string-append out "/share/doc/" #$name "-" #$version))) + (copy-recursively "examples" (string-append doc "/examples"))))) + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (substitute* "test.sh" + ;; Keep the test logs where --keep-failed can see them. + (("^(DUC_TEST_DIR=).*" _ assign) + (format #f "~a~a/test-directory~%" assign (getcwd))) + ;; XXX ‘actual size’ differed on my system (a consistent 348160 + ;; bytes where the tests expect 540672). However, the ‘apparent + ;; size’ matches, as does the actual test output. Good enough…? + ((" [0-9]*B actual") " [0-9]*B actual")) + (when tests? + (invoke "./test.sh"))))))) ; no ‘check’ target (native-inputs (list autoconf automake libtool pkg-config)) (inputs -- cgit v1.2.3 From d48d0baad16b3acc393f74a9fbea358ce94f1449 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Fri, 22 Mar 2024 22:45:04 +0100 Subject: gnu: pango-1.90: Disable failing test. * gnu/packages/gtk.scm (pango-1.90)[source]: Disable failing test. Change-Id: Ib0f6dcd42c9475c4b543400f43836c2f3f8db16f Signed-off-by: Christopher Baines --- gnu/packages/gtk.scm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm index f43eece4f2..9252315fd2 100644 --- a/gnu/packages/gtk.scm +++ b/gnu/packages/gtk.scm @@ -466,7 +466,12 @@ (define-public pango-1.90 #~(begin (substitute* "pango/pangocairo-font.c" (("cairo_user_font_face_set_render_color_glyph_func") - "cairo_user_font_face_set_render_glyph_func")))))))) + "cairo_user_font_face_set_render_glyph_func")) + ;; Disable a failing test + (substitute* "tests/testmisc.c" + (("\ +g_test_add_func \\(\"/layout/gravity-metrics2\", test_gravity_metrics2\\);") + "")))))))) (define-public pangox-compat (package -- cgit v1.2.3 From 88c180402258a13ca605ebd1073c471c8672a539 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Fri, 22 Mar 2024 21:10:35 +0100 Subject: gnu: lightdm: Update style. * gnu/packages/display-managers.scm (lightdm)[arguments]: Convert to list of G-Expressions. Change-Id: I8d7beb73e636be066d2dbe2588a5ebcb2f5afec0 Signed-off-by: Christopher Baines --- gnu/packages/display-managers.scm | 61 ++++++++++++++++++++------------------- 1 file changed, 31 insertions(+), 30 deletions(-) diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index 2df4e6311b..7b802f1b5f 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -330,36 +330,37 @@ (define-public lightdm "lightdm-vnc-ipv6.patch")))) (build-system gnu-build-system) (arguments - '(#:parallel-tests? #f ; fails when run in parallel - #:configure-flags - (list "--localstatedir=/var" - "--enable-gtk-doc" - ;; Otherwise the test suite fails on such a warning. - "CFLAGS=-Wno-error=missing-prototypes") - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'fix-paths - (lambda* (#:key inputs #:allow-other-keys) - (substitute* "src/shared-data-manager.c" - (("/bin/rm") - (search-input-file inputs "bin/rm"))) - (substitute* '("data/users.conf" - "common/user-list.c") - (("/bin/false") - (search-input-file inputs "bin/false")) - (("/usr/sbin/nologin") - (search-input-file inputs "sbin/nologin"))) - (substitute* "src/seat.c" - (("/bin/sh") - (search-input-file inputs "bin/sh"))))) - (add-before 'check 'pre-check - (lambda _ - (wrap-program "tests/src/test-python-greeter" - `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH"))) - `("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH")))) - ;; Avoid printing locale warnings, which trip up the text - ;; matching tests. - (unsetenv "LC_ALL")))))) + (list + #:parallel-tests? #f ; fails when run in parallel + #:configure-flags + #~(list "--localstatedir=/var" + "--enable-gtk-doc" + ;; Otherwise the test suite fails on such a warning. + "CFLAGS=-Wno-error=missing-prototypes") + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'fix-paths + (lambda* (#:key inputs #:allow-other-keys) + (substitute* "src/shared-data-manager.c" + (("/bin/rm") + (search-input-file inputs "bin/rm"))) + (substitute* '("data/users.conf" + "common/user-list.c") + (("/bin/false") + (search-input-file inputs "bin/false")) + (("/usr/sbin/nologin") + (search-input-file inputs "sbin/nologin"))) + (substitute* "src/seat.c" + (("/bin/sh") + (search-input-file inputs "bin/sh"))))) + (add-before 'check 'pre-check + (lambda _ + (wrap-program "tests/src/test-python-greeter" + `("GUIX_PYTHONPATH" ":" prefix (,(getenv "GUIX_PYTHONPATH"))) + `("GI_TYPELIB_PATH" ":" prefix (,(getenv "GI_TYPELIB_PATH")))) + ;; Avoid printing locale warnings, which trip up the text + ;; matching tests. + (unsetenv "LC_ALL")))))) (inputs (list audit bash-minimal ;for cross-compilation -- cgit v1.2.3 From 37db4e218845472d3c6f7759397921c969400603 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Fri, 22 Mar 2024 21:30:50 +0100 Subject: gnu: Add dbus-1.15.0. The NEWS file for 1.15.2 (the next release after 1.15.0) indicates a breaking change. This is the latest release that the lightdm testsuite can work with. * gnu/packages/glib.scm (dbus-1.15.0): New variable. Change-Id: I9c3553b315e6618fbbf19aade6b807ab7120364b Signed-off-by: Christopher Baines --- gnu/packages/glib.scm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm index bff8bec81f..cf066a8aa6 100644 --- a/gnu/packages/glib.scm +++ b/gnu/packages/glib.scm @@ -209,6 +209,21 @@ (define-public dbus-for-jami (("@SYSCONFDIR_FROM_PKGDATADIR@/dbus-1/session-local.conf") "/var/run/jami/session-local.conf"))))))))))) +(define-public dbus-1.15.0 + ;; Dbus 1.15.2 has a breaking change. + (hidden-package + (package/inherit dbus + (version "1.15.0") + (source (origin + (method url-fetch) + (uri (string-append + "https://dbus.freedesktop.org/releases/dbus/dbus-" + version ".tar.xz")) + (sha256 + (base32 + "02k4zm5h24clwp4csp2r3xp2lxib31jlk3xkgdj2c0njkb5whwsh")) + (patches (search-patches "dbus-helper-search-path.patch"))))))) + ;;; The reason this is not enabled in the regular dbus package is because it ;;; impacts the performance of D-Bus (including its library) as a whole, even ;;; when the DBUS_VERBOSE environment variable is not set. -- cgit v1.2.3 From da381e233453b746b77b899b0584a13c41202e4c Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Fri, 22 Mar 2024 21:32:11 +0100 Subject: gnu: lightdm: Run tests with dbus-1.15.0. * gnu/packages/display-managers.scm (lightdm)[native-inputs]: Replace dbus with dbus-1.15.0. Change-Id: Icc3b3f7d4589b60220e15aaa02d2203af308d44c Signed-off-by: Christopher Baines --- gnu/packages/display-managers.scm | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gnu/packages/display-managers.scm b/gnu/packages/display-managers.scm index 7b802f1b5f..e3381a1665 100644 --- a/gnu/packages/display-managers.scm +++ b/gnu/packages/display-managers.scm @@ -382,7 +382,9 @@ (define-public lightdm libtool vala ;for Vala bindings ;; For tests - dbus + ;; All tests fail with dbus >= 1.15.2, see + ;; https://github.com/canonical/lightdm/issues/346 + dbus-1.15.0 python-wrapper python-pygobject which -- cgit v1.2.3 From 17d12bf6a6c842642d420366a42bd26de087f017 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Sat, 23 Mar 2024 10:07:43 +0100 Subject: gnu: kcalendarcore: Disable failing test. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * gnu/packages/kde-frameworks.scm (kcalendarcore) [#:phases]: Add ‘disable-failing-test’. Change-Id: Ia0a5828b032d1940f30a7d38ebd276e60929c310 Signed-off-by: Liliana Marie Prikler --- gnu/packages/kde-frameworks.scm | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gnu/packages/kde-frameworks.scm b/gnu/packages/kde-frameworks.scm index 64e41b510d..c177c33d0d 100644 --- a/gnu/packages/kde-frameworks.scm +++ b/gnu/packages/kde-frameworks.scm @@ -509,6 +509,12 @@ (define-public kcalendarcore (list #:phases #~(modify-phases %standard-phases + (add-after 'unpack 'disable-failing-test + (lambda _ + ;; Reported as https://bugs.kde.org/show_bug.cgi?id=484306 + (substitute* "autotests/CMakeLists.txt" + (("testdateserialization") + "")))) (add-before 'check 'check-setup (lambda* (#:key inputs #:allow-other-keys) ;;; XXX: failing test (setenv "QT_QPA_PLATFORM" "offscreen") -- cgit v1.2.3 From 51f59e24266271c058eeb03ce600b534f07f9dcc Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Sat, 23 Mar 2024 11:20:48 +0100 Subject: gnu: todoman: Update style. * gnu/packages/task-management.scm (todoman) [arguments]: Convert to list of G-Expressions. Change-Id: I63faadabb27fa2053e3e01c3e285176bc040c634 Signed-off-by: Liliana Marie Prikler --- gnu/packages/task-management.scm | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/gnu/packages/task-management.scm b/gnu/packages/task-management.scm index f9221f8483..aac643799f 100644 --- a/gnu/packages/task-management.scm +++ b/gnu/packages/task-management.scm @@ -443,21 +443,22 @@ (define-public todoman (base32 "1j2h5cv8wnmw41fpz1ggsgi599qhk184cas9kgd92glj3m4alg6f")))) (build-system python-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (add-after 'unpack 'patch-tests - (lambda _ - (substitute* '("tests/test_cli.py" "tests/test_formatter.py") - (("tests\\.helpers") "helpers")))) - (replace 'check - (lambda* (#:key inputs outputs tests? #:allow-other-keys) - (when tests? - (invoke "pytest" "-vv" "tests" "-k" - (string-append - ;; Test expects wrong output string. - "not test_bad_start_date " - ;; Unknown failure - "and not test_default_command_args")))))))) + (list + #:phases + #~(modify-phases %standard-phases + (add-after 'unpack 'patch-tests + (lambda _ + (substitute* '("tests/test_cli.py" "tests/test_formatter.py") + (("tests\\.helpers") "helpers")))) + (replace 'check + (lambda* (#:key inputs outputs tests? #:allow-other-keys) + (when tests? + (invoke "pytest" "-vv" "tests" "-k" + (string-append + ;; Test expects wrong output string. + "not test_bad_start_date " + ;; Unknown failure + "and not test_default_command_args")))))))) (native-inputs (list python-setuptools-scm python-pytest -- cgit v1.2.3 From f367047e9574ca8dd30ae8dc36ab1e783e2af71b Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Sat, 23 Mar 2024 11:21:08 +0100 Subject: gnu: todoman: Fix tests. * gnu/packages/task-management.scm (todoman) [#:phases] : Load the `ci' hypothesis profile provided by upstream. Change-Id: I2ea01f8c424a50cd617303f8338f92563e7b0204 Signed-off-by: Liliana Marie Prikler --- gnu/packages/task-management.scm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gnu/packages/task-management.scm b/gnu/packages/task-management.scm index aac643799f..96df50d747 100644 --- a/gnu/packages/task-management.scm +++ b/gnu/packages/task-management.scm @@ -453,7 +453,8 @@ (define-public todoman (replace 'check (lambda* (#:key inputs outputs tests? #:allow-other-keys) (when tests? - (invoke "pytest" "-vv" "tests" "-k" + (invoke "pytest" "--hypothesis-profile=ci" + "-vv" "tests" "-k" (string-append ;; Test expects wrong output string. "not test_bad_start_date " -- cgit v1.2.3 From 704e09f1626303625e1e4eea552bff3a05303e89 Mon Sep 17 00:00:00 2001 From: Vivien Kraus Date: Sat, 9 Mar 2024 22:03:15 +0100 Subject: gnu: ocaml-extlib: Convert to dune-build-system. * gnu/packages/ocaml.scm (ocaml-extlib) [build-system]: Convert to dune-build-system. [arguments]: Remove '#:phases' and add '#:package'. Change-Id: Ia50c05423f3062200704fbcbb0680f2b326a7ca4 Signed-off-by: Liliana Marie Prikler --- gnu/packages/ocaml.scm | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 0f4c351141..b70e925d51 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -644,11 +644,9 @@ (define-public ocaml-extlib (sha256 (base32 "1jydzw2n84cfiz9y6lk4gih4wbr8jybanmiryfs01svd07g4vpjq")))) - (build-system ocaml-build-system) + (build-system dune-build-system) (arguments - `(#:phases - (modify-phases %standard-phases - (delete 'configure)))) + (list #:package "extlib")) (native-inputs (list ocaml-cppo)) (home-page "https://github.com/ygrek/ocaml-extlib") -- cgit v1.2.3