unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#73128] [PATCH gnome-team 01/12] gnu: orca: Update to 46.2.
  2024-09-08 21:02 [bug#73128] [PATCH gnome-team 00/12] Mini update dump Liliana Marie Prikler
@ 2024-09-08 14:32 ` Liliana Marie Prikler
  2024-09-08 14:36 ` [bug#73128] [PATCH gnome-team 02/12] gnu: gnome-music: Update to 46.0 Liliana Marie Prikler
                   ` (11 subsequent siblings)
  12 siblings, 0 replies; 22+ messages in thread
From: Liliana Marie Prikler @ 2024-09-08 14:32 UTC (permalink / raw)
  To: 73128; +Cc: liliana.prikler, maxim.cournoyer, vivien

* 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





^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [bug#73128] [PATCH gnome-team 02/12] gnu: gnome-music: Update to 46.0.
  2024-09-08 21:02 [bug#73128] [PATCH gnome-team 00/12] Mini update dump Liliana Marie Prikler
  2024-09-08 14:32 ` [bug#73128] [PATCH gnome-team 01/12] gnu: orca: Update to 46.2 Liliana Marie Prikler
@ 2024-09-08 14:36 ` Liliana Marie Prikler
  2024-09-08 15:01 ` [bug#73128] [PATCH gnome-team 03/12] gnu: gnome-session: " Liliana Marie Prikler
                   ` (10 subsequent siblings)
  12 siblings, 0 replies; 22+ messages in thread
From: Liliana Marie Prikler @ 2024-09-08 14:36 UTC (permalink / raw)
  To: 73128; +Cc: liliana.prikler, maxim.cournoyer, vivien

* 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





^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [bug#73128] [PATCH gnome-team 03/12] gnu: gnome-session: Update to 46.0.
  2024-09-08 21:02 [bug#73128] [PATCH gnome-team 00/12] Mini update dump Liliana Marie Prikler
  2024-09-08 14:32 ` [bug#73128] [PATCH gnome-team 01/12] gnu: orca: Update to 46.2 Liliana Marie Prikler
  2024-09-08 14:36 ` [bug#73128] [PATCH gnome-team 02/12] gnu: gnome-music: Update to 46.0 Liliana Marie Prikler
@ 2024-09-08 15:01 ` Liliana Marie Prikler
  2024-09-11  5:49   ` Maxim Cournoyer
  2024-09-08 15:10 ` [bug#73128] [PATCH gnome-team 04/12] gnu: gnome-control-center: Update to 46.3 Liliana Marie Prikler
                   ` (9 subsequent siblings)
  12 siblings, 1 reply; 22+ messages in thread
From: Liliana Marie Prikler @ 2024-09-08 15:01 UTC (permalink / raw)
  To: 73128; +Cc: liliana.prikler, maxim.cournoyer, vivien

* 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: Sun, 15 Mar 2020 14:34:39 +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





^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [bug#73128] [PATCH gnome-team 04/12] gnu: gnome-control-center: Update to 46.3.
  2024-09-08 21:02 [bug#73128] [PATCH gnome-team 00/12] Mini update dump Liliana Marie Prikler
                   ` (2 preceding siblings ...)
  2024-09-08 15:01 ` [bug#73128] [PATCH gnome-team 03/12] gnu: gnome-session: " Liliana Marie Prikler
@ 2024-09-08 15:10 ` Liliana Marie Prikler
  2024-09-08 18:47 ` [bug#73128] [PATCH gnome-team 07/12] gnu: Add libei Liliana Marie Prikler
                   ` (8 subsequent siblings)
  12 siblings, 0 replies; 22+ messages in thread
From: Liliana Marie Prikler @ 2024-09-08 15:10 UTC (permalink / raw)
  To: 73128; +Cc: liliana.prikler, maxim.cournoyer, vivien

* 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





^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [bug#73128] [PATCH gnome-team 07/12] gnu: Add libei.
  2024-09-08 21:02 [bug#73128] [PATCH gnome-team 00/12] Mini update dump Liliana Marie Prikler
                   ` (3 preceding siblings ...)
  2024-09-08 15:10 ` [bug#73128] [PATCH gnome-team 04/12] gnu: gnome-control-center: Update to 46.3 Liliana Marie Prikler
@ 2024-09-08 18:47 ` Liliana Marie Prikler
  2024-09-11  5:47   ` Maxim Cournoyer
  2024-09-08 18:51 ` [bug#73128] [PATCH gnome-team 09/12] gnu: xdg-desktop-portal-gnome: Update to 46.2 Liliana Marie Prikler
                   ` (7 subsequent siblings)
  12 siblings, 1 reply; 22+ messages in thread
From: Liliana Marie Prikler @ 2024-09-08 18:47 UTC (permalink / raw)
  To: 73128; +Cc: liliana.prikler, maxim.cournoyer, vivien

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

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

diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index cb1d625d24..5ce90e1f69 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -735,6 +735,46 @@ (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))
+                   (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





^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [bug#73128] [PATCH gnome-team 09/12] gnu: xdg-desktop-portal-gnome: Update to 46.2.
  2024-09-08 21:02 [bug#73128] [PATCH gnome-team 00/12] Mini update dump Liliana Marie Prikler
                   ` (4 preceding siblings ...)
  2024-09-08 18:47 ` [bug#73128] [PATCH gnome-team 07/12] gnu: Add libei Liliana Marie Prikler
@ 2024-09-08 18:51 ` Liliana Marie Prikler
  2024-09-08 20:21 ` [bug#73128] [PATCH gnome-team 11/12] gnu: mutter: Update to 46.4 Liliana Marie Prikler
                   ` (6 subsequent siblings)
  12 siblings, 0 replies; 22+ messages in thread
From: Liliana Marie Prikler @ 2024-09-08 18:51 UTC (permalink / raw)
  To: 73128; +Cc: liliana.prikler, maxim.cournoyer, vivien

* 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





^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [bug#73128] [PATCH gnome-team 11/12] gnu: mutter: Update to 46.4.
  2024-09-08 21:02 [bug#73128] [PATCH gnome-team 00/12] Mini update dump Liliana Marie Prikler
                   ` (5 preceding siblings ...)
  2024-09-08 18:51 ` [bug#73128] [PATCH gnome-team 09/12] gnu: xdg-desktop-portal-gnome: Update to 46.2 Liliana Marie Prikler
@ 2024-09-08 20:21 ` Liliana Marie Prikler
  2024-09-08 20:22 ` [bug#73128] [PATCH gnome-team 10/12] gnu: sysprof: Propagate libdex Liliana Marie Prikler
                   ` (5 subsequent siblings)
  12 siblings, 0 replies; 22+ messages in thread
From: Liliana Marie Prikler @ 2024-09-08 20:21 UTC (permalink / raw)
  To: 73128; +Cc: liliana.prikler, maxim.cournoyer, vivien

* 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





^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [bug#73128] [PATCH gnome-team 10/12] gnu: sysprof: Propagate libdex.
  2024-09-08 21:02 [bug#73128] [PATCH gnome-team 00/12] Mini update dump Liliana Marie Prikler
                   ` (6 preceding siblings ...)
  2024-09-08 20:21 ` [bug#73128] [PATCH gnome-team 11/12] gnu: mutter: Update to 46.4 Liliana Marie Prikler
@ 2024-09-08 20:22 ` Liliana Marie Prikler
  2024-09-08 20:28 ` [bug#73128] [PATCH gnome-team 12/12] gnu: gnome-remote-desktop: Update to 46.3 Liliana Marie Prikler
                   ` (4 subsequent siblings)
  12 siblings, 0 replies; 22+ messages in thread
From: Liliana Marie Prikler @ 2024-09-08 20:22 UTC (permalink / raw)
  To: 73128; +Cc: liliana.prikler, maxim.cournoyer, vivien

* 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





^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [bug#73128] [PATCH gnome-team 12/12] gnu: gnome-remote-desktop: Update to 46.3.
  2024-09-08 21:02 [bug#73128] [PATCH gnome-team 00/12] Mini update dump Liliana Marie Prikler
                   ` (7 preceding siblings ...)
  2024-09-08 20:22 ` [bug#73128] [PATCH gnome-team 10/12] gnu: sysprof: Propagate libdex Liliana Marie Prikler
@ 2024-09-08 20:28 ` Liliana Marie Prikler
  2024-09-08 21:02 ` [bug#73128] [PATCH gnome-team 06/12] gnu: Add munit Vivien Kraus
                   ` (3 subsequent siblings)
  12 siblings, 0 replies; 22+ messages in thread
From: Liliana Marie Prikler @ 2024-09-08 20:28 UTC (permalink / raw)
  To: 73128; +Cc: liliana.prikler, maxim.cournoyer, vivien

* 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





^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [bug#73128] [PATCH gnome-team 00/12] Mini update dump
@ 2024-09-08 21:02 Liliana Marie Prikler
  2024-09-08 14:32 ` [bug#73128] [PATCH gnome-team 01/12] gnu: orca: Update to 46.2 Liliana Marie Prikler
                   ` (12 more replies)
  0 siblings, 13 replies; 22+ messages in thread
From: Liliana Marie Prikler @ 2024-09-08 21:02 UTC (permalink / raw)
  To: 73128; +Cc: liliana.prikler, maxim.cournoyer, vivien

Hi folks,

with GNOME 45 nearing EOL (we are still on 44, sadly) and 47 just around
the corner, I figured that gnome-team should pick up some speed.  Sadly,
we need glib 2.80 or newer for gnome-shell, so this is about as far as I
can get – there is also a nasty qtbase thing that is worth our attention.

Some of the latter patches require that qtbase be fixed or libcamera be
built without it.  This series includes neither, because I wasn't able to
do the former and would rather not push the latter without a good reason.

Cheers

Liliana Marie Prikler (10):
  gnu: orca: Update to 46.2.
  gnu: gnome-music: Update to 46.0.
  gnu: gnome-session: Update to 46.0.
  gnu: gnome-control-center: Update to 46.3.
  gnu: gdm: Update to 46.2.
  gnu: Add libei.
  gnu: xdg-desktop-portal-gnome: Update to 46.2.
  gnu: sysprof: Propagate libdex.
  gnu: mutter: Update to 46.4.
  gnu: gnome-remote-desktop: Update to 46.3.

Vivien Kraus (1):
  gnu: Add munit.

dan (1):
  gnu: xdg-desktop-portal: Update to 1.18.4.

 gnu/local.mk                                  |   2 +-
 gnu/packages/check.scm                        |  31 +++
 gnu/packages/freedesktop.scm                  |  65 +++++-
 gnu/packages/gnome.scm                        | 132 ++++++------
 .../patches/gdm-elogind-support.patch         | 199 ------------------
 .../gnome-session-support-elogind.patch       |  84 ++------
 ...-desktop-portal-disable-portal-tests.patch |  56 +++++
 7 files changed, 225 insertions(+), 344 deletions(-)
 delete mode 100644 gnu/packages/patches/gdm-elogind-support.patch
 create mode 100644 gnu/packages/patches/xdg-desktop-portal-disable-portal-tests.patch


base-commit: bf0af917fe6127d79251c7c0f3e3d33e1e8b1403
-- 
2.45.2





^ permalink raw reply	[flat|nested] 22+ messages in thread

* [bug#73128] [PATCH gnome-team 08/12] gnu: xdg-desktop-portal: Update to 1.18.4.
  2024-09-08 21:02 [bug#73128] [PATCH gnome-team 00/12] Mini update dump Liliana Marie Prikler
                   ` (9 preceding siblings ...)
  2024-09-08 21:02 ` [bug#73128] [PATCH gnome-team 06/12] gnu: Add munit Vivien Kraus
@ 2024-09-08 21:02 ` dan
  2024-09-11  5:52   ` Maxim Cournoyer
  2024-09-11  5:11 ` [bug#73128] [PATCH gnome-team 00/12] Mini update dump Maxim Cournoyer
  2024-09-11  6:00 ` Maxim Cournoyer
  12 siblings, 1 reply; 22+ messages in thread
From: dan @ 2024-09-08 21:02 UTC (permalink / raw)
  To: 73128; +Cc: liliana.prikler, maxim.cournoyer, vivien

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

* 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>: Update flags to meson options.

Change-Id: Ic9876565e9119443fedd082273be4f372ebce1d4
---
 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 5ce90e1f69..911ed110a0 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)
@@ -3026,7 +3028,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)
@@ -3035,18 +3037,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)
@@ -3058,7 +3063,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: Tue, 2 Jul 2024 19:37:38 +0800
+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





^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [bug#73128] [PATCH gnome-team 06/12] gnu: Add munit.
  2024-09-08 21:02 [bug#73128] [PATCH gnome-team 00/12] Mini update dump Liliana Marie Prikler
                   ` (8 preceding siblings ...)
  2024-09-08 20:28 ` [bug#73128] [PATCH gnome-team 12/12] gnu: gnome-remote-desktop: Update to 46.3 Liliana Marie Prikler
@ 2024-09-08 21:02 ` Vivien Kraus
  2024-09-11  5:33   ` Maxim Cournoyer
  2024-09-08 21:02 ` [bug#73128] [PATCH gnome-team 08/12] gnu: xdg-desktop-portal: Update to 1.18.4 dan
                   ` (2 subsequent siblings)
  12 siblings, 1 reply; 22+ messages in thread
From: Vivien Kraus @ 2024-09-08 21:02 UTC (permalink / raw)
  To: 73128; +Cc: liliana.prikler, maxim.cournoyer, vivien

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

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

Change-Id: I193e55ef4ceec1d62f595dd779f7b3d76154fad4
---
 gnu/packages/check.scm | 31 +++++++++++++++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
index 248d1c4231..d689bc5abe 100644
--- a/gnu/packages/check.scm
+++ b/gnu/packages/check.scm
@@ -4206,3 +4206,34 @@ (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
+  (package
+    (name "munit")
+    ;; No release for years, https://github.com/nemequ/munit/issues/95
+    (version "0.2.0")
+    (source (origin
+              (method git-fetch)
+              (uri (git-reference
+                    (url "https://github.com/nemequ/munit")
+                    (commit "fbbdf1467eb0d04a6ee465def2e529e4c87f2118")))
+              (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-installability
+            ;; See https://github.com/nemequ/munit/pull/67
+            (lambda _
+              (substitute* "meson.build"
+                (("install: meson.is_subproject\\(\\)")
+                 "install: not meson.is_subproject()")))))))
+    (synopsis "Small unit testing framework for C")
+    (description
+     "µnit is a small testing framework for C.")
+    (home-page "https://nemequ.github.io/munit/")
+    (license license:x11)))
-- 
2.45.2





^ permalink raw reply related	[flat|nested] 22+ messages in thread

* [bug#73128] [PATCH gnome-team 00/12] Mini update dump
  2024-09-08 21:02 [bug#73128] [PATCH gnome-team 00/12] Mini update dump Liliana Marie Prikler
                   ` (10 preceding siblings ...)
  2024-09-08 21:02 ` [bug#73128] [PATCH gnome-team 08/12] gnu: xdg-desktop-portal: Update to 1.18.4 dan
@ 2024-09-11  5:11 ` Maxim Cournoyer
  2024-09-11 17:00   ` Liliana Marie Prikler
  2024-09-11  6:00 ` Maxim Cournoyer
  12 siblings, 1 reply; 22+ messages in thread
From: Maxim Cournoyer @ 2024-09-11  5:11 UTC (permalink / raw)
  To: Liliana Marie Prikler; +Cc: vivien, 73128

Hi Liliana,

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

> Hi folks,
>
> with GNOME 45 nearing EOL (we are still on 44, sadly) and 47 just around
> the corner, I figured that gnome-team should pick up some speed.  Sadly,
> we need glib 2.80 or newer for gnome-shell, so this is about as far as I
> can get – there is also a nasty qtbase thing that is worth our attention.

Is there an issue for the qtbase related problem?

> Some of the latter patches require that qtbase be fixed or libcamera be
> built without it.  This series includes neither, because I wasn't able to
> do the former and would rather not push the latter without a good reason.

I think it'd make sense to have libcamera qt-less and have a
libcamera-qt variant for Qt users.  This would add to the greater work
of having GTK 4 not pull Qt (via gstreamer plugins for example), as was
reported here [0]

[0] bug #51994 (https://issues.guix.gnu.org/51994)

-- 
Thanks,
Maxim




^ permalink raw reply	[flat|nested] 22+ messages in thread

* [bug#73128] [PATCH gnome-team 06/12] gnu: Add munit.
  2024-09-08 21:02 ` [bug#73128] [PATCH gnome-team 06/12] gnu: Add munit Vivien Kraus
@ 2024-09-11  5:33   ` Maxim Cournoyer
  0 siblings, 0 replies; 22+ messages in thread
From: Maxim Cournoyer @ 2024-09-11  5:33 UTC (permalink / raw)
  To: Vivien Kraus; +Cc: vivien, 73128

Hi,

Vivien Kraus <liliana.prikler@gmail.com> writes:

> * gnu/packages/check.scm (munit): New variable.
>
> Change-Id: I193e55ef4ceec1d62f595dd779f7b3d76154fad4
> ---
>  gnu/packages/check.scm | 31 +++++++++++++++++++++++++++++++
>  1 file changed, 31 insertions(+)
>
> diff --git a/gnu/packages/check.scm b/gnu/packages/check.scm
> index 248d1c4231..d689bc5abe 100644
> --- a/gnu/packages/check.scm
> +++ b/gnu/packages/check.scm
> @@ -4206,3 +4206,34 @@ (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
> +  (package
> +    (name "munit")
> +    ;; No release for years, https://github.com/nemequ/munit/issues/95

Nitpick, but I'd fully punctuate that standalone comment, like:

       ;; No release for years (see:
       ;; https://github.com/nemequ/munit/issues/95).
          
> +    (version "0.2.0")
> +    (source (origin
> +              (method git-fetch)
> +              (uri (git-reference
> +                    (url "https://github.com/nemequ/munit")
> +                    (commit "fbbdf1467eb0d04a6ee465def2e529e4c87f2118")))
> +              (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-installability
> +            ;; See https://github.com/nemequ/munit/pull/67

I'd give a bit more context in the comment, and reference the upstream
issue URL as I did above.

> +            (lambda _
> +              (substitute* "meson.build"
> +                (("install: meson.is_subproject\\(\\)")
> +                 "install: not meson.is_subproject()")))))))
> +    (synopsis "Small unit testing framework for C")
> +    (description
> +     "µnit is a small testing framework for C.")

Some extra description would be welcome; right now it doesn't add
anything to the synopsis. What kind of features does it provided, for
example? Hopefully the home page of the project has more to say about
it.

Could you please send a v2?

-- 
Thanks,
Maxim




^ permalink raw reply	[flat|nested] 22+ messages in thread

* [bug#73128] [PATCH gnome-team 07/12] gnu: Add libei.
  2024-09-08 18:47 ` [bug#73128] [PATCH gnome-team 07/12] gnu: Add libei Liliana Marie Prikler
@ 2024-09-11  5:47   ` Maxim Cournoyer
  0 siblings, 0 replies; 22+ messages in thread
From: Maxim Cournoyer @ 2024-09-11  5:47 UTC (permalink / raw)
  To: Liliana Marie Prikler; +Cc: vivien, 73128

Hi,

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

> * gnu/packages/freedesktop.scm (libei): New variable.
>
> Co-authored-by: Vivien Kraus <vivien@planete-kraus.eu>

[...]

> +(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))
> +                   (substitute* "test/meson.build"
> +                     (("subproject\\('munit'")
> +                      "# subproject('munit'")
> +                     ((", fallback: \\['munit', 'munit_dep'\\]")
> +                      ""))
> +                   (delete-file-recursively "subprojects")))))

What is the above snippet for?  A comment would be great.

> +    (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))

160 chars is a tad long for our 80 columns maximum width convention :-).

> +    (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

I think you can safely add a space after the comma, for extra
readability (and allowing M-q to break tE long line).

Otherwise, LGTM.

-- 
Thanks,
Maxim




^ permalink raw reply	[flat|nested] 22+ messages in thread

* [bug#73128] [PATCH gnome-team 03/12] gnu: gnome-session: Update to 46.0.
  2024-09-08 15:01 ` [bug#73128] [PATCH gnome-team 03/12] gnu: gnome-session: " Liliana Marie Prikler
@ 2024-09-11  5:49   ` Maxim Cournoyer
  2024-09-11 17:03     ` Liliana Marie Prikler
  0 siblings, 1 reply; 22+ messages in thread
From: Maxim Cournoyer @ 2024-09-11  5:49 UTC (permalink / raw)
  To: Liliana Marie Prikler; +Cc: vivien, 73128

Hello,

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

> * 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”.

Just checking: is this the result of upstream changing their build
system, or the elogind carried patch being updated?

-- 
Thanks,
Maxim




^ permalink raw reply	[flat|nested] 22+ messages in thread

* [bug#73128] [PATCH gnome-team 08/12] gnu: xdg-desktop-portal: Update to 1.18.4.
  2024-09-08 21:02 ` [bug#73128] [PATCH gnome-team 08/12] gnu: xdg-desktop-portal: Update to 1.18.4 dan
@ 2024-09-11  5:52   ` Maxim Cournoyer
  0 siblings, 0 replies; 22+ messages in thread
From: Maxim Cournoyer @ 2024-09-11  5:52 UTC (permalink / raw)
  To: dan; +Cc: vivien, 73128

Hi,

dan <liliana.prikler@gmail.com> writes:

> * 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>: Update flags to meson options.

Sounds good.

[...]

>  (define-public xdg-desktop-portal
>    (package
>      (name "xdg-desktop-portal")
> -    (version "1.16.0")
> +    (version "1.18.4")
>      (source
>       (origin
>         (method url-fetch)
> @@ -3035,18 +3037,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

As a tiny improvement, I'd fully punctuate the above standalone comment
(capitalize first character and add a terminating dot).

> +       (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)

As a v2 follow-up, it would be nice to drop all these labels to conform
to our newer style.  Perhaps 'guix style' can automate this one.

-- 
Thanks,
Maxim




^ permalink raw reply	[flat|nested] 22+ messages in thread

* [bug#73128] [PATCH gnome-team 00/12] Mini update dump
  2024-09-08 21:02 [bug#73128] [PATCH gnome-team 00/12] Mini update dump Liliana Marie Prikler
                   ` (11 preceding siblings ...)
  2024-09-11  5:11 ` [bug#73128] [PATCH gnome-team 00/12] Mini update dump Maxim Cournoyer
@ 2024-09-11  6:00 ` Maxim Cournoyer
  12 siblings, 0 replies; 22+ messages in thread
From: Maxim Cournoyer @ 2024-09-11  6:00 UTC (permalink / raw)
  To: Liliana Marie Prikler; +Cc: vivien, 73128

Hi Liliana,

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

[...]

> Liliana Marie Prikler (10):
>   gnu: orca: Update to 46.2.
>   gnu: gnome-music: Update to 46.0.
>   gnu: gnome-session: Update to 46.0.
>   gnu: gnome-control-center: Update to 46.3.
>   gnu: gdm: Update to 46.2.
>   gnu: Add libei.
>   gnu: xdg-desktop-portal-gnome: Update to 46.2.
>   gnu: sysprof: Propagate libdex.
>   gnu: mutter: Update to 46.4.
>   gnu: gnome-remote-desktop: Update to 46.3.
>
> Vivien Kraus (1):
>   gnu: Add munit.
>
> dan (1):
>   gnu: xdg-desktop-portal: Update to 1.18.4.

Thanks for kickstarting this new GNOME effort.  I've replied with some
suggestions, nothing serious.  Great work!

-- 
Thanks,
Maxim




^ permalink raw reply	[flat|nested] 22+ messages in thread

* [bug#73128] [PATCH gnome-team 00/12] Mini update dump
  2024-09-11  5:11 ` [bug#73128] [PATCH gnome-team 00/12] Mini update dump Maxim Cournoyer
@ 2024-09-11 17:00   ` Liliana Marie Prikler
  2024-09-12  0:57     ` Maxim Cournoyer
  0 siblings, 1 reply; 22+ messages in thread
From: Liliana Marie Prikler @ 2024-09-11 17:00 UTC (permalink / raw)
  To: Maxim Cournoyer; +Cc: vivien, 73128

Am Mittwoch, dem 11.09.2024 um 14:11 +0900 schrieb Maxim Cournoyer:
> Hi Liliana,
> 
> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> 
> > Hi folks,
> > 
> > with GNOME 45 nearing EOL (we are still on 44, sadly) and 47 just
> > around the corner, I figured that gnome-team should pick up some
> > speed.  Sadly, we need glib 2.80 or newer for gnome-shell, so this
> > is about as far as I can get – there is also a nasty qtbase thing
> > that is worth our attention.
> 
> Is there an issue for the qtbase related problem?
Not yet – I haven't found the time to document it, but it is a single
test failure that sounds very bad.

> > Some of the latter patches require that qtbase be fixed or
> > libcamera be built without it.  This series includes neither,
> > because I wasn't able to do the former and would rather not push
> > the latter without a good reason.
> 
> I think it'd make sense to have libcamera qt-less and have a
> libcamera-qt variant for Qt users.  This would add to the greater
> work of having GTK 4 not pull Qt (via gstreamer plugins for example),
> as was reported here [0]
Okay, I will go with that in a separate issue then.

Cheers




^ permalink raw reply	[flat|nested] 22+ messages in thread

* [bug#73128] [PATCH gnome-team 03/12] gnu: gnome-session: Update to 46.0.
  2024-09-11  5:49   ` Maxim Cournoyer
@ 2024-09-11 17:03     ` Liliana Marie Prikler
  2024-09-12  0:58       ` Maxim Cournoyer
  0 siblings, 1 reply; 22+ messages in thread
From: Liliana Marie Prikler @ 2024-09-11 17:03 UTC (permalink / raw)
  To: Maxim Cournoyer; +Cc: vivien, 73128

Am Mittwoch, dem 11.09.2024 um 14:49 +0900 schrieb Maxim Cournoyer:
> Hello,
> 
> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> 
> > * 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”.
> 
> Just checking: is this the result of upstream changing their build
> system, or the elogind carried patch being updated?
The elogind patch should be updated.  The ChangeLog entry for that is
just below.

Cheers




^ permalink raw reply	[flat|nested] 22+ messages in thread

* [bug#73128] [PATCH gnome-team 00/12] Mini update dump
  2024-09-11 17:00   ` Liliana Marie Prikler
@ 2024-09-12  0:57     ` Maxim Cournoyer
  0 siblings, 0 replies; 22+ messages in thread
From: Maxim Cournoyer @ 2024-09-12  0:57 UTC (permalink / raw)
  To: Liliana Marie Prikler; +Cc: vivien, 73128

Hi,

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

> Am Mittwoch, dem 11.09.2024 um 14:11 +0900 schrieb Maxim Cournoyer:
>> Hi Liliana,
>> 
>> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
>> 
>> > Hi folks,
>> > 
>> > with GNOME 45 nearing EOL (we are still on 44, sadly) and 47 just
>> > around the corner, I figured that gnome-team should pick up some
>> > speed.  Sadly, we need glib 2.80 or newer for gnome-shell, so this
>> > is about as far as I can get – there is also a nasty qtbase thing
>> > that is worth our attention.
>> 
>> Is there an issue for the qtbase related problem?
> Not yet – I haven't found the time to document it, but it is a single
> test failure that sounds very bad.

If you could just let me know quickly how to reproduce it, I'd be
interested in looking at it, since we're prepping a bunch of Qt updates
in the Qt team.

>> > Some of the latter patches require that qtbase be fixed or
>> > libcamera be built without it.  This series includes neither,
>> > because I wasn't able to do the former and would rather not push
>> > the latter without a good reason.
>> 
>> I think it'd make sense to have libcamera qt-less and have a
>> libcamera-qt variant for Qt users.  This would add to the greater
>> work of having GTK 4 not pull Qt (via gstreamer plugins for example),
>> as was reported here [0]
> Okay, I will go with that in a separate issue then.

Sounds good!  Thanks for all the work.

-- 
Thanks,
Maxim




^ permalink raw reply	[flat|nested] 22+ messages in thread

* [bug#73128] [PATCH gnome-team 03/12] gnu: gnome-session: Update to 46.0.
  2024-09-11 17:03     ` Liliana Marie Prikler
@ 2024-09-12  0:58       ` Maxim Cournoyer
  0 siblings, 0 replies; 22+ messages in thread
From: Maxim Cournoyer @ 2024-09-12  0:58 UTC (permalink / raw)
  To: Liliana Marie Prikler; +Cc: vivien, 73128

Hi,

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

> Am Mittwoch, dem 11.09.2024 um 14:49 +0900 schrieb Maxim Cournoyer:
>> Hello,
>> 
>> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
>> 
>> > * 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”.
>> 
>> Just checking: is this the result of upstream changing their build
>> system, or the elogind carried patch being updated?
> The elogind patch should be updated.  The ChangeLog entry for that is
> just below.

Alright, thanks for explaining (one last thing: is this patch properly
identified with regard to its origin?)

-- 
Thanks,
Maxim




^ permalink raw reply	[flat|nested] 22+ messages in thread

end of thread, other threads:[~2024-09-12  1:00 UTC | newest]

Thread overview: 22+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-09-08 21:02 [bug#73128] [PATCH gnome-team 00/12] Mini update dump Liliana Marie Prikler
2024-09-08 14:32 ` [bug#73128] [PATCH gnome-team 01/12] gnu: orca: Update to 46.2 Liliana Marie Prikler
2024-09-08 14:36 ` [bug#73128] [PATCH gnome-team 02/12] gnu: gnome-music: Update to 46.0 Liliana Marie Prikler
2024-09-08 15:01 ` [bug#73128] [PATCH gnome-team 03/12] gnu: gnome-session: " Liliana Marie Prikler
2024-09-11  5:49   ` Maxim Cournoyer
2024-09-11 17:03     ` Liliana Marie Prikler
2024-09-12  0:58       ` Maxim Cournoyer
2024-09-08 15:10 ` [bug#73128] [PATCH gnome-team 04/12] gnu: gnome-control-center: Update to 46.3 Liliana Marie Prikler
2024-09-08 18:47 ` [bug#73128] [PATCH gnome-team 07/12] gnu: Add libei Liliana Marie Prikler
2024-09-11  5:47   ` Maxim Cournoyer
2024-09-08 18:51 ` [bug#73128] [PATCH gnome-team 09/12] gnu: xdg-desktop-portal-gnome: Update to 46.2 Liliana Marie Prikler
2024-09-08 20:21 ` [bug#73128] [PATCH gnome-team 11/12] gnu: mutter: Update to 46.4 Liliana Marie Prikler
2024-09-08 20:22 ` [bug#73128] [PATCH gnome-team 10/12] gnu: sysprof: Propagate libdex Liliana Marie Prikler
2024-09-08 20:28 ` [bug#73128] [PATCH gnome-team 12/12] gnu: gnome-remote-desktop: Update to 46.3 Liliana Marie Prikler
2024-09-08 21:02 ` [bug#73128] [PATCH gnome-team 06/12] gnu: Add munit Vivien Kraus
2024-09-11  5:33   ` Maxim Cournoyer
2024-09-08 21:02 ` [bug#73128] [PATCH gnome-team 08/12] gnu: xdg-desktop-portal: Update to 1.18.4 dan
2024-09-11  5:52   ` Maxim Cournoyer
2024-09-11  5:11 ` [bug#73128] [PATCH gnome-team 00/12] Mini update dump Maxim Cournoyer
2024-09-11 17:00   ` Liliana Marie Prikler
2024-09-12  0:57     ` Maxim Cournoyer
2024-09-11  6:00 ` Maxim Cournoyer

Code repositories for project(s) associated with this public inbox

	https://git.savannah.gnu.org/cgit/guix.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).