lilyp pushed a commit to branch gnome-team
in repository guix.
commit 0d441d8f08a35510f56702db144f62539d9980ba
Author: Liliana Marie Prikler <[email protected]>
AuthorDate: Wed Dec 25 11:18:07 2024 +0100
Revert inadvertent downgrades.
This commit partially reverts 41e90167d71ba756fac676bf3085ee3accc3dc1c.
---
gnu/packages/gnome.scm | 51 ++++++++++++++---------------
gnu/packages/gtk.scm | 88 +++++++++++++++++++-------------------------------
2 files changed, 58 insertions(+), 81 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 294dd81e8f..5e693afaf1 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -1572,7 +1572,7 @@ extraction, and lookup for applications on the desktop.")
(define-public gnome-initial-setup
(package
(name "gnome-initial-setup")
- (version "44.8")
+ (version "46.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/gnome-initial-setup/"
@@ -1580,7 +1580,7 @@ extraction, and lookup for applications on the desktop.")
"/gnome-initial-setup-" version ".tar.xz"))
(sha256
(base32
- "0y61y3rvz1hqmhjxl9mjwxcdvdxslyaghajav6l79a9yxi859508"))))
+ "1mqvvsl161pi4sv2x6b90rfs4a2166da9rkgkcpd67pwfhgyjxmr"))))
(build-system meson-build-system)
(arguments
(list
@@ -1604,6 +1604,7 @@ extraction, and lookup for applications on the desktop.")
pkg-config))
(inputs
(list accountsservice
+ dconf
elogind
gdm
geoclue
@@ -2641,7 +2642,7 @@ GNOME Desktop.")
(define-public gnome-keyring
(package
(name "gnome-keyring")
- (version "46.1")
+ (version "46.2")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@@ -2649,7 +2650,7 @@ GNOME Desktop.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1xp31iashi7n81z4halmrw53v3lnj847k4514lzqnbzz6a8sxlxi"))))
+ "098ryv7xsnf5r58w8kdr6nahzhmrczjb72ycbqlg7dx8p1kcj9mz"))))
(build-system gnu-build-system)
(arguments
(list
@@ -2659,7 +2660,7 @@ GNOME Desktop.")
#$output "/share/p11-kit/modules/")
(string-append "--with-pkcs11-modules="
#$output "/share/p11-kit/modules/"))
- #:parallel-tests? (not (target-riscv64?))
+ #:parallel-tests? #f ; XXX: concurrency in dbus tests
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'fix-/bin/sh-reference
@@ -5098,7 +5099,7 @@ libxml to ease remote use of the RESTful API.")
(define-public libshumate
(package
(name "libshumate")
- (version "1.2.1")
+ (version "1.3.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@@ -5106,7 +5107,7 @@ libxml to ease remote use of the RESTful API.")
name "-" version ".tar.xz"))
(sha256
(base32
- "04cwakbdr68nw4kh956xhf447fawz8badpyd76hg4ir1gq3yw18i"))))
+ "1m3mvk38cjlkxmhkq0zg75msckylc0vzizll50ii5phw53lac9w2"))))
(build-system meson-build-system)
(arguments
(list #:phases
@@ -5787,7 +5788,7 @@ output devices.")
(define-public geoclue
(package
(name "geoclue")
- (version "2.6.0")
+ (version "2.7.2")
(source
(origin
(method url-fetch)
@@ -5795,7 +5796,7 @@ output devices.")
(string-append
"https://gitlab.freedesktop.org/geoclue/geoclue/-/archive/";
version "/geoclue-" version ".tar.bz2"))
(sha256
- (base32 "1854i8lih1jkks5w38xv8k5gs7s8629qjg3cg96ji0ffk35yzjfd"))
+ (base32 "1ljn4k1zlfx0ymmdz8ycfb976vx8r61sx68q854r0xinl124mlh1"))
(patches (search-patches "geoclue-config.patch"))))
(build-system meson-build-system)
(arguments
@@ -5813,7 +5814,7 @@ output devices.")
`(,glib "bin")
glib-networking
json-glib
- libsoup-minimal-2))
+ libsoup-minimal))
(home-page "https://gitlab.freedesktop.org/geoclue/geoclue/-/wikis/home";)
(synopsis "Geolocation service")
(description "Geoclue is a D-Bus service that provides location
@@ -9469,7 +9470,7 @@ properties, screen resolution, and other GNOME
parameters.")
(define-public gnome-shell
(package
(name "gnome-shell")
- (version "44.10")
+ (version "46.7")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@@ -9477,7 +9478,7 @@ properties, screen resolution, and other GNOME
parameters.")
name "-" version ".tar.xz"))
(sha256
(base32
- "01pw9qnnvh64x56z1gqh0qk6vfn0ihh4zijq23f4bpz9wszlbpwf"))))
+ "0n19160ab6chcnxmwwv4m0kfz856n7851dv4ck0p08mfp39wzwhw"))))
(build-system meson-build-system)
(arguments
(let ((disallowed-references
@@ -9492,8 +9493,7 @@ properties, screen resolution, and other GNOME
parameters.")
#~(list "-Dsystemd=false"
;; Otherwise, the RUNPATH will lack the final path component.
(string-append "-Dc_link_args=-Wl,-rpath="
- #$output "/lib/gnome-shell")
- "-Dsoup2=false")
+ #$output "/lib/gnome-shell"))
#:modules '((guix build meson-build-system)
(guix build utils)
(ice-9 match)
@@ -9515,11 +9515,11 @@ properties, screen resolution, and other GNOME
parameters.")
(substitute* "meson.build"
(("gtk_update_icon_cache: true")
"gtk_update_icon_cache: false"))))
- (add-after 'unpack 'unbreak-perf-tests
+ (add-after 'unpack 'unbreak-shell-tests
(lambda _
;; Lest non-fatal dbus warnings be made fatal again…
(substitute* "tests/meson.build"
- (("perf_testenv\\.set\\('G_DEBUG'" all)
+ (("shell_testenv\\.set\\('G_DEBUG'" all)
(string-append "# " all)))))
(add-before 'configure 'record-absolute-file-names
(lambda* (#:key inputs #:allow-other-keys)
@@ -9559,7 +9559,7 @@ properties, screen resolution, and other GNOME
parameters.")
(lambda (prog)
(wrap-program (string-append #$output "/bin/" prog)
`("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))))
- '("gnome-shell" "gnome-extensions-app"))
+ '("gnome-shell" "gnome-extensions" "gnome-extensions-app"))
(substitute* (string-append #$output "/share/gnome-shell/"
"org.gnome.Shell.Extensions")
(("imports\\.package\\.start" all)
@@ -9579,13 +9579,7 @@ properties, screen resolution, and other GNOME
parameters.")
"[imports.gi.GLib.getenv('GST_PLUGIN_SYSTEM_PATH'),"
"'" gst-plugin-path "'].filter(v =>
v).join(':'),"
"true);\n"
- all)))
- (for-each
- (lambda (prog)
- (wrap-program (string-append #$output "/bin/" prog)
- `("GUIX_PYTHONPATH" ":" prefix (,python-path))
- `("GI_TYPELIB_PATH" ":" prefix (,gi-typelib-path))))
- '("gnome-shell-perf-tool")))))
+ all))))))
(add-after 'install 'rewire
(lambda* (#:key inputs #:allow-other-keys)
(for-each
@@ -11058,7 +11052,7 @@ functionality and behavior.")
(define-public folks
(package
(name "folks")
- (version "0.15.8")
+ (version "0.15.9")
(source (origin
(method url-fetch)
(uri (string-append
@@ -11067,10 +11061,13 @@ functionality and behavior.")
"folks-" version ".tar.xz"))
(sha256
(base32
- "1hj9brran2azy3scyf913svhxjrmya83fi7x239h33rp7vxnljlm"))))
+ "0ps1243l4vladlylj6f3h830lam2fi43kp1z2qzz6lf3amrv6493"))))
(build-system meson-build-system)
(arguments
- '(#:phases
+ '(;; Tests are broken since GLib 2.80
+ ;; See <https://gitlab.gnome.org/GNOME/folks/-/issues/140>.
+ #:tests? #f
+ #:phases
(modify-phases %standard-phases
(add-after 'unpack 'skip-gtk-update-icon-cache
;; Don't create 'icon-theme.cache'.
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 6fbdb60409..fd6448cc6d 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -77,6 +77,7 @@
#:use-module (gnu packages base)
#:use-module (gnu packages bash)
#:use-module (gnu packages boost)
+ #:use-module (gnu packages build-tools)
#:use-module (gnu packages texinfo)
#:use-module (gnu packages check)
#:use-module (gnu packages compression)
@@ -169,7 +170,7 @@ such as mate-panel and xfce4-panel.")
(define cairo
(package
(name "cairo")
- (version "1.18.0")
+ (version "1.18.2")
(source
(origin
(method url-fetch)
@@ -177,7 +178,7 @@ such as mate-panel and xfce4-panel.")
(string-append "https://cairographics.org/releases/cairo-";
version ".tar.xz"))
(sha256
- (base32 "0r0by563s75xyzz0d0j1nmjqmdrk2x9agk7r57p3v8vqp4v0ffi4"))))
+ (base32 "0nnli5cghygbl9bvlbjls7nspnrrzx1y1pbd7p649s154js9nax6"))))
(build-system meson-build-system)
(arguments
`(#:tests? #f ; see
http://lists.gnu.org/archive/html/bug-guix/2013-06/msg00085.html
@@ -384,7 +385,7 @@ applications.")
(define-public pango
(package
(name "pango")
- (version "1.50.14")
+ (version "1.54.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/pango/"
@@ -393,7 +394,7 @@ applications.")
(patches (search-patches "pango-skip-libthai-test.patch"))
(sha256
(base32
- "1s41sprfgkc944fva36zjmkmdpv8hn1bdpyg55xc4663pw2z4rqx"))))
+ "1n0y5l5wfq2a86dimraazvz1v9dvqdjkmpqgzkbk9rqy09syv7la"))))
(build-system meson-build-system)
(arguments
'(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
@@ -617,7 +618,7 @@ printing and other features typical of a source code
editor.")
(define-public gtksourceview
(package
(name "gtksourceview")
- (version "5.8.0")
+ (version "5.12.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/gtksourceview/"
@@ -625,7 +626,7 @@ printing and other features typical of a source code
editor.")
"gtksourceview-" version ".tar.xz"))
(sha256
(base32
- "0cw9h4aa84a48b3kd3rv0bb2mk7q1vz9hwkppxpqh8gg1p1d838i"))))
+ "07rcnhwqyiqs9icld3965g41wd3n9a808y7agjpasnjwk2njmj44"))))
(build-system meson-build-system)
(arguments
'(#:phases
@@ -718,7 +719,7 @@ highlighting and other features typical of a source code
editor.")
(define-public gdk-pixbuf
(package
(name "gdk-pixbuf")
- (version "2.42.12")
+ (version "2.42.10")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@@ -726,7 +727,7 @@ highlighting and other features typical of a source code
editor.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1iz392vrlrnb92hrak697bgndsbkrcxhqxilxn6f99xr8ls5nl5r"))))
+ "0jz4kziz5lirnjjvbspbqzsigk8vnqknng1fga89d81vs5snr6zf"))))
(build-system meson-build-system)
(outputs '("out" "debug"))
(arguments
@@ -734,10 +735,7 @@ highlighting and other features typical of a source code
editor.")
#:configure-flags '("-Dinstalled_tests=false"
,@(if (%current-target-system)
'()
- '("-Dgtk_doc=true"))
- ;; GTK+ 3 needs the XPM loader, see
- ;;
<https://gitlab.gnome.org/GNOME/gtk/-/issues/7143>.
- "-Dothers=enabled")
+ '("-Dgtk_doc=true")))
#:phases
(modify-phases %standard-phases
(add-before 'configure 'disable-failing-tests
@@ -824,7 +822,7 @@ ever use this library.")
(hidden-package
(package
(name "at-spi2-core")
- (version "2.48.4")
+ (version "2.52.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@@ -832,7 +830,7 @@ ever use this library.")
name "-" version ".tar.xz"))
(sha256
(base32
- "05d5azffbglnvqzwk8ngg61jksm3brrwhmfpymsrccz8j8lv3v19"))))
+ "1azmbzik0gl2s03c9lq3dff3h1iql1zvlwn28yhizl68421zrhqa"))))
(build-system meson-build-system)
(arguments
(list
@@ -1026,7 +1024,7 @@ application suites.")
(package
(inherit gtk+-2)
(name "gtk+")
- (version "3.24.41")
+ (version "3.24.43")
(source
(origin
(method url-fetch)
@@ -1035,7 +1033,7 @@ application suites.")
name "-" version ".tar.xz"))
(sha256
(base32
- "1ymna7b8p668wxbca1pgjqpw02ya4p86yaa9pja7l27kg9463nj7"))
+ "1izky8dxaxp4bg5nii4n58dgpkw79mvmvbkldf04n0qmhmjg013y"))
(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
@@ -1147,7 +1145,7 @@ application suites.")
(define-public gtk
(package
(name "gtk")
- (version "4.14.5")
+ (version "4.16.1")
(source
(origin
(method url-fetch)
@@ -1155,7 +1153,7 @@ application suites.")
(version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
- (base32 "0kg286za53qhl6ngw4rrvbpm3q04g30qf2q77sck7c86y2wz4ism"))
+ (base32 "0p11k5afy3g9d6p402zrn9izkypwzlb51y9qanibzyc1sjmiwslj"))
(patches
(search-patches "gtk4-respect-GUIX_GTK4_PATH.patch"))
(modules '((guix build utils)))))
@@ -1172,11 +1170,7 @@ application suites.")
"-Dcloudproviders=enabled" ;for cloud-providers support
"-Dtracker=enabled" ;for filechooser search support
"-Dcolord=enabled" ;for color printing support
- #$@(if (%current-target-system)
- ;; If true, gtkdoc-scangobj will try to execute a
- ;; cross-compiled binary.
- '("-Dgtk_doc=false")
- '("-Dgtk_doc=true"))
+ "-Ddocumentation=true"
"-Dman-pages=true")
#:test-options #~(list "--setup=x11" ;defaults to wayland
;; Use the same test options as upstream uses for
@@ -1186,6 +1180,7 @@ application suites.")
"--no-suite=flaky"
"--no-suite=headless" ; requires mutter…
"--no-suite=gsk-compare-broadway"
+ "--no-suite=needs-udmabuf"
;; These seem to fail on aarch64, and Debian has
;; also disabled these, see:
;;
https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1050075
@@ -1225,29 +1220,14 @@ application suites.")
(("[ \t]*'empty-text.node',") "")
(("[ \t]*'testswitch.node',") "")
(("[ \t]*'widgetfactory.node',") "")
- ;; The unaligned-offscreen test fails for unknown reasons, also
- ;; on different distributions (see:
- ;; https://gitlab.gnome.org/GNOME/gtk/-/issues/4889).
- ((" 'unaligned-offscreen',") "")
;; This test, 'gtk:tools / validate', started failing for
;; unknown reasons after updating mesa to 23.3.1 and xorgproto
;; to 2023.2.
((" 'validate',") "")
- ;; XXX: These test failures come newly from 4.14.
- ;; Not all of them are reported upstream yet, but the text
nodes
- ;; are mentioned in
- ;; <https://gitlab.gnome.org/GNOME/gtk/-/issues/6647>.
- (("'glyph-subpixel-position',") "")
- (("'subpixel-positioning',") "")
- (("'subpixel-positioning-hidpi-nogl-nocairo',") "")
- (("'text.*\\.node',") "")
- (("'text-mixed-color-colrv1',") ""))
+ ;; XXX: Figure out why this fails and report upstream.
+ ((".*'memorytexture',.*") ""))
(substitute* "testsuite/reftests/meson.build"
- (("[ \t]*'label-wrap-justify.ui',") "")
- ;; The inscription-markup.ui fails due to /etc/machine-id
- ;; related warnings (see:
- ;; https://gitlab.gnome.org/GNOME/gtk/-/issues/5169).
- (("[ \t]*'inscription-markup.ui',") ""))
+ (("[ \t]*'label-wrap-justify.ui',") ""))
;; These tests fail on an Apple M1 (aarch64) with the following
errors:
;; - MESA: error: ZINK: failed to choose pdev
;; - libEGL warning: egl: failed to create dri2 screen
@@ -1773,7 +1753,7 @@ library.")
(define-public pangomm
(package
(name "pangomm")
- (version "2.50.1")
+ (version "2.54.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@@ -1781,7 +1761,7 @@ library.")
name "-" version ".tar.xz"))
(sha256
(base32
- "054jglmnbig14fs99qqi5y174z9j90r6dprpyszw42742cs95jfc"))))
+ "1kvs9vbqikwlcfm7v8hhzc48xjpamfsq5skpabs1lyn4nz8iynsa"))))
(build-system meson-build-system)
(outputs '("out" "doc"))
(arguments
@@ -1835,7 +1815,7 @@ text rendering library.")
(define-public atkmm
(package
(name "atkmm")
- (version "2.36.2")
+ (version "2.36.3")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@@ -1843,7 +1823,7 @@ text rendering library.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0yg0v8f0xms2cfj1r9q6yrl4757wrivpb4q56rbmx626yycxsqkg"))))
+ "0x2rdjmgmxza83lznss69nz7z6ny1cbh1ih2fbdhmpn4l3m69hkf"))))
(build-system meson-build-system)
(outputs '("out" "doc"))
(arguments
@@ -1903,7 +1883,7 @@ text rendering library.")
(define-public gtkmm
(package
(name "gtkmm")
- (version "4.6.1")
+ (version "4.14.0")
(source
(origin
(method url-fetch)
@@ -1912,7 +1892,7 @@ text rendering library.")
(version-major+minor version) "/"
name "-" version ".tar.xz"))
(sha256
- (base32 "1q6iycd7jfbn6rp4sq6r7ndm96dc21inq8mq1d9xsky6kv5gwphd"))))
+ (base32 "1npcf6i07riw20rg5x6rnqi0jlh7cwdvsvjqd7fa6k3l9d2a0l4k"))))
(build-system meson-build-system)
(outputs '("out" "doc"))
(arguments
@@ -2283,7 +2263,7 @@ information.")
(define-public gtk-doc
(package
(name "gtk-doc")
- (version "1.33.2")
+ (version "1.34.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/" name "/"
@@ -2291,7 +2271,7 @@ information.")
name "-" version ".tar.xz"))
(sha256
(base32
- "0hxza8qp52lrq7s1vbilz2vh4170cail560zi8khl0zb42d706yc"))
+ "0746lwxgybc5ss3hzdd0crjjghk0ck0x9jbmz73iig405arp42xj"))
(patches
(search-patches "gtk-doc-respect-xml-catalog.patch"))))
(build-system meson-build-system)
@@ -2712,7 +2692,8 @@ printed to standard output.")
"--localstatedir=/var"
;; The shebang of the generated test files should be patched
;; before enabling tests.
- "--disable-tests")
+ "--disable-tests"
+ "--disable-dumper")
#:make-flags
#~(list (string-append "typelibdir=" #$output "/lib/girepository-1.0"))
#:phases
@@ -2744,8 +2725,7 @@ printed to standard output.")
(setenv "HAVE_VALGRIND_FALSE" "#"))))))
(inputs
(list glib
- gtk+
- gtk+-2))
+ gtk+))
(native-inputs
(list autoconf
automake
@@ -3027,7 +3007,7 @@ Unix desktop environment under X11 as well as Wayland.")
(define-public libpanel
(package
(name "libpanel")
- (version "1.2.0")
+ (version "1.7.0")
(source
(origin
(method git-fetch)
@@ -3036,7 +3016,7 @@ Unix desktop environment under X11 as well as Wayland.")
(commit version)))
(file-name (git-file-name name version))
(sha256
- (base32 "0wal073anl6iviyljyr8pw0m7av4ik6azpmrwzxw4snp95ib27aq"))))
+ (base32 "09lgzjydnahi14xn5rchb91d6m3idzgb68xm3lklwnkdda7dz0w8"))))
(build-system meson-build-system)
(arguments
(list
