[bug#73128] [PATCH gnome-team v2 10/13] gnu: xdg-desktop-portal-gnome: Update to 46.2.

[bug#73128] [PATCH gnome-team v2 10/13] gnu: xdg-desktop-portal-gnome: Update to 46.2.

[Liliana Marie Prikler]

* gnu/packages/gnome.scm (xdg-desktop-portal-gnome): Update to 46.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 16ace031ad..69091aca2e 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -13212,7 +13212,7 @@ (define-public piper
 (define-public xdg-desktop-portal-gnome
   (package
     (name "xdg-desktop-portal-gnome")
-    (version "44.2")
+    (version "46.2")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
@@ -13220,7 +13220,7 @@ (define-public xdg-desktop-portal-gnome
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "08gznmr718na5p2j8fm7nim5862r2v0sjh68ql5yl0q356n1mvah"))
+                "1mhngp24k06i993kw6kzq0x8hwbbvkk3nq9s0cnm10w4bsi5ximm"))
               (snippet
                #~(begin
                    (use-modules (guix build utils))
-- 
2.45.2

[bug#73128] [PATCH gnome-team v2 12/13] gnu: mutter: Update to 46.4.

[Liliana Marie Prikler]

* gnu/packages/gnome.scm (mutter): Update to 46.4.
[#:configure-flags]: Update accordingly.
[native-inputs]: Replace wayland-protocols with wayland-protocols-next.
Add libei.
[inputs]: Add linux-libre-headers-6.1.
---
 gnu/packages/gnome.scm | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 71aeec0905..90669e6703 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7976,7 +7976,7 @@ (define-public zenity
 (define-public mutter
   (package
     (name "mutter")
-    (version "44.9")
+    (version "46.4")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
@@ -7984,7 +7984,7 @@ (define-public mutter
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0b7wzaj67qzrhgclvqk10fwk4524j4qppl88822mxxlqr40frfnk"))))
+                "1r02fp1z5ikm9ml2m4dvnfdn3nig4wj45cz2gicmdnrak37xj6v1"))))
     ;; 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
@@ -8001,7 +8001,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-12")
+                        #$output "/lib/mutter-14")
          ;; Disable systemd support.
          "-Dsystemd=false"
          ;; Don't install tests.
@@ -8124,19 +8124,20 @@ (define-public mutter
            autoconf
            automake
            libtool
-           wayland-protocols
+           wayland-protocols-next
            ;; For tests.
            ;; Warnings are configured to be fatal during the tests; add an icon
            ;; theme to please libxcursor.
            adwaita-icon-theme
+           libei
            libxcursor                   ;for XCURSOR_PATH
            pipewire
            python
            python-dbus
            python-dbusmock))
     (propagated-inputs
-     (list gsettings-desktop-schemas      ;required by libmutter-12.pc
-           ;; mutter-clutter-12.pc and mutter-cogl-12.pc refer to these:
+     (list gsettings-desktop-schemas      ;required by libmutter-14.pc
+           ;; mutter-clutter-14.pc and mutter-cogl-14.pc refer to these:
            at-spi2-core
            cairo
            eudev
@@ -8171,6 +8172,7 @@ (define-public mutter
            libxkbfile
            libxrandr
            libxtst
+           linux-libre-headers-6.1      ; for dma_buf_export_sync_file
            pipewire
            startup-notification
            sysprof
-- 
2.45.2

[bug#73128] [PATCH gnome-team v2 12/13] gnu: mutter: Update to 46.4.

[Maxim Cournoyer]

Hi,

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

[...]

>             libxrandr
>             libxtst
> +           linux-libre-headers-6.1      ; for dma_buf_export_sync_file
>             pipewire

This reminds me, we should do something about
https://issues.guix.gnu.org/72119.

-- 
Thanks,
Maxim

[bug#73128] [PATCH gnome-team v2 12/13] gnu: mutter: Update to 46.4.

[Liliana Marie Prikler]

Am Samstag, dem 14.09.2024 um 00:01 +0900 schrieb Maxim Cournoyer:
> Hi,
> 
> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> 
> [...]
> 
> >             libxrandr
> >             libxtst
> > +           linux-libre-headers-6.1      ; for
> > dma_buf_export_sync_file
> >             pipewire
> 
> This reminds me, we should do something about
> https://issues.guix.gnu.org/72119.
Not sure if that's related, but it seems you need a Linux 6 kernel for
GNOME now.  I haven't seen a switch to disable it – we would need a
patch for that.

Cheers

[bug#73128] [PATCH gnome-team v2 12/13] gnu: mutter: Update to 46.4.

[Maxim Cournoyer]

Hi Liliana,

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

> Am Samstag, dem 14.09.2024 um 00:01 +0900 schrieb Maxim Cournoyer:
>> Hi,
>> 
>> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
>> 
>> [...]
>> 
>> >             libxrandr
>> >             libxtst
>> > +           linux-libre-headers-6.1      ; for
>> > dma_buf_export_sync_file
>> >             pipewire
>> 
>> This reminds me, we should do something about
>> https://issues.guix.gnu.org/72119.
> Not sure if that's related, but it seems you need a Linux 6 kernel for
> GNOME now.  I haven't seen a switch to disable it – we would need a
> patch for that.

I propose we rename current 'linux-libre-headers' to
'linux-libre-headers/pinned', making 'linux-libre-headers' track latest
from there.

Then, we'd bump linux-libre-headers/pinned to latest in a
world-rebuilding branch.

Does that sound like a plan?

-- 
Thanks,
Maxim

[bug#73128] [PATCH gnome-team v2 12/13] gnu: mutter: Update to 46.4.

[Liliana Marie Prikler]

Am Samstag, dem 14.09.2024 um 22:27 +0900 schrieb Maxim Cournoyer:
> Hi Liliana,
> 
> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> 
> > Am Samstag, dem 14.09.2024 um 00:01 +0900 schrieb Maxim Cournoyer:
> > > Hi,
> > > 
> > > Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> > > 
> > > [...]
> > > 
> > > >             libxrandr
> > > >             libxtst
> > > > +           linux-libre-headers-6.1      ; for
> > > > dma_buf_export_sync_file
> > > >             pipewire
> > > 
> > > This reminds me, we should do something about
> > > https://issues.guix.gnu.org/72119.
> > Not sure if that's related, but it seems you need a Linux 6 kernel
> > for GNOME now.  I haven't seen a switch to disable it – we would
> > need a patch for that.
> 
> I propose we rename current 'linux-libre-headers' to
> 'linux-libre-headers/pinned', making 'linux-libre-headers' track
> latest from there.
> 
> Then, we'd bump linux-libre-headers/pinned to latest in a
> world-rebuilding branch.
> 
> Does that sound like a plan?
SGTM, but I'm not sure whether that's something for gnome-team.  We
might want to discuss this within a wider area.

Cheers

[bug#73128] [PATCH gnome-team v2 12/13] gnu: mutter: Update to 46.4.

[Maxim Cournoyer]

Hi Liliana,

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

> Am Samstag, dem 14.09.2024 um 22:27 +0900 schrieb Maxim Cournoyer:
>> Hi Liliana,
>> 
>> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
>> 
>> > Am Samstag, dem 14.09.2024 um 00:01 +0900 schrieb Maxim Cournoyer:
>> > > Hi,
>> > > 
>> > > Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
>> > > 
>> > > [...]
>> > > 
>> > > >             libxrandr
>> > > >             libxtst
>> > > > +           linux-libre-headers-6.1      ; for
>> > > > dma_buf_export_sync_file
>> > > >             pipewire
>> > > 
>> > > This reminds me, we should do something about
>> > > https://issues.guix.gnu.org/72119.
>> > Not sure if that's related, but it seems you need a Linux 6 kernel
>> > for GNOME now.  I haven't seen a switch to disable it – we would
>> > need a patch for that.
>> 
>> I propose we rename current 'linux-libre-headers' to
>> 'linux-libre-headers/pinned', making 'linux-libre-headers' track
>> latest from there.
>> 
>> Then, we'd bump linux-libre-headers/pinned to latest in a
>> world-rebuilding branch.
>> 
>> Does that sound like a plan?
> SGTM, but I'm not sure whether that's something for gnome-team.  We
> might want to discuss this within a wider area.

Agreed.  I've proposed the same to Leo and Wilker in the thread of
bug#66968 (https://issues.guix.gnu.org/66968).

-- 
Thanks,
Maxim

[bug#73128] [PATCH gnome-team v2 04/13] gnu: gnome-control-center: Update to 46.3.

[Liliana Marie Prikler]

* gnu/packages/gnome.scm (gnome-control-center): Update to 46.3.
[source]: Drop “gnome-control-center-firmware-security.patch”.
[arguments]: Adjust ‘patch-paths’ phase accordingly.
[inputs]: Replace gcr-3 with gcr.
Replace libgnomekbd with tecla.
Add json-glib and libsoup.
---
 gnu/packages/gnome.scm | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 62e53c7789..6bebd03c06 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9296,7 +9296,7 @@ (define-public tecla
 (define-public gnome-control-center
   (package
     (name "gnome-control-center")
-    (version "44.4")
+    (version "46.3")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
@@ -9304,10 +9304,7 @@ (define-public gnome-control-center
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "0mz134argczbkfnxzqsfa1vydx3v44wrldcczyzjanvrq7ia7hli"))
-              (patches
-               (search-patches
-                "gnome-control-center-firmware-security.patch"))))
+                "1fbcwkm1av0026sbx4yqh0a63dv4h6v4bj6byca5j6gf3mynrp4p"))))
     (build-system meson-build-system)
     (arguments
      (list
@@ -9316,13 +9313,13 @@ (define-public gnome-control-center
       #~(modify-phases %standard-phases
           (add-before 'configure 'patch-paths
             (lambda* (#:key inputs #:allow-other-keys)
-              (substitute* "panels/datetime/tz.h"
+              (substitute* "panels/system/datetime/tz.h"
                 (("/usr/share/zoneinfo/zone.tab")
                  (search-input-file inputs "share/zoneinfo/zone.tab")))
               (substitute* "tests/datetime/test-endianess.c"
                 (("/usr/share/locale")
                  (search-input-directory inputs "share/locale")))
-              (substitute* "panels/region/cc-region-panel.c"
+              (substitute* "panels/system/region/cc-region-page.c"
                 (("\"gkbd-keyboard-display")
                  (string-append "\"" (search-input-file
                                       inputs "bin/gkbd-keyboard-display"))))
@@ -9372,7 +9369,7 @@ (define-public gnome-control-center
            colord-gtk
            cups
            dconf
-           gcr-3
+           gcr
            gnome-bluetooth
            gnome-desktop
            gnome-online-accounts
@@ -9382,14 +9379,15 @@ (define-public gnome-control-center
            grilo
            gsound
            ibus
+           json-glib
            libadwaita
-           libgnomekbd
            libgudev
            libgtop
            libnma
            libpwquality
            (librsvg-for-system)             ;for loading SVG files
            libsecret
+           libsoup
            libxml2
            libwacom
            mesa
@@ -9399,6 +9397,7 @@ (define-public gnome-control-center
            polkit
            pulseaudio
            samba
+           tecla
            tzdata
            udisks
            upower))
-- 
2.45.2

[bug#73128] [PATCH gnome-team v2 07/13] gnu: Add libei.

[Liliana Marie Prikler]

* gnu/packages/freedesktop.scm (libei): New variable.

Co-authored-by: Vivien Kraus <vivien@planete-kraus.eu>
---
 gnu/packages/freedesktop.scm | 52 ++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index cb1d625d24..f898f28a30 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -735,6 +735,58 @@ (define-public libinput-minimal
                "-Ddebug-gui=false"    ;requires gtk+@3
                ,flags))))))
 
+(define-public libei
+  (package
+    (name "libei")
+    (version "1.3.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://gitlab.freedesktop.org/libinput/libei.git")
+                    (commit version)))
+              (sha256
+               (base32
+                "0idbl20ax060s7m435rszfv7c0bvpinjvq45qbqwvcvp0hg8r9y8"))
+              (snippet
+               #~(begin
+                   (use-modules (guix build utils))
+                   ;; Unbundle munit, we provide it as input.
+                   (substitute* "test/meson.build"
+                     (("subproject\\('munit'")
+                      "# subproject('munit'")
+                     ((", fallback: \\['munit', 'munit_dep'\\]")
+                      ""))
+                   (delete-file-recursively "subprojects")))))
+    (build-system meson-build-system)
+    (arguments
+     (list
+      #:configure-flags #~'("-Ddocumentation=api" ;protocol requires hugo
+                            "-Dsd-bus-provider=libelogind")))
+    (inputs
+     (list elogind libevdev libxkbcommon))
+    (propagated-inputs
+     ;; liboeffis-1.0.pc requires.private libelogind
+     (list elogind))
+    (native-inputs
+     (list doxygen
+           libxml2
+           munit
+           pkg-config
+           python
+           python-attrs
+           python-black
+           python-dbusmock
+           python-jinja2
+           python-pytest
+           python-structlog
+           valgrind/interactive))
+    (home-page "https://libinput.pages.freedesktop.org/libei/")
+    (synopsis "Emulated Input protocol implementation")
+    (description
+     "Libei provides a client and server implementation of the @acronym{EI,
+Emulated Input} protocol for Wayland compositors.")
+    (license license:x11)))
+
 (define-public libxdg-basedir
   (package
     (name "libxdg-basedir")
-- 
2.45.2

[bug#73128] [PATCH gnome-team v2 02/13] gnu: gnome-music: Update to 46.0.

[Liliana Marie Prikler]

* gnu/packages/gnome.scm (gnome-music): Update to 46.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 85831af3dc..7889fac877 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -908,7 +908,7 @@ (define-public gnome-photos
 (define-public gnome-music
   (package
     (name "gnome-music")
-    (version "44.0")
+    (version "46.0")
     (source
      (origin
        (method url-fetch)
@@ -918,7 +918,7 @@ (define-public gnome-music
                        name "-" version ".tar.xz"))
        (sha256
         (base32
-         "0l8xiw1nv8agskrpgiyr7kinna3gms1hv5d64hh4fqifaz4smlcv"))))
+         "0pzcqmmzcp71ls9bl85nqwi2wf4lqg3izdwa5ypzd4k8077dal54"))))
     (build-system meson-build-system)
     (arguments
      (list
-- 
2.45.2

[bug#73128] [PATCH gnome-team v2 08/13] gnu: xdg-desktop-portal: Update to 1.18.4.

[dan]

* gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it.
* gnu/packages/freedesktop.scm (xdg-desktop-portal): Update to 1.18.4.
[patches]: Disable portal tests.
[native-inputs]: Remove autoconf, automake, libtool and which.  Add python,
python-dbusmock, python-pytest and python-pytest-xdist.
[inputs]: Add bubblewrap.
[arguments]<#:configure-flags>: Replace “--with-systemd=no” with
“-Dsystemd=disabled”.

Change-Id: Ic9876565e9119443fedd082273be4f372ebce1d4
Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
---
 gnu/local.mk                                  |  1 +
 gnu/packages/freedesktop.scm                  | 25 +++++----
 ...-desktop-portal-disable-portal-tests.patch | 56 +++++++++++++++++++
 3 files changed, 72 insertions(+), 10 deletions(-)
 create mode 100644 gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index bbf342119c..4c956eee82 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -2295,6 +2295,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/wordnet-CVE-2008-3908-pt2.patch			\
   %D%/packages/patches/wpa-supplicant-dbus-group-policy.patch		\
   %D%/packages/patches/x265-arm-flags.patch			\
+  %D%/packages/patches/xdg-desktop-portal-disable-portal-tests.patch\
   %D%/packages/patches/xdg-desktop-portal-wlr-harcoded-length.patch\
   %D%/packages/patches/xen-docs-use-predictable-ordering.patch	\
   %D%/packages/patches/xen-remove-config.gz-timestamp.patch	\
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index f898f28a30..e593bf4ebb 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -39,6 +39,7 @@
 ;;; Copyright © 2024 aurtzy <aurtzy@gmail.com>
 ;;; Copyright © 2024 Dariqq <dariqq@posteo.net>
 ;;; Copyright © 2024 Wilko Meyer <w@wmeyer.eu>
+;;; Copyright © 2024 dan <i@dan.games>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -136,6 +137,7 @@ (define-module (gnu packages freedesktop)
   #:use-module (gnu packages tls)
   #:use-module (gnu packages valgrind)
   #:use-module (gnu packages video)
+  #:use-module (gnu packages virtualization)
   #:use-module (gnu packages w3m)
   #:use-module (gnu packages web)
   #:use-module (gnu packages xdisorg)
@@ -3038,7 +3040,7 @@ (define-public libportal
 (define-public xdg-desktop-portal
   (package
     (name "xdg-desktop-portal")
-    (version "1.16.0")
+    (version "1.18.4")
     (source
      (origin
        (method url-fetch)
@@ -3047,18 +3049,21 @@ (define-public xdg-desktop-portal
              version "/xdg-desktop-portal-" version ".tar.xz"))
        (sha256
         (base32
-         "06cczlh39kc41rvav06v37sad827y61rffy3v29i918ibj8sahav"))))
-    (build-system gnu-build-system)
+         "0r8y8qmzcfj7b7brqcxr9lg8pavfds815ffvj0kqc378fhgaln5q"))
+       ;; Disable portal tests since they try to use fuse.
+       (patches (search-patches "xdg-desktop-portal-disable-portal-tests.patch"))))
+    (build-system meson-build-system)
     (native-inputs
      `(("pkg-config" ,pkg-config)
-       ("autoconf" ,autoconf)
-       ("automake" ,automake)
-       ("libtool" ,libtool)
        ("glib:bin" ,glib "bin")
-       ("which" ,which)
-       ("gettext" ,gettext-minimal)))
+       ("gettext" ,gettext-minimal)
+       ("python" ,python)
+       ("python-dbusmock" ,python-dbusmock)
+       ("python-pytest" ,python-pytest)
+       ("python-pytest-xdist" ,python-pytest-xdist)))
     (inputs
-     `(("gdk-pixbuf" ,gdk-pixbuf)
+     `(("bubblewrap" ,bubblewrap)
+       ("gdk-pixbuf" ,gdk-pixbuf)
        ("glib" ,glib)
        ("flatpak" ,flatpak)
        ("fontconfig" ,fontconfig)
@@ -3070,7 +3075,7 @@ (define-public xdg-desktop-portal
        ("fuse" ,fuse)))
     (arguments
      `(#:configure-flags
-       (list "--with-systemd=no")
+       (list "-Dsystemd=disabled")
        #:phases
        (modify-phases %standard-phases
          (add-after 'unpack 'po-chmod
diff --git a/gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch b/gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch
new file mode 100644
index 0000000000..5e13493613
--- /dev/null
+++ b/gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch
@@ -0,0 +1,56 @@
+From b7750fa99c31c5f28ac2053fa154bef4038b5cc0 Mon Sep 17 00:00:00 2001
+From: dan <i@dan.games>
+Date: Fri, 13 Sep 2024 09:37:01 +0200
+Subject: [PATCH] tests: remove portal tests.
+
+---
+ tests/meson.build | 24 ------------------------
+ 1 file changed, 24 deletions(-)
+
+diff --git a/tests/meson.build b/tests/meson.build
+index a2dafee..bcd87be 100644
+--- a/tests/meson.build
++++ b/tests/meson.build
+@@ -181,18 +181,6 @@ portal_tests = [
+ 
+ test_env = env_tests
+ test_env.set('XDG_CURRENT_DESKTOP', 'test')
+-foreach p : portal_tests
+-    test(
+-      'test-portals-@0@'.format(p),
+-      test_portals,
+-      args: ['--verbose', '--keep-going', '--tap', '-p', '/portal/@0@'.format(p)],
+-      depends: [test_backends, test_portals],
+-      env: test_env,
+-      is_parallel: false,
+-      protocol: test_protocol,
+-      suite: 'portals',
+-    )
+-endforeach
+ 
+ # Split the portal tests into one test per portal, this makes debugging a lot
+ # easier.
+@@ -204,18 +192,6 @@ portal_limited = [
+ 
+ limited_env = env_tests
+ limited_env.set('XDG_CURRENT_DESKTOP', 'limited')
+-foreach p : portal_limited
+-    test(
+-      'limited-portals-@0@'.format(p),
+-      limited_portals,
+-      args: ['--verbose', '--keep-going', '--tap', '-p', '/limited/@0@'.format(p)],
+-      depends: [test_backends, limited_portals],
+-      env: limited_env,
+-      is_parallel: false,
+-      protocol: test_protocol,
+-      suite: 'portals',
+-    )
+-endforeach
+ 
+ if enable_installed_tests
+   install_data(
+
+base-commit: 11c8a96b147aeae70e3f770313f93b367d53fedd
+-- 
+2.41.0
+
-- 
2.45.2

[bug#73128] [PATCH gnome-team v2 06/13] gnu: Add munit.

[Vivien Kraus]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 2473 bytes --]

* gnu/packages/check.scm (munit): New variable.

Change-Id: I193e55ef4ceec1d62f595dd779f7b3d76154fad4
Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
---
 gnu/packages/check.scm | 40 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 248d1c4231..fd865552fc 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -4206,3 +4206,43 @@ (define-public subunit
 command line filters to process a subunit stream and language bindings for
 Python, C, C++ and shell.  Bindings are easy to write for other languages.")
     (license (list license:asl2.0 license:bsd-3)))) ;user can pick
+
+(define-public munit
+  ;; Last release in 2016, see also <https://github.com/nemequ/munit/issues/95>.
+  (let ((commit "fbbdf1467eb0d04a6ee465def2e529e4c87f2118")
+        (revision "1"))
+    (package
+      (name "munit")
+      (version (git-version "0.2.0" revision commit))
+      (source (origin
+                (method git-fetch)
+                (uri (git-reference
+                      (url "https://github.com/nemequ/munit")
+                      (commit commit)))
+                (file-name (git-file-name name version))
+                (sha256
+                 (base32
+                  "13725v4pps2bpndniksa58nqi9gvx0f0900k0rqvp95bxw5z8vda"))))
+      (build-system meson-build-system)
+      (arguments
+       (list
+        #:phases
+        #~(modify-phases %standard-phases
+            (add-after 'unpack 'fix-install
+              ;; munit is paradoxically configured to only be installed
+              ;; when built as a subproject.
+              ;; See <https://github.com/nemequ/munit/pull/67> for a
+              ;; pull request that aims to fix this.  As we don't care about
+              ;; bundling scenarios (or rather: aim to unbundle everything),
+              ;; install it unconditionally.
+              (lambda _
+                (substitute* "meson.build"
+                  (("install: meson.is_subproject\\(\\)")
+                   "install: true")))))))
+      (synopsis "Small unit testing framework for C")
+      (description
+       "µnit is a small testing framework for C with nested test suites,
+parameterized tests, timing of the wall clock and CPU time, reproducible
+random number generation, and more.")
+      (home-page "https://nemequ.github.io/munit/")
+      (license license:x11))))
-- 
2.45.2

[bug#73128] [PATCH gnome-team v2 11/13] gnu: sysprof: Propagate libdex.

[Liliana Marie Prikler]

* gnu/packages/gnome.scm (sysprof)[inputs]: Move libdex from here…
[propagated-inputs]: … to here.
---
 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 69091aca2e..71aeec0905 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -13429,14 +13429,13 @@ (define-public sysprof
                  "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 libadwaita libdex polkit))
     (inputs
      (list glib
            gtk
            json-glib
            libadwaita
            libdazzle
-           libdex
            libpanel
            libunwind
            polkit))
-- 
2.45.2

[bug#73128] [PATCH gnome-team v2 09/13] gnu: xdg-desktop-portal: Improve style.

[Liliana Marie Prikler]

* gnu/packages/freedesktop.scm (xdg-desktop-portal) [inputs]: Move after
arguments.  Drop labels.
[native-inputs]: Move after inputs.  Drop labels.
---
 gnu/packages/freedesktop.scm | 40 ++++++++++++++++++------------------
 1 file changed, 20 insertions(+), 20 deletions(-)

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index e593bf4ebb..d539e5fe31 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -3053,26 +3053,6 @@ (define-public xdg-desktop-portal
        ;; Disable portal tests since they try to use fuse.
        (patches (search-patches "xdg-desktop-portal-disable-portal-tests.patch"))))
     (build-system meson-build-system)
-    (native-inputs
-     `(("pkg-config" ,pkg-config)
-       ("glib:bin" ,glib "bin")
-       ("gettext" ,gettext-minimal)
-       ("python" ,python)
-       ("python-dbusmock" ,python-dbusmock)
-       ("python-pytest" ,python-pytest)
-       ("python-pytest-xdist" ,python-pytest-xdist)))
-    (inputs
-     `(("bubblewrap" ,bubblewrap)
-       ("gdk-pixbuf" ,gdk-pixbuf)
-       ("glib" ,glib)
-       ("flatpak" ,flatpak)
-       ("fontconfig" ,fontconfig)
-       ("json-glib" ,json-glib)
-       ("libportal" ,libportal)
-       ("dbus" ,dbus)
-       ("geoclue" ,geoclue)
-       ("pipewire" ,pipewire)
-       ("fuse" ,fuse)))
     (arguments
      `(#:configure-flags
        (list "-Dsystemd=disabled")
@@ -3086,6 +3066,26 @@ (define-public xdg-desktop-portal
                        (find-files "po" "\\.po$"))))
          (add-after 'unpack 'set-home-directory
            (lambda _ (setenv "HOME" "/tmp"))))))
+    (inputs
+     (list bubblewrap
+           dbus
+           flatpak
+           fontconfig
+           fuse
+           gdk-pixbuf
+           geoclue
+           glib
+           json-glib
+           libportal
+           pipewire))
+    (native-inputs
+     (list gettext-minimal
+           `(,glib "bin")
+           pkg-config
+           python
+           python-dbusmock
+           python-pytest
+           python-pytest-xdist))
     (native-search-paths
      (list (search-path-specification
             (variable "XDG_DESKTOP_PORTAL_DIR")
-- 
2.45.2

[bug#73128] [PATCH gnome-team v2 13/13] gnu: gnome-remote-desktop: Update to 46.3.

[Liliana Marie Prikler]

* gnu/packages/gnome.scm (gnome-remote-desktop): Update to 46.3.
[#:configure-flags]: Drop “-Dfdk_aac=false”.
[#:phases]: Drop ‘shorten-vnc-test’.
[inputs]: Add libei and wireplumber.
[native-inputs]: Add xdg-desktop-portal-gnome.
---
 gnu/packages/gnome.scm | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 90669e6703..9cecc3c044 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -13950,7 +13950,7 @@ (define-public xffm+
 (define-public gnome-remote-desktop
   (package
     (name "gnome-remote-desktop")
-    (version "44.2")
+    (version "46.3")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
@@ -13958,30 +13958,18 @@ (define-public gnome-remote-desktop
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "13kvr1f2vk0qfqr9alpz7wb542b5d5i9ypk74rnn7jsz3csgv7vs"))))
+                "156pfx61mfwjr413w0zawb0pshh2ypl2k29ajys9wqyl25pnbih8"))))
     (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
@@ -14010,6 +13998,7 @@ (define-public gnome-remote-desktop
      (list cairo
            glib
            libdrm
+           libei
            libepoxy
            libgudev
            libnotify
@@ -14020,6 +14009,7 @@ (define-public gnome-remote-desktop
              '(gnu packages vnc))
             'libvnc)
            pipewire
+           wireplumber
            tpm2-tss))
     (native-inputs
      (list asciidoc
@@ -14035,7 +14025,8 @@ (define-public gnome-remote-desktop
            pkg-config
            python
            python-dbus
-           python-pygobject))
+           python-pygobject
+           xdg-desktop-portal-gnome))
     (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.")
-- 
2.45.2

[bug#73128] [PATCH gnome-team v2 13/13] gnu: gnome-remote-desktop: Update to 46.3.

[Maxim Cournoyer]

Hi,

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

> * gnu/packages/gnome.scm (gnome-remote-desktop): Update to 46.3.
> [#:configure-flags]: Drop “-Dfdk_aac=false”.
> [#:phases]: Drop ‘shorten-vnc-test’.
> [inputs]: Add libei and wireplumber.
> [native-inputs]: Add xdg-desktop-portal-gnome.

Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail>

(for the whole v2 series)

-- 
Thanks,
Maxim

[bug#73128] [PATCH gnome-team v2 01/13] gnu: orca: Update to 46.2.

[Liliana Marie Prikler]

* gnu/packages/gnome.scm (orca): Update to 46.2.
[build-system]: Use meson-build-system.
[arguments]: Add #:glib-or-gtk?.
<#:phases>: Add ‘skip-gtk-update-icon-cache’.
---
 gnu/packages/gnome.scm | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index abe1255712..85831af3dc 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -11438,7 +11438,7 @@ (define-public python-pyatspi
 (define-public orca
   (package
     (name "orca")
-    (version "44.2")
+    (version "46.2")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -11447,11 +11447,17 @@ (define-public orca
                     name "-" version ".tar.xz"))
               (sha256
                (base32
-                "11jn925ga970y74did96ms78pc3lshkd9rd8v82i6zdzigxa7yvd"))))
-    (build-system glib-or-gtk-build-system)
+                "0ppx7svqpjhljf8by3x9xvm46b3gw6f6m7r2gj2k172g3adjjqwg"))))
+    (build-system meson-build-system)
     (arguments
-     '(#:phases
+     '(#: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 'configure 'qualify-programs
            (lambda* (#:key inputs #:allow-other-keys)
              (let ((xkbcomp (string-append
-- 
2.45.2

[bug#73128] [PATCH gnome-team v2 05/13] gnu: gdm: Update to 46.2.

[Liliana Marie Prikler]

* gnu/packages/gnome.scm (gdm): Update to 46.2.
[source]: Drop “gdm-elogind-support.patch”.
[#:phases]<pre-configure>: Fix handling of dconf.
[inputs]: Sort.  Ad json-glib.
* gnu/packages/patches/gdm-elogind-support.patch: Remove file.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
---
 gnu/local.mk                                  |   1 -
 gnu/packages/gnome.scm                        |  22 +-
 .../patches/gdm-elogind-support.patch         | 199 ------------------
 3 files changed, 12 insertions(+), 210 deletions(-)
 delete mode 100644 gnu/packages/patches/gdm-elogind-support.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 5e100ea756..bbf342119c 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1356,7 +1356,6 @@ dist_patch_DATA =						\
   %D%/packages/patches/gd-fix-tests-on-i686.patch		\
   %D%/packages/patches/gd-brect-bounds.patch			\
   %D%/packages/patches/gdm-default-session.patch		\
-  %D%/packages/patches/gdm-elogind-support.patch		\
   %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	\
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 6bebd03c06..16ace031ad 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -8974,7 +8974,7 @@ (define-public libxml++-2
 (define-public gdm
   (package
     (name "gdm")
-    (version "44.1")
+    (version "46.2")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
@@ -8982,11 +8982,10 @@ (define-public gdm
                                   name "-" version ".tar.xz"))
               (sha256
                (base32
-                "03avvkrm2jd0731ggh9cjnkhrfysqp4slrq0km3gqa3xpqx6n9k8"))
+                "12r6ppsdq9f0rlhfwldwhilshb1blp6m0944rm872lqn5914bqsf"))
               (patches
                (search-patches
                 "gdm-default-session.patch"
-                "gdm-elogind-support.patch"
                 "gdm-remove-hardcoded-xwayland-path.patch"
                 "gdm-wayland-session-wrapper-from-env.patch"
                 "gdm-pass-gdk-pixbuf-loader-env.patch"))))
@@ -9033,6 +9032,10 @@ (define-public gdm
                  (search-input-file inputs "bin/dbus-run-session")))))
           (add-before 'configure 'pre-configure
             (lambda* (#:key inputs #:allow-other-keys)
+              ;; We don't want to write to other packages.
+              (substitute* "meson.build"
+                (("if dconf_dep\\.found\\(\\)" all)
+                 (string-append all " and false")))
               ;; We don't have <systemd/sd-daemon.h>.
               (substitute* '("common/gdm-log.c"
                              "daemon/gdm-server.c"
@@ -9184,23 +9187,22 @@ (define-public gdm
            pkg-config))
     (inputs
      (list accountsservice
-           check                        ;for testing
+           at-spi2-core
+           check                        ; for testing
            dbus
+           dconf                        ; for wrap-accessibility-dependencies
            egl-wayland
            elogind
            eudev
            gnome-session
+           gnome-control-center
            gnome-settings-daemon
            gtk+
            iso-codes
+           json-glib
            libcanberra
            libgudev
-           linux-pam
-
-           ;; accessibility dependencies
-           at-spi2-core
-           dconf
-           gnome-control-center))
+           linux-pam))
     (synopsis "Display manager for GNOME")
     (home-page "https://wiki.gnome.org/Projects/GDM/")
     (description
diff --git a/gnu/packages/patches/gdm-elogind-support.patch b/gnu/packages/patches/gdm-elogind-support.patch
deleted file mode 100644
index b27e000585..0000000000
--- a/gnu/packages/patches/gdm-elogind-support.patch
+++ /dev/null
@@ -1,199 +0,0 @@
-https://gitlab.gnome.org/GNOME/gdm/-/merge_requests/113
-
-From 462cc0f5346f5913cf7151044f1c232c5d21c1c3 Mon Sep 17 00:00:00 2001
-From: Dudemanguy <random342@airmail.cc>
-Date: Fri, 13 Sep 2024 09:37:01 +0200
-Subject: [PATCH] meson: allow building with elogind
-
-Currently, the GDM meson build has a hard dependency on systemd.
-However, GDM can function just fine if one is using elogind. This allows
-a user to build GDM against libelogind and also disable the systemd
-system and user units.
----
- common/meson.build                       |  2 +-
- data/meson.build                         | 62 ++++++++++++++----------
- data/pam-arch/gdm-launch-environment.pam |  1 +
- libgdm/meson.build                       |  2 +-
- meson.build                              | 36 +++++++++-----
- meson_options.txt                        |  5 +-
- 6 files changed, 66 insertions(+), 42 deletions(-)
-
-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(
- )
- 
- libgdmcommon_deps = [
--  libsystemd_dep,
-+  logind_dep,
-   gobject_dep,
-   gio_dep,
-   gio_unix_dep,
-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
- 
--if get_option('systemdsystemunitdir') != ''
--  systemd_systemunitdir = get_option('systemdsystemunitdir')
--else
--  systemd_systemunitdir = systemd_dep.get_pkgconfig_variable('systemdsystemunitdir')
-+systemdsystemunitdir = get_option('systemdsystemunitdir')
-+if systemdsystemunitdir != 'no'
-+  assert(systemd_dep.found(), 'systemd required but not found, please provide a valid systemd system unit dir or disable it')
-+  if get_option('systemdsystemunitdir') != ''
-+    systemd_systemunitdir = get_option('systemdsystemunitdir')
-+  else
-+    systemd_systemunitdir = systemd_dep.get_pkgconfig_variable('systemdsystemunitdir')
-+  endif
- endif
- 
--if get_option('systemduserunitdir') != ''
--  systemd_userunitdir = get_option('systemduserunitdir')
--else
--  systemd_userunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir',
--                                                           define_variable: ['prefix', get_option('prefix')])
-+systemduserunitdir = get_option('systemduserunitdir')
-+if systemduserunitdir != 'no'
-+  assert(systemd_dep.found(), 'systemd required but not found, please provide a valid systemd user unit dir or disable it')
-+  if get_option('systemduserunitdir') != ''
-+    systemd_userunitdir = get_option('systemduserunitdir')
-+  else
-+    systemd_userunitdir = systemd_dep.get_pkgconfig_variable('systemduserunitdir',
-+                                                             define_variable: ['prefix', get_option('prefix')])
-+  endif
- endif
- 
--configure_file(
--  input: 'gdm.service.in',
--  output: '@BASENAME@',
--  configuration: service_config,
--  install_dir: systemd_systemunitdir,
--  format: 'cmake'
--)
-+if systemdsystemunitdir != 'no'
-+  configure_file(
-+    input: 'gdm.service.in',
-+    output: '@BASENAME@',
-+    configuration: service_config,
-+    install_dir: systemd_systemunitdir,
-+    format: 'cmake'
-+  )
-+endif
- 
- gdm_gnome_session_wanted_targets = []
- foreach component: gdm_gnome_user_session_wanted_components
-   gdm_gnome_session_wanted_targets += 'Wants=@0@.target'.format(component)
- endforeach
- 
--configure_file(
--  input: 'session.conf.in',
--  output: 'session.conf',
--  configuration: {
--    'requires_component': gdm_gnome_shell_component,
--    'wants_required_components': '\n'.join(gdm_gnome_session_wanted_targets),
--  },
--  install_dir: systemd_userunitdir / 'gnome-session@gnome-login.target.d',
--)
-+if systemduserunitdir != 'no'
-+  configure_file(
-+    input: 'session.conf.in',
-+    output: 'session.conf',
-+    configuration: {
-+      'requires_component': gdm_gnome_shell_component,
-+      'wants_required_components': '\n'.join(gdm_gnome_session_wanted_targets),
-+    },
-+    install_dir: systemd_userunitdir / 'gnome-session@gnome-login.target.d',
-+  )
-+endif
- 
- # XSession
- if get_option('gdm-xsession')
-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,
-   gio_unix_dep,
--  libsystemd_dep,
-+  logind_dep,
-   libgdmcommon_dep,
- ]
- 
-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_dep = dependency('systemd')
--libsystemd_dep = dependency('libsystemd')
--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
-+  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
-+  elogind_dep = dependency('libelogind')
-+  logind_dep = elogind_dep
-+  systemd_x_server = 'disabled'
-+endif
- # Plymouth
- plymouth_dep = dependency('ply-boot-client', required: get_option('plymouth'))
- # Check for Solaris auditing API (ADT)
-@@ -319,6 +327,7 @@ summary({
-     'PAM Syslog': have_pam_syslog,
-     'Supports PAM Extensions': pam_extensions_supported,
-     'SeLinux': libselinux_dep.found(),
-+    'Logind Provider': get_option('logind-provider'),
-     'Use GDM Xsession': get_option('gdm-xsession'),
-     'Use UserDisplayServer': get_option('user-display-server'),
-     'Use SystemdJournal': get_option('systemd-journal'),
-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.')
-+option('logind-provider', type: 'combo', choices: ['systemd', 'elogind'], value: 'systemd', description: 'Which logind library to use.')
- 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
- 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.')
--option('systemdsystemunitdir', type: 'string', value: '', description: 'Directory for systemd service files.')
--option('systemduserunitdir', type: 'string', value: '', description: 'Directory for systemd user service files.')
-+option('systemdsystemunitdir', type: 'string', value: '', description: 'Directory for systemd service files, or \'no\' to disable.')
-+option('systemduserunitdir', type: 'string', value: '', description: 'Directory for systemd user service files, or \'no\' to disable.')
- option('tcp-wrappers', type: 'boolean', value: false, description: 'Use TCP wrappers.')
- option('udev-dir', type: 'string', value: '', description: 'Directory for udev rules file.')
- option('user', type: 'string', value: 'gdm', description: 'GDM\'s username.')
-- 
2.45.2

[bug#73128] [PATCH gnome-team v2 03/13] gnu: gnome-session: Update to 46.0.

[Liliana Marie Prikler]

* gnu/packages/gnome.scm (gnome-session): Update to 46.0.
[arguments]: Change to list of G-Expressions.
<#:configure-flags>: Move above #:phases.
Drop “-Delogind=true”, “-Dsystemd=false”, “-Dsystemd_session=disable”, and
“-Dsystemd_journal=false”.
Add “-Dsystemduserunitdir=$output/share/systemd”.
* gnu/packages/patches/gnome-session-support-elogind.patch: Adjust accordingly.
---
 gnu/packages/gnome.scm                        | 33 ++++----
 .../gnome-session-support-elogind.patch       | 84 ++++---------------
 2 files changed, 33 insertions(+), 84 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 7889fac877..62e53c7789 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7764,7 +7764,7 @@ (define-public file-roller
 (define-public gnome-session
   (package
     (name "gnome-session")
-    (version "44.0")
+    (version "46.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/" name "/"
@@ -7773,23 +7773,22 @@ (define-public gnome-session
               (patches (search-patches "gnome-session-support-elogind.patch"))
               (sha256
                (base32
-                "1ipjvcjabifqgmrz65m3vwmhk99nbm8jcxcikyg5w4r6cnljky6c"))))
+                "0m4sgfzpkrhpy9bpmjiig3h8sypsmdl25zlil7hw82q9yr565qf6"))))
     (arguments
-     `(#:glib-or-gtk? #t
-       #:phases
-       (modify-phases %standard-phases
-         (add-after 'install 'wrap-gnome-session
-           (lambda* (#:key native-inputs inputs outputs #:allow-other-keys)
-             ;; Make sure 'gnome-session' finds the 'gsettings' program.
-             (wrap-program (search-input-file outputs "bin/gnome-session")
-               `("PATH" ":" prefix
-                 (,(dirname (search-input-file (or native-inputs inputs)
-                                               "bin/gdbus"))))))))
-       #:configure-flags
-       '("-Delogind=true"
-         "-Dsystemd=false"
-         "-Dsystemd_session=disable"
-         "-Dsystemd_journal=false")))
+     (list
+      #:glib-or-gtk? #t
+      #:configure-flags
+      #~(list (string-append "-Dsystemduserunitdir="
+                             #$output "/share/systemd"))
+      #:phases
+      #~(modify-phases %standard-phases
+          (add-after 'install 'wrap-gnome-session
+            (lambda* (#:key native-inputs inputs outputs #:allow-other-keys)
+              ;; Make sure 'gnome-session' finds the 'gsettings' program.
+              (wrap-program (search-input-file outputs "bin/gnome-session")
+                `("PATH" ":" prefix
+                  (,(dirname (search-input-file (or native-inputs inputs)
+                                                "bin/gdbus"))))))))))
     (build-system meson-build-system)
     (native-inputs
      (list docbook-xml-4.1.2
diff --git a/gnu/packages/patches/gnome-session-support-elogind.patch b/gnu/packages/patches/gnome-session-support-elogind.patch
index b52b4c6855..9b9fef3168 100644
--- a/gnu/packages/patches/gnome-session-support-elogind.patch
+++ b/gnu/packages/patches/gnome-session-support-elogind.patch
@@ -1,73 +1,23 @@
 This patch, borrowed from Gentoo, allows configuring gnome-sesssion with
 elogind support.
 
-https://gitweb.gentoo.org/repo/gentoo.git/plain/gnome-base/gnome-session/files/gnome-session-3.38.0-meson-Support-elogind.patch?id=5f7fe88af5f888aff58fa0c069c3fe07973c7cd2
+https://gitweb.gentoo.org/repo/gentoo.git/plain/gnome-base/gnome-session/files/gnome-session-46.0-meson-Support-elogind.patch?id=47aae21c1beeef930aa7e2125d93e52bf237d2b9
 
-From 4454f2a63394b69fba2c900151165ad8b5742f31 Mon Sep 17 00:00:00 2001
-From: Mart Raudsepp <leio@gentoo.org>
-Date: Fri, 13 Sep 2024 09:37:01 +0200
-Subject: [PATCH] meson: Support elogind
-
----
- meson.build       | 12 +++++++++---
- meson_options.txt |  1 +
- 2 files changed, 10 insertions(+), 3 deletions(-)
-
-diff --git a/meson.build b/meson.build
-index ef5132c6..7f68aaae 100644
---- a/meson.build
-+++ b/meson.build
-@@ -124,8 +124,10 @@ enable_systemd = get_option('systemd')
- enable_systemd_session = get_option('systemd_session') != 'disable'
- use_systemd_session = get_option('systemd_session') == 'default'
- enable_systemd_journal = get_option('systemd_journal')
-+enable_elogind = get_option('elogind')
- enable_consolekit = get_option('consolekit')
--if enable_systemd or enable_consolekit
-+assert(not (enable_systemd and enable_elogind), 'Can not support systemd and elogind at once')
-+if enable_systemd or enable_elogind or enable_consolekit
-   session_bin_deps += dependency('gio-unix-2.0', version: glib_req_version)
- 
-   # Check for systemd
-@@ -152,6 +154,10 @@ if enable_systemd or enable_consolekit
-     endif
- 
-     session_tracking = 'systemd'
-+  elif enable_elogind
-+    libelogind_dep = dependency('libelogind', version: '>= 239.4')
-+    session_bin_deps += libelogind_dep
-+    session_tracking = 'elogind'
-   endif
- 
-   # Check for ConsoleKit
-@@ -161,7 +167,7 @@ if enable_systemd or enable_consolekit
+--- a/meson.build	2024-07-29 16:43:01.812864903 +0200
++++ b/meson.build	2024-07-29 16:54:16.654741387 +0200
+@@ -113,8 +113,13 @@
+                                                  pkgconfig_define: ['prefix', session_prefix])
+ endif
  
-     session_bin_deps += dbus_glib_dep
+-libsystemd_dep = dependency('libsystemd', version: '>= 209', required: true)
+-session_bin_deps += libsystemd_dep
++libsystemd_dep = dependency('libsystemd', version: '>= 209', required: false)
++if libsystemd_dep.found()
++  session_bin_deps += libsystemd_dep
++else
++  elogind_dep = dependency('libelogind', version: '>=209', required: true)
++  session_bin_deps += elogind_dep
++endif
  
--    if enable_systemd
-+    if enable_systemd or enable_elogind
-       session_tracking += ' (with fallback to ConsoleKit)'
-     else
-       session_tracking = 'ConsoleKit'
-@@ -171,7 +177,7 @@ endif
- if enable_systemd_session
-   assert(enable_systemd, 'Systemd support must be enabled when using systemd session management')
- endif
--config_h.set('HAVE_SYSTEMD', enable_systemd)
-+config_h.set('HAVE_SYSTEMD', enable_systemd or enable_elogind)
- config_h.set('ENABLE_SYSTEMD_SESSION', enable_systemd_session)
- config_h.set('ENABLE_SYSTEMD_JOURNAL', enable_systemd_journal)
- config_h.set('HAVE_CONSOLEKIT', enable_consolekit)
-diff --git a/meson_options.txt b/meson_options.txt
-index 4c05dc6e..512d1528 100644
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -1,4 +1,5 @@
- option('deprecation_flags', type: 'boolean', value: false, description: 'use *_DISABLE_DEPRECATED flags')
-+option('elogind', type: 'boolean', value: true, description: 'Use elogind')
- option('session_selector', type: 'boolean', value: false, description: 'enable building a custom session selector dialog')
- option('systemd', type: 'boolean', value: true, description: 'Use systemd')
- option('systemd_session', type: 'combo', choices: ['disable', 'enable', 'default'], value: 'default', description: 'Whether to include systemd session support and use it by default')
--- 
-2.26.2
-
+ configure_file(
+   output: 'config.h',
\ No newline at end of file
-- 
2.45.2