* [bug#73610] [PATCH gnome-team 1/2] gnu: glib: Update to 2.82.1.
2024-10-03 9:32 [bug#73610] [PATCH gnome-team 0/2] Update GLib to 2.82.1 Liliana Marie Prikler
@ 2024-10-03 9:25 ` Liliana Marie Prikler
2024-10-03 9:25 ` [bug#73610] [PATCH gnome-team v2 1/4] " Liliana Marie Prikler
2024-10-03 9:31 ` [bug#73610] [PATCH gnome-team 2/2] gnu: gobject-introspection: Update to 1.82.0 Liliana Marie Prikler
2 siblings, 0 replies; 7+ messages in thread
From: Liliana Marie Prikler @ 2024-10-03 9:25 UTC (permalink / raw)
To: 73610; +Cc: liliana.prikler, maxim.cournoyer, vivien
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
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [bug#73610] [PATCH gnome-team v2 1/4] gnu: glib: Update to 2.82.1.
2024-10-03 9:32 [bug#73610] [PATCH gnome-team 0/2] Update GLib to 2.82.1 Liliana Marie Prikler
2024-10-03 9:25 ` [bug#73610] [PATCH gnome-team 1/2] gnu: glib: Update " Liliana Marie Prikler
@ 2024-10-03 9:25 ` Liliana Marie Prikler
2024-10-03 9:31 ` [bug#73610] [PATCH gnome-team v2 2/4] gnu: gobject-introspection: Update to 1.82.0 Liliana Marie Prikler
` (2 more replies)
2024-10-03 9:31 ` [bug#73610] [PATCH gnome-team 2/2] gnu: gobject-introspection: Update to 1.82.0 Liliana Marie Prikler
2 siblings, 3 replies; 7+ messages in thread
From: Liliana Marie Prikler @ 2024-10-03 9:25 UTC (permalink / raw)
To: 73610; +Cc: liliana.prikler, maxim.cournoyer, vivien
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
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [bug#73610] [PATCH gnome-team 2/2] gnu: gobject-introspection: Update to 1.82.0.
2024-10-03 9:32 [bug#73610] [PATCH gnome-team 0/2] Update GLib to 2.82.1 Liliana Marie Prikler
2024-10-03 9:25 ` [bug#73610] [PATCH gnome-team 1/2] gnu: glib: Update " Liliana Marie Prikler
2024-10-03 9:25 ` [bug#73610] [PATCH gnome-team v2 1/4] " Liliana Marie Prikler
@ 2024-10-03 9:31 ` Liliana Marie Prikler
2 siblings, 0 replies; 7+ messages in thread
From: Liliana Marie Prikler @ 2024-10-03 9:31 UTC (permalink / raw)
To: 73610; +Cc: liliana.prikler, maxim.cournoyer, vivien
* 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
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [bug#73610] [PATCH gnome-team v2 2/4] gnu: gobject-introspection: Update to 1.82.0.
2024-10-03 9:25 ` [bug#73610] [PATCH gnome-team v2 1/4] " Liliana Marie Prikler
@ 2024-10-03 9:31 ` Liliana Marie Prikler
2024-10-05 7:55 ` [bug#73610] [PATCH gnome-team v2 3/4] gnu: bootstrap glib and gobject against each other Liliana Marie Prikler
2024-10-05 7:59 ` [bug#73610] [PATCH gnome-team v2 4/4] gnu: cairo: Update to 1.18.2 Liliana Marie Prikler
2 siblings, 0 replies; 7+ messages in thread
From: Liliana Marie Prikler @ 2024-10-03 9:31 UTC (permalink / raw)
To: 73610; +Cc: liliana.prikler, maxim.cournoyer, vivien
* 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
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [bug#73610] [PATCH gnome-team 0/2] Update GLib to 2.82.1
@ 2024-10-03 9:32 Liliana Marie Prikler
2024-10-03 9:25 ` [bug#73610] [PATCH gnome-team 1/2] gnu: glib: Update " Liliana Marie Prikler
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Liliana Marie Prikler @ 2024-10-03 9:32 UTC (permalink / raw)
To: 73610; +Cc: liliana.prikler, maxim.cournoyer, vivien
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
^ permalink raw reply [flat|nested] 7+ messages in thread
* [bug#73610] [PATCH gnome-team v2 3/4] gnu: bootstrap glib and gobject against each other.
2024-10-03 9:25 ` [bug#73610] [PATCH gnome-team v2 1/4] " Liliana Marie Prikler
2024-10-03 9:31 ` [bug#73610] [PATCH gnome-team v2 2/4] gnu: gobject-introspection: Update to 1.82.0 Liliana Marie Prikler
@ 2024-10-05 7:55 ` Liliana Marie Prikler
2024-10-05 7:59 ` [bug#73610] [PATCH gnome-team v2 4/4] gnu: cairo: Update to 1.18.2 Liliana Marie Prikler
2 siblings, 0 replies; 7+ messages in thread
From: Liliana Marie Prikler @ 2024-10-05 7:55 UTC (permalink / raw)
To: 73610; +Cc: liliana.prikler, maxim.cournoyer, vivien
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
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [bug#73610] [PATCH gnome-team v2 4/4] gnu: cairo: Update to 1.18.2.
2024-10-03 9:25 ` [bug#73610] [PATCH gnome-team v2 1/4] " Liliana Marie Prikler
2024-10-03 9:31 ` [bug#73610] [PATCH gnome-team v2 2/4] gnu: gobject-introspection: Update to 1.82.0 Liliana Marie Prikler
2024-10-05 7:55 ` [bug#73610] [PATCH gnome-team v2 3/4] gnu: bootstrap glib and gobject against each other Liliana Marie Prikler
@ 2024-10-05 7:59 ` Liliana Marie Prikler
2 siblings, 0 replies; 7+ messages in thread
From: Liliana Marie Prikler @ 2024-10-05 7:59 UTC (permalink / raw)
To: 73610; +Cc: liliana.prikler, maxim.cournoyer, vivien
* 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
^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-10-05 8:38 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-10-03 9:32 [bug#73610] [PATCH gnome-team 0/2] Update GLib to 2.82.1 Liliana Marie Prikler
2024-10-03 9:25 ` [bug#73610] [PATCH gnome-team 1/2] gnu: glib: Update " Liliana Marie Prikler
2024-10-03 9:25 ` [bug#73610] [PATCH gnome-team v2 1/4] " Liliana Marie Prikler
2024-10-03 9:31 ` [bug#73610] [PATCH gnome-team v2 2/4] gnu: gobject-introspection: Update to 1.82.0 Liliana Marie Prikler
2024-10-05 7:55 ` [bug#73610] [PATCH gnome-team v2 3/4] gnu: bootstrap glib and gobject against each other Liliana Marie Prikler
2024-10-05 7:59 ` [bug#73610] [PATCH gnome-team v2 4/4] gnu: cairo: Update to 1.18.2 Liliana Marie Prikler
2024-10-03 9:31 ` [bug#73610] [PATCH gnome-team 2/2] gnu: gobject-introspection: Update to 1.82.0 Liliana Marie Prikler
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.