[bug#73610] [PATCH gnome-team 0/2] Update GLib to 2.82.1

[bug#73610] [PATCH gnome-team 0/2] Update GLib to 2.82.1

[Liliana Marie Prikler]

Hi Guix,

this little world rebuild ought to fix our CI issues with gnome-team.

kthxbye

Liliana Marie Prikler (2):
  gnu: glib: Update to 2.82.1.
  gnu: gobject-introspection: Update to 1.82.0.

 gnu/packages/glib.scm | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)


base-commit: cfa370fc1511a8c50c1179a50138fd335d737d96
-- 
2.46.0

[bug#73610] [PATCH gnome-team v3 1/4] gnu: glib: Update to 2.82.1.

[Liliana Marie Prikler]

* gnu/packages/glib.scm (glib): Update to 2.82.1.
---
 gnu/packages/glib.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 6dc8e70b01..3bf201e7cf 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -245,7 +245,7 @@ (define-public dbus-verbose
 (define glib
   (package
     (name "glib")
-    (version "2.78.0")
+    (version "2.82.1")
     (source
      (origin
        (method url-fetch)
@@ -254,7 +254,7 @@ (define glib
                        name "/" (string-take version 4) "/"
                        name "-" version ".tar.xz"))
        (sha256
-        (base32 "0c3vagxl77wma85qinbj974jvw96n5bvch2m7hqcwxq8fa5spsj4"))
+        (base32 "19l98kdv6d4363minliw0imvxh4qfdw5im988knf8bpm1d2391j7"))
        (patches
         (search-patches "glib-appinfo-watch.patch"
                         "glib-skip-failing-test.patch"))
@@ -488,7 +488,8 @@ (define glib
            python-wrapper
            tzdata-for-tests))           ;for tests/gdatetime.c
     (inputs
-     (list ;; "python", "python-wrapper" and "bash-minimal"
+     (list
+      ;; "python", "python-wrapper" and "bash-minimal"
       ;; are for the 'patch-shebangs' phase, to make
       ;; sure the installed scripts end up with a correct shebang
       ;; when cross-compiling.

base-commit: 74e56625492bfb3129139cd8ff13e9b96ae45be8
prerequisite-patch-id: 62615e3364240136aed1a3cf7a7305820d7556a0
prerequisite-patch-id: 3d96061b0ed271a639d4fc0330f950f10cfcaa65
prerequisite-patch-id: 98994f71a2858eaf2daa698e06631bd96c571a6f
prerequisite-patch-id: 55a4eacd8251dac5b5a5a172ba71d11a1d33bd30
-- 
2.46.0

[bug#73610] [PATCH gnome-team v3 2/4] gnu: gobject-introspection: Update to 1.82.0.

[Liliana Marie Prikler]

* gnu/packages/glib.scm (gobject-introspection): Update to 1.82.0.
---
 gnu/packages/glib.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 3bf201e7cf..b13b2c659a 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -605,14 +605,14 @@ (define (correct-library-name-phase python name)
 (define gobject-introspection
   (package
     (name "gobject-introspection")
-    (version "1.78.1")
+    (version "1.82.0")
     (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/"
                    "gobject-introspection/" (version-major+minor version)
                    "/gobject-introspection-" version ".tar.xz"))
              (sha256
-              (base32 "1d0vhi83q0xc7kg3zn32wy7n16f3dd5blicyh5v8w9gpkbcsnyxx"))
+              (base32 "029gr80q8749dhcpmf5x1w48adinihb634qyqimz4js210clqnhg"))
              (patches (search-patches
                        "gobject-introspection-cc.patch"
                        "gobject-introspection-girepository.patch"
-- 
2.46.0

[bug#73610] [PATCH gnome-team v3 3/4] gnu: bootstrap glib and gobject against each other.

[Liliana Marie Prikler]

As of GLib 2.82, introspection data in GLib is built as part of the package,
requiring gobject-introspection.

* gnu/packages/gnome.scm (glib-minimal, gobject-introspection-minimal): New
variables.
(glib): Use gobject-introspection-minimal for bootstrap.
(gobject-introspection-minimal): Use glib-minimal for bootstrap.
(gobject-introspection): Fix propagations.
---
 gnu/packages/glib.scm | 36 ++++++++++++++++++++++++++++++------
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index b13b2c659a..15b0c03de6 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -242,7 +242,7 @@ (define-public dbus-verbose
 the @code{DBUS_VERBOSE} environment variable is set to @samp{1}.  For more
 information, refer to the @samp{dbus-daemon(1)} man page.")))
 
-(define glib
+(define glib-minimal
   (package
     (name "glib")
     (version "2.82.1")
@@ -524,6 +524,21 @@ (define glib
     (license license:lgpl2.1+)
     (properties '((hidden? . #t)))))
 
+(define glib
+  (let ((base glib-minimal))
+    (package/inherit base
+      (native-inputs
+       (modify-inputs (package-native-inputs base)
+         (prepend gobject-introspection-minimal)))
+      (arguments
+       (substitute-keyword-arguments (package-arguments base)
+         ((#:phases phases)
+          #~(modify-phases #$phases
+              ;; GI tests require installed libraries
+              (delete 'check)
+              (add-after 'install 'check
+                (assoc-ref #$phases 'check)))))))))
+
 (define-public glib-with-documentation
   ;; glib's doc must be built in a separate package since it requires gtk-doc,
   ;; which in turn depends on glib.
@@ -602,7 +617,7 @@ (define (correct-library-name-phase python name)
         (string-append name target-suffix))
       (rename-file native-name target-name)))
 
-(define gobject-introspection
+(define gobject-introspection-minimal
   (package
     (name "gobject-introspection")
     (version "1.82.0")
@@ -659,15 +674,14 @@ (define gobject-introspection
      `(,@(if (%current-target-system)
            `(("python" ,python))
            '())
-       ("glib" ,glib "bin")
+       ("glib" ,glib-minimal "bin")
        ("pkg-config" ,pkg-config)
        ("bison" ,bison)
        ("flex" ,flex)))
     (inputs
-     `(("python" ,python)
-       ("zlib" ,zlib)))
+     (list python zlib))
     (propagated-inputs
-     (list glib
+     (list glib-minimal
            ;; In practice, GIR users will need libffi when using
            ;; gobject-introspection.
            libffi))
@@ -691,6 +705,16 @@ (define gobject-introspection
       ;; For tools.
       license:gpl2+))))
 
+(define gobject-introspection
+  (let ((base gobject-introspection-minimal))
+    (package/inherit base
+      (native-inputs
+       (modify-inputs (package-native-inputs base)
+         (replace "glib" glib)))
+      (propagated-inputs
+       (modify-inputs (package-propagated-inputs base)
+         (replace "glib" glib))))))
+
 (define intltool
   (package
     (name "intltool")
-- 
2.46.0

[bug#73610] [PATCH gnome-team v3 4/4] gnu: cairo: Update to 1.18.2.

[Liliana Marie Prikler]

* gnu/packages/gtk.scm (cairo): Update to 1.18.2.
---
 gnu/packages/gtk.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index ec301dd2fa..a31fb1069d 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -77,6 +77,7 @@ (define-module (gnu packages gtk)
   #:use-module (gnu packages base)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages boost)
+  #:use-module (gnu packages build-tools)
   #:use-module (gnu packages texinfo)
   #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
@@ -169,7 +170,7 @@ (define-public appmenu-gtk-module
 (define cairo
   (package
     (name "cairo")
-    (version "1.18.0")
+    (version "1.18.2")
     (source
      (origin
        (method url-fetch)
@@ -177,10 +178,11 @@ (define cairo
         (string-append "https://cairographics.org/releases/cairo-"
                        version ".tar.xz"))
        (sha256
-        (base32 "0r0by563s75xyzz0d0j1nmjqmdrk2x9agk7r57p3v8vqp4v0ffi4"))))
+        (base32 "0nnli5cghygbl9bvlbjls7nspnrrzx1y1pbd7p649s154js9nax6"))))
     (build-system meson-build-system)
     (arguments
      `(#:tests? #f ; see http://lists.gnu.org/archive/html/bug-guix/2013-06/msg00085.html
+       #:meson ,meson-1.5               ; 1.3 or higher required
        #:glib-or-gtk? #t
        #:configure-flags
        ,#~(list "-Dtests=disabled")
-- 
2.46.0

[bug#73610] [PATCH gnome-team 1/2] gnu: glib: Update to 2.82.1.

[Liliana Marie Prikler]

GLib 2.82.1 builds without the packaging module, instead using internal
code for version checks.  Currently, CI fails with 2.80.5, because
python-packaging-bootstrap (and therefore glib) can not be cross-built.
For more information on the upstream change, see
<https://gitlab.gnome.org/GNOME/glib/-/issues/3301> and
<https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4133>.

* gnu/packages/glib.scm (glib): Update to 2.82.1.
[#:phases]: Remove ‘wrap-python’.
[inputs]: Remove python-packaging-bootstrap.
---
 gnu/packages/glib.scm | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 1c2c2a3179..3bf201e7cf 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -75,7 +75,6 @@ (define-module (gnu packages glib)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages pretty-print)
   #:use-module (gnu packages python)
-  #:use-module (gnu packages python-build)
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages sqlite)
   #:use-module (gnu packages web)
@@ -246,7 +245,7 @@ (define-public dbus-verbose
 (define glib
   (package
     (name "glib")
-    (version "2.80.5")
+    (version "2.82.1")
     (source
      (origin
        (method url-fetch)
@@ -255,7 +254,7 @@ (define glib
                        name "/" (string-take version 4) "/"
                        name "-" version ".tar.xz"))
        (sha256
-        (base32 "0wb77rnfcfmz368dg7b8d4waif8qddidcdvyvszmns9wh3gaj8wz"))
+        (base32 "19l98kdv6d4363minliw0imvxh4qfdw5im988knf8bpm1d2391j7"))
        (patches
         (search-patches "glib-appinfo-watch.patch"
                         "glib-skip-failing-test.patch"))
@@ -478,12 +477,7 @@ (define glib
                 (("^bindir=.*")
                  "")
                 (("=\\$\\{bindir\\}/")
-                 "="))))
-          (add-after 'install 'wrap-python
-            (lambda* (#:key outputs #:allow-other-keys)
-              ;; gdbus-codegen imports packaging.version.
-              (wrap-program (search-input-file outputs "bin/gdbus-codegen")
-                `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH")))))))))
+                 "=")))))))
     (native-inputs
      (list dbus
            gettext-minimal
@@ -499,12 +493,9 @@ (define glib
       ;; are for the 'patch-shebangs' phase, to make
       ;; sure the installed scripts end up with a correct shebang
       ;; when cross-compiling.
-      ;; "python-packaging-bootstrap" is needed by 'wrap-python' to
-      ;; ensure gdbus-codegen works as expected.
       bash-minimal
       python
-      python-wrapper
-      python-packaging-bootstrap))
+      python-wrapper))
     (propagated-inputs
      (list libffi            ; in the Requires.private field of gobject-2.0.pc
            pcre2             ; in the Requires.private field of glib-2.0.pc
-- 
2.46.0

[bug#73610] [PATCH gnome-team v2 1/4] gnu: glib: Update to 2.82.1.

[Liliana Marie Prikler]

GLib 2.82.1 builds without the packaging module, instead using internal
code for version checks.  Currently, CI fails with 2.80.5, because
python-packaging-bootstrap (and therefore glib) can not be cross-built.
For more information on the upstream change, see
<https://gitlab.gnome.org/GNOME/glib/-/issues/3301> and
<https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4133>.

* gnu/packages/glib.scm (glib): Update to 2.82.1.
[#:phases]: Remove ‘wrap-python’.
[inputs]: Remove python-packaging-bootstrap.
---
 gnu/packages/glib.scm | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 1c2c2a3179..3bf201e7cf 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -75,7 +75,6 @@ (define-module (gnu packages glib)
   #:use-module (gnu packages pkg-config)
   #:use-module (gnu packages pretty-print)
   #:use-module (gnu packages python)
-  #:use-module (gnu packages python-build)
   #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages sqlite)
   #:use-module (gnu packages web)
@@ -246,7 +245,7 @@ (define-public dbus-verbose
 (define glib
   (package
     (name "glib")
-    (version "2.80.5")
+    (version "2.82.1")
     (source
      (origin
        (method url-fetch)
@@ -255,7 +254,7 @@ (define glib
                        name "/" (string-take version 4) "/"
                        name "-" version ".tar.xz"))
        (sha256
-        (base32 "0wb77rnfcfmz368dg7b8d4waif8qddidcdvyvszmns9wh3gaj8wz"))
+        (base32 "19l98kdv6d4363minliw0imvxh4qfdw5im988knf8bpm1d2391j7"))
        (patches
         (search-patches "glib-appinfo-watch.patch"
                         "glib-skip-failing-test.patch"))
@@ -478,12 +477,7 @@ (define glib
                 (("^bindir=.*")
                  "")
                 (("=\\$\\{bindir\\}/")
-                 "="))))
-          (add-after 'install 'wrap-python
-            (lambda* (#:key outputs #:allow-other-keys)
-              ;; gdbus-codegen imports packaging.version.
-              (wrap-program (search-input-file outputs "bin/gdbus-codegen")
-                `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH")))))))))
+                 "=")))))))
     (native-inputs
      (list dbus
            gettext-minimal
@@ -499,12 +493,9 @@ (define glib
       ;; are for the 'patch-shebangs' phase, to make
       ;; sure the installed scripts end up with a correct shebang
       ;; when cross-compiling.
-      ;; "python-packaging-bootstrap" is needed by 'wrap-python' to
-      ;; ensure gdbus-codegen works as expected.
       bash-minimal
       python
-      python-wrapper
-      python-packaging-bootstrap))
+      python-wrapper))
     (propagated-inputs
      (list libffi            ; in the Requires.private field of gobject-2.0.pc
            pcre2             ; in the Requires.private field of glib-2.0.pc

base-commit: cfa370fc1511a8c50c1179a50138fd335d737d96
prerequisite-patch-id: 62615e3364240136aed1a3cf7a7305820d7556a0
prerequisite-patch-id: 3d96061b0ed271a639d4fc0330f950f10cfcaa65
prerequisite-patch-id: 98994f71a2858eaf2daa698e06631bd96c571a6f
prerequisite-patch-id: 55a4eacd8251dac5b5a5a172ba71d11a1d33bd30
-- 
2.46.0

[bug#73610] [PATCH gnome-team v2 2/4] gnu: gobject-introspection: Update to 1.82.0.

[Liliana Marie Prikler]

* gnu/packages/glib.scm (gobject-introspection): Update to 1.82.0.
---
 gnu/packages/glib.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 3bf201e7cf..b13b2c659a 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -605,14 +605,14 @@ (define (correct-library-name-phase python name)
 (define gobject-introspection
   (package
     (name "gobject-introspection")
-    (version "1.78.1")
+    (version "1.82.0")
     (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/"
                    "gobject-introspection/" (version-major+minor version)
                    "/gobject-introspection-" version ".tar.xz"))
              (sha256
-              (base32 "1d0vhi83q0xc7kg3zn32wy7n16f3dd5blicyh5v8w9gpkbcsnyxx"))
+              (base32 "029gr80q8749dhcpmf5x1w48adinihb634qyqimz4js210clqnhg"))
              (patches (search-patches
                        "gobject-introspection-cc.patch"
                        "gobject-introspection-girepository.patch"
-- 
2.46.0

[bug#73610] [PATCH gnome-team v2 3/4] gnu: bootstrap glib and gobject against each other.

[Liliana Marie Prikler]

As of GLib 2.82, introspection data in GLib is built as part of the package,
requiring gobject-introspection.

* gnu/packages/gnome.scm (glib-minimal, gobject-introspection-minimal): New
variables.
(glib): Use gobject-introspection-minimal for bootstrap.
(gobject-introspection-minimal): Use glib-minimal for bootstrap.
(gobject-introspection): Fix propagations.
---
 gnu/packages/glib.scm | 36 ++++++++++++++++++++++++++++++------
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index b13b2c659a..15b0c03de6 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -242,7 +242,7 @@ (define-public dbus-verbose
 the @code{DBUS_VERBOSE} environment variable is set to @samp{1}.  For more
 information, refer to the @samp{dbus-daemon(1)} man page.")))
 
-(define glib
+(define glib-minimal
   (package
     (name "glib")
     (version "2.82.1")
@@ -524,6 +524,21 @@ (define glib
     (license license:lgpl2.1+)
     (properties '((hidden? . #t)))))
 
+(define glib
+  (let ((base glib-minimal))
+    (package/inherit base
+      (native-inputs
+       (modify-inputs (package-native-inputs base)
+         (prepend gobject-introspection-minimal)))
+      (arguments
+       (substitute-keyword-arguments (package-arguments base)
+         ((#:phases phases)
+          #~(modify-phases #$phases
+              ;; GI tests require installed libraries
+              (delete 'check)
+              (add-after 'install 'check
+                (assoc-ref #$phases 'check)))))))))
+
 (define-public glib-with-documentation
   ;; glib's doc must be built in a separate package since it requires gtk-doc,
   ;; which in turn depends on glib.
@@ -602,7 +617,7 @@ (define (correct-library-name-phase python name)
         (string-append name target-suffix))
       (rename-file native-name target-name)))
 
-(define gobject-introspection
+(define gobject-introspection-minimal
   (package
     (name "gobject-introspection")
     (version "1.82.0")
@@ -659,15 +674,14 @@ (define gobject-introspection
      `(,@(if (%current-target-system)
            `(("python" ,python))
            '())
-       ("glib" ,glib "bin")
+       ("glib" ,glib-minimal "bin")
        ("pkg-config" ,pkg-config)
        ("bison" ,bison)
        ("flex" ,flex)))
     (inputs
-     `(("python" ,python)
-       ("zlib" ,zlib)))
+     (list python zlib))
     (propagated-inputs
-     (list glib
+     (list glib-minimal
            ;; In practice, GIR users will need libffi when using
            ;; gobject-introspection.
            libffi))
@@ -691,6 +705,16 @@ (define gobject-introspection
       ;; For tools.
       license:gpl2+))))
 
+(define gobject-introspection
+  (let ((base gobject-introspection-minimal))
+    (package/inherit base
+      (native-inputs
+       (modify-inputs (package-native-inputs base)
+         (replace "glib" glib)))
+      (propagated-inputs
+       (modify-inputs (package-propagated-inputs base)
+         (replace "glib" glib))))))
+
 (define intltool
   (package
     (name "intltool")
-- 
2.46.0

[bug#73610] [PATCH gnome-team v2 4/4] gnu: cairo: Update to 1.18.2.

[Liliana Marie Prikler]

* gnu/packages/gtk.scm (cairo): Update to 1.18.2.
---
 gnu/packages/gtk.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index ec301dd2fa..a31fb1069d 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -77,6 +77,7 @@ (define-module (gnu packages gtk)
   #:use-module (gnu packages base)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages boost)
+  #:use-module (gnu packages build-tools)
   #:use-module (gnu packages texinfo)
   #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
@@ -169,7 +170,7 @@ (define-public appmenu-gtk-module
 (define cairo
   (package
     (name "cairo")
-    (version "1.18.0")
+    (version "1.18.2")
     (source
      (origin
        (method url-fetch)
@@ -177,10 +178,11 @@ (define cairo
         (string-append "https://cairographics.org/releases/cairo-"
                        version ".tar.xz"))
        (sha256
-        (base32 "0r0by563s75xyzz0d0j1nmjqmdrk2x9agk7r57p3v8vqp4v0ffi4"))))
+        (base32 "0nnli5cghygbl9bvlbjls7nspnrrzx1y1pbd7p649s154js9nax6"))))
     (build-system meson-build-system)
     (arguments
      `(#:tests? #f ; see http://lists.gnu.org/archive/html/bug-guix/2013-06/msg00085.html
+       #:meson ,meson-1.5               ; 1.3 or higher required
        #:glib-or-gtk? #t
        #:configure-flags
        ,#~(list "-Dtests=disabled")
-- 
2.46.0

[bug#73610] [PATCH gnome-team 2/2] gnu: gobject-introspection: Update to 1.82.0.

[Liliana Marie Prikler]

* gnu/packages/glib.scm (gobject-introspection): Update to 1.82.0.
---
 gnu/packages/glib.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 3bf201e7cf..b13b2c659a 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -605,14 +605,14 @@ (define (correct-library-name-phase python name)
 (define gobject-introspection
   (package
     (name "gobject-introspection")
-    (version "1.78.1")
+    (version "1.82.0")
     (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/"
                    "gobject-introspection/" (version-major+minor version)
                    "/gobject-introspection-" version ".tar.xz"))
              (sha256
-              (base32 "1d0vhi83q0xc7kg3zn32wy7n16f3dd5blicyh5v8w9gpkbcsnyxx"))
+              (base32 "029gr80q8749dhcpmf5x1w48adinihb634qyqimz4js210clqnhg"))
              (patches (search-patches
                        "gobject-introspection-cc.patch"
                        "gobject-introspection-girepository.patch"
-- 
2.46.0

[bug#73610] Status: [PATCH gnome-team 0/2] Update GLib to 2.82.1

[Maxim Cournoyer]

Hi,

I've reviewed v3, which LGTM.

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

-- 
Thanks,
Maxim

[bug#73610] [PATCH gnome-team v4 0/7] Update GLib to 2.82.1

[Liliana Marie Prikler]

So…

it turns out, that gobject-introspection changes the rules for some
annotations with 1.82, causing failures in GI-related packages.
This revision fixes those, at least for Python and JS.

Cheers

Liliana Marie Prikler (7):
  gnu: glib: Update to 2.82.1.
  gnu: gobject-introspection: Update to 1.82.0.
  gnu: bootstrap glib and gobject against each other.
  gnu: cairo: Update to 1.18.2.
  gnu: python-pygobject: Update to 3.50.0.
  gnu: json-glib: Update to 1.10.0.
  gnu: gjs: Fix build.

 gnu/local.mk                                  |  1 +
 gnu/packages/glib.scm                         | 65 +++++++-----
 gnu/packages/gnome.scm                        | 12 ++-
 gnu/packages/gstreamer.scm                    |  2 +-
 gnu/packages/gtk.scm                          |  6 +-
 .../patches/gjs-fix-closure-annotations.patch | 99 +++++++++++++++++++
 6 files changed, 151 insertions(+), 34 deletions(-)
 create mode 100644 gnu/packages/patches/gjs-fix-closure-annotations.patch


base-commit: 0db7fdd101ffcc8cbd4b35682f0bc8f8e9a72d58
-- 
2.46.0

[bug#73610] [PATCH gnome-team v4 1/7] gnu: glib: Update to 2.82.1.

[Liliana Marie Prikler]

* gnu/packages/glib.scm (glib): Update to 2.82.1.

Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
---
 gnu/packages/glib.scm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 6dc8e70b01..3bf201e7cf 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -245,7 +245,7 @@ (define-public dbus-verbose
 (define glib
   (package
     (name "glib")
-    (version "2.78.0")
+    (version "2.82.1")
     (source
      (origin
        (method url-fetch)
@@ -254,7 +254,7 @@ (define glib
                        name "/" (string-take version 4) "/"
                        name "-" version ".tar.xz"))
        (sha256
-        (base32 "0c3vagxl77wma85qinbj974jvw96n5bvch2m7hqcwxq8fa5spsj4"))
+        (base32 "19l98kdv6d4363minliw0imvxh4qfdw5im988knf8bpm1d2391j7"))
        (patches
         (search-patches "glib-appinfo-watch.patch"
                         "glib-skip-failing-test.patch"))
@@ -488,7 +488,8 @@ (define glib
            python-wrapper
            tzdata-for-tests))           ;for tests/gdatetime.c
     (inputs
-     (list ;; "python", "python-wrapper" and "bash-minimal"
+     (list
+      ;; "python", "python-wrapper" and "bash-minimal"
       ;; are for the 'patch-shebangs' phase, to make
       ;; sure the installed scripts end up with a correct shebang
       ;; when cross-compiling.
-- 
2.46.0

[bug#73610] [PATCH gnome-team v4 2/7] gnu: gobject-introspection: Update to 1.82.0.

[Liliana Marie Prikler]

* gnu/packages/glib.scm (gobject-introspection): Update to 1.82.0.

Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
---
 gnu/packages/glib.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 3bf201e7cf..b13b2c659a 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -605,14 +605,14 @@ (define (correct-library-name-phase python name)
 (define gobject-introspection
   (package
     (name "gobject-introspection")
-    (version "1.78.1")
+    (version "1.82.0")
     (source (origin
              (method url-fetch)
              (uri (string-append "mirror://gnome/sources/"
                    "gobject-introspection/" (version-major+minor version)
                    "/gobject-introspection-" version ".tar.xz"))
              (sha256
-              (base32 "1d0vhi83q0xc7kg3zn32wy7n16f3dd5blicyh5v8w9gpkbcsnyxx"))
+              (base32 "029gr80q8749dhcpmf5x1w48adinihb634qyqimz4js210clqnhg"))
              (patches (search-patches
                        "gobject-introspection-cc.patch"
                        "gobject-introspection-girepository.patch"
-- 
2.46.0

[bug#73610] [PATCH gnome-team v4 3/7] gnu: bootstrap glib and gobject against each other.

[Liliana Marie Prikler]

As of GLib 2.82, introspection data in GLib is built as part of the package,
requiring gobject-introspection.

* gnu/packages/gnome.scm (glib-minimal, gobject-introspection-minimal): New
variables.
(glib): Use gobject-introspection-minimal for bootstrap.
(gobject-introspection-minimal): Use glib-minimal for bootstrap.
(gobject-introspection): Fix propagations.

Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
---
 gnu/packages/glib.scm | 36 ++++++++++++++++++++++++++++++------
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index b13b2c659a..15b0c03de6 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -242,7 +242,7 @@ (define-public dbus-verbose
 the @code{DBUS_VERBOSE} environment variable is set to @samp{1}.  For more
 information, refer to the @samp{dbus-daemon(1)} man page.")))
 
-(define glib
+(define glib-minimal
   (package
     (name "glib")
     (version "2.82.1")
@@ -524,6 +524,21 @@ (define glib
     (license license:lgpl2.1+)
     (properties '((hidden? . #t)))))
 
+(define glib
+  (let ((base glib-minimal))
+    (package/inherit base
+      (native-inputs
+       (modify-inputs (package-native-inputs base)
+         (prepend gobject-introspection-minimal)))
+      (arguments
+       (substitute-keyword-arguments (package-arguments base)
+         ((#:phases phases)
+          #~(modify-phases #$phases
+              ;; GI tests require installed libraries
+              (delete 'check)
+              (add-after 'install 'check
+                (assoc-ref #$phases 'check)))))))))
+
 (define-public glib-with-documentation
   ;; glib's doc must be built in a separate package since it requires gtk-doc,
   ;; which in turn depends on glib.
@@ -602,7 +617,7 @@ (define (correct-library-name-phase python name)
         (string-append name target-suffix))
       (rename-file native-name target-name)))
 
-(define gobject-introspection
+(define gobject-introspection-minimal
   (package
     (name "gobject-introspection")
     (version "1.82.0")
@@ -659,15 +674,14 @@ (define gobject-introspection
      `(,@(if (%current-target-system)
            `(("python" ,python))
            '())
-       ("glib" ,glib "bin")
+       ("glib" ,glib-minimal "bin")
        ("pkg-config" ,pkg-config)
        ("bison" ,bison)
        ("flex" ,flex)))
     (inputs
-     `(("python" ,python)
-       ("zlib" ,zlib)))
+     (list python zlib))
     (propagated-inputs
-     (list glib
+     (list glib-minimal
            ;; In practice, GIR users will need libffi when using
            ;; gobject-introspection.
            libffi))
@@ -691,6 +705,16 @@ (define gobject-introspection
       ;; For tools.
       license:gpl2+))))
 
+(define gobject-introspection
+  (let ((base gobject-introspection-minimal))
+    (package/inherit base
+      (native-inputs
+       (modify-inputs (package-native-inputs base)
+         (replace "glib" glib)))
+      (propagated-inputs
+       (modify-inputs (package-propagated-inputs base)
+         (replace "glib" glib))))))
+
 (define intltool
   (package
     (name "intltool")
-- 
2.46.0

[bug#73610] [PATCH gnome-team v4 4/7] gnu: cairo: Update to 1.18.2.

[Liliana Marie Prikler]

* gnu/packages/gtk.scm (cairo): Update to 1.18.2.

Reviewed-by: Maxim Cournoyer <maxim.cournoyer@gmail.com>
---
 gnu/packages/gtk.scm | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 23bb953f6f..dcee128fa0 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -77,6 +77,7 @@ (define-module (gnu packages gtk)
   #:use-module (gnu packages base)
   #:use-module (gnu packages bash)
   #:use-module (gnu packages boost)
+  #:use-module (gnu packages build-tools)
   #:use-module (gnu packages texinfo)
   #:use-module (gnu packages check)
   #:use-module (gnu packages compression)
@@ -169,7 +170,7 @@ (define-public appmenu-gtk-module
 (define cairo
   (package
     (name "cairo")
-    (version "1.18.0")
+    (version "1.18.2")
     (source
      (origin
        (method url-fetch)
@@ -177,10 +178,11 @@ (define cairo
         (string-append "https://cairographics.org/releases/cairo-"
                        version ".tar.xz"))
        (sha256
-        (base32 "0r0by563s75xyzz0d0j1nmjqmdrk2x9agk7r57p3v8vqp4v0ffi4"))))
+        (base32 "0nnli5cghygbl9bvlbjls7nspnrrzx1y1pbd7p649s154js9nax6"))))
     (build-system meson-build-system)
     (arguments
      `(#:tests? #f ; see http://lists.gnu.org/archive/html/bug-guix/2013-06/msg00085.html
+       #:meson ,meson-1.5               ; 1.3 or higher required
        #:glib-or-gtk? #t
        #:configure-flags
        ,#~(list "-Dtests=disabled")
-- 
2.46.0

[bug#73610] [PATCH gnome-team v4 5/7] gnu: python-pygobject: Update to 3.50.0.

[Liliana Marie Prikler]

* gnu/packages/glib.scm (python-pygobject): Update to 3.50.0.
(python-pygobject-3.48): Delete variable.
* gnu/packages/gstreamer.scm (python-gst): Adjust accordingly.
---
 gnu/packages/glib.scm      | 18 ++----------------
 gnu/packages/gstreamer.scm |  2 +-
 2 files changed, 3 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 15b0c03de6..1a8ecdad35 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -1056,7 +1056,7 @@ (define-public glibmm-2.76
 (define-public python-pygobject
   (package
     (name "python-pygobject")
-    (version "3.47.0")
+    (version "3.50.0")
     (source
      (origin
        (method url-fetch)
@@ -1065,7 +1065,7 @@ (define-public python-pygobject
                            "/pygobject-" version ".tar.xz"))
        (sha256
         (base32
-         "082dpm34a350bnhgmkdv8myxzjgnrflckkpn46vnvs36f7bbfdij"))
+         "04i28xrb9fxkmn9j2mmsl0lbmk9blgjcl8hnxrbx90d8nmsnx0wd"))
        (modules '((guix build utils)))
        (snippet
         ;; We disable these tests in a snippet so that they are inherited
@@ -1105,20 +1105,6 @@ (define-public python-pygobject
      '((upstream-name . "pygobject")))
     (license license:lgpl2.1+)))
 
-(define-public python-pygobject-3.48
-  (package
-    (inherit python-pygobject)
-    (version "3.48.2")
-    (source
-     (origin
-       (inherit (package-source python-pygobject))
-       (uri (string-append "mirror://gnome/sources/pygobject/"
-                           (version-major+minor version)
-                           "/pygobject-" version ".tar.xz"))
-       (sha256
-        (base32
-         "19yii8lydnjw225k4gclhn8hya7caiginqi0mj9a0cdym6sax507"))))))
-
 (define-public perl-glib
   (package
     (name "perl-glib")
diff --git a/gnu/packages/gstreamer.scm b/gnu/packages/gstreamer.scm
index feb2505b5f..e638e1c230 100644
--- a/gnu/packages/gstreamer.scm
+++ b/gnu/packages/gstreamer.scm
@@ -1130,7 +1130,7 @@ (define-public python-gst
     (native-inputs
      (list pkg-config python))
     (propagated-inputs
-     (list gst-plugins-base python-pygobject-3.48))
+     (list gst-plugins-base python-pygobject))
     (home-page "https://gstreamer.freedesktop.org/")
     (synopsis "GStreamer GObject Introspection overrides for Python")
     (description
-- 
2.46.0

[bug#73610] [PATCH gnome-team v4 6/7] gnu: json-glib: Update to 1.10.0.

[Liliana Marie Prikler]

* gnu/packages/gnome.scm (json-glib-minimal): Update to 1.10.0.
[#:configure-flags]: Add “-Dman=false”.
(json-glib)[inputs]: Add python-docutils.
---
 gnu/packages/gnome.scm | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 3617eecbf0..844d348801 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -4817,7 +4817,7 @@ (define-public dconf
 (define-public json-glib-minimal
   (package
     (name "json-glib-minimal")
-    (version "1.6.6")
+    (version "1.10.0")
     (source (origin
               (method url-fetch)
               (uri (string-append "mirror://gnome/sources/json-glib/"
@@ -4825,11 +4825,12 @@ (define-public json-glib-minimal
                                   "/json-glib-" version ".tar.xz"))
               (sha256
                (base32
-                "03j9ba2sccbz954smk3n1swwnvpzl8yhwwin6vixvxligaz9iv4n"))))
+                "0yxg215gpa61sxnx05bgzbqq9dsvbawk6cfz8z0yq1k1v5k8vjhv"))))
     (build-system meson-build-system)
     (arguments
      (list #:glib-or-gtk? #t            ;to wrap binaries, compile schemas
-           #:configure-flags #~(list "-Dgtk_doc=disabled")))
+           #:configure-flags #~(list "-Dman=false"
+                                     "-Dgtk_doc=disabled")))
     (native-inputs
      (list
       gettext-minimal
@@ -4883,7 +4884,8 @@ (define-public json-glib
          ;; No docs, no additional inputs.
          (package-native-inputs json-glib-minimal)
          (modify-inputs (package-native-inputs json-glib-minimal)
-                        (prepend gi-docgen gobject-introspection))))))
+           (prepend gi-docgen gobject-introspection
+                    python-docutils))))))
 
 (define-public libxklavier
   (package
-- 
2.46.0

[bug#73610] [PATCH gnome-team v4 7/7] gnu: gjs: Fix build.

[Liliana Marie Prikler]

* gnu/packages/patches/gjs-fix-closure-annotations.patch: New file.
* gnu/local.mk (dist_patch_DATA): Register it here.
* gnu/packages/gnome.scm (gjs)[patches]: Use it here.
---
 gnu/local.mk                                  |  1 +
 gnu/packages/gnome.scm                        |  2 +
 .../patches/gjs-fix-closure-annotations.patch | 99 +++++++++++++++++++
 3 files changed, 102 insertions(+)
 create mode 100644 gnu/packages/patches/gjs-fix-closure-annotations.patch

diff --git a/gnu/local.mk b/gnu/local.mk
index 8cc0e0e3ab..e55c7b938b 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1396,6 +1396,7 @@ dist_patch_DATA =						\
   %D%/packages/patches/ghostscript-no-header-uuid.patch		\
   %D%/packages/patches/ghostscript-no-header-creationdate.patch \
   %D%/packages/patches/git-filter-repo-generate-doc.patch	\
+  %D%/packages/patches/gjs-fix-closure-annotations.patch	\
   %D%/packages/patches/gklib-suitesparse.patch			\
   %D%/packages/patches/glib-appinfo-watch.patch			\
   %D%/packages/patches/glib-skip-failing-test.patch		\
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 844d348801..a247f024eb 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -7832,6 +7832,8 @@ (define-public gjs
               (sha256
                (base32
                 "0knkbczic9874r2mnhc8yh9w63bmj574b7528ql0x3lf40nzcjx5"))
+              ;; TODO: Remove when updating to 1.82.0.
+              (patches (search-patches "gjs-fix-closure-annotations.patch"))
               (modules '((guix build utils)))
               (snippet
                '(begin
diff --git a/gnu/packages/patches/gjs-fix-closure-annotations.patch b/gnu/packages/patches/gjs-fix-closure-annotations.patch
new file mode 100644
index 0000000000..1b440ef9da
--- /dev/null
+++ b/gnu/packages/patches/gjs-fix-closure-annotations.patch
@@ -0,0 +1,99 @@
+From 1df5d72d8df383199dcd88cd1d16209617bf32ca Mon Sep 17 00:00:00 2001
+From: Philip Chimento <philip.chimento@gmail.com>
+Date: Sat, 27 Jul 2024 20:17:39 -0700
+Subject: [PATCH] GjsPrivate: Fix closure annotations
+
+Apparently the closure annotation can be omitted if the parameter is named
+"user_data". If it is needed because the parameter is not named
+"user_data" then the annotation should be on the callback argument and
+refer to the user data argument.
+---
+ libgjs-private/gjs-util.c | 10 +++++-----
+ libgjs-private/gjs-util.h | 16 ++++++++--------
+ 2 files changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/libgjs-private/gjs-util.c b/libgjs-private/gjs-util.c
+index b264aec1e..ae65287f5 100644
+--- a/libgjs-private/gjs-util.c
++++ b/libgjs-private/gjs-util.c
+@@ -235,7 +235,7 @@ void gjs_gtk_container_child_set_property(GObject* container, GObject* child,
+  * @store: a #GListStore
+  * @item: the new item
+  * @compare_func: (scope call): pairwise comparison function for sorting
+- * @user_data: (closure): user data for @compare_func
++ * @user_data: user data for @compare_func
+  *
+  * Inserts @item into @store at a position to be determined by the
+  * @compare_func.
+@@ -258,7 +258,7 @@ unsigned int gjs_list_store_insert_sorted(GListStore *store, GObject *item,
+  * gjs_list_store_sort:
+  * @store: a #GListStore
+  * @compare_func: (scope call): pairwise comparison function for sorting
+- * @user_data: (closure): user data for @compare_func
++ * @user_data: user data for @compare_func
+  *
+  * Sort the items in @store according to @compare_func.
+  */
+@@ -270,7 +270,7 @@ void gjs_list_store_sort(GListStore *store, GjsCompareDataFunc compare_func,
+ /**
+  * gjs_gtk_custom_sorter_new:
+  * @sort_func: (nullable) (scope call): function to sort items
+- * @user_data: (closure): user data for @compare_func
++ * @user_data: user data for @sort_func
+  * @destroy: destroy notify for @user_data
+  *
+  * Creates a new `GtkSorter` that works by calling @sort_func to compare items.
+@@ -305,7 +305,7 @@ GObject* gjs_gtk_custom_sorter_new(GjsCompareDataFunc sort_func,
+  * gjs_gtk_custom_sorter_set_sort_func:
+  * @sorter: a `GtkCustomSorter`
+  * @sort_func: (nullable) (scope call): function to sort items
+- * @user_data: (closure): user data to pass to @sort_func
++ * @user_data: user data to pass to @sort_func
+  * @destroy: destroy notify for @user_data
+  *
+  * Sets (or unsets) the function used for sorting items.
+@@ -423,7 +423,7 @@ void gjs_log_set_writer_default() {
+ /**
+  * gjs_log_set_writer_func:
+  * @func: (scope notified): callback with log data
+- * @user_data: (closure): user data for @func
++ * @user_data: user data for @func
+  * @user_data_free: (destroy user_data_free): destroy for @user_data
+  *
+  * Sets a given function as the writer function for structured logging,
+diff --git a/libgjs-private/gjs-util.h b/libgjs-private/gjs-util.h
+index 7ee83e0d8..11b7c7cbc 100644
+--- a/libgjs-private/gjs-util.h
++++ b/libgjs-private/gjs-util.h
+@@ -124,11 +124,11 @@ typedef gboolean (*GjsBindingTransformFunc)(GBinding* binding,
+  * @target:
+  * @target_property:
+  * @flags:
+- * @to_callback: (scope notified) (nullable):
+- * @to_data: (closure to_callback):
++ * @to_callback: (scope notified) (nullable) (closure to_data):
++ * @to_data:
+  * @to_notify: (destroy to_data):
+- * @from_callback: (scope notified) (nullable):
+- * @from_data: (closure from_callback):
++ * @from_callback: (scope notified) (nullable) (closure from_data):
++ * @from_data:
+  * @from_notify: (destroy from_data):
+  *
+  * Returns: (transfer none):
+@@ -149,11 +149,11 @@ GBinding* gjs_g_object_bind_property_full(
+  * @target:
+  * @target_property:
+  * @flags:
+- * @to_callback: (scope notified) (nullable):
+- * @to_data: (closure to_callback):
++ * @to_callback: (scope notified) (nullable) (closure to_data):
++ * @to_data:
+  * @to_notify: (destroy to_data):
+- * @from_callback: (scope notified) (nullable):
+- * @from_data: (closure from_callback):
++ * @from_callback: (scope notified) (nullable) (closure from_data):
++ * @from_data:
+  * @from_notify: (destroy from_data):
+  */
+ GJS_EXPORT
\ No newline at end of file
-- 
2.46.0

bug#73610: [PATCH gnome-team v4 0/7] Update GLib to 2.82.1

[Liliana Marie Prikler]

Am Sonntag, dem 20.10.2024 um 13:40 +0200 schrieb Liliana Marie
Prikler:
> So…
> 
> it turns out, that gobject-introspection changes the rules for some
> annotations with 1.82, causing failures in GI-related packages.
> This revision fixes those, at least for Python and JS.
> 
> Cheers
> 
> Liliana Marie Prikler (7):
>   gnu: glib: Update to 2.82.1.
>   gnu: gobject-introspection: Update to 1.82.0.
>   gnu: bootstrap glib and gobject against each other.
>   gnu: cairo: Update to 1.18.2.
>   gnu: python-pygobject: Update to 3.50.0.
>   gnu: json-glib: Update to 1.10.0.
>   gnu: gjs: Fix build.
Pushed as 39db94b398bbac02f3305b5a7b23c76518ba00f1.

Cheers