[PATCH gnome-team 0/9] Update GNOME Shell to 44

  • Done
  • quality assurance status badge
Details
2 participants
  • Liliana Marie Prikler
  • Maxim Cournoyer
Owner
unassigned
Submitted by
Liliana Marie Prikler
Severity
normal
L
L
Liliana Marie Prikler wrote on 31 Aug 2023 06:08
(address . guix-patches@gnu.org)
cover.1693454927.git.liliana.prikler@gmail.com
Hi Guix,

this is the first big update to user-visible stuff: GDM and GNOME Shell.
Both build fine (if you adjust for dbus warnings in the latter), but I
haven't tested them under "real" conditions yet. Suffice to say that
a lot more core applications need updates.

Cheers

Liliana Marie Prikler (9):
gnu: Add gcr 4.0.
gnu: gjs: Update to 1.76.2.
gnu: mutter: Update to 44.3.
gnu: baobab: Update to 44.0.
gnu: gnome-desktop: Update to 44.0.
gnu: gnome-session: Update to 44.0.
gnu: gnome-settings-daemon: Update to 44.1.
gnu: gdm: Update to 44.1.
gnu: gnome-shell: Update to 44.3.

gnu/packages/gnome.scm | 104 ++++++++++++------
.../patches/gdm-elogind-support.patch | 93 +++++++---------
2 files changed, 115 insertions(+), 82 deletions(-)


base-commit: baf5b0745446dabe8166d860996dc54cfa09db3e
--
2.41.0
L
L
Liliana Marie Prikler wrote on 20 Aug 2023 09:00
[PATCH gnome-team 1/9] gnu: Add gcr 4.0.
(address . 65644@debbugs.gnu.org)
e7265eecb913f7c7efb9b84ac028c00fcf5eeb9f.1693454927.git.liliana.prikler@gmail.com
* gnu/packages/gnome.scm (gcr-4): New variable.
---
gnu/packages/gnome.scm | 24 ++++++++++++++++++++++++
1 file changed, 24 insertions(+)

Toggle diff (37 lines)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 922d6ba24b..b30e00365c 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -2445,6 +2445,30 @@ (define-public gcr
GNOME Desktop.")
(license license:lgpl2.1+)))
+(define-public gcr-4
+ (package
+ (inherit gcr)
+ (name "gcr")
+ (version "4.0.0")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://gnome/sources/" name "/"
+ (version-major+minor version) "/"
+ name "-" version ".tar.xz"))
+ (sha256
+ (base32
+ "0z7cviri25qy2v042hw6x731bj1azpx8plrd7ssbmrqf9y95an64"))))
+ (arguments
+ (substitute-keyword-arguments (package-arguments gcr)
+ ((#:phases phases)
+ #~(modify-phases #$phases
+ (replace 'skip-gtk-update-icon-cache
+ (lambda _
+ (substitute* "meson.build"
+ (("gtk_update_icon_cache: true")
+ "gtk_update_icon_cache: false"))))))))
+ (propagated-inputs (list glib gtk p11-kit))))
+
(define-public gdl
(package
(name "gdl")
--
2.41.0
L
L
Liliana Marie Prikler wrote on 29 Aug 2023 22:21
[PATCH gnome-team 2/9] gnu: gjs: Update to 1.76.2.
(address . 65644@debbugs.gnu.org)
53d43c2a8f06a0a298e3ba1e7cd28a827f997229.1693454927.git.liliana.prikler@gmail.com
* gnu/packages/gnome.scm (gjs): Update to 1.76.2.
---
gnu/packages/gnome.scm | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

Toggle diff (25 lines)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index b30e00365c..51a03d6532 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7607,8 +7607,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 "/"
@@ -7616,7 +7615,7 @@ (define-public gjs
name "-" version ".tar.xz"))
(sha256
(base32
- "0xfspsc1q4xm7p500lmy17b9csyaqps1kilylq8wjjd0fjqq8ayg"))
+ "1m15qscx2z862gfkb9pxg30bz8ka0h774l2azs5dfvzaagbckn7p"))
(modules '((guix build utils)))
(snippet
'(begin
--
2.41.0
L
L
Liliana Marie Prikler wrote on 29 Aug 2023 22:20
[PATCH gnome-team 3/9] gnu: mutter: Update to 44.3.
(address . 65644@debbugs.gnu.org)
fb20d3480cf34a2ad1945bfb356b5ef3516b755b.1693454927.git.liliana.prikler@gmail.com
* 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(-)

Toggle diff (43 lines)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 51a03d6532..2707ce40a8 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7762,7 +7762,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 "/"
@@ -7770,7 +7770,7 @@ (define-public mutter
name "-" version ".tar.xz"))
(sha256
(base32
- "0h1ak3201mdc2qbf67fhcn801ddp33hm0f0c52zis1l7s6ipyb62"))
+ "0l85qyn6x5hyaaclzcbqd44xpd582gdindqfam8f9lsh46zvwp0q"))
;; TODO: Remove on update as this was merged upstream. See
;; <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3047>.
(patches (search-patches "mutter-fix-inverted-test.patch"))))
@@ -7793,7 +7793,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.
@@ -7940,7 +7940,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
--
2.41.0
L
L
Liliana Marie Prikler wrote on 20 Aug 2023 09:11
[PATCH gnome-team 5/9] gnu: gnome-desktop: Update to 44.0.
(address . 65644@debbugs.gnu.org)
49faf1945f0a3a4ac71520f68edaac4d0322d04c.1693454927.git.liliana.prikler@gmail.com
* gnu/packages/gnome.scm (gnome-desktop): Update to 44.0.
---
gnu/packages/gnome.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 75e17f9b68..18711b4d74 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
--
2.41.0
L
L
Liliana Marie Prikler wrote on 20 Aug 2023 09:03
[PATCH gnome-team 7/9] gnu: gnome-settings-daemon: Update to 44.1.
(address . 65644@debbugs.gnu.org)
c5e469a21cb6bd779cca0cf2d6c253b39a5ba870.1693454927.git.liliana.prikler@gmail.com
* gnu/packages/gnome.scm (gnome-settings-daemon): Update to 44.1.
[inputs]: Replace gcr with gcr-4.
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(-)

Toggle diff (43 lines)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 26bc238f14..7341f58547 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5924,7 +5924,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)
@@ -5933,7 +5933,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
@@ -5976,15 +5976,15 @@ (define-public gnome-settings-daemon
baobab
colord
cups
- gcr
+ gcr-4
geoclue
- geocode-glib-with-libsoup2
+ geocode-glib
gnome-desktop
gsettings-desktop-schemas
lcms
libcanberra
libgudev
- libgweather4-with-libsoup2
+ libgweather4
libnotify
(librsvg-for-system)
libwacom
--
2.41.0
L
L
Liliana Marie Prikler wrote on 20 Aug 2023 09:01
[PATCH gnome-team 4/9] gnu: baobab: Update to 44.0.
(address . 65644@debbugs.gnu.org)
6d5743fba99bd82b8dcdef2642cedb5fb053b90b.1693454927.git.liliana.prikler@gmail.com
* 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(-)

Toggle diff (51 lines)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 2707ce40a8..75e17f9b68 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9694,7 +9694,7 @@ (define-public nautilus
(define-public baobab
(package
(name "baobab")
- (version "42.0")
+ (version "44.0")
(source (origin
(method url-fetch)
(uri (string-append
@@ -9703,24 +9703,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
--
2.41.0
L
L
Liliana Marie Prikler wrote on 31 Aug 2023 05:37
[PATCH gnome-team 6/9] gnu: gnome-session: Update to 44.0.
(address . 65644@debbugs.gnu.org)
baf52382074c331d2b518acad8fc35c1879a4a34.1693454927.git.liliana.prikler@gmail.com
* gnu/packages/gnome.scm (gnome-session): Update to 44.0.
---
gnu/packages/gnome.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 18711b4d74..26bc238f14 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7547,7 +7547,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 "/"
@@ -7556,7 +7556,7 @@ (define-public gnome-session
(patches (search-patches "gnome-session-support-elogind.patch"))
(sha256
(base32
- "1alwjqr36rd0s132qs2clwnxgilcbylps6lm41lr50mn782hdjiw"))))
+ "1ipjvcjabifqgmrz65m3vwmhk99nbm8jcxcikyg5w4r6cnljky6c"))))
(arguments
`(#:glib-or-gtk? #t
#:phases
--
2.41.0
L
L
Liliana Marie Prikler wrote on 30 Aug 2023 06:22
[PATCH gnome-team 8/9] gnu: gdm: Update to 44.1.
(address . 65644@debbugs.gnu.org)
c787603a951e0a9ffe8caddcfcf8f0d794316eb4.1693454927.git.liliana.prikler@gmail.com
* 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 +-
.../patches/gdm-elogind-support.patch | 93 +++++++++----------
2 files changed, 45 insertions(+), 53 deletions(-)

Toggle diff (187 lines)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 7341f58547..5e6a6df44c 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -8729,7 +8729,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 "/"
@@ -8737,7 +8737,7 @@ (define-public gdm
name "-" version ".tar.xz"))
(sha256
(base32
- "0m9qmm3vm81jmqlc30a1fb79hsr4l4lpiw0zjxww3gipd6bsqa53"))
+ "03avvkrm2jd0731ggh9cjnkhrfysqp4slrq0km3gqa3xpqx6n9k8"))
(patches
(search-patches
"gdm-default-session.patch"
@@ -8930,6 +8930,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.')
--
2.41.0
L
L
Liliana Marie Prikler wrote on 31 Aug 2023 05:35
[PATCH gnome-team 9/9] gnu: gnome-shell: Update to 44.3.
(address . 65644@debbugs.gnu.org)
784d9cde7ead9ea237035b7f19d0c46346d4fade.1693454927.git.liliana.prikler@gmail.com
* 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 with gcr-4.
---
gnu/packages/gnome.scm | 23 ++++++++++++++++++-----
1 file changed, 18 insertions(+), 5 deletions(-)

Toggle diff (72 lines)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 5e6a6df44c..d4e78bb08d 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9114,7 +9114,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 "/"
@@ -9122,7 +9122,7 @@ (define-public gnome-shell
name "-" version ".tar.xz"))
(sha256
(base32
- "0kn5fclciybp2fs38wd39hdz85y91pas0ckfa02pmyx91sbz4pw7"))))
+ "1grizh3fbks5dgizaj38300cz97ay81q0hlk1pvawkpfq9qlnsam"))))
(build-system meson-build-system)
(arguments
(let ((disallowed-references
@@ -9160,6 +9160,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 _
+ ;; non-fatal dbus warning otherwise causes shell to crash
+ (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"))
@@ -9176,7 +9182,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"))
@@ -9242,16 +9254,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
+ gcr-4
gdm
librsvg
gjs
--
2.41.0
M
M
Maxim Cournoyer wrote on 5 Sep 2023 04:53
Re: [bug#65644] [PATCH gnome-team 1/9] gnu: Add gcr 4.0.
(name . Liliana Marie Prikler)(address . liliana.prikler@gmail.com)
871qfdqqik.fsf@gmail.com
Hi,

Liliana Marie Prikler <liliana.prikler@gmail.com> writes:

Toggle quote (2 lines)
> * gnu/packages/gnome.scm (gcr-4): New variable.

I guess we can't yet remove the older version? By convention, 'gcr'
should point to the latest and greatest, so I'd make this one 'gcr', and
run a sed job that rewrites current gcr to gcr-3.

Maybe the inheritance relationship would better be reversed to ease
maintenance in the future.

--
Thanks,
Maxim
M
M
Maxim Cournoyer wrote on 5 Sep 2023 04:54
Re: [bug#65644] [PATCH gnome-team 7/9] gnu: gnome-settings-daemon: Update to 44.1.
(name . Liliana Marie Prikler)(address . liliana.prikler@gmail.com)
87wmx5pbwy.fsf@gmail.com
Hi,

Liliana Marie Prikler <liliana.prikler@gmail.com> writes:

Toggle quote (5 lines)
> * gnu/packages/gnome.scm (gnome-settings-daemon): Update to 44.1.
> [inputs]: Replace gcr with gcr-4.
> Replace geocode-glib-with-libsoup2 with geocode-glib.
> Replace libgweather4-with-libsoup2 with libgweather4.

LGTM. Nice to finally say farewell to libsoup2 things.

--
Thanks,
Maxim
M
M
Maxim Cournoyer wrote on 5 Sep 2023 04:56
Re: [bug#65644] [PATCH gnome-team 8/9] gnu: gdm: Update to 44.1.
(name . Liliana Marie Prikler)(address . liliana.prikler@gmail.com)
87sf7tpbt6.fsf@gmail.com
Hi,

Liliana Marie Prikler <liliana.prikler@gmail.com> writes:

Toggle quote (43 lines)
> * 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 +-
> .../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 7341f58547..5e6a6df44c 100644
> --- a/gnu/packages/gnome.scm
> +++ b/gnu/packages/gnome.scm
> @@ -8729,7 +8729,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 "/"
> @@ -8737,7 +8737,7 @@ (define-public gdm
> name "-" version ".tar.xz"))
> (sha256
> (base32
> - "0m9qmm3vm81jmqlc30a1fb79hsr4l4lpiw0zjxww3gipd6bsqa53"))
> + "03avvkrm2jd0731ggh9cjnkhrfysqp4slrq0km3gqa3xpqx6n9k8"))
> (patches
> (search-patches
> "gdm-default-session.patch"
> @@ -8930,6 +8930,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

Ideally this patch should be upstreamed to make our life (and that of
others) easier in the future, with the URL referenced here. Otherwise LGTM.

--
Thanks,
Maxim
M
M
Maxim Cournoyer wrote on 5 Sep 2023 04:59
Re: [bug#65644] [PATCH gnome-team 9/9] gnu: gnome-shell: Update to 44.3.
(name . Liliana Marie Prikler)(address . liliana.prikler@gmail.com)
87o7ihpbpm.fsf@gmail.com
Liliana Marie Prikler <liliana.prikler@gmail.com> writes:

Toggle quote (39 lines)
> * 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 with gcr-4.
> ---
> 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 5e6a6df44c..d4e78bb08d 100644
> --- a/gnu/packages/gnome.scm
> +++ b/gnu/packages/gnome.scm
> @@ -9114,7 +9114,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 "/"
> @@ -9122,7 +9122,7 @@ (define-public gnome-shell
> name "-" version ".tar.xz"))
> (sha256
> (base32
> - "0kn5fclciybp2fs38wd39hdz85y91pas0ckfa02pmyx91sbz4pw7"))))
> + "1grizh3fbks5dgizaj38300cz97ay81q0hlk1pvawkpfq9qlnsam"))))
> (build-system meson-build-system)
> (arguments
> (let ((disallowed-references
> @@ -9160,6 +9160,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 _
> + ;; non-fatal dbus warning otherwise causes shell to crash

Please punctuate stand-alone comments (capitalization, periods).

Otherwise LGTM.

--
Thanks,
Maxim
M
M
Maxim Cournoyer wrote on 5 Sep 2023 04:59
Re: [bug#65644] [PATCH gnome-team 3/9] gnu: mutter: Update to 44.3.
(name . Liliana Marie Prikler)(address . liliana.prikler@gmail.com)
87jzt5pbog.fsf@gmail.com
Liliana Marie Prikler <liliana.prikler@gmail.com> writes:

Toggle quote (4 lines)
> * gnu/packages/gnome.scm (mutter): Update to 44.3.
> [arguments]: Adjust linker rpath accordingly.
> [inputs]: Add colord.

LGTM.

--
Thanks,
Maxim
M
M
Maxim Cournoyer wrote on 5 Sep 2023 05:01
Re: [bug#65644] [PATCH gnome-team 0/9] Update GNOME Shell to 44
(name . Liliana Marie Prikler)(address . liliana.prikler@gmail.com)
87fs3tpbma.fsf@gmail.com
Hi Liliana,

Liliana Marie Prikler <liliana.prikler@gmail.com> writes:

Toggle quote (20 lines)
> Hi Guix,
>
> this is the first big update to user-visible stuff: GDM and GNOME Shell.
> Both build fine (if you adjust for dbus warnings in the latter), but I
> haven't tested them under "real" conditions yet. Suffice to say that
> a lot more core applications need updates.
>
> Cheers
>
> Liliana Marie Prikler (9):
> gnu: Add gcr 4.0.
> gnu: gjs: Update to 1.76.2.
> gnu: mutter: Update to 44.3.
> gnu: baobab: Update to 44.0.
> gnu: gnome-desktop: Update to 44.0.
> gnu: gnome-session: Update to 44.0.
> gnu: gnome-settings-daemon: Update to 44.1.
> gnu: gdm: Update to 44.1.
> gnu: gnome-shell: Update to 44.3.

The series LGTM overall. I've shared some comments with regards of
"nice to have" items.

--
Thanks,
Maxim
L
L
Liliana Marie Prikler wrote on 29 Aug 2023 22:21
[PATCH gnome-team v2 2/9] gnu: gjs: Update to 1.76.2.
(address . 65644@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
69ed4f137dce7d2cdbb99d55fde90eaa4b0b1b21.1694031712.git.liliana.prikler@gmail.com
* gnu/packages/gnome.scm (gjs): Update to 1.76.2.
---
gnu/packages/gnome.scm | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)

Toggle diff (25 lines)
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
--
2.41.0
L
L
Liliana Marie Prikler wrote on 20 Aug 2023 09:00
[PATCH gnome-team v2 1/9] gnu: gcr: Update to 4.0.0.
(address . 65644@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
35a9ebf83ef1063dfdda255b5a670d19747564f7.1694031712.git.liliana.prikler@gmail.com
* 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(-)

Toggle diff (303 lines)
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: <https://gitlab.gnome.org/GNOME/gnome-keyring/-/issues/124>.
@@ -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)

base-commit: baf5b0745446dabe8166d860996dc54cfa09db3e
--
2.41.0
L
L
Liliana Marie Prikler wrote on 29 Aug 2023 22:20
[PATCH gnome-team v2 3/9] gnu: mutter: Update to 44.3.
(address . 65644@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
f1c70ac025e48629fdd8f005030e0678bf7ba040.1694031712.git.liliana.prikler@gmail.com
* 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(-)

Toggle diff (43 lines)
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
;; <https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/3047>.
(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
--
2.41.0
L
L
Liliana Marie Prikler wrote on 20 Aug 2023 09:11
[PATCH gnome-team v2 5/9] gnu: gnome-desktop: Update to 44.0.
(address . 65644@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
b18f30d524008c293212945f0131102b3603fc5f.1694031712.git.liliana.prikler@gmail.com
* gnu/packages/gnome.scm (gnome-desktop): Update to 44.0.
---
gnu/packages/gnome.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)
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
--
2.41.0
L
L
Liliana Marie Prikler wrote on 31 Aug 2023 05:37
[PATCH gnome-team v2 6/9] gnu: gnome-session: Update to 44.0.
(address . 65644@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
1aa94384b8bb97258ea99eadb55d45f38dde9841.1694031712.git.liliana.prikler@gmail.com
* gnu/packages/gnome.scm (gnome-session): Update to 44.0.
---
gnu/packages/gnome.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

Toggle diff (24 lines)
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
--
2.41.0
L
L
Liliana Marie Prikler wrote on 20 Aug 2023 09:03
[PATCH gnome-team v2 7/9] gnu: gnome-settings-daemon: Update to 44.1.
(address . 65644@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
4522022a41acf04dbd6eea5ccf9983e486c06eed.1694031712.git.liliana.prikler@gmail.com
* 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(-)

Toggle diff (43 lines)
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
--
2.41.0
L
L
Liliana Marie Prikler wrote on 30 Aug 2023 06:22
[PATCH gnome-team v2 8/9] gnu: gdm: Update to 44.1.
(address . 65644@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
9c28ee9daf0927905916e2102830b958b20a164c.1694031712.git.liliana.prikler@gmail.com
* 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 +-
.../patches/gdm-elogind-support.patch | 93 +++++++++----------
2 files changed, 45 insertions(+), 53 deletions(-)

Toggle diff (187 lines)
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.')
--
2.41.0
L
L
Liliana Marie Prikler wrote on 31 Aug 2023 05:35
[PATCH gnome-team v2 9/9] gnu: gnome-shell: Update to 44.3.
(address . 65644@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
12c3e3341d5d4a3a98c5f6ebe7166034bd025a45.1694031712.git.liliana.prikler@gmail.com
* 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(-)

Toggle diff (72 lines)
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
--
2.41.0
L
L
Liliana Marie Prikler wrote on 20 Aug 2023 09:01
[PATCH gnome-team v2 4/9] gnu: baobab: Update to 44.0.
(address . 65644@debbugs.gnu.org)(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)
f29be169fbd994b5e8a5f62e942e09e2847af745.1694031712.git.liliana.prikler@gmail.com
* 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(-)

Toggle diff (51 lines)
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
--
2.41.0
M
M
Maxim Cournoyer wrote on 7 Sep 2023 03:52
Re: [PATCH gnome-team v2 9/9] gnu: gnome-shell: Update to 44.3.
(name . Liliana Marie Prikler)(address . liliana.prikler@gmail.com)(address . 65644@debbugs.gnu.org)
87a5typx65.fsf@gmail.com
Hi,

This series LGTM as well. Thank you for doing the gcr-4 -> gcr change
suggested!

--
Thanks,
Maxim
L
L
Liliana Marie Prikler wrote on 7 Sep 2023 20:34
(name . Maxim Cournoyer)(address . maxim.cournoyer@gmail.com)(address . 65644-done@debbugs.gnu.org)
387a5807a83b323a2d7fc675d4acef37d1380601.camel@gmail.com
Am Mittwoch, dem 06.09.2023 um 21:52 -0400 schrieb Maxim Cournoyer:
Toggle quote (4 lines)
> Hi,
>
> This series LGTM as well.  Thank you for doing the gcr-4 -> gcr
> change suggested!
Thanks for reviewing.

Pushed
Closed
?
Your comment

This issue is archived.

To comment on this conversation send an email to 65644@debbugs.gnu.org

To respond to this issue using the mumi CLI, first switch to it
mumi current 65644
Then, you may apply the latest patchset in this issue (with sign off)
mumi am -- -s
Or, compose a reply to this issue
mumi compose
Or, send patches to this issue
mumi send-email *.patch