* [bug#62467] [PATCH gnome-team 1/5] gnu: glib: Update to 2.76.1.
2023-03-26 19:20 [bug#62467] [PATCH gnome-team 0/5] Update fundamental packages Liliana Marie Prikler
@ 2023-03-26 15:39 ` Liliana Marie Prikler
2023-03-26 15:39 ` [bug#62467] [PATCH gnome-team v3 02/15] " Liliana Marie Prikler
` (32 subsequent siblings)
33 siblings, 0 replies; 64+ messages in thread
From: Liliana Marie Prikler @ 2023-03-26 15:39 UTC (permalink / raw)
To: 62467; +Cc: rg
* gnu/packages/glib.scm (glib): Update to 2.76.1.
[source]<snippet>: Adjust accordingly.
[arguments]<#:phases>: Add ‘set-G_TEST_SRCDIR’. Update ‘delete-failing-tests’.
[propagated-inputs]: Replace pcre with pcre2.
(glib-with-documentation): Inherit from glib.
* gnu/packages/gnome.scm (sysprof, gtranslator): Use glib.
* gnu/packages/gtk.scm (gtksourceview): Use glib.
* gnu/packages/guile-xyz.scm (guile-g-golf): Use glib.
* gnu/packages/patches/glib-skip-failing-test.patch: Adjust accordingly.
---
gnu/packages/glib.scm | 92 +++++--------------
gnu/packages/gnome.scm | 8 +-
gnu/packages/gtk.scm | 2 +-
gnu/packages/guile-xyz.scm | 2 +-
.../patches/glib-skip-failing-test.patch | 3 +-
5 files changed, 30 insertions(+), 77 deletions(-)
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index f85d5e3225..ecf5cb491f 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -215,7 +215,7 @@ (define-public dbus-verbose
(define glib
(package
(name "glib")
- (version "2.70.2")
+ (version "2.76.1")
(source
(origin
(method url-fetch)
@@ -224,14 +224,14 @@ (define glib
name "/" (string-take version 4) "/"
name "-" version ".tar.xz"))
(sha256
- (base32 "0vw08p4jllavp9qmlqg1yl1zanmy53yid46wipas6gfdhnf4al85"))
+ (base32 "17x1zpr2avj8hjbpc6hp2sf2885lxac46v0kajsgan3929m0zp23"))
(patches
(search-patches "glib-appinfo-watch.patch"
"glib-skip-failing-test.patch"))
(modules '((guix build utils)))
(snippet
'(begin
- (substitute* "tests/spawn-test.c"
+ (substitute* "glib/tests/spawn-test.c"
(("/bin/sh") "sh"))))))
(build-system meson-build-system)
(outputs '("out" ;libraries, locales, etc
@@ -256,6 +256,9 @@ (define glib
#:phases
(modify-phases %standard-phases
;; Needed to pass the test phase on slower ARM and i686 machines.
+ (add-after 'unpack 'set-G_TEST_SRCDIR
+ (lambda _
+ (setenv "G_TEST_SRCDIR" (string-append (getcwd) "/gio/tests"))))
(add-after 'unpack 'increase-test-timeout
(lambda _
(substitute* "meson.build"
@@ -270,9 +273,19 @@ (define glib
(substitute* '("unix.c" "utils.c")
(("[ \t]*g_test_add_func.*;") "")))
(with-directory-excursion "gio/tests"
- (substitute* '("contenttype.c" "gdbus-address-get-session.c"
- "gdbus-peer.c" "appinfo.c" "desktop-app-info.c")
- (("[ \t]*g_test_add_func.*;") "")))
+ (substitute* '("contenttype.c"
+ "gdbus-address-get-session.c"
+ "gdbus-server-auth.c"
+ "gdbus-peer.c"
+ "appinfo.c"
+ "desktop-app-info.c")
+ (("[ \t]*g_test_add_func.*;") ""))
+ (unless (which "update-desktop-database")
+ (substitute* '("file.c")
+ (("[ \t]*g_test_add_func.*query-default-handler.*;") "")))
+ (substitute* '("portal-support-snap.c")
+ (("g_test_init .*")
+ "return EXIT_SUCCESS;")))
,@(if (target-x86-32?)
;; Comment out parts of timer.c that fail on i686 due to
@@ -357,7 +370,7 @@ (define glib
libelf))
(propagated-inputs
(list libffi ; in the Requires.private field of gobject-2.0.pc
- pcre ; in the Requires.private field of glib-2.0.pc
+ pcre2 ; in the Requires.private field of glib-2.0.pc
`(,util-linux "lib") ;for libmount
zlib)) ; in the Requires.private field of glib-2.0.pc
(native-search-paths
@@ -383,68 +396,10 @@ (define glib
(license license:lgpl2.1+)
(properties '((hidden? . #t)))))
-(define-public glib-next
- (package
- (inherit glib)
- (name "glib")
- (version "2.73.3")
- (source
- (origin
- (inherit (package-source glib))
- (uri
- (string-append "mirror://gnome/sources/"
- name "/" (string-take version 4) "/"
- name "-" version ".tar.xz"))
- (snippet
- '(substitute* "glib/tests/spawn-test.c"
- (("/bin/sh") "sh")))
- (sha256
- (base32 "1bgfch7zj1pq4rkqcibfky1470ijljyrx5pn5s5v9mk72s22n6nz"))))
- (arguments
- (substitute-keyword-arguments (package-arguments glib)
- ((#:test-options test-options ''())
- ;; Skip flaky or slow tests.
- `(cons* "--no-suite=slow" "--no-suite=flaky" ,test-options))
- ((#:phases phases '%standard-phases)
- `(modify-phases ,phases
- (replace 'disable-failing-tests
- (lambda _
- (with-directory-excursion "glib/tests"
- (substitute* '("unix.c" "utils.c")
- (("[ \t]*g_test_add_func.*;") "")))
- ;; The "glib:gio / file" test fails with the error "No
- ;; application is registered as handling this file" (see:
- ;; https://gitlab.gnome.org/GNOME/glib/-/issues/2742).
- (with-directory-excursion "gio/tests"
- (substitute* '("appinfo.c"
- "contenttype.c"
- "desktop-app-info.c"
- "file.c"
- "gdbus-address-get-session.c"
- "gdbus-peer.c")
- (("[ \t]*g_test_add_func.*;") "")))
-
- ,@(if (target-x86-32?)
- ;; Comment out parts of timer.c that fail on i686 due to
- ;; excess precision when building with GCC 10:
- ;; <https://gitlab.gnome.org/GNOME/glib/-/issues/820>.
- '((substitute* "glib/tests/timer.c"
- (("^ g_assert_cmpuint \\(micros.*" all)
- (string-append "//" all "\n"))
- (("^ g_assert_cmpfloat \\(elapsed, ==.*" all)
- (string-append "//" all "\n"))))
- '())))))))
- (native-inputs
- (modify-inputs (package-native-inputs glib)
- (append desktop-file-utils)))
- (propagated-inputs
- (modify-inputs (package-propagated-inputs glib)
- (replace "pcre" pcre2)))))
-
(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.
- (let ((base glib-next))
+ (let ((base glib))
(package/inherit base
(properties (alist-delete 'hidden? (package-properties base)))
(outputs (cons "doc" (package-outputs base))) ; 20 MiB of GTK-Doc reference
@@ -624,10 +579,7 @@ (define-public gobject-introspection-next
(patches (search-patches
"gobject-introspection-cc-1.72.patch"
"gobject-introspection-girepository.patch"
- "gobject-introspection-absolute-shlib-path-1.72.patch"))))
- (propagated-inputs
- (modify-inputs (package-propagated-inputs gobject-introspection)
- (replace "glib" glib-next)))))
+ "gobject-introspection-absolute-shlib-path-1.72.patch"))))))
(define intltool
(package
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 0efb98b97c..4a7e188048 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -13167,7 +13167,7 @@ (define-public sysprof
(propagated-inputs
(list polkit))
(inputs
- (list glib-next
+ (list glib
gtk
json-glib
libadwaita
@@ -13176,7 +13176,7 @@ (define-public sysprof
polkit))
(native-inputs
(list gettext-minimal
- `(,glib-next "bin") ;for gdbus-codegen, etc.
+ `(,glib "bin") ;for gdbus-codegen, etc.
itstool
libxml2
pkg-config))
@@ -13445,7 +13445,7 @@ (define-public gtranslator
(substitute* "build-aux/meson/meson_post_install.py"
(("gtk-update-icon-cache") (which "true"))))))))
(native-inputs
- (list `(,glib-next "bin")
+ (list `(,glib "bin")
gettext-minimal
itstool
pkg-config))
@@ -13453,7 +13453,7 @@ (define-public gtranslator
(list json-glib
jsonrpc-glib
gettext-minimal
- glib-next
+ glib
gsettings-desktop-schemas
gspell
libgda
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index b9ef660a80..1911ed7774 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -710,7 +710,7 @@ (define-public gtksourceview
;; gtksourceview-5.pc refers to all these.
(list fontconfig
fribidi
- glib-next
+ glib
gtk
libxml2
pcre2
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 315c9a7554..5d861c5c82 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -2290,7 +2290,7 @@ (define (get lib)
(setenv "DISPLAY" ":1")
#t)))))
(inputs
- (list guile-3.0 guile-lib glib-next))
+ (list guile-3.0 guile-lib glib))
(native-inputs
(list autoconf
automake
diff --git a/gnu/packages/patches/glib-skip-failing-test.patch b/gnu/packages/patches/glib-skip-failing-test.patch
index c7706aaa74..3fde5cb1e2 100644
--- a/gnu/packages/patches/glib-skip-failing-test.patch
+++ b/gnu/packages/patches/glib-skip-failing-test.patch
@@ -10,12 +10,13 @@ diff --git a/gio/tests/meson.build b/gio/tests/meson.build
index a926ae0..4fdbe7a 100644
--- a/gio/tests/meson.build
+++ b/gio/tests/meson.build
-@@ -317,10 +317,6 @@ if host_machine.system() != 'windows'
+@@ -317,11 +317,6 @@ if host_machine.system() != 'windows'
'extra_sources' : [extra_sources, gdbus_test_codegen_generated, gdbus_test_codegen_generated_interface_info],
'c_args' : ['-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32'],
},
- 'gdbus-threading' : {
- 'extra_sources' : extra_sources,
+- 'extra_programs': extra_programs,
- 'suite' : ['slow'],
- },
'gmenumodel' : {
base-commit: 42fbe62d52a82d1003c3d7039d3c4a46806c5cee
--
2.39.2
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team v2 01/12] gnu: glib: Update to 2.76.1.
2023-03-26 19:20 [bug#62467] [PATCH gnome-team 0/5] Update fundamental packages Liliana Marie Prikler
2023-03-26 15:39 ` [bug#62467] [PATCH gnome-team 1/5] gnu: glib: Update to 2.76.1 Liliana Marie Prikler
2023-03-26 15:39 ` [bug#62467] [PATCH gnome-team v3 02/15] " Liliana Marie Prikler
@ 2023-03-26 15:39 ` Liliana Marie Prikler
2023-04-08 19:37 ` Maxim Cournoyer
2023-03-26 15:53 ` [bug#62467] [PATCH gnome-team 2/5] gnu: Make pango-next the new pango Liliana Marie Prikler
` (30 subsequent siblings)
33 siblings, 1 reply; 64+ messages in thread
From: Liliana Marie Prikler @ 2023-03-26 15:39 UTC (permalink / raw)
To: 62467; +Cc: rg, Maxim Cournoyer
* gnu/packages/glib.scm (glib): Update to 2.76.1.
[source]<snippet>: Adjust accordingly.
[arguments]<#:phases>: Add ‘set-G_TEST_SRCDIR’. Update ‘delete-failing-tests’.
[propagated-inputs]: Replace pcre with pcre2.
(glib-with-documentation): Inherit from glib.
* gnu/packages/gnome.scm (sysprof, gtranslator): Use glib.
* gnu/packages/gtk.scm (gtksourceview): Use glib.
* gnu/packages/guile-xyz.scm (guile-g-golf): Use glib.
* gnu/packages/patches/glib-skip-failing-test.patch: Adjust accordingly.
---
gnu/packages/glib.scm | 92 +++++--------------
gnu/packages/gnome.scm | 8 +-
gnu/packages/gtk.scm | 2 +-
gnu/packages/guile-xyz.scm | 2 +-
.../patches/glib-skip-failing-test.patch | 3 +-
5 files changed, 30 insertions(+), 77 deletions(-)
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index f85d5e3225..ecf5cb491f 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -215,7 +215,7 @@ (define-public dbus-verbose
(define glib
(package
(name "glib")
- (version "2.70.2")
+ (version "2.76.1")
(source
(origin
(method url-fetch)
@@ -224,14 +224,14 @@ (define glib
name "/" (string-take version 4) "/"
name "-" version ".tar.xz"))
(sha256
- (base32 "0vw08p4jllavp9qmlqg1yl1zanmy53yid46wipas6gfdhnf4al85"))
+ (base32 "17x1zpr2avj8hjbpc6hp2sf2885lxac46v0kajsgan3929m0zp23"))
(patches
(search-patches "glib-appinfo-watch.patch"
"glib-skip-failing-test.patch"))
(modules '((guix build utils)))
(snippet
'(begin
- (substitute* "tests/spawn-test.c"
+ (substitute* "glib/tests/spawn-test.c"
(("/bin/sh") "sh"))))))
(build-system meson-build-system)
(outputs '("out" ;libraries, locales, etc
@@ -256,6 +256,9 @@ (define glib
#:phases
(modify-phases %standard-phases
;; Needed to pass the test phase on slower ARM and i686 machines.
+ (add-after 'unpack 'set-G_TEST_SRCDIR
+ (lambda _
+ (setenv "G_TEST_SRCDIR" (string-append (getcwd) "/gio/tests"))))
(add-after 'unpack 'increase-test-timeout
(lambda _
(substitute* "meson.build"
@@ -270,9 +273,19 @@ (define glib
(substitute* '("unix.c" "utils.c")
(("[ \t]*g_test_add_func.*;") "")))
(with-directory-excursion "gio/tests"
- (substitute* '("contenttype.c" "gdbus-address-get-session.c"
- "gdbus-peer.c" "appinfo.c" "desktop-app-info.c")
- (("[ \t]*g_test_add_func.*;") "")))
+ (substitute* '("contenttype.c"
+ "gdbus-address-get-session.c"
+ "gdbus-server-auth.c"
+ "gdbus-peer.c"
+ "appinfo.c"
+ "desktop-app-info.c")
+ (("[ \t]*g_test_add_func.*;") ""))
+ (unless (which "update-desktop-database")
+ (substitute* '("file.c")
+ (("[ \t]*g_test_add_func.*query-default-handler.*;") "")))
+ (substitute* '("portal-support-snap.c")
+ (("g_test_init .*")
+ "return EXIT_SUCCESS;")))
,@(if (target-x86-32?)
;; Comment out parts of timer.c that fail on i686 due to
@@ -357,7 +370,7 @@ (define glib
libelf))
(propagated-inputs
(list libffi ; in the Requires.private field of gobject-2.0.pc
- pcre ; in the Requires.private field of glib-2.0.pc
+ pcre2 ; in the Requires.private field of glib-2.0.pc
`(,util-linux "lib") ;for libmount
zlib)) ; in the Requires.private field of glib-2.0.pc
(native-search-paths
@@ -383,68 +396,10 @@ (define glib
(license license:lgpl2.1+)
(properties '((hidden? . #t)))))
-(define-public glib-next
- (package
- (inherit glib)
- (name "glib")
- (version "2.73.3")
- (source
- (origin
- (inherit (package-source glib))
- (uri
- (string-append "mirror://gnome/sources/"
- name "/" (string-take version 4) "/"
- name "-" version ".tar.xz"))
- (snippet
- '(substitute* "glib/tests/spawn-test.c"
- (("/bin/sh") "sh")))
- (sha256
- (base32 "1bgfch7zj1pq4rkqcibfky1470ijljyrx5pn5s5v9mk72s22n6nz"))))
- (arguments
- (substitute-keyword-arguments (package-arguments glib)
- ((#:test-options test-options ''())
- ;; Skip flaky or slow tests.
- `(cons* "--no-suite=slow" "--no-suite=flaky" ,test-options))
- ((#:phases phases '%standard-phases)
- `(modify-phases ,phases
- (replace 'disable-failing-tests
- (lambda _
- (with-directory-excursion "glib/tests"
- (substitute* '("unix.c" "utils.c")
- (("[ \t]*g_test_add_func.*;") "")))
- ;; The "glib:gio / file" test fails with the error "No
- ;; application is registered as handling this file" (see:
- ;; https://gitlab.gnome.org/GNOME/glib/-/issues/2742).
- (with-directory-excursion "gio/tests"
- (substitute* '("appinfo.c"
- "contenttype.c"
- "desktop-app-info.c"
- "file.c"
- "gdbus-address-get-session.c"
- "gdbus-peer.c")
- (("[ \t]*g_test_add_func.*;") "")))
-
- ,@(if (target-x86-32?)
- ;; Comment out parts of timer.c that fail on i686 due to
- ;; excess precision when building with GCC 10:
- ;; <https://gitlab.gnome.org/GNOME/glib/-/issues/820>.
- '((substitute* "glib/tests/timer.c"
- (("^ g_assert_cmpuint \\(micros.*" all)
- (string-append "//" all "\n"))
- (("^ g_assert_cmpfloat \\(elapsed, ==.*" all)
- (string-append "//" all "\n"))))
- '())))))))
- (native-inputs
- (modify-inputs (package-native-inputs glib)
- (append desktop-file-utils)))
- (propagated-inputs
- (modify-inputs (package-propagated-inputs glib)
- (replace "pcre" pcre2)))))
-
(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.
- (let ((base glib-next))
+ (let ((base glib))
(package/inherit base
(properties (alist-delete 'hidden? (package-properties base)))
(outputs (cons "doc" (package-outputs base))) ; 20 MiB of GTK-Doc reference
@@ -624,10 +579,7 @@ (define-public gobject-introspection-next
(patches (search-patches
"gobject-introspection-cc-1.72.patch"
"gobject-introspection-girepository.patch"
- "gobject-introspection-absolute-shlib-path-1.72.patch"))))
- (propagated-inputs
- (modify-inputs (package-propagated-inputs gobject-introspection)
- (replace "glib" glib-next)))))
+ "gobject-introspection-absolute-shlib-path-1.72.patch"))))))
(define intltool
(package
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 0efb98b97c..4a7e188048 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -13167,7 +13167,7 @@ (define-public sysprof
(propagated-inputs
(list polkit))
(inputs
- (list glib-next
+ (list glib
gtk
json-glib
libadwaita
@@ -13176,7 +13176,7 @@ (define-public sysprof
polkit))
(native-inputs
(list gettext-minimal
- `(,glib-next "bin") ;for gdbus-codegen, etc.
+ `(,glib "bin") ;for gdbus-codegen, etc.
itstool
libxml2
pkg-config))
@@ -13445,7 +13445,7 @@ (define-public gtranslator
(substitute* "build-aux/meson/meson_post_install.py"
(("gtk-update-icon-cache") (which "true"))))))))
(native-inputs
- (list `(,glib-next "bin")
+ (list `(,glib "bin")
gettext-minimal
itstool
pkg-config))
@@ -13453,7 +13453,7 @@ (define-public gtranslator
(list json-glib
jsonrpc-glib
gettext-minimal
- glib-next
+ glib
gsettings-desktop-schemas
gspell
libgda
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index b9ef660a80..1911ed7774 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -710,7 +710,7 @@ (define-public gtksourceview
;; gtksourceview-5.pc refers to all these.
(list fontconfig
fribidi
- glib-next
+ glib
gtk
libxml2
pcre2
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 315c9a7554..5d861c5c82 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -2290,7 +2290,7 @@ (define (get lib)
(setenv "DISPLAY" ":1")
#t)))))
(inputs
- (list guile-3.0 guile-lib glib-next))
+ (list guile-3.0 guile-lib glib))
(native-inputs
(list autoconf
automake
diff --git a/gnu/packages/patches/glib-skip-failing-test.patch b/gnu/packages/patches/glib-skip-failing-test.patch
index c7706aaa74..3fde5cb1e2 100644
--- a/gnu/packages/patches/glib-skip-failing-test.patch
+++ b/gnu/packages/patches/glib-skip-failing-test.patch
@@ -10,12 +10,13 @@ diff --git a/gio/tests/meson.build b/gio/tests/meson.build
index a926ae0..4fdbe7a 100644
--- a/gio/tests/meson.build
+++ b/gio/tests/meson.build
-@@ -317,10 +317,6 @@ if host_machine.system() != 'windows'
+@@ -317,11 +317,6 @@ if host_machine.system() != 'windows'
'extra_sources' : [extra_sources, gdbus_test_codegen_generated, gdbus_test_codegen_generated_interface_info],
'c_args' : ['-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32'],
},
- 'gdbus-threading' : {
- 'extra_sources' : extra_sources,
+- 'extra_programs': extra_programs,
- 'suite' : ['slow'],
- },
'gmenumodel' : {
--
2.39.2
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team v3 02/15] gnu: glib: Update to 2.76.1.
2023-03-26 19:20 [bug#62467] [PATCH gnome-team 0/5] Update fundamental packages Liliana Marie Prikler
2023-03-26 15:39 ` [bug#62467] [PATCH gnome-team 1/5] gnu: glib: Update to 2.76.1 Liliana Marie Prikler
@ 2023-03-26 15:39 ` Liliana Marie Prikler
2023-03-26 15:39 ` [bug#62467] [PATCH gnome-team v2 01/12] " Liliana Marie Prikler
` (31 subsequent siblings)
33 siblings, 0 replies; 64+ messages in thread
From: Liliana Marie Prikler @ 2023-03-26 15:39 UTC (permalink / raw)
To: 62467; +Cc: rg, Maxim Cournoyer
* gnu/packages/glib.scm (glib): Update to 2.76.1.
[source]<snippet>: Adjust accordingly.
[arguments]<#:phases>: Add ‘set-G_TEST_SRCDIR’. Update ‘delete-failing-tests’.
[propagated-inputs]: Replace pcre with pcre2.
(glib-with-documentation): Inherit from glib.
* gnu/packages/gnome.scm (sysprof, gtranslator): Use glib.
* gnu/packages/gtk.scm (gtksourceview, libpanel): Use glib.
* gnu/packages/guile-xyz.scm (guile-g-golf): Use glib.
* gnu/packages/music.scm (zrythm): Use glib.
* gnu/packages/patches/glib-skip-failing-test.patch: Adjust accordingly.
---
gnu/packages/glib.scm | 92 +++++--------------
gnu/packages/gnome.scm | 8 +-
gnu/packages/gtk.scm | 6 +-
gnu/packages/guile-xyz.scm | 2 +-
gnu/packages/music.scm | 4 +-
.../patches/glib-skip-failing-test.patch | 3 +-
6 files changed, 34 insertions(+), 81 deletions(-)
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index f85d5e3225..d9a9c58fbb 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -215,7 +215,7 @@ (define-public dbus-verbose
(define glib
(package
(name "glib")
- (version "2.70.2")
+ (version "2.76.1")
(source
(origin
(method url-fetch)
@@ -224,14 +224,14 @@ (define glib
name "/" (string-take version 4) "/"
name "-" version ".tar.xz"))
(sha256
- (base32 "0vw08p4jllavp9qmlqg1yl1zanmy53yid46wipas6gfdhnf4al85"))
+ (base32 "17x1zpr2avj8hjbpc6hp2sf2885lxac46v0kajsgan3929m0zp23"))
(patches
(search-patches "glib-appinfo-watch.patch"
"glib-skip-failing-test.patch"))
(modules '((guix build utils)))
(snippet
'(begin
- (substitute* "tests/spawn-test.c"
+ (substitute* "glib/tests/spawn-test.c"
(("/bin/sh") "sh"))))))
(build-system meson-build-system)
(outputs '("out" ;libraries, locales, etc
@@ -256,6 +256,9 @@ (define glib
#:phases
(modify-phases %standard-phases
;; Needed to pass the test phase on slower ARM and i686 machines.
+ (add-after 'unpack 'set-G_TEST_SRCDIR
+ (lambda _
+ (setenv "G_TEST_SRCDIR" (string-append (getcwd) "/gio/tests"))))
(add-after 'unpack 'increase-test-timeout
(lambda _
(substitute* "meson.build"
@@ -270,9 +273,19 @@ (define glib
(substitute* '("unix.c" "utils.c")
(("[ \t]*g_test_add_func.*;") "")))
(with-directory-excursion "gio/tests"
- (substitute* '("contenttype.c" "gdbus-address-get-session.c"
- "gdbus-peer.c" "appinfo.c" "desktop-app-info.c")
- (("[ \t]*g_test_add_func.*;") "")))
+ (substitute* '("contenttype.c"
+ "gdbus-address-get-session.c"
+ "gdbus-server-auth.c"
+ "gdbus-peer.c"
+ "appinfo.c"
+ "desktop-app-info.c")
+ (("[ \t]*g_test_add_func.*;") ""))
+ (unless (which "update-desktop-database")
+ (substitute* "file.c"
+ (("[ \t]*g_test_add_func.*query-default-handler.*;") "")))
+ (substitute* '("portal-support-snap.c")
+ (("g_test_init .*")
+ "return EXIT_SUCCESS;")))
,@(if (target-x86-32?)
;; Comment out parts of timer.c that fail on i686 due to
@@ -357,7 +370,7 @@ (define glib
libelf))
(propagated-inputs
(list libffi ; in the Requires.private field of gobject-2.0.pc
- pcre ; in the Requires.private field of glib-2.0.pc
+ pcre2 ; in the Requires.private field of glib-2.0.pc
`(,util-linux "lib") ;for libmount
zlib)) ; in the Requires.private field of glib-2.0.pc
(native-search-paths
@@ -383,68 +396,10 @@ (define glib
(license license:lgpl2.1+)
(properties '((hidden? . #t)))))
-(define-public glib-next
- (package
- (inherit glib)
- (name "glib")
- (version "2.73.3")
- (source
- (origin
- (inherit (package-source glib))
- (uri
- (string-append "mirror://gnome/sources/"
- name "/" (string-take version 4) "/"
- name "-" version ".tar.xz"))
- (snippet
- '(substitute* "glib/tests/spawn-test.c"
- (("/bin/sh") "sh")))
- (sha256
- (base32 "1bgfch7zj1pq4rkqcibfky1470ijljyrx5pn5s5v9mk72s22n6nz"))))
- (arguments
- (substitute-keyword-arguments (package-arguments glib)
- ((#:test-options test-options ''())
- ;; Skip flaky or slow tests.
- `(cons* "--no-suite=slow" "--no-suite=flaky" ,test-options))
- ((#:phases phases '%standard-phases)
- `(modify-phases ,phases
- (replace 'disable-failing-tests
- (lambda _
- (with-directory-excursion "glib/tests"
- (substitute* '("unix.c" "utils.c")
- (("[ \t]*g_test_add_func.*;") "")))
- ;; The "glib:gio / file" test fails with the error "No
- ;; application is registered as handling this file" (see:
- ;; https://gitlab.gnome.org/GNOME/glib/-/issues/2742).
- (with-directory-excursion "gio/tests"
- (substitute* '("appinfo.c"
- "contenttype.c"
- "desktop-app-info.c"
- "file.c"
- "gdbus-address-get-session.c"
- "gdbus-peer.c")
- (("[ \t]*g_test_add_func.*;") "")))
-
- ,@(if (target-x86-32?)
- ;; Comment out parts of timer.c that fail on i686 due to
- ;; excess precision when building with GCC 10:
- ;; <https://gitlab.gnome.org/GNOME/glib/-/issues/820>.
- '((substitute* "glib/tests/timer.c"
- (("^ g_assert_cmpuint \\(micros.*" all)
- (string-append "//" all "\n"))
- (("^ g_assert_cmpfloat \\(elapsed, ==.*" all)
- (string-append "//" all "\n"))))
- '())))))))
- (native-inputs
- (modify-inputs (package-native-inputs glib)
- (append desktop-file-utils)))
- (propagated-inputs
- (modify-inputs (package-propagated-inputs glib)
- (replace "pcre" pcre2)))))
-
(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.
- (let ((base glib-next))
+ (let ((base glib))
(package/inherit base
(properties (alist-delete 'hidden? (package-properties base)))
(outputs (cons "doc" (package-outputs base))) ; 20 MiB of GTK-Doc reference
@@ -624,10 +579,7 @@ (define-public gobject-introspection-next
(patches (search-patches
"gobject-introspection-cc-1.72.patch"
"gobject-introspection-girepository.patch"
- "gobject-introspection-absolute-shlib-path-1.72.patch"))))
- (propagated-inputs
- (modify-inputs (package-propagated-inputs gobject-introspection)
- (replace "glib" glib-next)))))
+ "gobject-introspection-absolute-shlib-path-1.72.patch"))))))
(define intltool
(package
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 6db6004356..99ca0fef88 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -13174,7 +13174,7 @@ (define-public sysprof
(propagated-inputs
(list polkit))
(inputs
- (list glib-next
+ (list glib
gtk
json-glib
libadwaita
@@ -13183,7 +13183,7 @@ (define-public sysprof
polkit))
(native-inputs
(list gettext-minimal
- `(,glib-next "bin") ;for gdbus-codegen, etc.
+ `(,glib "bin") ;for gdbus-codegen, etc.
itstool
libxml2
pkg-config))
@@ -13452,7 +13452,7 @@ (define-public gtranslator
(substitute* "build-aux/meson/meson_post_install.py"
(("gtk-update-icon-cache") (which "true"))))))))
(native-inputs
- (list `(,glib-next "bin")
+ (list `(,glib "bin")
gettext-minimal
itstool
pkg-config))
@@ -13460,7 +13460,7 @@ (define-public gtranslator
(list json-glib
jsonrpc-glib
gettext-minimal
- glib-next
+ glib
gsettings-desktop-schemas
gspell
libgda
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index e4026c601f..89ce459e4c 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -710,7 +710,7 @@ (define-public gtksourceview
;; gtksourceview-5.pc refers to all these.
(list fontconfig
fribidi
- glib-next
+ glib
gtk
libxml2
pcre2
@@ -3063,11 +3063,11 @@ (define-public libpanel
(substitute* "meson.build"
(("gtk_update_icon_cache: true")
"gtk_update_icon_cache: false")))))))
- (native-inputs (list `(,glib-next "bin")
+ (native-inputs (list `(,glib "bin")
gobject-introspection
pkg-config
vala))
- (inputs (list glib-next gtk libadwaita))
+ (inputs (list glib gtk libadwaita))
(home-page "https://gitlab.gnome.org/GNOME/libpanel")
(synopsis "Dock and panel library for GTK 4")
(description "Libpanel provides a library to create IDE-like applications
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index fd8fb25da1..e6cef165ea 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -2327,7 +2327,7 @@ (define (get lib)
(setenv "DISPLAY" ":1")
#t)))))
(inputs
- (list guile-3.0 guile-lib glib-next))
+ (list guile-3.0 guile-lib glib))
(native-inputs
(list autoconf
automake
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 69fe7009be..5a28e1321f 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -6481,7 +6481,7 @@ (define-public zrythm
flex
font-dseg
gettext-minimal
- glib-next
+ glib
glibc
graphviz
gtk
@@ -6519,7 +6519,7 @@ (define-public zrythm
;; XDG_DATA_DIRS.
(list breeze-icons ;native because not executable
help2man
- `(,glib-next "bin") ;for 'glib-compile-resources'
+ `(,glib "bin") ;for 'glib-compile-resources'
pkg-config
python-sphinx
python-sphinx-intl
diff --git a/gnu/packages/patches/glib-skip-failing-test.patch b/gnu/packages/patches/glib-skip-failing-test.patch
index c7706aaa74..3fde5cb1e2 100644
--- a/gnu/packages/patches/glib-skip-failing-test.patch
+++ b/gnu/packages/patches/glib-skip-failing-test.patch
@@ -10,12 +10,13 @@ diff --git a/gio/tests/meson.build b/gio/tests/meson.build
index a926ae0..4fdbe7a 100644
--- a/gio/tests/meson.build
+++ b/gio/tests/meson.build
-@@ -317,10 +317,6 @@ if host_machine.system() != 'windows'
+@@ -317,11 +317,6 @@ if host_machine.system() != 'windows'
'extra_sources' : [extra_sources, gdbus_test_codegen_generated, gdbus_test_codegen_generated_interface_info],
'c_args' : ['-DGLIB_VERSION_MIN_REQUIRED=GLIB_VERSION_2_32'],
},
- 'gdbus-threading' : {
- 'extra_sources' : extra_sources,
+- 'extra_programs': extra_programs,
- 'suite' : ['slow'],
- },
'gmenumodel' : {
--
2.39.2
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team 2/5] gnu: Make pango-next the new pango.
2023-03-26 19:20 [bug#62467] [PATCH gnome-team 0/5] Update fundamental packages Liliana Marie Prikler
` (2 preceding siblings ...)
2023-03-26 15:39 ` [bug#62467] [PATCH gnome-team v2 01/12] " Liliana Marie Prikler
@ 2023-03-26 15:53 ` Liliana Marie Prikler
2023-03-26 15:53 ` [bug#62467] [PATCH gnome-team v3 03/15] " Liliana Marie Prikler
` (29 subsequent siblings)
33 siblings, 0 replies; 64+ messages in thread
From: Liliana Marie Prikler @ 2023-03-26 15:53 UTC (permalink / raw)
To: 62467; +Cc: rg
* gnu/packages/gtk.scm (pango): Update to 1.50.4.
(pango-next): Delete variable.
(gtk)[propagated-inputs]: Use pango instead of pango-next.
(pangomm)[propagated-inputs]: Likewise.
(gtksourceview, gtk, pangomm)[inputs]: Use pango instead of pango-next.
* gnu/packages/freedesktop.scm (colord-gtk)[inputs]: Remove pango-next.
* gnu/packages/geo.scm (gnome-maps)[inputs]: Likewise.
* gnu/packages/gnome.scm (evolution-data-server)[inputs]: Likewise.
(network-manager-openvpn)[inputs]: Likewise.
(network-manager-vpnc)[inputs]: Likewise.
(network-manager-openconnect)[inputs]: Likewise.
(network-manager-fortisslvpn)[inputs]: Likewise.
(gnome-bluetooth)[inputs]: Likewise.
(baobab)[inputs]: Likewise.
(gnome-calendar)[inputs]: Likewise.
(gtranslator)[inputs]: Likewise.
* gnu/packages/ibus.scm (ibus)[inputs]: Likewise.
* gnu/packages/messaging.scm (dino)[inputs]: Likewise.
* gnu/packages/webkit.scm (webkitgtk-next)[inputs]: Likewise.
---
gnu/packages/freedesktop.scm | 4 +---
gnu/packages/geo.scm | 1 -
gnu/packages/gnome.scm | 25 ++++++-------------------
gnu/packages/gtk.scm | 28 +++++-----------------------
gnu/packages/ibus.scm | 2 +-
gnu/packages/messaging.scm | 1 -
gnu/packages/webkit.scm | 3 +--
7 files changed, 14 insertions(+), 50 deletions(-)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 40edcfdab4..20b2f5a87b 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -2113,9 +2113,7 @@ (define-public colord-gtk
pkg-config
vala))
(inputs
- ;; TODO: remove pango-next after it's the default.
- (list gtk+
- pango-next))
+ (list gtk+))
(propagated-inputs
;; colord-gtk.pc refers to all these.
(list colord gtk))
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 753ab558ad..9465c0eda7 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -388,7 +388,6 @@ (define-public gnome-maps
libshumate
libsoup
libxml2
- pango-next ;TODO: remove when it's the default
rest-next
webkitgtk))
(synopsis "Graphical map viewer and wayfinding program")
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 4a7e188048..90e33d72b6 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -8399,7 +8399,6 @@ (define-public evolution-data-server
libphonenumber
mit-krb5
openldap
- pango-next ;remove after it's the default
webkitgtk))
(synopsis "Store address books and calendars")
(home-page "https://wiki.gnome.org/Apps/Evolution")
@@ -8707,8 +8706,7 @@ (define-public network-manager-openvpn
libnma
libsecret
network-manager
- openvpn
- pango-next)) ;remove after it's the default
+ openvpn))
(home-page "https://wiki.gnome.org/Projects/NetworkManager/VPN")
(synopsis "OpenVPN plug-in for NetworkManager")
(description
@@ -8758,8 +8756,7 @@ (define-public network-manager-vpnc
vpnc
network-manager
libnma
- libsecret
- pango-next)) ;TODO: remove after it's the default
+ libsecret))
(home-page "https://wiki.gnome.org/Projects/NetworkManager/VPN")
(synopsis "VPNC plug-in for NetworkManager")
(description
@@ -8811,8 +8808,7 @@ (define-public network-manager-openconnect
libxml2
lz4
network-manager
- openconnect
- pango-next)) ;TODO: remove after it's the default
+ openconnect))
(home-page "https://wiki.gnome.org/Projects/NetworkManager/VPN")
(synopsis "OpenConnect plug-in for NetworkManager")
(description
@@ -8875,7 +8871,6 @@ (define-public network-manager-fortisslvpn
libsecret
network-manager
openfortivpn
- pango-next ;TODO: remove after it's the default
ppp))
(home-page "https://wiki.gnome.org/Projects/NetworkManager/VPN")
(synopsis "Fortinet SSLVPN plug-in for NetworkManager")
@@ -9302,8 +9297,6 @@ (define-public gnome-bluetooth
(list eudev
gsound
libnotify
- ;; TODO: Delete pango-next after it's the default.
- pango-next
python-dbus
upower))
(synopsis "GNOME Bluetooth subsystem")
@@ -10016,10 +10009,7 @@ (define-public baobab
python
vala))
(inputs
- (list gtk libadwaita libhandy
- ;; XXX: Ensure pango-next is used instead of the equally propagated
- ;; 'pango'.
- pango-next))
+ (list gtk libadwaita libhandy))
(synopsis "Disk usage analyzer for GNOME")
(description
"Baobab (Disk Usage Analyzer) is a graphical application to analyse disk
@@ -10617,9 +10607,7 @@ (define-public gnome-calendar
gsettings-desktop-schemas
libadwaita
libdazzle
- libgweather4-with-libsoup2
- ;; Remove pango-next when it's the default.
- pango-next))
+ libgweather4-with-libsoup2))
(home-page "https://wiki.gnome.org/Apps/Calendar")
(synopsis "GNOME's calendar application")
(description
@@ -13458,8 +13446,7 @@ (define-public gtranslator
gspell
libgda
libhandy
- libsoup
- pango-next))
+ libsoup))
(propagated-inputs
(list gtksourceview-4)) ; required for source view
(home-page "https://wiki.gnome.org/Apps/Gtranslator")
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 1911ed7774..ee9311ee79 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -427,7 +427,7 @@ (define-public libthai
(define-public pango
(package
(name "pango")
- (version "1.48.10")
+ (version "1.50.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/pango/"
@@ -436,7 +436,7 @@ (define-public pango
(patches (search-patches "pango-skip-libthai-test.patch"))
(sha256
(base32
- "166wxhsjb6hb0dk7wkkdcmpvasl9n0a0aa64mdgagzfdidwzbq91"))))
+ "0qn1a7ccs3p5vc6swbqm6hdzka879l0gp9220lq4bcf2gpl67bgl"))))
(build-system meson-build-system)
(arguments
'(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
@@ -481,22 +481,6 @@ (define-public pango
(home-page "https://pango.gnome.org/")
(license license:lgpl2.0+)))
-;; TODO: Make this the default package in next release cycle.
-(define-public pango-next
- (package
- (inherit pango)
- (name "pango-next") ;to avoid profile conflicts
- (version "1.50.4")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnome/sources/pango/"
- (version-major+minor version)
- "/pango-" version ".tar.xz"))
- (patches (search-patches "pango-skip-libthai-test.patch"))
- (sha256
- (base32
- "0qn1a7ccs3p5vc6swbqm6hdzka879l0gp9220lq4bcf2gpl67bgl"))))))
-
(define-public pango-1.42
(package
(inherit pango)
@@ -713,8 +697,7 @@ (define-public gtksourceview
glib
gtk
libxml2
- pcre2
- pango-next))
+ pcre2))
(home-page "https://wiki.gnome.org/Projects/GtkSourceView")
(synopsis "GNOME source code widget")
(description "GtkSourceView is a text widget that extends the standard
@@ -741,7 +724,6 @@ (define-public gtksourceview-4
(propagated-inputs
(modify-inputs (package-propagated-inputs gtksourceview)
(replace "gtk" gtk+)
- (replace "pango-next" pango)
(replace "glib" glib)))))
(define-public gtksourceview-3
@@ -1413,7 +1395,7 @@ (define-public gtk
libxkbcommon
libxrandr
libxrender
- pango-next
+ pango
vulkan-headers
vulkan-loader ;for vulkan graphics API support
wayland ;for wayland display-backend
@@ -1830,7 +1812,7 @@ (define-public pangomm
("python" ,python)
("xsltproc" ,libxslt)))
(propagated-inputs
- (list cairo cairomm glibmm pango-next))
+ (list cairo cairomm glibmm pango))
(home-page "https://pango.gnome.org//")
(synopsis "C++ interface to the Pango text rendering library")
(description
diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm
index 7d52c5889e..2bcad54656 100644
--- a/gnu/packages/ibus.scm
+++ b/gnu/packages/ibus.scm
@@ -248,7 +248,7 @@ (define-public ibus
((#:configure-flags flags)
#~(cons* "--enable-gtk4" #$flags))))
(inputs (modify-inputs (package-inputs ibus-minimal)
- (prepend gtk pango-next)))
+ (prepend gtk)))
(properties (alist-delete 'hidden? (package-properties ibus-minimal)))))
(define-public ibus-libpinyin
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 4b8071e728..66875a2136 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -1395,7 +1395,6 @@ (define-public dino
libsignal-protocol-c
libsoup
libsrtp ;for calls support
- pango-next ;gtk4 wants pango 1.50+
qrencode
sqlite
webrtc-audio-processing)) ;for A/V support
diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm
index 0a51479985..8ef95ce518 100644
--- a/gnu/packages/webkit.scm
+++ b/gnu/packages/webkit.scm
@@ -290,8 +290,7 @@ (define-public webkitgtk-next
(replace "gtk+" gtk)))
(inputs
(modify-inputs (package-inputs webkitgtk)
- (delete "gtk+-2" "libnotify")
- (append pango-next))))) ;TODO: remove after it's the default
+ (delete "gtk+-2" "libnotify")))))
;;; Required by e.g. emacs-next-pgtk, emacs-xwidgets, and some other GNOME
;;; packages for webkit2gtk-4.0. See also the upstream tracker for libsoup 3:
--
2.39.2
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team v2 02/12] gnu: Make pango-next the new pango.
2023-03-26 19:20 [bug#62467] [PATCH gnome-team 0/5] Update fundamental packages Liliana Marie Prikler
` (4 preceding siblings ...)
2023-03-26 15:53 ` [bug#62467] [PATCH gnome-team v3 03/15] " Liliana Marie Prikler
@ 2023-03-26 15:53 ` Liliana Marie Prikler
2023-04-08 19:39 ` Maxim Cournoyer
2023-03-26 18:53 ` [bug#62467] [PATCH gnome-team v3 04/15] gnu: pango: Update to 1.50.14 Liliana Marie Prikler
` (27 subsequent siblings)
33 siblings, 1 reply; 64+ messages in thread
From: Liliana Marie Prikler @ 2023-03-26 15:53 UTC (permalink / raw)
To: 62467; +Cc: rg, Maxim Cournoyer
* gnu/packages/gtk.scm (pango): Update to 1.50.4.
(pango-next): Delete variable.
(pango-1.48): New variable, defining old pango with inheritance.
(gtk)[propagated-inputs]: Use pango instead of pango-next.
(pangomm)[propagated-inputs]: Likewise.
(gtksourceview, gtk, pangomm)[inputs]: Use pango instead of pango-next.
(pangomm-2.46)[inputs]: Use pango-1.48.
* gnu/packages/freedesktop.scm (colord-gtk)[inputs]: Remove pango-next.
* gnu/packages/geo.scm (gnome-maps)[inputs]: Likewise.
* gnu/packages/gnome.scm (evolution-data-server)[inputs]: Likewise.
(network-manager-openvpn)[inputs]: Likewise.
(network-manager-vpnc)[inputs]: Likewise.
(network-manager-openconnect)[inputs]: Likewise.
(network-manager-fortisslvpn)[inputs]: Likewise.
(gnome-bluetooth)[inputs]: Likewise.
(baobab)[inputs]: Likewise.
(gnome-calendar)[inputs]: Likewise.
(gtranslator)[inputs]: Likewise.
* gnu/packages/ibus.scm (ibus)[inputs]: Likewise.
* gnu/packages/messaging.scm (dino)[inputs]: Likewise.
* gnu/packages/webkit.scm (webkitgtk-next)[inputs]: Likewise.
---
gnu/packages/freedesktop.scm | 4 +---
gnu/packages/geo.scm | 1 -
gnu/packages/gnome.scm | 25 ++++++-------------------
gnu/packages/gtk.scm | 26 +++++++++++---------------
gnu/packages/ibus.scm | 2 +-
gnu/packages/messaging.scm | 1 -
gnu/packages/webkit.scm | 3 +--
7 files changed, 20 insertions(+), 42 deletions(-)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 40edcfdab4..20b2f5a87b 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -2113,9 +2113,7 @@ (define-public colord-gtk
pkg-config
vala))
(inputs
- ;; TODO: remove pango-next after it's the default.
- (list gtk+
- pango-next))
+ (list gtk+))
(propagated-inputs
;; colord-gtk.pc refers to all these.
(list colord gtk))
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 753ab558ad..9465c0eda7 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -388,7 +388,6 @@ (define-public gnome-maps
libshumate
libsoup
libxml2
- pango-next ;TODO: remove when it's the default
rest-next
webkitgtk))
(synopsis "Graphical map viewer and wayfinding program")
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 4a7e188048..90e33d72b6 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -8399,7 +8399,6 @@ (define-public evolution-data-server
libphonenumber
mit-krb5
openldap
- pango-next ;remove after it's the default
webkitgtk))
(synopsis "Store address books and calendars")
(home-page "https://wiki.gnome.org/Apps/Evolution")
@@ -8707,8 +8706,7 @@ (define-public network-manager-openvpn
libnma
libsecret
network-manager
- openvpn
- pango-next)) ;remove after it's the default
+ openvpn))
(home-page "https://wiki.gnome.org/Projects/NetworkManager/VPN")
(synopsis "OpenVPN plug-in for NetworkManager")
(description
@@ -8758,8 +8756,7 @@ (define-public network-manager-vpnc
vpnc
network-manager
libnma
- libsecret
- pango-next)) ;TODO: remove after it's the default
+ libsecret))
(home-page "https://wiki.gnome.org/Projects/NetworkManager/VPN")
(synopsis "VPNC plug-in for NetworkManager")
(description
@@ -8811,8 +8808,7 @@ (define-public network-manager-openconnect
libxml2
lz4
network-manager
- openconnect
- pango-next)) ;TODO: remove after it's the default
+ openconnect))
(home-page "https://wiki.gnome.org/Projects/NetworkManager/VPN")
(synopsis "OpenConnect plug-in for NetworkManager")
(description
@@ -8875,7 +8871,6 @@ (define-public network-manager-fortisslvpn
libsecret
network-manager
openfortivpn
- pango-next ;TODO: remove after it's the default
ppp))
(home-page "https://wiki.gnome.org/Projects/NetworkManager/VPN")
(synopsis "Fortinet SSLVPN plug-in for NetworkManager")
@@ -9302,8 +9297,6 @@ (define-public gnome-bluetooth
(list eudev
gsound
libnotify
- ;; TODO: Delete pango-next after it's the default.
- pango-next
python-dbus
upower))
(synopsis "GNOME Bluetooth subsystem")
@@ -10016,10 +10009,7 @@ (define-public baobab
python
vala))
(inputs
- (list gtk libadwaita libhandy
- ;; XXX: Ensure pango-next is used instead of the equally propagated
- ;; 'pango'.
- pango-next))
+ (list gtk libadwaita libhandy))
(synopsis "Disk usage analyzer for GNOME")
(description
"Baobab (Disk Usage Analyzer) is a graphical application to analyse disk
@@ -10617,9 +10607,7 @@ (define-public gnome-calendar
gsettings-desktop-schemas
libadwaita
libdazzle
- libgweather4-with-libsoup2
- ;; Remove pango-next when it's the default.
- pango-next))
+ libgweather4-with-libsoup2))
(home-page "https://wiki.gnome.org/Apps/Calendar")
(synopsis "GNOME's calendar application")
(description
@@ -13458,8 +13446,7 @@ (define-public gtranslator
gspell
libgda
libhandy
- libsoup
- pango-next))
+ libsoup))
(propagated-inputs
(list gtksourceview-4)) ; required for source view
(home-page "https://wiki.gnome.org/Apps/Gtranslator")
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 1911ed7774..29494c36b1 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -427,7 +427,7 @@ (define-public libthai
(define-public pango
(package
(name "pango")
- (version "1.48.10")
+ (version "1.50.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/pango/"
@@ -436,7 +436,7 @@ (define-public pango
(patches (search-patches "pango-skip-libthai-test.patch"))
(sha256
(base32
- "166wxhsjb6hb0dk7wkkdcmpvasl9n0a0aa64mdgagzfdidwzbq91"))))
+ "0qn1a7ccs3p5vc6swbqm6hdzka879l0gp9220lq4bcf2gpl67bgl"))))
(build-system meson-build-system)
(arguments
'(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
@@ -481,21 +481,19 @@ (define-public pango
(home-page "https://pango.gnome.org/")
(license license:lgpl2.0+)))
-;; TODO: Make this the default package in next release cycle.
-(define-public pango-next
+(define-public pango-1.48
(package
(inherit pango)
- (name "pango-next") ;to avoid profile conflicts
- (version "1.50.4")
+ (version "1.48.10")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/pango/"
- (version-major+minor version)
- "/pango-" version ".tar.xz"))
+ (version-major+minor version) "/"
+ "pango-" version ".tar.xz"))
(patches (search-patches "pango-skip-libthai-test.patch"))
(sha256
(base32
- "0qn1a7ccs3p5vc6swbqm6hdzka879l0gp9220lq4bcf2gpl67bgl"))))))
+ "166wxhsjb6hb0dk7wkkdcmpvasl9n0a0aa64mdgagzfdidwzbq91"))))))
(define-public pango-1.42
(package
@@ -713,8 +711,7 @@ (define-public gtksourceview
glib
gtk
libxml2
- pcre2
- pango-next))
+ pcre2))
(home-page "https://wiki.gnome.org/Projects/GtkSourceView")
(synopsis "GNOME source code widget")
(description "GtkSourceView is a text widget that extends the standard
@@ -741,7 +738,6 @@ (define-public gtksourceview-4
(propagated-inputs
(modify-inputs (package-propagated-inputs gtksourceview)
(replace "gtk" gtk+)
- (replace "pango-next" pango)
(replace "glib" glib)))))
(define-public gtksourceview-3
@@ -1413,7 +1409,7 @@ (define-public gtk
libxkbcommon
libxrandr
libxrender
- pango-next
+ pango
vulkan-headers
vulkan-loader ;for vulkan graphics API support
wayland ;for wayland display-backend
@@ -1830,7 +1826,7 @@ (define-public pangomm
("python" ,python)
("xsltproc" ,libxslt)))
(propagated-inputs
- (list cairo cairomm glibmm pango-next))
+ (list cairo cairomm glibmm pango))
(home-page "https://pango.gnome.org//")
(synopsis "C++ interface to the Pango text rendering library")
(description
@@ -1853,7 +1849,7 @@ (define-public pangomm-2.46
(sha256
(base32 "06zczkaxf5p5kjgnzrfylzi40w9a8lxpndgs7rpn12qrsq27sy6k"))))
(propagated-inputs
- (list cairomm-1.14 glibmm-2.64 pango))))
+ (list cairomm-1.14 glibmm-2.64 pango-1.48))))
(define-public atkmm
(package
diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm
index 7d52c5889e..2bcad54656 100644
--- a/gnu/packages/ibus.scm
+++ b/gnu/packages/ibus.scm
@@ -248,7 +248,7 @@ (define-public ibus
((#:configure-flags flags)
#~(cons* "--enable-gtk4" #$flags))))
(inputs (modify-inputs (package-inputs ibus-minimal)
- (prepend gtk pango-next)))
+ (prepend gtk)))
(properties (alist-delete 'hidden? (package-properties ibus-minimal)))))
(define-public ibus-libpinyin
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 4b8071e728..66875a2136 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -1395,7 +1395,6 @@ (define-public dino
libsignal-protocol-c
libsoup
libsrtp ;for calls support
- pango-next ;gtk4 wants pango 1.50+
qrencode
sqlite
webrtc-audio-processing)) ;for A/V support
diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm
index 0a51479985..8ef95ce518 100644
--- a/gnu/packages/webkit.scm
+++ b/gnu/packages/webkit.scm
@@ -290,8 +290,7 @@ (define-public webkitgtk-next
(replace "gtk+" gtk)))
(inputs
(modify-inputs (package-inputs webkitgtk)
- (delete "gtk+-2" "libnotify")
- (append pango-next))))) ;TODO: remove after it's the default
+ (delete "gtk+-2" "libnotify")))))
;;; Required by e.g. emacs-next-pgtk, emacs-xwidgets, and some other GNOME
;;; packages for webkit2gtk-4.0. See also the upstream tracker for libsoup 3:
--
2.39.2
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team v3 03/15] gnu: Make pango-next the new pango.
2023-03-26 19:20 [bug#62467] [PATCH gnome-team 0/5] Update fundamental packages Liliana Marie Prikler
` (3 preceding siblings ...)
2023-03-26 15:53 ` [bug#62467] [PATCH gnome-team 2/5] gnu: Make pango-next the new pango Liliana Marie Prikler
@ 2023-03-26 15:53 ` Liliana Marie Prikler
2023-03-26 15:53 ` [bug#62467] [PATCH gnome-team v2 02/12] " Liliana Marie Prikler
` (28 subsequent siblings)
33 siblings, 0 replies; 64+ messages in thread
From: Liliana Marie Prikler @ 2023-03-26 15:53 UTC (permalink / raw)
To: 62467; +Cc: rg, Maxim Cournoyer
* gnu/packages/gtk.scm (pango): Update to 1.50.4.
(pango-next): Delete variable.
(pango-1.48): New variable, defining old pango with inheritance.
(gtk)[propagated-inputs]: Use pango instead of pango-next.
(pangomm)[propagated-inputs]: Likewise.
(gtksourceview, gtk, pangomm)[inputs]: Use pango instead of pango-next.
(pangomm-2.46)[inputs]: Use pango-1.48.
* gnu/packages/freedesktop.scm (colord-gtk)[inputs]: Remove pango-next.
* gnu/packages/geo.scm (gnome-maps)[inputs]: Likewise.
* gnu/packages/gnome.scm (evolution-data-server)[inputs]: Likewise.
(network-manager-openvpn)[inputs]: Likewise.
(network-manager-vpnc)[inputs]: Likewise.
(network-manager-openconnect)[inputs]: Likewise.
(network-manager-fortisslvpn)[inputs]: Likewise.
(gnome-bluetooth)[inputs]: Likewise.
(baobab)[inputs]: Likewise.
(gnome-calendar)[inputs]: Likewise.
(gtranslator)[inputs]: Likewise.
* gnu/packages/ibus.scm (ibus)[inputs]: Likewise.
* gnu/packages/messaging.scm (dino)[inputs]: Likewise.
* gnu/packages/music.scm (zrythm)[inputs]: Likewise.
* gnu/packages/webkit.scm (webkitgtk-next)[inputs]: Likewise.
---
gnu/packages/freedesktop.scm | 4 +---
gnu/packages/geo.scm | 1 -
gnu/packages/gnome.scm | 25 ++++++-------------------
gnu/packages/gtk.scm | 26 +++++++++++---------------
gnu/packages/ibus.scm | 2 +-
gnu/packages/messaging.scm | 1 -
gnu/packages/music.scm | 2 +-
gnu/packages/webkit.scm | 3 +--
8 files changed, 21 insertions(+), 43 deletions(-)
diff --git a/gnu/packages/freedesktop.scm b/gnu/packages/freedesktop.scm
index 043d1ec92b..d63faedb85 100644
--- a/gnu/packages/freedesktop.scm
+++ b/gnu/packages/freedesktop.scm
@@ -2113,9 +2113,7 @@ (define-public colord-gtk
pkg-config
vala))
(inputs
- ;; TODO: remove pango-next after it's the default.
- (list gtk+
- pango-next))
+ (list gtk+))
(propagated-inputs
;; colord-gtk.pc refers to all these.
(list colord gtk))
diff --git a/gnu/packages/geo.scm b/gnu/packages/geo.scm
index 753ab558ad..9465c0eda7 100644
--- a/gnu/packages/geo.scm
+++ b/gnu/packages/geo.scm
@@ -388,7 +388,6 @@ (define-public gnome-maps
libshumate
libsoup
libxml2
- pango-next ;TODO: remove when it's the default
rest-next
webkitgtk))
(synopsis "Graphical map viewer and wayfinding program")
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 99ca0fef88..2f73c0a9b7 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -8406,7 +8406,6 @@ (define-public evolution-data-server
libphonenumber
mit-krb5
openldap
- pango-next ;remove after it's the default
webkitgtk))
(synopsis "Store address books and calendars")
(home-page "https://wiki.gnome.org/Apps/Evolution")
@@ -8714,8 +8713,7 @@ (define-public network-manager-openvpn
libnma
libsecret
network-manager
- openvpn
- pango-next)) ;remove after it's the default
+ openvpn))
(home-page "https://wiki.gnome.org/Projects/NetworkManager/VPN")
(synopsis "OpenVPN plug-in for NetworkManager")
(description
@@ -8765,8 +8763,7 @@ (define-public network-manager-vpnc
vpnc
network-manager
libnma
- libsecret
- pango-next)) ;TODO: remove after it's the default
+ libsecret))
(home-page "https://wiki.gnome.org/Projects/NetworkManager/VPN")
(synopsis "VPNC plug-in for NetworkManager")
(description
@@ -8818,8 +8815,7 @@ (define-public network-manager-openconnect
libxml2
lz4
network-manager
- openconnect
- pango-next)) ;TODO: remove after it's the default
+ openconnect))
(home-page "https://wiki.gnome.org/Projects/NetworkManager/VPN")
(synopsis "OpenConnect plug-in for NetworkManager")
(description
@@ -8882,7 +8878,6 @@ (define-public network-manager-fortisslvpn
libsecret
network-manager
openfortivpn
- pango-next ;TODO: remove after it's the default
ppp))
(home-page "https://wiki.gnome.org/Projects/NetworkManager/VPN")
(synopsis "Fortinet SSLVPN plug-in for NetworkManager")
@@ -9309,8 +9304,6 @@ (define-public gnome-bluetooth
(list eudev
gsound
libnotify
- ;; TODO: Delete pango-next after it's the default.
- pango-next
python-dbus
upower))
(synopsis "GNOME Bluetooth subsystem")
@@ -10023,10 +10016,7 @@ (define-public baobab
python
vala))
(inputs
- (list gtk libadwaita libhandy
- ;; XXX: Ensure pango-next is used instead of the equally propagated
- ;; 'pango'.
- pango-next))
+ (list gtk libadwaita libhandy))
(synopsis "Disk usage analyzer for GNOME")
(description
"Baobab (Disk Usage Analyzer) is a graphical application to analyse disk
@@ -10624,9 +10614,7 @@ (define-public gnome-calendar
gsettings-desktop-schemas
libadwaita
libdazzle
- libgweather4-with-libsoup2
- ;; Remove pango-next when it's the default.
- pango-next))
+ libgweather4-with-libsoup2))
(home-page "https://wiki.gnome.org/Apps/Calendar")
(synopsis "GNOME's calendar application")
(description
@@ -13465,8 +13453,7 @@ (define-public gtranslator
gspell
libgda
libhandy
- libsoup
- pango-next))
+ libsoup))
(propagated-inputs
(list gtksourceview-4)) ; required for source view
(home-page "https://wiki.gnome.org/Apps/Gtranslator")
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 89ce459e4c..edcdda8187 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -427,7 +427,7 @@ (define-public libthai
(define-public pango
(package
(name "pango")
- (version "1.48.10")
+ (version "1.50.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/pango/"
@@ -436,7 +436,7 @@ (define-public pango
(patches (search-patches "pango-skip-libthai-test.patch"))
(sha256
(base32
- "166wxhsjb6hb0dk7wkkdcmpvasl9n0a0aa64mdgagzfdidwzbq91"))))
+ "0qn1a7ccs3p5vc6swbqm6hdzka879l0gp9220lq4bcf2gpl67bgl"))))
(build-system meson-build-system)
(arguments
'(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
@@ -481,21 +481,19 @@ (define-public pango
(home-page "https://pango.gnome.org/")
(license license:lgpl2.0+)))
-;; TODO: Make this the default package in next release cycle.
-(define-public pango-next
+(define-public pango-1.48
(package
(inherit pango)
- (name "pango-next") ;to avoid profile conflicts
- (version "1.50.4")
+ (version "1.48.10")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/pango/"
- (version-major+minor version)
- "/pango-" version ".tar.xz"))
+ (version-major+minor version) "/"
+ "pango-" version ".tar.xz"))
(patches (search-patches "pango-skip-libthai-test.patch"))
(sha256
(base32
- "0qn1a7ccs3p5vc6swbqm6hdzka879l0gp9220lq4bcf2gpl67bgl"))))))
+ "166wxhsjb6hb0dk7wkkdcmpvasl9n0a0aa64mdgagzfdidwzbq91"))))))
(define-public pango-1.42
(package
@@ -713,8 +711,7 @@ (define-public gtksourceview
glib
gtk
libxml2
- pcre2
- pango-next))
+ pcre2))
(home-page "https://wiki.gnome.org/Projects/GtkSourceView")
(synopsis "GNOME source code widget")
(description "GtkSourceView is a text widget that extends the standard
@@ -741,7 +738,6 @@ (define-public gtksourceview-4
(propagated-inputs
(modify-inputs (package-propagated-inputs gtksourceview)
(replace "gtk" gtk+)
- (replace "pango-next" pango)
(replace "glib" glib)))))
(define-public gtksourceview-3
@@ -1413,7 +1409,7 @@ (define-public gtk
libxkbcommon
libxrandr
libxrender
- pango-next
+ pango
vulkan-headers
vulkan-loader ;for vulkan graphics API support
wayland ;for wayland display-backend
@@ -1830,7 +1826,7 @@ (define-public pangomm
("python" ,python)
("xsltproc" ,libxslt)))
(propagated-inputs
- (list cairo cairomm glibmm pango-next))
+ (list cairo cairomm glibmm pango))
(home-page "https://pango.gnome.org//")
(synopsis "C++ interface to the Pango text rendering library")
(description
@@ -1853,7 +1849,7 @@ (define-public pangomm-2.46
(sha256
(base32 "06zczkaxf5p5kjgnzrfylzi40w9a8lxpndgs7rpn12qrsq27sy6k"))))
(propagated-inputs
- (list cairomm-1.14 glibmm-2.64 pango))))
+ (list cairomm-1.14 glibmm-2.64 pango-1.48))))
(define-public atkmm
(package
diff --git a/gnu/packages/ibus.scm b/gnu/packages/ibus.scm
index 7d52c5889e..2bcad54656 100644
--- a/gnu/packages/ibus.scm
+++ b/gnu/packages/ibus.scm
@@ -248,7 +248,7 @@ (define-public ibus
((#:configure-flags flags)
#~(cons* "--enable-gtk4" #$flags))))
(inputs (modify-inputs (package-inputs ibus-minimal)
- (prepend gtk pango-next)))
+ (prepend gtk)))
(properties (alist-delete 'hidden? (package-properties ibus-minimal)))))
(define-public ibus-libpinyin
diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index ebb9bc17b3..2365e4f848 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -1396,7 +1396,6 @@ (define-public dino
libsignal-protocol-c
libsoup
libsrtp ;for calls support
- pango-next ;gtk4 wants pango 1.50+
qrencode
sqlite
webrtc-audio-processing)) ;for A/V support
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm
index 5a28e1321f..bcf587f010 100644
--- a/gnu/packages/music.scm
+++ b/gnu/packages/music.scm
@@ -6501,7 +6501,7 @@ (define-public zrythm
libyaml
lilv
lv2
- pango-next
+ pango
pipewire
pulseaudio
reproc
diff --git a/gnu/packages/webkit.scm b/gnu/packages/webkit.scm
index 0a51479985..8ef95ce518 100644
--- a/gnu/packages/webkit.scm
+++ b/gnu/packages/webkit.scm
@@ -290,8 +290,7 @@ (define-public webkitgtk-next
(replace "gtk+" gtk)))
(inputs
(modify-inputs (package-inputs webkitgtk)
- (delete "gtk+-2" "libnotify")
- (append pango-next))))) ;TODO: remove after it's the default
+ (delete "gtk+-2" "libnotify")))))
;;; Required by e.g. emacs-next-pgtk, emacs-xwidgets, and some other GNOME
;;; packages for webkit2gtk-4.0. See also the upstream tracker for libsoup 3:
--
2.39.2
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team 3/5] gnu: pango: Update to 1.50.14.
2023-03-26 19:20 [bug#62467] [PATCH gnome-team 0/5] Update fundamental packages Liliana Marie Prikler
` (7 preceding siblings ...)
2023-03-26 18:53 ` [bug#62467] [PATCH gnome-team v2 03/12] " Liliana Marie Prikler
@ 2023-03-26 18:53 ` Liliana Marie Prikler
2023-03-26 19:14 ` [bug#62467] [PATCH gnome-team 4/5] gnu: Make gobject-introspection-next the new gobject-introspection Liliana Marie Prikler
` (24 subsequent siblings)
33 siblings, 0 replies; 64+ messages in thread
From: Liliana Marie Prikler @ 2023-03-26 18:53 UTC (permalink / raw)
To: 62467; +Cc: rg
* gnu/packages/gtk.scm (pango): Update to 1.50.14.
---
gnu/packages/gtk.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index ee9311ee79..75cf9004b4 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -427,7 +427,7 @@ (define-public libthai
(define-public pango
(package
(name "pango")
- (version "1.50.4")
+ (version "1.50.14")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/pango/"
@@ -436,7 +436,7 @@ (define-public pango
(patches (search-patches "pango-skip-libthai-test.patch"))
(sha256
(base32
- "0qn1a7ccs3p5vc6swbqm6hdzka879l0gp9220lq4bcf2gpl67bgl"))))
+ "1s41sprfgkc944fva36zjmkmdpv8hn1bdpyg55xc4663pw2z4rqx"))))
(build-system meson-build-system)
(arguments
'(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
--
2.39.2
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team v2 03/12] gnu: pango: Update to 1.50.14.
2023-03-26 19:20 [bug#62467] [PATCH gnome-team 0/5] Update fundamental packages Liliana Marie Prikler
` (6 preceding siblings ...)
2023-03-26 18:53 ` [bug#62467] [PATCH gnome-team v3 04/15] gnu: pango: Update to 1.50.14 Liliana Marie Prikler
@ 2023-03-26 18:53 ` Liliana Marie Prikler
2023-04-08 19:39 ` Maxim Cournoyer
2023-03-26 18:53 ` [bug#62467] [PATCH gnome-team 3/5] " Liliana Marie Prikler
` (25 subsequent siblings)
33 siblings, 1 reply; 64+ messages in thread
From: Liliana Marie Prikler @ 2023-03-26 18:53 UTC (permalink / raw)
To: 62467; +Cc: rg, Maxim Cournoyer
* gnu/packages/gtk.scm (pango): Update to 1.50.14.
---
gnu/packages/gtk.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 29494c36b1..6d5e7f56bc 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -427,7 +427,7 @@ (define-public libthai
(define-public pango
(package
(name "pango")
- (version "1.50.4")
+ (version "1.50.14")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/pango/"
@@ -436,7 +436,7 @@ (define-public pango
(patches (search-patches "pango-skip-libthai-test.patch"))
(sha256
(base32
- "0qn1a7ccs3p5vc6swbqm6hdzka879l0gp9220lq4bcf2gpl67bgl"))))
+ "1s41sprfgkc944fva36zjmkmdpv8hn1bdpyg55xc4663pw2z4rqx"))))
(build-system meson-build-system)
(arguments
'(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
--
2.39.2
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team v3 04/15] gnu: pango: Update to 1.50.14.
2023-03-26 19:20 [bug#62467] [PATCH gnome-team 0/5] Update fundamental packages Liliana Marie Prikler
` (5 preceding siblings ...)
2023-03-26 15:53 ` [bug#62467] [PATCH gnome-team v2 02/12] " Liliana Marie Prikler
@ 2023-03-26 18:53 ` Liliana Marie Prikler
2023-03-26 18:53 ` [bug#62467] [PATCH gnome-team v2 03/12] " Liliana Marie Prikler
` (26 subsequent siblings)
33 siblings, 0 replies; 64+ messages in thread
From: Liliana Marie Prikler @ 2023-03-26 18:53 UTC (permalink / raw)
To: 62467; +Cc: rg, Maxim Cournoyer
* gnu/packages/gtk.scm (pango): Update to 1.50.14.
---
gnu/packages/gtk.scm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index edcdda8187..589d861a50 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -427,7 +427,7 @@ (define-public libthai
(define-public pango
(package
(name "pango")
- (version "1.50.4")
+ (version "1.50.14")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/pango/"
@@ -436,7 +436,7 @@ (define-public pango
(patches (search-patches "pango-skip-libthai-test.patch"))
(sha256
(base32
- "0qn1a7ccs3p5vc6swbqm6hdzka879l0gp9220lq4bcf2gpl67bgl"))))
+ "1s41sprfgkc944fva36zjmkmdpv8hn1bdpyg55xc4663pw2z4rqx"))))
(build-system meson-build-system)
(arguments
'(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
--
2.39.2
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team 4/5] gnu: Make gobject-introspection-next the new gobject-introspection.
2023-03-26 19:20 [bug#62467] [PATCH gnome-team 0/5] Update fundamental packages Liliana Marie Prikler
` (8 preceding siblings ...)
2023-03-26 18:53 ` [bug#62467] [PATCH gnome-team 3/5] " Liliana Marie Prikler
@ 2023-03-26 19:14 ` Liliana Marie Prikler
2023-03-26 19:14 ` [bug#62467] [PATCH gnome-team v3 05/15] " Liliana Marie Prikler
` (23 subsequent siblings)
33 siblings, 0 replies; 64+ messages in thread
From: Liliana Marie Prikler @ 2023-03-26 19:14 UTC (permalink / raw)
To: 62467; +Cc: rg
* gnu/packages/glib.scm (gobject-introspection): Update to 1.73.1.
(gobject-introspection-next): Delete variable.
* gnu/packages/gtk.scm.scm (gtksourceview)[native-inputs]:
Replace gobject-introspection-next with gobject-introspection.
* gnu/packages/guile-xyz.scm (guile-g-golf)[native-inputs]:
Replace gobject-introspection-next with gobject-introspection.
* gnu/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch:
Rename to…
* gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch:
… this.
* gnu/packages/patches/gobject-introspection-cc-1.72.patch: Rename to…
* gnu/packages/patches/gobject-introspection-cc.patch: … this.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
---
gnu/local.mk | 2 -
gnu/packages/glib.scm | 21 +--
gnu/packages/gtk.scm | 2 +-
gnu/packages/guile-xyz.scm | 2 +-
...trospection-absolute-shlib-path-1.72.patch | 173 ------------------
...ct-introspection-absolute-shlib-path.patch | 51 +++---
.../gobject-introspection-cc-1.72.patch | 15 --
.../patches/gobject-introspection-cc.patch | 11 +-
8 files changed, 39 insertions(+), 238 deletions(-)
delete mode 100644 gnu/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch
delete mode 100644 gnu/packages/patches/gobject-introspection-cc-1.72.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 64a1268fbe..3e94281ccf 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1264,9 +1264,7 @@ dist_patch_DATA = \
%D%/packages/patches/gnutls-cross.patch \
%D%/packages/patches/gnutls-guile-eintr-eagain.patch \
%D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \
- %D%/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch \
%D%/packages/patches/gobject-introspection-cc.patch \
- %D%/packages/patches/gobject-introspection-cc-1.72.patch \
%D%/packages/patches/gobject-introspection-girepository.patch \
%D%/packages/patches/go-fix-script-tests.patch \
%D%/packages/patches/go-github-com-golang-snappy-32bit-test.patch \
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index ecf5cb491f..09386d1652 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -477,14 +477,14 @@ (define target-name
(define gobject-introspection
(package
(name "gobject-introspection")
- (version "1.66.1")
+ (version "1.73.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/"
"gobject-introspection/" (version-major+minor version)
"/gobject-introspection-" version ".tar.xz"))
(sha256
- (base32 "078n0q7b6z682mf4irclrksm73cyixq295mqnqifl9plwmgaai6x"))
+ (base32 "1gkbx32as3v2286w7k3j24fwhkxj6brr49881m2zavxamfwxdm34"))
(patches (search-patches
"gobject-introspection-cc.patch"
"gobject-introspection-girepository.patch"
@@ -564,23 +564,6 @@ (define gobject-introspection
;; For tools.
license:gpl2+))))
-(define-public gobject-introspection-next
- (package
- (inherit gobject-introspection)
- (name "gobject-introspection")
- (version "1.73.1")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnome/sources/"
- "gobject-introspection/" (version-major+minor version)
- "/gobject-introspection-" version ".tar.xz"))
- (sha256
- (base32 "1gkbx32as3v2286w7k3j24fwhkxj6brr49881m2zavxamfwxdm34"))
- (patches (search-patches
- "gobject-introspection-cc-1.72.patch"
- "gobject-introspection-girepository.patch"
- "gobject-introspection-absolute-shlib-path-1.72.patch"))))))
-
(define intltool
(package
(name "intltool")
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 75cf9004b4..f89b0dc199 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -684,7 +684,7 @@ (define-public gtksourceview
(list `(,glib "bin") ; for glib-genmarshal, etc.
gettext-minimal
gi-docgen
- gobject-introspection-next
+ gobject-introspection
pkg-config
vala
;; For testing.
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 5d861c5c82..5c7c880b0e 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -2303,7 +2303,7 @@ (define (get lib)
clutter
xorg-server-for-tests))
(propagated-inputs
- (list gobject-introspection-next))
+ (list gobject-introspection))
(home-page "https://www.gnu.org/software/g-golf/")
(synopsis "Guile bindings for GObject Introspection")
(description
diff --git a/gnu/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch b/gnu/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch
deleted file mode 100644
index 8bb86467c0..0000000000
--- a/gnu/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-Names of libraries included in typelib files are opened by dlopen.
-Here we add the full path.
-
-This patch was provided by Luca Bruno <lucabru@src.gnome.org>,
-for 'gobject-introspection' 1.40.0 in Nix.
-
-It has since been updated to work with newer versions of
-gobject-introspection.
-
-diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py
-index 1d39ab84..e12ed24e 100644
---- a/giscanner/scannermain.py
-+++ b/giscanner/scannermain.py
-@@ -95,6 +95,39 @@ def get_windows_option_group(parser):
- return group
-
-
-+def _get_default_fallback_libpath():
-+ # Newer multiple-output-optimized stdenv has an environment variable
-+ # $outputLib which in turn specifies another variable which then is used as
-+ # the destination for the library contents (${!outputLib}/lib).
-+ store_path = os.environ.get(os.environ.get("outputLib")) if "outputLib" in os.environ else None
-+ if store_path is None:
-+ outputs = os.environ.get("outputs", "out").split()
-+ if "lib" in outputs:
-+ # For multiple output derivations let's try whether there is a $lib
-+ # environment variable and use that as the base store path.
-+ store_path = os.environ.get("lib")
-+ elif "out" in outputs:
-+ # Otherwise we have a single output derivation, so the libraries
-+ # most certainly will end up in "$out/lib".
-+ store_path = os.environ.get("out")
-+
-+ if store_path is not None:
-+ # Even if we have a $lib as output, there still should be a $lib/lib
-+ # directory.
-+ return os.path.join(store_path, 'lib')
-+ else:
-+ # If we haven't found a possible scenario, let's return an empty string
-+ # so that the shared library won't be prepended with a path.
-+ #
-+ # Note that this doesn't mean that all hope is lost, because after all
-+ # we can still use --fallback-library-path to set one.
-+ #
-+ # Also, we're not returning None, because that would make it very
-+ # difficult to disable adding fallback paths altogether using something
-+ # like: --fallback-library-path=""
-+ return ""
-+
-+
- def _get_option_parser():
- parser = optparse.OptionParser('%prog [options] sources',
- version='%prog ' + giscanner.__version__)
-@@ -220,6 +253,10 @@ match the namespace prefix.""")
- parser.add_option("", "--compiler",
- action="store", dest="compiler", default=None,
- help="the C compiler to use internally")
-+ parser.add_option("", "--fallback-library-path",
-+ action="store", dest="fallback_libpath",
-+ default=_get_default_fallback_libpath(),
-+ help="Path to prepend to unknown shared libraries")
-
- group = get_preprocessor_option_group(parser)
- parser.add_option_group(group)
-diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py
-index 9f8ab5df..8aa37c99 100644
---- a/giscanner/shlibs.py
-+++ b/giscanner/shlibs.py
-@@ -57,6 +57,14 @@ def _ldd_library_pattern(library_name):
- $""" % re.escape(library_name), re.VERBOSE)
-
-
-+def _ldd_library_guix_pattern(library_name):
-+ store_dir = re.escape(
-+ os.environ.get("NIX_STORE", default="/gnu/store")
-+ )
-+ pattern = r'(%s(?:/[^/]*)+lib%s[^A-Za-z0-9_-][^\s\(\)]*)'
-+ return re.compile(pattern % (store_dir, re.escape(library_name)))
-+
-+
- # This is a what we do for non-la files. We assume that we are on an
- # ELF-like system where ldd exists and the soname extracted with ldd is
- # a filename that can be opened with dlopen().
-@@ -108,7 +116,8 @@ def _resolve_non_libtool(options, binary, libraries):
- output = output.decode("utf-8", "replace")
-
- shlibs = resolve_from_ldd_output(libraries, output)
-- return list(map(sanitize_shlib_path, shlibs))
-+ fallback_libpath = options.fallback_libpath or "";
-+ return list(map(lambda p: os.path.join(fallback_libpath, p), map(sanitize_shlib_path, shlibs)))
-
-
- def sanitize_shlib_path(lib):
-@@ -117,19 +126,18 @@ def sanitize_shlib_path(lib):
- # In case we get relative paths on macOS (like @rpath) then we fall
- # back to the basename as well:
- # https://gitlab.gnome.org/GNOME/gobject-introspection/issues/222
-- if sys.platform == "darwin":
-- if not os.path.isabs(lib):
-- return os.path.basename(lib)
-- return lib
-- else:
-+
-+ # Always use absolute paths if available
-+ if not os.path.isabs(lib):
- return os.path.basename(lib)
-+ return lib
-
-
- def resolve_from_ldd_output(libraries, output):
- patterns = {}
- for library in libraries:
- if not os.path.isfile(library):
-- patterns[library] = _ldd_library_pattern(library)
-+ patterns[library] = (_ldd_library_pattern(library), _ldd_library_guix_pattern(library))
- if len(patterns) == 0:
- return []
-
-@@ -141,8 +149,12 @@ def resolve_from_ldd_output(libraries, output):
- if line.endswith(':'):
- continue
- for word in line.split():
-- for library, pattern in patterns.items():
-- m = pattern.match(word)
-+ for library, (pattern, guix_pattern) in patterns.items():
-+ store_dir = os.environ.get("NIX_STORE", default="/gnu/store")
-+ if line.find(store_dir) != -1:
-+ m = guix_pattern.match(word)
-+ else:
-+ m = pattern.match(word)
- if m:
- del patterns[library]
- shlibs.append(m.group())
-diff --git a/giscanner/utils.py b/giscanner/utils.py
-index 31c7ea48..630002a8 100644
---- a/giscanner/utils.py
-+++ b/giscanner/utils.py
-@@ -114,16 +114,11 @@ def extract_libtool_shlib(la_file):
- if dlname is None:
- return None
-
-- # Darwin uses absolute paths where possible; since the libtool files never
-- # contain absolute paths, use the libdir field
-- if platform.system() == 'Darwin':
-- dlbasename = os.path.basename(dlname)
-- libdir = _extract_libdir_field(la_file)
-- if libdir is None:
-- return dlbasename
-- return libdir + '/' + dlbasename
-- # Older libtools had a path rather than the raw dlname
-- return os.path.basename(dlname)
-+ dlbasename = os.path.basename(dlname)
-+ libdir = _extract_libdir_field(la_file)
-+ if libdir is None:
-+ return dlbasename
-+ return libdir + '/' + dlbasename
-
-
- # Returns arguments for invoking libtool, if applicable, otherwise None
-diff --git a/tests/scanner/test_shlibs.py b/tests/scanner/test_shlibs.py
-index a8337c60..7f123103 100644
---- a/tests/scanner/test_shlibs.py
-+++ b/tests/scanner/test_shlibs.py
-@@ -40,7 +40,8 @@ class TestLddParser(unittest.TestCase):
-
- self.assertEqual(
- sanitize_shlib_path('/foo/bar'),
-- '/foo/bar' if sys.platform == 'darwin' else 'bar')
-+ # Always use an absolute filename for Guix
-+ '/foo/bar')
-
- def test_unresolved_library(self):
- output = ''
diff --git a/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch b/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch
index 956fa617c3..8bb86467c0 100644
--- a/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch
+++ b/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch
@@ -1,11 +1,14 @@
-# Names of libraries included in typelib files are opened by dlopen. Here we
-# add the full path.
-#
-# This patch was provided by Luca Bruno <lucabru@src.gnome.org> for
-# 'gobject-introspection' 1.40.0 in Nix.
-#
-# It has since been updated to work with newer versions of
-# gobject-introspection.
+Names of libraries included in typelib files are opened by dlopen.
+Here we add the full path.
+
+This patch was provided by Luca Bruno <lucabru@src.gnome.org>,
+for 'gobject-introspection' 1.40.0 in Nix.
+
+It has since been updated to work with newer versions of
+gobject-introspection.
+
+diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py
+index 1d39ab84..e12ed24e 100644
--- a/giscanner/scannermain.py
+++ b/giscanner/scannermain.py
@@ -95,6 +95,39 @@ def get_windows_option_group(parser):
@@ -48,10 +51,10 @@
def _get_option_parser():
parser = optparse.OptionParser('%prog [options] sources',
version='%prog ' + giscanner.__version__)
-@@ -205,6 +238,10 @@ match the namespace prefix.""")
- parser.add_option("", "--filelist",
- action="store", dest="filelist", default=[],
- help="file containing headers and sources to be scanned")
+@@ -220,6 +253,10 @@ match the namespace prefix.""")
+ parser.add_option("", "--compiler",
+ action="store", dest="compiler", default=None,
+ help="the C compiler to use internally")
+ parser.add_option("", "--fallback-library-path",
+ action="store", dest="fallback_libpath",
+ default=_get_default_fallback_libpath(),
@@ -59,6 +62,8 @@
group = get_preprocessor_option_group(parser)
parser.add_option_group(group)
+diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py
+index 9f8ab5df..8aa37c99 100644
--- a/giscanner/shlibs.py
+++ b/giscanner/shlibs.py
@@ -57,6 +57,14 @@ def _ldd_library_pattern(library_name):
@@ -76,7 +81,7 @@
# This is a what we do for non-la files. We assume that we are on an
# ELF-like system where ldd exists and the soname extracted with ldd is
# a filename that can be opened with dlopen().
-@@ -106,7 +112,8 @@ def _resolve_non_libtool(options, binary, libraries):
+@@ -108,7 +116,8 @@ def _resolve_non_libtool(options, binary, libraries):
output = output.decode("utf-8", "replace")
shlibs = resolve_from_ldd_output(libraries, output)
@@ -86,7 +91,7 @@
def sanitize_shlib_path(lib):
-@@ -115,19 +122,18 @@ def sanitize_shlib_path(lib):
+@@ -117,19 +126,18 @@ def sanitize_shlib_path(lib):
# In case we get relative paths on macOS (like @rpath) then we fall
# back to the basename as well:
# https://gitlab.gnome.org/GNOME/gobject-introspection/issues/222
@@ -111,7 +116,7 @@
if len(patterns) == 0:
return []
-@@ -139,8 +145,12 @@ def resolve_from_ldd_output(libraries, output):
+@@ -141,8 +149,12 @@ def resolve_from_ldd_output(libraries, output):
if line.endswith(':'):
continue
for word in line.split():
@@ -126,10 +131,11 @@
if m:
del patterns[library]
shlibs.append(m.group())
-
+diff --git a/giscanner/utils.py b/giscanner/utils.py
+index 31c7ea48..630002a8 100644
--- a/giscanner/utils.py
+++ b/giscanner/utils.py
-@@ -111,17 +111,11 @@ def extract_libtool_shlib(la_file):
+@@ -114,16 +114,11 @@ def extract_libtool_shlib(la_file):
if dlname is None:
return None
@@ -141,8 +147,7 @@
- if libdir is None:
- return dlbasename
- return libdir + '/' + dlbasename
-- # From the comments in extract_libtool(), older libtools had
-- # a path rather than the raw dlname
+- # Older libtools had a path rather than the raw dlname
- return os.path.basename(dlname)
+ dlbasename = os.path.basename(dlname)
+ libdir = _extract_libdir_field(la_file)
@@ -151,10 +156,12 @@
+ return libdir + '/' + dlbasename
- def extract_libtool(la_file):
+ # Returns arguments for invoking libtool, if applicable, otherwise None
+diff --git a/tests/scanner/test_shlibs.py b/tests/scanner/test_shlibs.py
+index a8337c60..7f123103 100644
--- a/tests/scanner/test_shlibs.py
+++ b/tests/scanner/test_shlibs.py
-@@ -40,6 +64,7 @@ class TestLddParser(unittest.TestCase):
+@@ -40,7 +40,8 @@ class TestLddParser(unittest.TestCase):
self.assertEqual(
sanitize_shlib_path('/foo/bar'),
@@ -163,4 +170,4 @@
+ '/foo/bar')
def test_unresolved_library(self):
-output = ''
+ output = ''
diff --git a/gnu/packages/patches/gobject-introspection-cc-1.72.patch b/gnu/packages/patches/gobject-introspection-cc-1.72.patch
deleted file mode 100644
index d3b1df82af..0000000000
--- a/gnu/packages/patches/gobject-introspection-cc-1.72.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Use gcc as the default C compiler if CC is not set.
-
-diff --git a/giscanner/__init__.py b/giscanner/__init__.py
-index 7c2f365a..607fe341 100644
---- a/giscanner/__init__.py
-+++ b/giscanner/__init__.py
-@@ -21,6 +21,8 @@ import os
- builddir = os.environ.get('UNINSTALLED_INTROSPECTION_BUILDDIR')
- if builddir is not None:
- __path__.append(os.path.join(builddir, 'giscanner')) # type: ignore # mypy issue #1422
-+if not 'CC' in os.environ:
-+ os.environ['CC'] = 'gcc'
- try:
- from ._version import __version__
- except ImportError:
diff --git a/gnu/packages/patches/gobject-introspection-cc.patch b/gnu/packages/patches/gobject-introspection-cc.patch
index 6a86b56b44..d3b1df82af 100644
--- a/gnu/packages/patches/gobject-introspection-cc.patch
+++ b/gnu/packages/patches/gobject-introspection-cc.patch
@@ -1,12 +1,13 @@
Use gcc as the default C compiler if CC is not set.
-diff -ru gobject-introspection-1.58.1.orig/giscanner/__init__.py gobject-introspection-1.58.1/giscanner/__init__.py
---- gobject-introspection-1.58.1.orig/giscanner/__init__.py 1970-01-01 01:00:00.000000000 +0100
-+++ gobject-introspection-1.58.1/giscanner/__init__.py 2018-12-03 13:33:28.788971299 +0100
-@@ -22,6 +22,8 @@
+diff --git a/giscanner/__init__.py b/giscanner/__init__.py
+index 7c2f365a..607fe341 100644
+--- a/giscanner/__init__.py
++++ b/giscanner/__init__.py
+@@ -21,6 +21,8 @@ import os
builddir = os.environ.get('UNINSTALLED_INTROSPECTION_BUILDDIR')
if builddir is not None:
- __path__.append(os.path.join(builddir, 'giscanner'))
+ __path__.append(os.path.join(builddir, 'giscanner')) # type: ignore # mypy issue #1422
+if not 'CC' in os.environ:
+ os.environ['CC'] = 'gcc'
try:
--
2.39.2
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team v2 04/12] gnu: Make gobject-introspection-next the new gobject-introspection.
2023-03-26 19:20 [bug#62467] [PATCH gnome-team 0/5] Update fundamental packages Liliana Marie Prikler
` (10 preceding siblings ...)
2023-03-26 19:14 ` [bug#62467] [PATCH gnome-team v3 05/15] " Liliana Marie Prikler
@ 2023-03-26 19:14 ` Liliana Marie Prikler
2023-04-08 19:41 ` Maxim Cournoyer
2023-03-26 19:19 ` [bug#62467] [PATCH gnome-team 5/5] gnu: gobject-introspection: Update to 1.76.1 Liliana Marie Prikler
` (21 subsequent siblings)
33 siblings, 1 reply; 64+ messages in thread
From: Liliana Marie Prikler @ 2023-03-26 19:14 UTC (permalink / raw)
To: 62467; +Cc: rg, Maxim Cournoyer
* gnu/packages/glib.scm (gobject-introspection): Update to 1.73.1.
(gobject-introspection-next): Delete variable.
* gnu/packages/gtk.scm.scm (gtksourceview)[native-inputs]:
Replace gobject-introspection-next with gobject-introspection.
* gnu/packages/guile-xyz.scm (guile-g-golf)[native-inputs]:
Replace gobject-introspection-next with gobject-introspection.
* gnu/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch:
Rename to…
* gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch:
… this.
* gnu/packages/patches/gobject-introspection-cc-1.72.patch: Rename to…
* gnu/packages/patches/gobject-introspection-cc.patch: … this.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
---
gnu/local.mk | 2 -
gnu/packages/glib.scm | 21 +--
gnu/packages/gtk.scm | 2 +-
gnu/packages/guile-xyz.scm | 2 +-
...trospection-absolute-shlib-path-1.72.patch | 173 ------------------
...ct-introspection-absolute-shlib-path.patch | 51 +++---
.../gobject-introspection-cc-1.72.patch | 15 --
.../patches/gobject-introspection-cc.patch | 11 +-
8 files changed, 39 insertions(+), 238 deletions(-)
delete mode 100644 gnu/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch
delete mode 100644 gnu/packages/patches/gobject-introspection-cc-1.72.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 64a1268fbe..3e94281ccf 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1264,9 +1264,7 @@ dist_patch_DATA = \
%D%/packages/patches/gnutls-cross.patch \
%D%/packages/patches/gnutls-guile-eintr-eagain.patch \
%D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \
- %D%/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch \
%D%/packages/patches/gobject-introspection-cc.patch \
- %D%/packages/patches/gobject-introspection-cc-1.72.patch \
%D%/packages/patches/gobject-introspection-girepository.patch \
%D%/packages/patches/go-fix-script-tests.patch \
%D%/packages/patches/go-github-com-golang-snappy-32bit-test.patch \
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index ecf5cb491f..09386d1652 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -477,14 +477,14 @@ (define target-name
(define gobject-introspection
(package
(name "gobject-introspection")
- (version "1.66.1")
+ (version "1.73.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/"
"gobject-introspection/" (version-major+minor version)
"/gobject-introspection-" version ".tar.xz"))
(sha256
- (base32 "078n0q7b6z682mf4irclrksm73cyixq295mqnqifl9plwmgaai6x"))
+ (base32 "1gkbx32as3v2286w7k3j24fwhkxj6brr49881m2zavxamfwxdm34"))
(patches (search-patches
"gobject-introspection-cc.patch"
"gobject-introspection-girepository.patch"
@@ -564,23 +564,6 @@ (define gobject-introspection
;; For tools.
license:gpl2+))))
-(define-public gobject-introspection-next
- (package
- (inherit gobject-introspection)
- (name "gobject-introspection")
- (version "1.73.1")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnome/sources/"
- "gobject-introspection/" (version-major+minor version)
- "/gobject-introspection-" version ".tar.xz"))
- (sha256
- (base32 "1gkbx32as3v2286w7k3j24fwhkxj6brr49881m2zavxamfwxdm34"))
- (patches (search-patches
- "gobject-introspection-cc-1.72.patch"
- "gobject-introspection-girepository.patch"
- "gobject-introspection-absolute-shlib-path-1.72.patch"))))))
-
(define intltool
(package
(name "intltool")
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 6d5e7f56bc..c756f39e24 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -698,7 +698,7 @@ (define-public gtksourceview
(list `(,glib "bin") ; for glib-genmarshal, etc.
gettext-minimal
gi-docgen
- gobject-introspection-next
+ gobject-introspection
pkg-config
vala
;; For testing.
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 5d861c5c82..5c7c880b0e 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -2303,7 +2303,7 @@ (define (get lib)
clutter
xorg-server-for-tests))
(propagated-inputs
- (list gobject-introspection-next))
+ (list gobject-introspection))
(home-page "https://www.gnu.org/software/g-golf/")
(synopsis "Guile bindings for GObject Introspection")
(description
diff --git a/gnu/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch b/gnu/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch
deleted file mode 100644
index 8bb86467c0..0000000000
--- a/gnu/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-Names of libraries included in typelib files are opened by dlopen.
-Here we add the full path.
-
-This patch was provided by Luca Bruno <lucabru@src.gnome.org>,
-for 'gobject-introspection' 1.40.0 in Nix.
-
-It has since been updated to work with newer versions of
-gobject-introspection.
-
-diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py
-index 1d39ab84..e12ed24e 100644
---- a/giscanner/scannermain.py
-+++ b/giscanner/scannermain.py
-@@ -95,6 +95,39 @@ def get_windows_option_group(parser):
- return group
-
-
-+def _get_default_fallback_libpath():
-+ # Newer multiple-output-optimized stdenv has an environment variable
-+ # $outputLib which in turn specifies another variable which then is used as
-+ # the destination for the library contents (${!outputLib}/lib).
-+ store_path = os.environ.get(os.environ.get("outputLib")) if "outputLib" in os.environ else None
-+ if store_path is None:
-+ outputs = os.environ.get("outputs", "out").split()
-+ if "lib" in outputs:
-+ # For multiple output derivations let's try whether there is a $lib
-+ # environment variable and use that as the base store path.
-+ store_path = os.environ.get("lib")
-+ elif "out" in outputs:
-+ # Otherwise we have a single output derivation, so the libraries
-+ # most certainly will end up in "$out/lib".
-+ store_path = os.environ.get("out")
-+
-+ if store_path is not None:
-+ # Even if we have a $lib as output, there still should be a $lib/lib
-+ # directory.
-+ return os.path.join(store_path, 'lib')
-+ else:
-+ # If we haven't found a possible scenario, let's return an empty string
-+ # so that the shared library won't be prepended with a path.
-+ #
-+ # Note that this doesn't mean that all hope is lost, because after all
-+ # we can still use --fallback-library-path to set one.
-+ #
-+ # Also, we're not returning None, because that would make it very
-+ # difficult to disable adding fallback paths altogether using something
-+ # like: --fallback-library-path=""
-+ return ""
-+
-+
- def _get_option_parser():
- parser = optparse.OptionParser('%prog [options] sources',
- version='%prog ' + giscanner.__version__)
-@@ -220,6 +253,10 @@ match the namespace prefix.""")
- parser.add_option("", "--compiler",
- action="store", dest="compiler", default=None,
- help="the C compiler to use internally")
-+ parser.add_option("", "--fallback-library-path",
-+ action="store", dest="fallback_libpath",
-+ default=_get_default_fallback_libpath(),
-+ help="Path to prepend to unknown shared libraries")
-
- group = get_preprocessor_option_group(parser)
- parser.add_option_group(group)
-diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py
-index 9f8ab5df..8aa37c99 100644
---- a/giscanner/shlibs.py
-+++ b/giscanner/shlibs.py
-@@ -57,6 +57,14 @@ def _ldd_library_pattern(library_name):
- $""" % re.escape(library_name), re.VERBOSE)
-
-
-+def _ldd_library_guix_pattern(library_name):
-+ store_dir = re.escape(
-+ os.environ.get("NIX_STORE", default="/gnu/store")
-+ )
-+ pattern = r'(%s(?:/[^/]*)+lib%s[^A-Za-z0-9_-][^\s\(\)]*)'
-+ return re.compile(pattern % (store_dir, re.escape(library_name)))
-+
-+
- # This is a what we do for non-la files. We assume that we are on an
- # ELF-like system where ldd exists and the soname extracted with ldd is
- # a filename that can be opened with dlopen().
-@@ -108,7 +116,8 @@ def _resolve_non_libtool(options, binary, libraries):
- output = output.decode("utf-8", "replace")
-
- shlibs = resolve_from_ldd_output(libraries, output)
-- return list(map(sanitize_shlib_path, shlibs))
-+ fallback_libpath = options.fallback_libpath or "";
-+ return list(map(lambda p: os.path.join(fallback_libpath, p), map(sanitize_shlib_path, shlibs)))
-
-
- def sanitize_shlib_path(lib):
-@@ -117,19 +126,18 @@ def sanitize_shlib_path(lib):
- # In case we get relative paths on macOS (like @rpath) then we fall
- # back to the basename as well:
- # https://gitlab.gnome.org/GNOME/gobject-introspection/issues/222
-- if sys.platform == "darwin":
-- if not os.path.isabs(lib):
-- return os.path.basename(lib)
-- return lib
-- else:
-+
-+ # Always use absolute paths if available
-+ if not os.path.isabs(lib):
- return os.path.basename(lib)
-+ return lib
-
-
- def resolve_from_ldd_output(libraries, output):
- patterns = {}
- for library in libraries:
- if not os.path.isfile(library):
-- patterns[library] = _ldd_library_pattern(library)
-+ patterns[library] = (_ldd_library_pattern(library), _ldd_library_guix_pattern(library))
- if len(patterns) == 0:
- return []
-
-@@ -141,8 +149,12 @@ def resolve_from_ldd_output(libraries, output):
- if line.endswith(':'):
- continue
- for word in line.split():
-- for library, pattern in patterns.items():
-- m = pattern.match(word)
-+ for library, (pattern, guix_pattern) in patterns.items():
-+ store_dir = os.environ.get("NIX_STORE", default="/gnu/store")
-+ if line.find(store_dir) != -1:
-+ m = guix_pattern.match(word)
-+ else:
-+ m = pattern.match(word)
- if m:
- del patterns[library]
- shlibs.append(m.group())
-diff --git a/giscanner/utils.py b/giscanner/utils.py
-index 31c7ea48..630002a8 100644
---- a/giscanner/utils.py
-+++ b/giscanner/utils.py
-@@ -114,16 +114,11 @@ def extract_libtool_shlib(la_file):
- if dlname is None:
- return None
-
-- # Darwin uses absolute paths where possible; since the libtool files never
-- # contain absolute paths, use the libdir field
-- if platform.system() == 'Darwin':
-- dlbasename = os.path.basename(dlname)
-- libdir = _extract_libdir_field(la_file)
-- if libdir is None:
-- return dlbasename
-- return libdir + '/' + dlbasename
-- # Older libtools had a path rather than the raw dlname
-- return os.path.basename(dlname)
-+ dlbasename = os.path.basename(dlname)
-+ libdir = _extract_libdir_field(la_file)
-+ if libdir is None:
-+ return dlbasename
-+ return libdir + '/' + dlbasename
-
-
- # Returns arguments for invoking libtool, if applicable, otherwise None
-diff --git a/tests/scanner/test_shlibs.py b/tests/scanner/test_shlibs.py
-index a8337c60..7f123103 100644
---- a/tests/scanner/test_shlibs.py
-+++ b/tests/scanner/test_shlibs.py
-@@ -40,7 +40,8 @@ class TestLddParser(unittest.TestCase):
-
- self.assertEqual(
- sanitize_shlib_path('/foo/bar'),
-- '/foo/bar' if sys.platform == 'darwin' else 'bar')
-+ # Always use an absolute filename for Guix
-+ '/foo/bar')
-
- def test_unresolved_library(self):
- output = ''
diff --git a/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch b/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch
index 956fa617c3..8bb86467c0 100644
--- a/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch
+++ b/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch
@@ -1,11 +1,14 @@
-# Names of libraries included in typelib files are opened by dlopen. Here we
-# add the full path.
-#
-# This patch was provided by Luca Bruno <lucabru@src.gnome.org> for
-# 'gobject-introspection' 1.40.0 in Nix.
-#
-# It has since been updated to work with newer versions of
-# gobject-introspection.
+Names of libraries included in typelib files are opened by dlopen.
+Here we add the full path.
+
+This patch was provided by Luca Bruno <lucabru@src.gnome.org>,
+for 'gobject-introspection' 1.40.0 in Nix.
+
+It has since been updated to work with newer versions of
+gobject-introspection.
+
+diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py
+index 1d39ab84..e12ed24e 100644
--- a/giscanner/scannermain.py
+++ b/giscanner/scannermain.py
@@ -95,6 +95,39 @@ def get_windows_option_group(parser):
@@ -48,10 +51,10 @@
def _get_option_parser():
parser = optparse.OptionParser('%prog [options] sources',
version='%prog ' + giscanner.__version__)
-@@ -205,6 +238,10 @@ match the namespace prefix.""")
- parser.add_option("", "--filelist",
- action="store", dest="filelist", default=[],
- help="file containing headers and sources to be scanned")
+@@ -220,6 +253,10 @@ match the namespace prefix.""")
+ parser.add_option("", "--compiler",
+ action="store", dest="compiler", default=None,
+ help="the C compiler to use internally")
+ parser.add_option("", "--fallback-library-path",
+ action="store", dest="fallback_libpath",
+ default=_get_default_fallback_libpath(),
@@ -59,6 +62,8 @@
group = get_preprocessor_option_group(parser)
parser.add_option_group(group)
+diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py
+index 9f8ab5df..8aa37c99 100644
--- a/giscanner/shlibs.py
+++ b/giscanner/shlibs.py
@@ -57,6 +57,14 @@ def _ldd_library_pattern(library_name):
@@ -76,7 +81,7 @@
# This is a what we do for non-la files. We assume that we are on an
# ELF-like system where ldd exists and the soname extracted with ldd is
# a filename that can be opened with dlopen().
-@@ -106,7 +112,8 @@ def _resolve_non_libtool(options, binary, libraries):
+@@ -108,7 +116,8 @@ def _resolve_non_libtool(options, binary, libraries):
output = output.decode("utf-8", "replace")
shlibs = resolve_from_ldd_output(libraries, output)
@@ -86,7 +91,7 @@
def sanitize_shlib_path(lib):
-@@ -115,19 +122,18 @@ def sanitize_shlib_path(lib):
+@@ -117,19 +126,18 @@ def sanitize_shlib_path(lib):
# In case we get relative paths on macOS (like @rpath) then we fall
# back to the basename as well:
# https://gitlab.gnome.org/GNOME/gobject-introspection/issues/222
@@ -111,7 +116,7 @@
if len(patterns) == 0:
return []
-@@ -139,8 +145,12 @@ def resolve_from_ldd_output(libraries, output):
+@@ -141,8 +149,12 @@ def resolve_from_ldd_output(libraries, output):
if line.endswith(':'):
continue
for word in line.split():
@@ -126,10 +131,11 @@
if m:
del patterns[library]
shlibs.append(m.group())
-
+diff --git a/giscanner/utils.py b/giscanner/utils.py
+index 31c7ea48..630002a8 100644
--- a/giscanner/utils.py
+++ b/giscanner/utils.py
-@@ -111,17 +111,11 @@ def extract_libtool_shlib(la_file):
+@@ -114,16 +114,11 @@ def extract_libtool_shlib(la_file):
if dlname is None:
return None
@@ -141,8 +147,7 @@
- if libdir is None:
- return dlbasename
- return libdir + '/' + dlbasename
-- # From the comments in extract_libtool(), older libtools had
-- # a path rather than the raw dlname
+- # Older libtools had a path rather than the raw dlname
- return os.path.basename(dlname)
+ dlbasename = os.path.basename(dlname)
+ libdir = _extract_libdir_field(la_file)
@@ -151,10 +156,12 @@
+ return libdir + '/' + dlbasename
- def extract_libtool(la_file):
+ # Returns arguments for invoking libtool, if applicable, otherwise None
+diff --git a/tests/scanner/test_shlibs.py b/tests/scanner/test_shlibs.py
+index a8337c60..7f123103 100644
--- a/tests/scanner/test_shlibs.py
+++ b/tests/scanner/test_shlibs.py
-@@ -40,6 +64,7 @@ class TestLddParser(unittest.TestCase):
+@@ -40,7 +40,8 @@ class TestLddParser(unittest.TestCase):
self.assertEqual(
sanitize_shlib_path('/foo/bar'),
@@ -163,4 +170,4 @@
+ '/foo/bar')
def test_unresolved_library(self):
-output = ''
+ output = ''
diff --git a/gnu/packages/patches/gobject-introspection-cc-1.72.patch b/gnu/packages/patches/gobject-introspection-cc-1.72.patch
deleted file mode 100644
index d3b1df82af..0000000000
--- a/gnu/packages/patches/gobject-introspection-cc-1.72.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Use gcc as the default C compiler if CC is not set.
-
-diff --git a/giscanner/__init__.py b/giscanner/__init__.py
-index 7c2f365a..607fe341 100644
---- a/giscanner/__init__.py
-+++ b/giscanner/__init__.py
-@@ -21,6 +21,8 @@ import os
- builddir = os.environ.get('UNINSTALLED_INTROSPECTION_BUILDDIR')
- if builddir is not None:
- __path__.append(os.path.join(builddir, 'giscanner')) # type: ignore # mypy issue #1422
-+if not 'CC' in os.environ:
-+ os.environ['CC'] = 'gcc'
- try:
- from ._version import __version__
- except ImportError:
diff --git a/gnu/packages/patches/gobject-introspection-cc.patch b/gnu/packages/patches/gobject-introspection-cc.patch
index 6a86b56b44..d3b1df82af 100644
--- a/gnu/packages/patches/gobject-introspection-cc.patch
+++ b/gnu/packages/patches/gobject-introspection-cc.patch
@@ -1,12 +1,13 @@
Use gcc as the default C compiler if CC is not set.
-diff -ru gobject-introspection-1.58.1.orig/giscanner/__init__.py gobject-introspection-1.58.1/giscanner/__init__.py
---- gobject-introspection-1.58.1.orig/giscanner/__init__.py 1970-01-01 01:00:00.000000000 +0100
-+++ gobject-introspection-1.58.1/giscanner/__init__.py 2018-12-03 13:33:28.788971299 +0100
-@@ -22,6 +22,8 @@
+diff --git a/giscanner/__init__.py b/giscanner/__init__.py
+index 7c2f365a..607fe341 100644
+--- a/giscanner/__init__.py
++++ b/giscanner/__init__.py
+@@ -21,6 +21,8 @@ import os
builddir = os.environ.get('UNINSTALLED_INTROSPECTION_BUILDDIR')
if builddir is not None:
- __path__.append(os.path.join(builddir, 'giscanner'))
+ __path__.append(os.path.join(builddir, 'giscanner')) # type: ignore # mypy issue #1422
+if not 'CC' in os.environ:
+ os.environ['CC'] = 'gcc'
try:
--
2.39.2
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team v3 05/15] gnu: Make gobject-introspection-next the new gobject-introspection.
2023-03-26 19:20 [bug#62467] [PATCH gnome-team 0/5] Update fundamental packages Liliana Marie Prikler
` (9 preceding siblings ...)
2023-03-26 19:14 ` [bug#62467] [PATCH gnome-team 4/5] gnu: Make gobject-introspection-next the new gobject-introspection Liliana Marie Prikler
@ 2023-03-26 19:14 ` Liliana Marie Prikler
2023-03-26 19:14 ` [bug#62467] [PATCH gnome-team v2 04/12] " Liliana Marie Prikler
` (22 subsequent siblings)
33 siblings, 0 replies; 64+ messages in thread
From: Liliana Marie Prikler @ 2023-03-26 19:14 UTC (permalink / raw)
To: 62467; +Cc: rg, Maxim Cournoyer
* gnu/packages/glib.scm (gobject-introspection): Update to 1.73.1.
(gobject-introspection-next): Delete variable.
* gnu/packages/gtk.scm.scm (gtksourceview)[native-inputs]:
Replace gobject-introspection-next with gobject-introspection.
* gnu/packages/guile-xyz.scm (guile-g-golf)[native-inputs]:
Replace gobject-introspection-next with gobject-introspection.
* gnu/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch:
Rename to…
* gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch:
… this.
* gnu/packages/patches/gobject-introspection-cc-1.72.patch: Rename to…
* gnu/packages/patches/gobject-introspection-cc.patch: … this.
* gnu/local.mk (dist_patch_DATA): Adjust accordingly.
---
gnu/local.mk | 2 -
gnu/packages/glib.scm | 21 +--
gnu/packages/gtk.scm | 2 +-
gnu/packages/guile-xyz.scm | 2 +-
...trospection-absolute-shlib-path-1.72.patch | 173 ------------------
...ct-introspection-absolute-shlib-path.patch | 51 +++---
.../gobject-introspection-cc-1.72.patch | 15 --
.../patches/gobject-introspection-cc.patch | 11 +-
8 files changed, 39 insertions(+), 238 deletions(-)
delete mode 100644 gnu/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch
delete mode 100644 gnu/packages/patches/gobject-introspection-cc-1.72.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index f0a228f19f..67ec1b754a 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1264,9 +1264,7 @@ dist_patch_DATA = \
%D%/packages/patches/gnutls-cross.patch \
%D%/packages/patches/gnutls-guile-eintr-eagain.patch \
%D%/packages/patches/gobject-introspection-absolute-shlib-path.patch \
- %D%/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch \
%D%/packages/patches/gobject-introspection-cc.patch \
- %D%/packages/patches/gobject-introspection-cc-1.72.patch \
%D%/packages/patches/gobject-introspection-girepository.patch \
%D%/packages/patches/go-fix-script-tests.patch \
%D%/packages/patches/go-github-com-golang-snappy-32bit-test.patch \
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index d9a9c58fbb..4bc7198ccb 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -477,14 +477,14 @@ (define target-name
(define gobject-introspection
(package
(name "gobject-introspection")
- (version "1.66.1")
+ (version "1.73.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/"
"gobject-introspection/" (version-major+minor version)
"/gobject-introspection-" version ".tar.xz"))
(sha256
- (base32 "078n0q7b6z682mf4irclrksm73cyixq295mqnqifl9plwmgaai6x"))
+ (base32 "1gkbx32as3v2286w7k3j24fwhkxj6brr49881m2zavxamfwxdm34"))
(patches (search-patches
"gobject-introspection-cc.patch"
"gobject-introspection-girepository.patch"
@@ -564,23 +564,6 @@ (define gobject-introspection
;; For tools.
license:gpl2+))))
-(define-public gobject-introspection-next
- (package
- (inherit gobject-introspection)
- (name "gobject-introspection")
- (version "1.73.1")
- (source (origin
- (method url-fetch)
- (uri (string-append "mirror://gnome/sources/"
- "gobject-introspection/" (version-major+minor version)
- "/gobject-introspection-" version ".tar.xz"))
- (sha256
- (base32 "1gkbx32as3v2286w7k3j24fwhkxj6brr49881m2zavxamfwxdm34"))
- (patches (search-patches
- "gobject-introspection-cc-1.72.patch"
- "gobject-introspection-girepository.patch"
- "gobject-introspection-absolute-shlib-path-1.72.patch"))))))
-
(define intltool
(package
(name "intltool")
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 589d861a50..3e57035bac 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -698,7 +698,7 @@ (define-public gtksourceview
(list `(,glib "bin") ; for glib-genmarshal, etc.
gettext-minimal
gi-docgen
- gobject-introspection-next
+ gobject-introspection
pkg-config
vala
;; For testing.
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index e6cef165ea..2bd5e1448c 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -2340,7 +2340,7 @@ (define (get lib)
clutter
xorg-server-for-tests))
(propagated-inputs
- (list gobject-introspection-next))
+ (list gobject-introspection))
(home-page "https://www.gnu.org/software/g-golf/")
(synopsis "Guile bindings for GObject Introspection")
(description
diff --git a/gnu/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch b/gnu/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch
deleted file mode 100644
index 8bb86467c0..0000000000
--- a/gnu/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch
+++ /dev/null
@@ -1,173 +0,0 @@
-Names of libraries included in typelib files are opened by dlopen.
-Here we add the full path.
-
-This patch was provided by Luca Bruno <lucabru@src.gnome.org>,
-for 'gobject-introspection' 1.40.0 in Nix.
-
-It has since been updated to work with newer versions of
-gobject-introspection.
-
-diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py
-index 1d39ab84..e12ed24e 100644
---- a/giscanner/scannermain.py
-+++ b/giscanner/scannermain.py
-@@ -95,6 +95,39 @@ def get_windows_option_group(parser):
- return group
-
-
-+def _get_default_fallback_libpath():
-+ # Newer multiple-output-optimized stdenv has an environment variable
-+ # $outputLib which in turn specifies another variable which then is used as
-+ # the destination for the library contents (${!outputLib}/lib).
-+ store_path = os.environ.get(os.environ.get("outputLib")) if "outputLib" in os.environ else None
-+ if store_path is None:
-+ outputs = os.environ.get("outputs", "out").split()
-+ if "lib" in outputs:
-+ # For multiple output derivations let's try whether there is a $lib
-+ # environment variable and use that as the base store path.
-+ store_path = os.environ.get("lib")
-+ elif "out" in outputs:
-+ # Otherwise we have a single output derivation, so the libraries
-+ # most certainly will end up in "$out/lib".
-+ store_path = os.environ.get("out")
-+
-+ if store_path is not None:
-+ # Even if we have a $lib as output, there still should be a $lib/lib
-+ # directory.
-+ return os.path.join(store_path, 'lib')
-+ else:
-+ # If we haven't found a possible scenario, let's return an empty string
-+ # so that the shared library won't be prepended with a path.
-+ #
-+ # Note that this doesn't mean that all hope is lost, because after all
-+ # we can still use --fallback-library-path to set one.
-+ #
-+ # Also, we're not returning None, because that would make it very
-+ # difficult to disable adding fallback paths altogether using something
-+ # like: --fallback-library-path=""
-+ return ""
-+
-+
- def _get_option_parser():
- parser = optparse.OptionParser('%prog [options] sources',
- version='%prog ' + giscanner.__version__)
-@@ -220,6 +253,10 @@ match the namespace prefix.""")
- parser.add_option("", "--compiler",
- action="store", dest="compiler", default=None,
- help="the C compiler to use internally")
-+ parser.add_option("", "--fallback-library-path",
-+ action="store", dest="fallback_libpath",
-+ default=_get_default_fallback_libpath(),
-+ help="Path to prepend to unknown shared libraries")
-
- group = get_preprocessor_option_group(parser)
- parser.add_option_group(group)
-diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py
-index 9f8ab5df..8aa37c99 100644
---- a/giscanner/shlibs.py
-+++ b/giscanner/shlibs.py
-@@ -57,6 +57,14 @@ def _ldd_library_pattern(library_name):
- $""" % re.escape(library_name), re.VERBOSE)
-
-
-+def _ldd_library_guix_pattern(library_name):
-+ store_dir = re.escape(
-+ os.environ.get("NIX_STORE", default="/gnu/store")
-+ )
-+ pattern = r'(%s(?:/[^/]*)+lib%s[^A-Za-z0-9_-][^\s\(\)]*)'
-+ return re.compile(pattern % (store_dir, re.escape(library_name)))
-+
-+
- # This is a what we do for non-la files. We assume that we are on an
- # ELF-like system where ldd exists and the soname extracted with ldd is
- # a filename that can be opened with dlopen().
-@@ -108,7 +116,8 @@ def _resolve_non_libtool(options, binary, libraries):
- output = output.decode("utf-8", "replace")
-
- shlibs = resolve_from_ldd_output(libraries, output)
-- return list(map(sanitize_shlib_path, shlibs))
-+ fallback_libpath = options.fallback_libpath or "";
-+ return list(map(lambda p: os.path.join(fallback_libpath, p), map(sanitize_shlib_path, shlibs)))
-
-
- def sanitize_shlib_path(lib):
-@@ -117,19 +126,18 @@ def sanitize_shlib_path(lib):
- # In case we get relative paths on macOS (like @rpath) then we fall
- # back to the basename as well:
- # https://gitlab.gnome.org/GNOME/gobject-introspection/issues/222
-- if sys.platform == "darwin":
-- if not os.path.isabs(lib):
-- return os.path.basename(lib)
-- return lib
-- else:
-+
-+ # Always use absolute paths if available
-+ if not os.path.isabs(lib):
- return os.path.basename(lib)
-+ return lib
-
-
- def resolve_from_ldd_output(libraries, output):
- patterns = {}
- for library in libraries:
- if not os.path.isfile(library):
-- patterns[library] = _ldd_library_pattern(library)
-+ patterns[library] = (_ldd_library_pattern(library), _ldd_library_guix_pattern(library))
- if len(patterns) == 0:
- return []
-
-@@ -141,8 +149,12 @@ def resolve_from_ldd_output(libraries, output):
- if line.endswith(':'):
- continue
- for word in line.split():
-- for library, pattern in patterns.items():
-- m = pattern.match(word)
-+ for library, (pattern, guix_pattern) in patterns.items():
-+ store_dir = os.environ.get("NIX_STORE", default="/gnu/store")
-+ if line.find(store_dir) != -1:
-+ m = guix_pattern.match(word)
-+ else:
-+ m = pattern.match(word)
- if m:
- del patterns[library]
- shlibs.append(m.group())
-diff --git a/giscanner/utils.py b/giscanner/utils.py
-index 31c7ea48..630002a8 100644
---- a/giscanner/utils.py
-+++ b/giscanner/utils.py
-@@ -114,16 +114,11 @@ def extract_libtool_shlib(la_file):
- if dlname is None:
- return None
-
-- # Darwin uses absolute paths where possible; since the libtool files never
-- # contain absolute paths, use the libdir field
-- if platform.system() == 'Darwin':
-- dlbasename = os.path.basename(dlname)
-- libdir = _extract_libdir_field(la_file)
-- if libdir is None:
-- return dlbasename
-- return libdir + '/' + dlbasename
-- # Older libtools had a path rather than the raw dlname
-- return os.path.basename(dlname)
-+ dlbasename = os.path.basename(dlname)
-+ libdir = _extract_libdir_field(la_file)
-+ if libdir is None:
-+ return dlbasename
-+ return libdir + '/' + dlbasename
-
-
- # Returns arguments for invoking libtool, if applicable, otherwise None
-diff --git a/tests/scanner/test_shlibs.py b/tests/scanner/test_shlibs.py
-index a8337c60..7f123103 100644
---- a/tests/scanner/test_shlibs.py
-+++ b/tests/scanner/test_shlibs.py
-@@ -40,7 +40,8 @@ class TestLddParser(unittest.TestCase):
-
- self.assertEqual(
- sanitize_shlib_path('/foo/bar'),
-- '/foo/bar' if sys.platform == 'darwin' else 'bar')
-+ # Always use an absolute filename for Guix
-+ '/foo/bar')
-
- def test_unresolved_library(self):
- output = ''
diff --git a/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch b/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch
index 956fa617c3..8bb86467c0 100644
--- a/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch
+++ b/gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch
@@ -1,11 +1,14 @@
-# Names of libraries included in typelib files are opened by dlopen. Here we
-# add the full path.
-#
-# This patch was provided by Luca Bruno <lucabru@src.gnome.org> for
-# 'gobject-introspection' 1.40.0 in Nix.
-#
-# It has since been updated to work with newer versions of
-# gobject-introspection.
+Names of libraries included in typelib files are opened by dlopen.
+Here we add the full path.
+
+This patch was provided by Luca Bruno <lucabru@src.gnome.org>,
+for 'gobject-introspection' 1.40.0 in Nix.
+
+It has since been updated to work with newer versions of
+gobject-introspection.
+
+diff --git a/giscanner/scannermain.py b/giscanner/scannermain.py
+index 1d39ab84..e12ed24e 100644
--- a/giscanner/scannermain.py
+++ b/giscanner/scannermain.py
@@ -95,6 +95,39 @@ def get_windows_option_group(parser):
@@ -48,10 +51,10 @@
def _get_option_parser():
parser = optparse.OptionParser('%prog [options] sources',
version='%prog ' + giscanner.__version__)
-@@ -205,6 +238,10 @@ match the namespace prefix.""")
- parser.add_option("", "--filelist",
- action="store", dest="filelist", default=[],
- help="file containing headers and sources to be scanned")
+@@ -220,6 +253,10 @@ match the namespace prefix.""")
+ parser.add_option("", "--compiler",
+ action="store", dest="compiler", default=None,
+ help="the C compiler to use internally")
+ parser.add_option("", "--fallback-library-path",
+ action="store", dest="fallback_libpath",
+ default=_get_default_fallback_libpath(),
@@ -59,6 +62,8 @@
group = get_preprocessor_option_group(parser)
parser.add_option_group(group)
+diff --git a/giscanner/shlibs.py b/giscanner/shlibs.py
+index 9f8ab5df..8aa37c99 100644
--- a/giscanner/shlibs.py
+++ b/giscanner/shlibs.py
@@ -57,6 +57,14 @@ def _ldd_library_pattern(library_name):
@@ -76,7 +81,7 @@
# This is a what we do for non-la files. We assume that we are on an
# ELF-like system where ldd exists and the soname extracted with ldd is
# a filename that can be opened with dlopen().
-@@ -106,7 +112,8 @@ def _resolve_non_libtool(options, binary, libraries):
+@@ -108,7 +116,8 @@ def _resolve_non_libtool(options, binary, libraries):
output = output.decode("utf-8", "replace")
shlibs = resolve_from_ldd_output(libraries, output)
@@ -86,7 +91,7 @@
def sanitize_shlib_path(lib):
-@@ -115,19 +122,18 @@ def sanitize_shlib_path(lib):
+@@ -117,19 +126,18 @@ def sanitize_shlib_path(lib):
# In case we get relative paths on macOS (like @rpath) then we fall
# back to the basename as well:
# https://gitlab.gnome.org/GNOME/gobject-introspection/issues/222
@@ -111,7 +116,7 @@
if len(patterns) == 0:
return []
-@@ -139,8 +145,12 @@ def resolve_from_ldd_output(libraries, output):
+@@ -141,8 +149,12 @@ def resolve_from_ldd_output(libraries, output):
if line.endswith(':'):
continue
for word in line.split():
@@ -126,10 +131,11 @@
if m:
del patterns[library]
shlibs.append(m.group())
-
+diff --git a/giscanner/utils.py b/giscanner/utils.py
+index 31c7ea48..630002a8 100644
--- a/giscanner/utils.py
+++ b/giscanner/utils.py
-@@ -111,17 +111,11 @@ def extract_libtool_shlib(la_file):
+@@ -114,16 +114,11 @@ def extract_libtool_shlib(la_file):
if dlname is None:
return None
@@ -141,8 +147,7 @@
- if libdir is None:
- return dlbasename
- return libdir + '/' + dlbasename
-- # From the comments in extract_libtool(), older libtools had
-- # a path rather than the raw dlname
+- # Older libtools had a path rather than the raw dlname
- return os.path.basename(dlname)
+ dlbasename = os.path.basename(dlname)
+ libdir = _extract_libdir_field(la_file)
@@ -151,10 +156,12 @@
+ return libdir + '/' + dlbasename
- def extract_libtool(la_file):
+ # Returns arguments for invoking libtool, if applicable, otherwise None
+diff --git a/tests/scanner/test_shlibs.py b/tests/scanner/test_shlibs.py
+index a8337c60..7f123103 100644
--- a/tests/scanner/test_shlibs.py
+++ b/tests/scanner/test_shlibs.py
-@@ -40,6 +64,7 @@ class TestLddParser(unittest.TestCase):
+@@ -40,7 +40,8 @@ class TestLddParser(unittest.TestCase):
self.assertEqual(
sanitize_shlib_path('/foo/bar'),
@@ -163,4 +170,4 @@
+ '/foo/bar')
def test_unresolved_library(self):
-output = ''
+ output = ''
diff --git a/gnu/packages/patches/gobject-introspection-cc-1.72.patch b/gnu/packages/patches/gobject-introspection-cc-1.72.patch
deleted file mode 100644
index d3b1df82af..0000000000
--- a/gnu/packages/patches/gobject-introspection-cc-1.72.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Use gcc as the default C compiler if CC is not set.
-
-diff --git a/giscanner/__init__.py b/giscanner/__init__.py
-index 7c2f365a..607fe341 100644
---- a/giscanner/__init__.py
-+++ b/giscanner/__init__.py
-@@ -21,6 +21,8 @@ import os
- builddir = os.environ.get('UNINSTALLED_INTROSPECTION_BUILDDIR')
- if builddir is not None:
- __path__.append(os.path.join(builddir, 'giscanner')) # type: ignore # mypy issue #1422
-+if not 'CC' in os.environ:
-+ os.environ['CC'] = 'gcc'
- try:
- from ._version import __version__
- except ImportError:
diff --git a/gnu/packages/patches/gobject-introspection-cc.patch b/gnu/packages/patches/gobject-introspection-cc.patch
index 6a86b56b44..d3b1df82af 100644
--- a/gnu/packages/patches/gobject-introspection-cc.patch
+++ b/gnu/packages/patches/gobject-introspection-cc.patch
@@ -1,12 +1,13 @@
Use gcc as the default C compiler if CC is not set.
-diff -ru gobject-introspection-1.58.1.orig/giscanner/__init__.py gobject-introspection-1.58.1/giscanner/__init__.py
---- gobject-introspection-1.58.1.orig/giscanner/__init__.py 1970-01-01 01:00:00.000000000 +0100
-+++ gobject-introspection-1.58.1/giscanner/__init__.py 2018-12-03 13:33:28.788971299 +0100
-@@ -22,6 +22,8 @@
+diff --git a/giscanner/__init__.py b/giscanner/__init__.py
+index 7c2f365a..607fe341 100644
+--- a/giscanner/__init__.py
++++ b/giscanner/__init__.py
+@@ -21,6 +21,8 @@ import os
builddir = os.environ.get('UNINSTALLED_INTROSPECTION_BUILDDIR')
if builddir is not None:
- __path__.append(os.path.join(builddir, 'giscanner'))
+ __path__.append(os.path.join(builddir, 'giscanner')) # type: ignore # mypy issue #1422
+if not 'CC' in os.environ:
+ os.environ['CC'] = 'gcc'
try:
--
2.39.2
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team 5/5] gnu: gobject-introspection: Update to 1.76.1.
2023-03-26 19:20 [bug#62467] [PATCH gnome-team 0/5] Update fundamental packages Liliana Marie Prikler
` (11 preceding siblings ...)
2023-03-26 19:14 ` [bug#62467] [PATCH gnome-team v2 04/12] " Liliana Marie Prikler
@ 2023-03-26 19:19 ` Liliana Marie Prikler
2023-03-26 19:19 ` [bug#62467] [PATCH gnome-team v2 05/12] " Liliana Marie Prikler
` (20 subsequent siblings)
33 siblings, 0 replies; 64+ messages in thread
From: Liliana Marie Prikler @ 2023-03-26 19:19 UTC (permalink / raw)
To: 62467; +Cc: rg
* gnu/packages/glib.scm (gobject-introspection): Update to 1.76.1.
---
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 09386d1652..4115e54782 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -477,14 +477,14 @@ (define target-name
(define gobject-introspection
(package
(name "gobject-introspection")
- (version "1.73.1")
+ (version "1.76.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/"
"gobject-introspection/" (version-major+minor version)
"/gobject-introspection-" version ".tar.xz"))
(sha256
- (base32 "1gkbx32as3v2286w7k3j24fwhkxj6brr49881m2zavxamfwxdm34"))
+ (base32 "1grq6wmbi2nbnwffgvsljd481zm6darnk12dvkf02m9lcjzphq8r"))
(patches (search-patches
"gobject-introspection-cc.patch"
"gobject-introspection-girepository.patch"
--
2.39.2
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team v2 05/12] gnu: gobject-introspection: Update to 1.76.1.
2023-03-26 19:20 [bug#62467] [PATCH gnome-team 0/5] Update fundamental packages Liliana Marie Prikler
` (12 preceding siblings ...)
2023-03-26 19:19 ` [bug#62467] [PATCH gnome-team 5/5] gnu: gobject-introspection: Update to 1.76.1 Liliana Marie Prikler
@ 2023-03-26 19:19 ` Liliana Marie Prikler
2023-04-08 19:40 ` Maxim Cournoyer
2023-03-26 19:19 ` [bug#62467] [PATCH gnome-team v3 06/15] " Liliana Marie Prikler
` (19 subsequent siblings)
33 siblings, 1 reply; 64+ messages in thread
From: Liliana Marie Prikler @ 2023-03-26 19:19 UTC (permalink / raw)
To: 62467; +Cc: rg, Maxim Cournoyer
* gnu/packages/glib.scm (gobject-introspection): Update to 1.76.1.
---
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 09386d1652..4115e54782 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -477,14 +477,14 @@ (define target-name
(define gobject-introspection
(package
(name "gobject-introspection")
- (version "1.73.1")
+ (version "1.76.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/"
"gobject-introspection/" (version-major+minor version)
"/gobject-introspection-" version ".tar.xz"))
(sha256
- (base32 "1gkbx32as3v2286w7k3j24fwhkxj6brr49881m2zavxamfwxdm34"))
+ (base32 "1grq6wmbi2nbnwffgvsljd481zm6darnk12dvkf02m9lcjzphq8r"))
(patches (search-patches
"gobject-introspection-cc.patch"
"gobject-introspection-girepository.patch"
--
2.39.2
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team v3 06/15] gnu: gobject-introspection: Update to 1.76.1.
2023-03-26 19:20 [bug#62467] [PATCH gnome-team 0/5] Update fundamental packages Liliana Marie Prikler
` (13 preceding siblings ...)
2023-03-26 19:19 ` [bug#62467] [PATCH gnome-team v2 05/12] " Liliana Marie Prikler
@ 2023-03-26 19:19 ` Liliana Marie Prikler
2023-03-28 4:26 ` [bug#62467] [PATCH gnome-team v3 07/15] gnu: libsoup-minimal@2: Update to 2.74.3 Liliana Marie Prikler
` (18 subsequent siblings)
33 siblings, 0 replies; 64+ messages in thread
From: Liliana Marie Prikler @ 2023-03-26 19:19 UTC (permalink / raw)
To: 62467; +Cc: rg, Maxim Cournoyer
* gnu/packages/glib.scm (gobject-introspection): Update to 1.76.1.
---
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 4bc7198ccb..08972bfe85 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -477,14 +477,14 @@ (define target-name
(define gobject-introspection
(package
(name "gobject-introspection")
- (version "1.73.1")
+ (version "1.76.1")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/"
"gobject-introspection/" (version-major+minor version)
"/gobject-introspection-" version ".tar.xz"))
(sha256
- (base32 "1gkbx32as3v2286w7k3j24fwhkxj6brr49881m2zavxamfwxdm34"))
+ (base32 "1grq6wmbi2nbnwffgvsljd481zm6darnk12dvkf02m9lcjzphq8r"))
(patches (search-patches
"gobject-introspection-cc.patch"
"gobject-introspection-girepository.patch"
--
2.39.2
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team 0/5] Update fundamental packages
@ 2023-03-26 19:20 Liliana Marie Prikler
2023-03-26 15:39 ` [bug#62467] [PATCH gnome-team 1/5] gnu: glib: Update to 2.76.1 Liliana Marie Prikler
` (33 more replies)
0 siblings, 34 replies; 64+ messages in thread
From: Liliana Marie Prikler @ 2023-03-26 19:20 UTC (permalink / raw)
To: 62467; +Cc: rg
Hi Guix,
to start off work in gnome-team, let's tackle the biggies.
Originally, I had planned to also do gtk 4.10, but that package requires
too much of our rebuilt world and I'd rather have a solid foundation
first.
Cheers
Liliana Marie Prikler (5):
gnu: glib: Update to 2.76.1.
gnu: Make pango-next the new pango.
gnu: pango: Update to 1.50.14.
gnu: Make gobject-introspection-next the new gobject-introspection.
gnu: gobject-introspection: Update to 1.76.1.
gnu/local.mk | 2 -
gnu/packages/freedesktop.scm | 4 +-
gnu/packages/geo.scm | 1 -
gnu/packages/glib.scm | 111 +++--------
gnu/packages/gnome.scm | 33 +---
gnu/packages/gtk.scm | 32 +---
gnu/packages/guile-xyz.scm | 4 +-
gnu/packages/ibus.scm | 2 +-
gnu/packages/messaging.scm | 1 -
.../patches/glib-skip-failing-test.patch | 3 +-
...trospection-absolute-shlib-path-1.72.patch | 173 ------------------
...ct-introspection-absolute-shlib-path.patch | 51 +++---
.../gobject-introspection-cc-1.72.patch | 15 --
.../patches/gobject-introspection-cc.patch | 11 +-
gnu/packages/webkit.scm | 3 +-
15 files changed, 82 insertions(+), 364 deletions(-)
delete mode 100644 gnu/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch
delete mode 100644 gnu/packages/patches/gobject-introspection-cc-1.72.patch
base-commit: 42fbe62d52a82d1003c3d7039d3c4a46806c5cee
--
2.39.2
^ permalink raw reply [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team v2 06/12] gnu: libsoup-minimal@2: Update to 2.74.3.
2023-03-26 19:20 [bug#62467] [PATCH gnome-team 0/5] Update fundamental packages Liliana Marie Prikler
` (15 preceding siblings ...)
2023-03-28 4:26 ` [bug#62467] [PATCH gnome-team v3 07/15] gnu: libsoup-minimal@2: Update to 2.74.3 Liliana Marie Prikler
@ 2023-03-28 4:26 ` Liliana Marie Prikler
2023-04-08 19:42 ` Maxim Cournoyer
2023-03-28 16:50 ` [bug#62467] [PATCH gnome-team v3 08/15] gnu: python-pygobject: Set upstream-name Liliana Marie Prikler
` (16 subsequent siblings)
33 siblings, 1 reply; 64+ messages in thread
From: Liliana Marie Prikler @ 2023-03-28 4:26 UTC (permalink / raw)
To: 62467; +Cc: rg, Maxim Cournoyer
* gnu/packages/gnome.scm (libsoup-minimal-2): Update to 2.74.3.
---
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 90e33d72b6..4f47e60505 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5263,7 +5263,7 @@ (define-public libsoup-minimal
;;; An older variant kept to build the 'rest' package.
(define-public libsoup-minimal-2
(package/inherit libsoup-minimal
- (version "2.72.0")
+ (version "2.74.3")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/libsoup/"
@@ -5271,7 +5271,7 @@ (define-public libsoup-minimal-2
"libsoup-" version ".tar.xz"))
(sha256
(base32
- "11skbyw2pw32178q3h8pi7xqa41b2x4k6q4k9f75zxmh8s23y30p"))))
+ "04rgv6hkyhgi7lak9865yxgbgky6gc635p7w6nhcbj64rx0prdz4"))))
(arguments
(substitute-keyword-arguments (package-arguments libsoup-minimal)
((#:phases phases)
--
2.39.2
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team v3 07/15] gnu: libsoup-minimal@2: Update to 2.74.3.
2023-03-26 19:20 [bug#62467] [PATCH gnome-team 0/5] Update fundamental packages Liliana Marie Prikler
` (14 preceding siblings ...)
2023-03-26 19:19 ` [bug#62467] [PATCH gnome-team v3 06/15] " Liliana Marie Prikler
@ 2023-03-28 4:26 ` Liliana Marie Prikler
2023-03-28 4:26 ` [bug#62467] [PATCH gnome-team v2 06/12] " Liliana Marie Prikler
` (17 subsequent siblings)
33 siblings, 0 replies; 64+ messages in thread
From: Liliana Marie Prikler @ 2023-03-28 4:26 UTC (permalink / raw)
To: 62467; +Cc: rg, Maxim Cournoyer
* gnu/packages/gnome.scm (libsoup-minimal-2): Update to 2.74.3.
---
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 2f73c0a9b7..a7eed081fb 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -5270,7 +5270,7 @@ (define-public libsoup-minimal
;;; An older variant kept to build the 'rest' package.
(define-public libsoup-minimal-2
(package/inherit libsoup-minimal
- (version "2.72.0")
+ (version "2.74.3")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnome/sources/libsoup/"
@@ -5278,7 +5278,7 @@ (define-public libsoup-minimal-2
"libsoup-" version ".tar.xz"))
(sha256
(base32
- "11skbyw2pw32178q3h8pi7xqa41b2x4k6q4k9f75zxmh8s23y30p"))))
+ "04rgv6hkyhgi7lak9865yxgbgky6gc635p7w6nhcbj64rx0prdz4"))))
(arguments
(substitute-keyword-arguments (package-arguments libsoup-minimal)
((#:phases phases)
--
2.39.2
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team v2 07/12] gnu: python-pygobject: Set upstream-name.
2023-03-26 19:20 [bug#62467] [PATCH gnome-team 0/5] Update fundamental packages Liliana Marie Prikler
` (17 preceding siblings ...)
2023-03-28 16:50 ` [bug#62467] [PATCH gnome-team v3 08/15] gnu: python-pygobject: Set upstream-name Liliana Marie Prikler
@ 2023-03-28 16:50 ` Liliana Marie Prikler
2023-04-08 19:42 ` Maxim Cournoyer
2023-03-28 16:51 ` [bug#62467] [PATCH gnome-team v3 09/15] gnu: python-pygobject: Update to 3.44.1 Liliana Marie Prikler
` (14 subsequent siblings)
33 siblings, 1 reply; 64+ messages in thread
From: Liliana Marie Prikler @ 2023-03-28 16:50 UTC (permalink / raw)
To: 62467; +Cc: rg, Maxim Cournoyer
* gnu/packages/glib.scm (python-pygobject)[properties]: Add upstream-name.
---
gnu/packages/glib.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 4115e54782..40d6dd3c86 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -967,7 +967,8 @@ (define-public python-pygobject
(synopsis "Python bindings for GObject")
(description
"Python bindings for GLib, GObject, and GIO.")
- (license license:lgpl2.1+)))
+ (license license:lgpl2.1+)
+ (properties '((upstream-name . "pygobject")))))
(define-public perl-glib
(package
--
2.39.2
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team v3 08/15] gnu: python-pygobject: Set upstream-name.
2023-03-26 19:20 [bug#62467] [PATCH gnome-team 0/5] Update fundamental packages Liliana Marie Prikler
` (16 preceding siblings ...)
2023-03-28 4:26 ` [bug#62467] [PATCH gnome-team v2 06/12] " Liliana Marie Prikler
@ 2023-03-28 16:50 ` Liliana Marie Prikler
2023-03-28 16:50 ` [bug#62467] [PATCH gnome-team v2 07/12] " Liliana Marie Prikler
` (15 subsequent siblings)
33 siblings, 0 replies; 64+ messages in thread
From: Liliana Marie Prikler @ 2023-03-28 16:50 UTC (permalink / raw)
To: 62467; +Cc: rg, Maxim Cournoyer
* gnu/packages/glib.scm (python-pygobject)[properties]: Add upstream-name.
---
gnu/packages/glib.scm | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 08972bfe85..9be8b46c34 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -967,7 +967,8 @@ (define-public python-pygobject
(synopsis "Python bindings for GObject")
(description
"Python bindings for GLib, GObject, and GIO.")
- (license license:lgpl2.1+)))
+ (license license:lgpl2.1+)
+ (properties '((upstream-name . "pygobject")))))
(define-public perl-glib
(package
--
2.39.2
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team v2 08/12] gnu: python-pygobject: Update to 3.44.1.
2023-03-26 19:20 [bug#62467] [PATCH gnome-team 0/5] Update fundamental packages Liliana Marie Prikler
` (19 preceding siblings ...)
2023-03-28 16:51 ` [bug#62467] [PATCH gnome-team v3 09/15] gnu: python-pygobject: Update to 3.44.1 Liliana Marie Prikler
@ 2023-03-28 16:51 ` Liliana Marie Prikler
2023-04-08 19:43 ` Maxim Cournoyer
2023-03-28 19:34 ` [bug#62467] [PATCH gnome-team v2 11/12] gnu: librsvg: Fix build Liliana Marie Prikler
` (12 subsequent siblings)
33 siblings, 1 reply; 64+ messages in thread
From: Liliana Marie Prikler @ 2023-03-28 16:51 UTC (permalink / raw)
To: 62467; +Cc: rg, Maxim Cournoyer
* gnu/packages/glib.scm (python-pygobject): Update to 3.44.1.
---
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 40d6dd3c86..24f66f133c 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -922,7 +922,7 @@ (define-public glibmm-2.64
(define-public python-pygobject
(package
(name "python-pygobject")
- (version "3.40.1")
+ (version "3.44.1")
(source
(origin
(method url-fetch)
@@ -931,7 +931,7 @@ (define-public python-pygobject
"/pygobject-" version ".tar.xz"))
(sha256
(base32
- "0d80g5kgf2i9cginyhalvb7ibfk9g30yilqzmcsw6h6byj8xbih0"))
+ "042pmpyaz7bsbr68znnwdqyhs3j3cajib0k45v1hrs8v6b8has1w"))
(modules '((guix build utils)))
(snippet
'(begin
--
2.39.2
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team v3 09/15] gnu: python-pygobject: Update to 3.44.1.
2023-03-26 19:20 [bug#62467] [PATCH gnome-team 0/5] Update fundamental packages Liliana Marie Prikler
` (18 preceding siblings ...)
2023-03-28 16:50 ` [bug#62467] [PATCH gnome-team v2 07/12] " Liliana Marie Prikler
@ 2023-03-28 16:51 ` Liliana Marie Prikler
2023-03-28 16:51 ` [bug#62467] [PATCH gnome-team v2 08/12] " Liliana Marie Prikler
` (13 subsequent siblings)
33 siblings, 0 replies; 64+ messages in thread
From: Liliana Marie Prikler @ 2023-03-28 16:51 UTC (permalink / raw)
To: 62467; +Cc: rg, Maxim Cournoyer
* gnu/packages/glib.scm (python-pygobject): Update to 3.44.1.
---
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 9be8b46c34..54d21c362f 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -922,7 +922,7 @@ (define-public glibmm-2.64
(define-public python-pygobject
(package
(name "python-pygobject")
- (version "3.40.1")
+ (version "3.44.1")
(source
(origin
(method url-fetch)
@@ -931,7 +931,7 @@ (define-public python-pygobject
"/pygobject-" version ".tar.xz"))
(sha256
(base32
- "0d80g5kgf2i9cginyhalvb7ibfk9g30yilqzmcsw6h6byj8xbih0"))
+ "042pmpyaz7bsbr68znnwdqyhs3j3cajib0k45v1hrs8v6b8has1w"))
(modules '((guix build utils)))
(snippet
'(begin
--
2.39.2
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team v2 11/12] gnu: librsvg: Fix build.
2023-03-26 19:20 [bug#62467] [PATCH gnome-team 0/5] Update fundamental packages Liliana Marie Prikler
` (20 preceding siblings ...)
2023-03-28 16:51 ` [bug#62467] [PATCH gnome-team v2 08/12] " Liliana Marie Prikler
@ 2023-03-28 19:34 ` Liliana Marie Prikler
2023-04-08 19:49 ` Maxim Cournoyer
2023-03-28 19:34 ` [bug#62467] [PATCH gnome-team v3 12/15] " Liliana Marie Prikler
` (11 subsequent siblings)
33 siblings, 1 reply; 64+ messages in thread
From: Liliana Marie Prikler @ 2023-03-28 19:34 UTC (permalink / raw)
To: 62467; +Cc: rg, Maxim Cournoyer
* gnu/packages/gnome.scm (librsvg)[#:phases]<ignore-failing-tests>: Also
delete SVG files that have been broken by the recent updates.
---
gnu/packages/gnome.scm | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 4f47e60505..e43e24dd94 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3696,7 +3696,12 @@ (define-public librsvg
(("fn multiple_input_files_not_allowed_for_png_output" all)
(string-append "#[ignore] " all))
(("fn stylesheet_option_error" all)
- (string-append "#[ignore] " all)))))
+ (string-append "#[ignore] " all)))
+ ;; XXX: re-enable when updating this package
+ (with-directory-excursion "tests/fixtures/reftests/"
+ (delete-file "filter-component-transfer-from-reference-page.svg")
+ (delete-file "filter-morphology-from-reference-page.svg")
+ (delete-file "svg1.1/text-text-03-b.svg"))))
(replace 'check
(lambda* args
((assoc-ref gnu:%standard-phases 'check)
--
2.39.2
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team v3 12/15] gnu: librsvg: Fix build.
2023-03-26 19:20 [bug#62467] [PATCH gnome-team 0/5] Update fundamental packages Liliana Marie Prikler
` (21 preceding siblings ...)
2023-03-28 19:34 ` [bug#62467] [PATCH gnome-team v2 11/12] gnu: librsvg: Fix build Liliana Marie Prikler
@ 2023-03-28 19:34 ` Liliana Marie Prikler
2023-03-30 4:28 ` [bug#62467] [PATCH gnome-team v3 11/15] gnu: gtk+: Update to 3.24.37 Liliana Marie Prikler
` (10 subsequent siblings)
33 siblings, 0 replies; 64+ messages in thread
From: Liliana Marie Prikler @ 2023-03-28 19:34 UTC (permalink / raw)
To: 62467; +Cc: rg, Maxim Cournoyer
* gnu/packages/gnome.scm (librsvg)[#:phases]<ignore-failing-tests>: Also
delete SVG files that have been broken by the recent updates.
---
gnu/packages/gnome.scm | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index a7eed081fb..725471c1c3 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -3697,7 +3697,12 @@ (define-public librsvg
(("fn multiple_input_files_not_allowed_for_png_output" all)
(string-append "#[ignore] " all))
(("fn stylesheet_option_error" all)
- (string-append "#[ignore] " all)))))
+ (string-append "#[ignore] " all)))
+ ;; XXX: re-enable when updating this package
+ (with-directory-excursion "tests/fixtures/reftests/"
+ (delete-file "filter-component-transfer-from-reference-page.svg")
+ (delete-file "filter-morphology-from-reference-page.svg")
+ (delete-file "svg1.1/text-text-03-b.svg"))))
(replace 'check
(lambda* args
((assoc-ref gnu:%standard-phases 'check)
--
2.39.2
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team v2 10/12] gnu: gtk+: Update to 3.24.37.
2023-03-26 19:20 [bug#62467] [PATCH gnome-team 0/5] Update fundamental packages Liliana Marie Prikler
` (23 preceding siblings ...)
2023-03-30 4:28 ` [bug#62467] [PATCH gnome-team v3 11/15] gnu: gtk+: Update to 3.24.37 Liliana Marie Prikler
@ 2023-03-30 4:28 ` Liliana Marie Prikler
2023-04-08 19:34 ` Maxim Cournoyer
2023-03-30 18:41 ` [bug#62467] [PATCH gnome-team v3 10/15] gnu: gtk+-2: Fix build by hardening list store Liliana Marie Prikler
` (8 subsequent siblings)
33 siblings, 1 reply; 64+ messages in thread
From: Liliana Marie Prikler @ 2023-03-30 4:28 UTC (permalink / raw)
To: 62467; +Cc: rg, Maxim Cournoyer
* gnu/packages/gtk.scm (gtk+): Update to 3.24.37.
[native-inputs]: Add docbook-xsl.
[build-system]: Use meson-build-system.
[arguments]: Add ‘glib-or-gtk?’. Adjust configure-flags accordingly.
<#:phases>: Remove ‘generate-gdk-pixbuf-loaders-cache-file’.
Adjust ‘disable-failing-tests’.
Rename ‘move-desktop-files’ to ‘move-files’ and move documentation as well.
---
gnu/packages/gtk.scm | 85 +++++++++++++++++++++++---------------------
1 file changed, 44 insertions(+), 41 deletions(-)
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 196d767160..75e56d4166 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1101,7 +1101,7 @@ (define-public gtk+
(package
(inherit gtk+-2)
(name "gtk+")
- (version "3.24.30")
+ (version "3.24.37")
(source
(origin
(method url-fetch)
@@ -1110,7 +1110,7 @@ (define-public gtk+
name "-" version ".tar.xz"))
(sha256
(base32
- "1a9vg840fjq1mmm403b67k624qrkxh9shaz9pv7z9l8a6bzvyxds"))
+ "0mvzzgjrzzir7nzx379yz3swzk3pn1s283hgzm8l2yakq2sg0ib7"))
(patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch"
"gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch"))))
(propagated-inputs
@@ -1152,6 +1152,7 @@ (define-public gtk+
rest))
(native-inputs
(list docbook-xml-4.1.2
+ docbook-xsl
gettext-minimal
`(,glib "bin")
gobject-introspection
@@ -1164,47 +1165,29 @@ (define-public gtk+
;; of updating xorg-server directly on the master branch.
xorg-server-for-tests
libxslt))
+ (build-system meson-build-system)
(arguments
- `(#:imported-modules ((guix build glib-or-gtk-build-system)
- ,@%gnu-build-system-modules)
- #:modules ((guix build utils)
- (guix build gnu-build-system)
- ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:))
+ `(#:glib-or-gtk? #t
#:disallowed-references (,xorg-server-for-tests)
- ;; 47 MiB goes to "out" (24 of which is locale data!), and 26 MiB goes
- ;; to "doc".
- #:configure-flags (list (string-append "--with-html-dir="
- (assoc-ref %outputs "doc")
- "/share/gtk-doc/html")
- "--enable-cloudproviders"
+ #:configure-flags (list "-Dcloudproviders=true"
;; The header file <gdk/gdkwayland.h> is required
;; by gnome-control-center
- "--enable-wayland-backend"
+ "-Dwayland_backend=true"
;; This is necessary to build both backends.
- "--enable-x11-backend"
+ "-Dx11_backend=true"
;; This enables the HTML5 websocket backend.
- "--enable-broadway-backend")
+ "-Dbroadway_backend=true"
+ "-Dman=true")
#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file
- (assoc-ref glib-or-gtk:%standard-phases
- 'generate-gdk-pixbuf-loaders-cache-file))
(add-after 'unpack 'disable-failing-tests
(lambda _
- (substitute* "testsuite/gtk/Makefile.in"
- (("builderparser cellarea check-icon-names check-cursor-names")
- "builderparser cellarea check-cursor-names")
- (("notify no-gtk-init object objects-finalize papersize rbtree")
- "no-gtk-init papersize rbtree")
- (("stylecontext templates textbuffer textiter treemodel treepath")
- "stylecontext textbuffer textiter treemodel treepath"))
- (substitute* "testsuite/a11y/Makefile.in"
- (("accessibility-dump tree-performance text children derive")
- "tree-performance text children derive"))
- (substitute* "testsuite/reftests/Makefile.in"
- (("TEST_PROGS = gtk-reftest")
- "TEST_PROGS = "))
- #t))
+ (substitute* "testsuite/gtk/meson.build"
+ (("\\['defaultvalue'\\],") "")
+ (("\\['objects-finalize', .*\\],") ""))
+ (substitute* "testsuite/reftests/meson.build"
+ (("'flipping-icons(\\.[^.]*)?\\.ui',") "")
+ (("'gtk-icontheme-sizing(\\.[^.]*)?\\.ui',") ""))))
(add-before 'check 'pre-check
(lambda _
;; Tests require a running X server.
@@ -1217,15 +1200,35 @@ (define-public gtk+
;; For missing '/etc/machine-id'.
(setenv "DBUS_FATAL_WARNINGS" "0")
#t))
- (add-after 'install 'move-desktop-files
- ;; Move desktop files into 'bin' to avoid cycle references.
+ (add-after 'install 'move-files
(lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out"))
- (bin (assoc-ref outputs "bin")))
- (mkdir-p (string-append bin "/share"))
- (rename-file (string-append out "/share/applications")
- (string-append bin "/share/applications"))
- #t))))))
+ (define-values (out bin doc)
+ (values (assoc-ref outputs "out")
+ (assoc-ref outputs "bin")
+ (assoc-ref outputs "doc")))
+ (for-each mkdir-p
+ (list
+ (string-append bin "/bin")
+ (string-append bin "/share/applications")
+ (string-append bin "/share/icons")
+ (string-append bin "/share/man")
+ (string-append bin "/share/metainfo")
+ (string-append doc "/share/doc")))
+ ;; Move programs and related files to output 'bin'.
+ (for-each (lambda (dir)
+ (rename-file
+ (string-append out dir)
+ (string-append bin dir)))
+ (list
+ "/bin"
+ "/share/applications"
+ "/share/icons"
+ "/share/man"))
+ ;; Move HTML documentation to output 'doc'.
+ (when (file-exists? (string-append out "/share/doc"))
+ (rename-file
+ (string-append out "/share/doc")
+ (string-append doc "/share/doc"))))))))
(native-search-paths
(list (search-path-specification
(variable "GUIX_GTK3_PATH")
--
2.39.2
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team v3 11/15] gnu: gtk+: Update to 3.24.37.
2023-03-26 19:20 [bug#62467] [PATCH gnome-team 0/5] Update fundamental packages Liliana Marie Prikler
` (22 preceding siblings ...)
2023-03-28 19:34 ` [bug#62467] [PATCH gnome-team v3 12/15] " Liliana Marie Prikler
@ 2023-03-30 4:28 ` Liliana Marie Prikler
2023-03-30 4:28 ` [bug#62467] [PATCH gnome-team v2 10/12] " Liliana Marie Prikler
` (9 subsequent siblings)
33 siblings, 0 replies; 64+ messages in thread
From: Liliana Marie Prikler @ 2023-03-30 4:28 UTC (permalink / raw)
To: 62467; +Cc: rg, Maxim Cournoyer
* gnu/packages/gtk.scm (gtk+): Update to 3.24.37.
[native-inputs]: Add docbook-xsl.
[build-system]: Use meson-build-system.
[arguments]: Add ‘glib-or-gtk?’. Adjust configure-flags accordingly.
<#:phases>: Remove ‘generate-gdk-pixbuf-loaders-cache-file’.
Adjust ‘disable-failing-tests’.
Rename ‘move-desktop-files’ to ‘move-files’ and move documentation as well.
---
gnu/packages/gtk.scm | 85 +++++++++++++++++++++++---------------------
1 file changed, 44 insertions(+), 41 deletions(-)
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 6d3bbb42be..e49115ad0e 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1101,7 +1101,7 @@ (define-public gtk+
(package
(inherit gtk+-2)
(name "gtk+")
- (version "3.24.30")
+ (version "3.24.37")
(source
(origin
(method url-fetch)
@@ -1110,7 +1110,7 @@ (define-public gtk+
name "-" version ".tar.xz"))
(sha256
(base32
- "1a9vg840fjq1mmm403b67k624qrkxh9shaz9pv7z9l8a6bzvyxds"))
+ "0mvzzgjrzzir7nzx379yz3swzk3pn1s283hgzm8l2yakq2sg0ib7"))
(patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch"
"gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch"))))
(propagated-inputs
@@ -1152,6 +1152,7 @@ (define-public gtk+
rest))
(native-inputs
(list docbook-xml-4.1.2
+ docbook-xsl
gettext-minimal
`(,glib "bin")
gobject-introspection
@@ -1164,47 +1165,29 @@ (define-public gtk+
;; of updating xorg-server directly on the master branch.
xorg-server-for-tests
libxslt))
+ (build-system meson-build-system)
(arguments
- `(#:imported-modules ((guix build glib-or-gtk-build-system)
- ,@%gnu-build-system-modules)
- #:modules ((guix build utils)
- (guix build gnu-build-system)
- ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:))
+ `(#:glib-or-gtk? #t
#:disallowed-references (,xorg-server-for-tests)
- ;; 47 MiB goes to "out" (24 of which is locale data!), and 26 MiB goes
- ;; to "doc".
- #:configure-flags (list (string-append "--with-html-dir="
- (assoc-ref %outputs "doc")
- "/share/gtk-doc/html")
- "--enable-cloudproviders"
+ #:configure-flags (list "-Dcloudproviders=true"
;; The header file <gdk/gdkwayland.h> is required
;; by gnome-control-center
- "--enable-wayland-backend"
+ "-Dwayland_backend=true"
;; This is necessary to build both backends.
- "--enable-x11-backend"
+ "-Dx11_backend=true"
;; This enables the HTML5 websocket backend.
- "--enable-broadway-backend")
+ "-Dbroadway_backend=true"
+ "-Dman=true")
#:phases
(modify-phases %standard-phases
- (add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file
- (assoc-ref glib-or-gtk:%standard-phases
- 'generate-gdk-pixbuf-loaders-cache-file))
(add-after 'unpack 'disable-failing-tests
(lambda _
- (substitute* "testsuite/gtk/Makefile.in"
- (("builderparser cellarea check-icon-names check-cursor-names")
- "builderparser cellarea check-cursor-names")
- (("notify no-gtk-init object objects-finalize papersize rbtree")
- "no-gtk-init papersize rbtree")
- (("stylecontext templates textbuffer textiter treemodel treepath")
- "stylecontext textbuffer textiter treemodel treepath"))
- (substitute* "testsuite/a11y/Makefile.in"
- (("accessibility-dump tree-performance text children derive")
- "tree-performance text children derive"))
- (substitute* "testsuite/reftests/Makefile.in"
- (("TEST_PROGS = gtk-reftest")
- "TEST_PROGS = "))
- #t))
+ (substitute* "testsuite/gtk/meson.build"
+ (("\\['defaultvalue'\\],") "")
+ (("\\['objects-finalize', .*\\],") ""))
+ (substitute* "testsuite/reftests/meson.build"
+ (("'flipping-icons(\\.[^.]*)?\\.ui',") "")
+ (("'gtk-icontheme-sizing(\\.[^.]*)?\\.ui',") ""))))
(add-before 'check 'pre-check
(lambda _
;; Tests require a running X server.
@@ -1217,15 +1200,35 @@ (define-public gtk+
;; For missing '/etc/machine-id'.
(setenv "DBUS_FATAL_WARNINGS" "0")
#t))
- (add-after 'install 'move-desktop-files
- ;; Move desktop files into 'bin' to avoid cycle references.
+ (add-after 'install 'move-files
(lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out"))
- (bin (assoc-ref outputs "bin")))
- (mkdir-p (string-append bin "/share"))
- (rename-file (string-append out "/share/applications")
- (string-append bin "/share/applications"))
- #t))))))
+ (define-values (out bin doc)
+ (values (assoc-ref outputs "out")
+ (assoc-ref outputs "bin")
+ (assoc-ref outputs "doc")))
+ (for-each mkdir-p
+ (list
+ (string-append bin "/bin")
+ (string-append bin "/share/applications")
+ (string-append bin "/share/icons")
+ (string-append bin "/share/man")
+ (string-append bin "/share/metainfo")
+ (string-append doc "/share/doc")))
+ ;; Move programs and related files to output 'bin'.
+ (for-each (lambda (dir)
+ (rename-file
+ (string-append out dir)
+ (string-append bin dir)))
+ (list
+ "/bin"
+ "/share/applications"
+ "/share/icons"
+ "/share/man"))
+ ;; Move HTML documentation to output 'doc'.
+ (when (file-exists? (string-append out "/share/doc"))
+ (rename-file
+ (string-append out "/share/doc")
+ (string-append doc "/share/doc"))))))))
(native-search-paths
(list (search-path-specification
(variable "GUIX_GTK3_PATH")
--
2.39.2
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team v2 09/12] gnu: gtk+-2: Fix build by hardening list store.
2023-03-26 19:20 [bug#62467] [PATCH gnome-team 0/5] Update fundamental packages Liliana Marie Prikler
` (25 preceding siblings ...)
2023-03-30 18:41 ` [bug#62467] [PATCH gnome-team v3 10/15] gnu: gtk+-2: Fix build by hardening list store Liliana Marie Prikler
@ 2023-03-30 18:41 ` Liliana Marie Prikler
2023-04-08 19:47 ` Maxim Cournoyer
2023-03-31 18:54 ` [bug#62467] [PATCH gnome-team v2 12/12] gnu: inkscape: Update stable version to 1.2.1 Liliana Marie Prikler
` (6 subsequent siblings)
33 siblings, 1 reply; 64+ messages in thread
From: Liliana Marie Prikler @ 2023-03-30 18:41 UTC (permalink / raw)
To: 62467; +Cc: rg, Maxim Cournoyer
* gnu/packages/patches/gtk2-harden-list-store.patch: New file.
* gnu/packages/gtk.scm (gtk+-2)[patches]: Add it here.
* gnu/local.mk (dist_patch_DATA): Register it here.
---
gnu/local.mk | 1 +
gnu/packages/gtk.scm | 1 +
.../patches/gtk2-harden-list-store.patch | 42 +++++++++++++++++++
3 files changed, 44 insertions(+)
create mode 100644 gnu/packages/patches/gtk2-harden-list-store.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 3e94281ccf..31456c5be8 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1303,6 +1303,7 @@ dist_patch_DATA = \
%D%/packages/patches/guile-rsvg-pkgconfig.patch \
%D%/packages/patches/guile-emacs-fix-configure.patch \
%D%/packages/patches/gtk2-fix-builder-test.patch \
+ %D%/packages/patches/gtk2-harden-list-store.patch \
%D%/packages/patches/gtk2-respect-GUIX_GTK2_PATH.patch \
%D%/packages/patches/gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch \
%D%/packages/patches/gtk2-theme-paths.patch \
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index c756f39e24..196d767160 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1014,6 +1014,7 @@ (define-public gtk+-2
"1nn6kks1zyvb5xikr9y2k7r9bwjy1g4b0m0s66532bclymbwfamc"))
(patches (search-patches "gtk2-respect-GUIX_GTK2_PATH.patch"
"gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch"
+ "gtk2-harden-list-store.patch"
"gtk2-theme-paths.patch"
"gtk2-fix-builder-test.patch"))))
(build-system gnu-build-system)
diff --git a/gnu/packages/patches/gtk2-harden-list-store.patch b/gnu/packages/patches/gtk2-harden-list-store.patch
new file mode 100644
index 0000000000..b107ba2bcc
--- /dev/null
+++ b/gnu/packages/patches/gtk2-harden-list-store.patch
@@ -0,0 +1,42 @@
+Mimic the implemenetation in gtk+-3.
+
+Index: gtk+-2.24.33/gtk/gtkliststore.c
+===================================================================
+--- gtk+-2.24.33.orig/gtk/gtkliststore.c
++++ gtk+-2.24.33/gtk/gtkliststore.c
+@@ -1195,16 +1195,31 @@ gboolean
+ gtk_list_store_iter_is_valid (GtkListStore *list_store,
+ GtkTreeIter *iter)
+ {
++ GSequenceIter *seq_iter;
++
+ g_return_val_if_fail (GTK_IS_LIST_STORE (list_store), FALSE);
+ g_return_val_if_fail (iter != NULL, FALSE);
+
+- if (!VALID_ITER (iter, list_store))
+- return FALSE;
++ /* can't use VALID_ITER() here, because iter might point
++ * to random memory.
++ *
++ * We MUST NOT dereference it.
++ */
+
+- if (g_sequence_iter_get_sequence (iter->user_data) != list_store->seq)
++ if (iter == NULL ||
++ iter->user_data == NULL ||
++ list_store->stamp != iter->stamp)
+ return FALSE;
+
+- return TRUE;
++ for (seq_iter = g_sequence_get_begin_iter (list_store->seq);
++ !g_sequence_iter_is_end (seq_iter);
++ seq_iter = g_sequence_iter_next (seq_iter))
++ {
++ if (seq_iter == iter->user_data)
++ return TRUE;
++ }
++
++ return FALSE;
+ }
+
+ static gboolean real_gtk_list_store_row_draggable (GtkTreeDragSource *drag_source,
--
2.39.2
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team v3 10/15] gnu: gtk+-2: Fix build by hardening list store.
2023-03-26 19:20 [bug#62467] [PATCH gnome-team 0/5] Update fundamental packages Liliana Marie Prikler
` (24 preceding siblings ...)
2023-03-30 4:28 ` [bug#62467] [PATCH gnome-team v2 10/12] " Liliana Marie Prikler
@ 2023-03-30 18:41 ` Liliana Marie Prikler
2023-03-30 18:41 ` [bug#62467] [PATCH gnome-team v2 09/12] " Liliana Marie Prikler
` (7 subsequent siblings)
33 siblings, 0 replies; 64+ messages in thread
From: Liliana Marie Prikler @ 2023-03-30 18:41 UTC (permalink / raw)
To: 62467; +Cc: rg, Maxim Cournoyer
* gnu/packages/patches/gtk2-harden-list-store.patch: New file.
* gnu/packages/gtk.scm (gtk+-2)[patches]: Add it here.
* gnu/local.mk (dist_patch_DATA): Register it here.
---
gnu/local.mk | 1 +
gnu/packages/gtk.scm | 1 +
.../patches/gtk2-harden-list-store.patch | 42 +++++++++++++++++++
3 files changed, 44 insertions(+)
create mode 100644 gnu/packages/patches/gtk2-harden-list-store.patch
diff --git a/gnu/local.mk b/gnu/local.mk
index 67ec1b754a..df78ce263e 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1303,6 +1303,7 @@ dist_patch_DATA = \
%D%/packages/patches/guile-rsvg-pkgconfig.patch \
%D%/packages/patches/guile-emacs-fix-configure.patch \
%D%/packages/patches/gtk2-fix-builder-test.patch \
+ %D%/packages/patches/gtk2-harden-list-store.patch \
%D%/packages/patches/gtk2-respect-GUIX_GTK2_PATH.patch \
%D%/packages/patches/gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch \
%D%/packages/patches/gtk2-theme-paths.patch \
diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
index 3e57035bac..6d3bbb42be 100644
--- a/gnu/packages/gtk.scm
+++ b/gnu/packages/gtk.scm
@@ -1014,6 +1014,7 @@ (define-public gtk+-2
"1nn6kks1zyvb5xikr9y2k7r9bwjy1g4b0m0s66532bclymbwfamc"))
(patches (search-patches "gtk2-respect-GUIX_GTK2_PATH.patch"
"gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch"
+ "gtk2-harden-list-store.patch"
"gtk2-theme-paths.patch"
"gtk2-fix-builder-test.patch"))))
(build-system gnu-build-system)
diff --git a/gnu/packages/patches/gtk2-harden-list-store.patch b/gnu/packages/patches/gtk2-harden-list-store.patch
new file mode 100644
index 0000000000..f49dc3bc77
--- /dev/null
+++ b/gnu/packages/patches/gtk2-harden-list-store.patch
@@ -0,0 +1,42 @@
+Backport the implementation of gtk_list_store_iter_is_valid from gtk+-3.
+
+Index: gtk+-2.24.33/gtk/gtkliststore.c
+===================================================================
+--- gtk+-2.24.33.orig/gtk/gtkliststore.c
++++ gtk+-2.24.33/gtk/gtkliststore.c
+@@ -1195,16 +1195,31 @@ gboolean
+ gtk_list_store_iter_is_valid (GtkListStore *list_store,
+ GtkTreeIter *iter)
+ {
++ GSequenceIter *seq_iter;
++
+ g_return_val_if_fail (GTK_IS_LIST_STORE (list_store), FALSE);
+ g_return_val_if_fail (iter != NULL, FALSE);
+
+- if (!VALID_ITER (iter, list_store))
+- return FALSE;
++ /* can't use VALID_ITER() here, because iter might point
++ * to random memory.
++ *
++ * We MUST NOT dereference it.
++ */
+
+- if (g_sequence_iter_get_sequence (iter->user_data) != list_store->seq)
++ if (iter == NULL ||
++ iter->user_data == NULL ||
++ list_store->stamp != iter->stamp)
+ return FALSE;
+
+- return TRUE;
++ for (seq_iter = g_sequence_get_begin_iter (list_store->seq);
++ !g_sequence_iter_is_end (seq_iter);
++ seq_iter = g_sequence_iter_next (seq_iter))
++ {
++ if (seq_iter == iter->user_data)
++ return TRUE;
++ }
++
++ return FALSE;
+ }
+
+ static gboolean real_gtk_list_store_row_draggable (GtkTreeDragSource *drag_source,
--
2.39.2
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team v2 12/12] gnu: inkscape: Update stable version to 1.2.1.
2023-03-26 19:20 [bug#62467] [PATCH gnome-team 0/5] Update fundamental packages Liliana Marie Prikler
` (26 preceding siblings ...)
2023-03-30 18:41 ` [bug#62467] [PATCH gnome-team v2 09/12] " Liliana Marie Prikler
@ 2023-03-31 18:54 ` Liliana Marie Prikler
2023-04-08 19:51 ` Maxim Cournoyer
2023-03-31 18:54 ` [bug#62467] [PATCH gnome-team v3 13/15] " Liliana Marie Prikler
` (5 subsequent siblings)
33 siblings, 1 reply; 64+ messages in thread
From: Liliana Marie Prikler @ 2023-03-31 18:54 UTC (permalink / raw)
To: 62467; +Cc: rg, Maxim Cournoyer
* gnu/packages/inkscape.scm (inkscape/stable): Update to 1.2.1.
[inputs]: Add bash-minimal, librsvg and python-cssselect.
Use lib2geom-1.2 rather than lib2geom.
(inkscape): Inherit build-system, arguments and inputs.
---
gnu/packages/inkscape.scm | 36 +++++++++++-------------------------
1 file changed, 11 insertions(+), 25 deletions(-)
diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm
index d1ac5e7312..b8e78c2b11 100644
--- a/gnu/packages/inkscape.scm
+++ b/gnu/packages/inkscape.scm
@@ -61,7 +61,7 @@ (define-public inkscape/stable
(hidden-package
(package
(name "inkscape")
- (version "1.1.1")
+ (version "1.2.1")
(source
(origin
(method url-fetch)
@@ -69,7 +69,7 @@ (define-public inkscape/stable
"resources/file/"
"inkscape-" version ".tar.xz"))
(sha256
- (base32 "1bvqg5xfs3m6r7qfdhmgzwhd1hx8wvg3nhvhmalwzcdm6ffhpjmf"))
+ (base32 "06scilds4p4bw337ss22nfdxy2kynv5yjw6vq6nlpjm7xfh7vkj6"))
(modules '((guix build utils)
(ice-9 format)))
(snippet
@@ -196,9 +196,14 @@ (define-public inkscape/stable
(let ((out (assoc-ref outputs "out")))
(wrap-program (string-append out "/bin/inkscape")
`("GUIX_PYTHONPATH" ":" prefix
- (,(getenv "GUIX_PYTHONPATH"))))))))))
+ (,(getenv "GUIX_PYTHONPATH")))
+ ;; Wrapping GDK_PIXBUF_MODULE_FILE allows Inkscape to load
+ ;; its own icons in pure environments.
+ `("GDK_PIXBUF_MODULE_FILE" =
+ (,(getenv "GDK_PIXBUF_MODULE_FILE"))))))))))
(inputs
`(("aspell" ,aspell)
+ ("bash-minimal" ,bash-minimal)
("autotrace" ,autotrace)
("gdl" ,gdl-minimal)
("gtkmm" ,gtkmm-3)
@@ -206,12 +211,13 @@ (define-public inkscape/stable
("gtkspell3" ,gtkspell3)
("gsl" ,gsl)
("poppler" ,poppler)
- ("lib2geom" ,lib2geom)
+ ("lib2geom" ,lib2geom-1.2)
("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("libxml2" ,libxml2)
("libxslt" ,libxslt)
("libgc" ,libgc)
+ ("librsvg" ,librsvg) ; for the pixbuf loader
("libsoup" ,libsoup-minimal-2)
("libcdr" ,libcdr)
("libvisio" ,libvisio)
@@ -223,6 +229,7 @@ (define-public inkscape/stable
("lcms" ,lcms)
("boost" ,boost)
("python" ,python-wrapper)
+ ("python-cssselect" ,python-cssselect) ; to render qrcode
("python-scour" ,python-scour)
("python-pyserial" ,python-pyserial)
("python-numpy" ,python-numpy)
@@ -255,25 +262,4 @@ (define-public inkscape
"inkscape-" version ".tar.xz"))
(sha256
(base32 "06scilds4p4bw337ss22nfdxy2kynv5yjw6vq6nlpjm7xfh7vkj6"))))
- (build-system cmake-build-system)
- (arguments
- (substitute-keyword-arguments (package-arguments inkscape/stable)
- ((#:phases phases)
- `(modify-phases ,phases
- (replace 'wrap-program
- ;; Ensure Python is available at runtime.
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (wrap-program (string-append out "/bin/inkscape")
- `("GUIX_PYTHONPATH" prefix
- (,(getenv "GUIX_PYTHONPATH")))
- ;; Wrapping GDK_PIXBUF_MODULE_FILE allows Inkscape to load
- ;; its own icons in pure environments.
- `("GDK_PIXBUF_MODULE_FILE" =
- (,(getenv "GDK_PIXBUF_MODULE_FILE")))))))))))
- (inputs (modify-inputs (package-inputs inkscape/stable)
- (replace "lib2geom" lib2geom-1.2)
- (append bash-minimal
- librsvg ;for the pixbuf loader
- python-cssselect))) ;to render qrcode
(properties (alist-delete 'hidden? (package-properties inkscape/stable)))))
--
2.39.2
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team v3 13/15] gnu: inkscape: Update stable version to 1.2.1.
2023-03-26 19:20 [bug#62467] [PATCH gnome-team 0/5] Update fundamental packages Liliana Marie Prikler
` (27 preceding siblings ...)
2023-03-31 18:54 ` [bug#62467] [PATCH gnome-team v2 12/12] gnu: inkscape: Update stable version to 1.2.1 Liliana Marie Prikler
@ 2023-03-31 18:54 ` Liliana Marie Prikler
2023-03-31 21:43 ` [bug#62467] [PATCH gnome-team v2 00/12] Update fundamental packages Liliana Marie Prikler
` (4 subsequent siblings)
33 siblings, 0 replies; 64+ messages in thread
From: Liliana Marie Prikler @ 2023-03-31 18:54 UTC (permalink / raw)
To: 62467; +Cc: rg, Maxim Cournoyer
* gnu/packages/inkscape.scm (inkscape/stable): Update to 1.2.1.
[inputs]: Add bash-minimal, librsvg and python-cssselect.
Use lib2geom-1.2 rather than lib2geom.
(inkscape): Inherit build-system, arguments and inputs.
---
gnu/packages/inkscape.scm | 36 +++++++++++-------------------------
1 file changed, 11 insertions(+), 25 deletions(-)
diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm
index d1ac5e7312..b8e78c2b11 100644
--- a/gnu/packages/inkscape.scm
+++ b/gnu/packages/inkscape.scm
@@ -61,7 +61,7 @@ (define-public inkscape/stable
(hidden-package
(package
(name "inkscape")
- (version "1.1.1")
+ (version "1.2.1")
(source
(origin
(method url-fetch)
@@ -69,7 +69,7 @@ (define-public inkscape/stable
"resources/file/"
"inkscape-" version ".tar.xz"))
(sha256
- (base32 "1bvqg5xfs3m6r7qfdhmgzwhd1hx8wvg3nhvhmalwzcdm6ffhpjmf"))
+ (base32 "06scilds4p4bw337ss22nfdxy2kynv5yjw6vq6nlpjm7xfh7vkj6"))
(modules '((guix build utils)
(ice-9 format)))
(snippet
@@ -196,9 +196,14 @@ (define-public inkscape/stable
(let ((out (assoc-ref outputs "out")))
(wrap-program (string-append out "/bin/inkscape")
`("GUIX_PYTHONPATH" ":" prefix
- (,(getenv "GUIX_PYTHONPATH"))))))))))
+ (,(getenv "GUIX_PYTHONPATH")))
+ ;; Wrapping GDK_PIXBUF_MODULE_FILE allows Inkscape to load
+ ;; its own icons in pure environments.
+ `("GDK_PIXBUF_MODULE_FILE" =
+ (,(getenv "GDK_PIXBUF_MODULE_FILE"))))))))))
(inputs
`(("aspell" ,aspell)
+ ("bash-minimal" ,bash-minimal)
("autotrace" ,autotrace)
("gdl" ,gdl-minimal)
("gtkmm" ,gtkmm-3)
@@ -206,12 +211,13 @@ (define-public inkscape/stable
("gtkspell3" ,gtkspell3)
("gsl" ,gsl)
("poppler" ,poppler)
- ("lib2geom" ,lib2geom)
+ ("lib2geom" ,lib2geom-1.2)
("libjpeg" ,libjpeg-turbo)
("libpng" ,libpng)
("libxml2" ,libxml2)
("libxslt" ,libxslt)
("libgc" ,libgc)
+ ("librsvg" ,librsvg) ; for the pixbuf loader
("libsoup" ,libsoup-minimal-2)
("libcdr" ,libcdr)
("libvisio" ,libvisio)
@@ -223,6 +229,7 @@ (define-public inkscape/stable
("lcms" ,lcms)
("boost" ,boost)
("python" ,python-wrapper)
+ ("python-cssselect" ,python-cssselect) ; to render qrcode
("python-scour" ,python-scour)
("python-pyserial" ,python-pyserial)
("python-numpy" ,python-numpy)
@@ -255,25 +262,4 @@ (define-public inkscape
"inkscape-" version ".tar.xz"))
(sha256
(base32 "06scilds4p4bw337ss22nfdxy2kynv5yjw6vq6nlpjm7xfh7vkj6"))))
- (build-system cmake-build-system)
- (arguments
- (substitute-keyword-arguments (package-arguments inkscape/stable)
- ((#:phases phases)
- `(modify-phases ,phases
- (replace 'wrap-program
- ;; Ensure Python is available at runtime.
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (wrap-program (string-append out "/bin/inkscape")
- `("GUIX_PYTHONPATH" prefix
- (,(getenv "GUIX_PYTHONPATH")))
- ;; Wrapping GDK_PIXBUF_MODULE_FILE allows Inkscape to load
- ;; its own icons in pure environments.
- `("GDK_PIXBUF_MODULE_FILE" =
- (,(getenv "GDK_PIXBUF_MODULE_FILE")))))))))))
- (inputs (modify-inputs (package-inputs inkscape/stable)
- (replace "lib2geom" lib2geom-1.2)
- (append bash-minimal
- librsvg ;for the pixbuf loader
- python-cssselect))) ;to render qrcode
(properties (alist-delete 'hidden? (package-properties inkscape/stable)))))
--
2.39.2
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team v2 00/12] Update fundamental packages
2023-03-26 19:20 [bug#62467] [PATCH gnome-team 0/5] Update fundamental packages Liliana Marie Prikler
` (28 preceding siblings ...)
2023-03-31 18:54 ` [bug#62467] [PATCH gnome-team v3 13/15] " Liliana Marie Prikler
@ 2023-03-31 21:43 ` Liliana Marie Prikler
2023-04-02 17:27 ` Raghav Gururajan via Guix-patches via
2023-04-03 16:37 ` [bug#62467] [PATCH gnome-team v3 01/15] gnu: librsvg-2.40: Fix test failure with Pango 1.50 Kaelyn Takata
` (3 subsequent siblings)
33 siblings, 1 reply; 64+ messages in thread
From: Liliana Marie Prikler @ 2023-03-31 21:43 UTC (permalink / raw)
To: 62467; +Cc: rg, Maxim Cournoyer
With this series, everything up to inkscape builds. The next big step
is building GStreamer. For this, I'd like to bump Meson to 1.0, but
even then, there are some difficulties. (I'm currently struggling
with an EBADF in gst-plugins-base.)
Cheers
Liliana Marie Prikler (12):
gnu: glib: Update to 2.76.1.
gnu: Make pango-next the new pango.
gnu: pango: Update to 1.50.14.
gnu: Make gobject-introspection-next the new gobject-introspection.
gnu: gobject-introspection: Update to 1.76.1.
gnu: libsoup-minimal@2: Update to 2.74.3.
gnu: python-pygobject: Set upstream-name.
gnu: python-pygobject: Update to 3.44.1.
gnu: gtk+-2: Fix build by hardening list store.
gnu: gtk+: Update to 3.24.37.
gnu: librsvg: Fix build.
gnu: inkscape: Update stable version to 1.2.1.
gnu/local.mk | 3 +-
gnu/packages/freedesktop.scm | 4 +-
gnu/packages/geo.scm | 1 -
gnu/packages/glib.scm | 118 +++---------
gnu/packages/gnome.scm | 44 ++---
gnu/packages/gtk.scm | 116 ++++++------
gnu/packages/guile-xyz.scm | 4 +-
gnu/packages/ibus.scm | 2 +-
gnu/packages/inkscape.scm | 36 ++--
gnu/packages/messaging.scm | 1 -
.../patches/glib-skip-failing-test.patch | 3 +-
...trospection-absolute-shlib-path-1.72.patch | 173 ------------------
...ct-introspection-absolute-shlib-path.patch | 51 +++---
.../gobject-introspection-cc-1.72.patch | 15 --
.../patches/gobject-introspection-cc.patch | 11 +-
.../patches/gtk2-harden-list-store.patch | 42 +++++
gnu/packages/webkit.scm | 3 +-
17 files changed, 199 insertions(+), 428 deletions(-)
delete mode 100644 gnu/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch
delete mode 100644 gnu/packages/patches/gobject-introspection-cc-1.72.patch
create mode 100644 gnu/packages/patches/gtk2-harden-list-store.patch
base-commit: 42fbe62d52a82d1003c3d7039d3c4a46806c5cee
--
2.39.2
^ permalink raw reply [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team v2 00/12] Update fundamental packages
2023-03-31 21:43 ` [bug#62467] [PATCH gnome-team v2 00/12] Update fundamental packages Liliana Marie Prikler
@ 2023-04-02 17:27 ` Raghav Gururajan via Guix-patches via
2023-04-02 18:20 ` Liliana Marie Prikler
0 siblings, 1 reply; 64+ messages in thread
From: Raghav Gururajan via Guix-patches via @ 2023-04-02 17:27 UTC (permalink / raw)
To: Liliana Marie Prikler, 62467; +Cc: Maxim Cournoyer
[-- Attachment #1.1: Type: text/plain, Size: 352 bytes --]
LilyP,
> With this series, everything up to inkscape builds. The next big step
> is building GStreamer. For this, I'd like to bump Meson to 1.0, but
> even then, there are some difficulties. (I'm currently struggling
> with an EBADF in gst-plugins-base.)
EBADE as in “Invalid exchange.” error?
Lemme give it a try.
Regards,
RG.
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 236 bytes --]
^ permalink raw reply [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team v2 00/12] Update fundamental packages
2023-04-02 17:27 ` Raghav Gururajan via Guix-patches via
@ 2023-04-02 18:20 ` Liliana Marie Prikler
0 siblings, 0 replies; 64+ messages in thread
From: Liliana Marie Prikler @ 2023-04-02 18:20 UTC (permalink / raw)
To: Raghav Gururajan, 62467; +Cc: Maxim Cournoyer
[-- Attachment #1: Type: text/plain, Size: 674 bytes --]
Am Sonntag, dem 02.04.2023 um 13:27 -0400 schrieb Raghav Gururajan:
> LilyP,
>
> > With this series, everything up to inkscape builds. The next big
> > step is building GStreamer. For this, I'd like to bump Meson to
> > 1.0, but even then, there are some difficulties. (I'm currently
> > struggling with an EBADF in gst-plugins-base.)
>
> EBADE as in “Invalid exchange.” error?
EBADF as in invalid file descriptor. I actually have a fix for that
locally already, attached below.
The bug is that GLib raises a warning here, which IIUC is the correct
thing to do (assuming EBADF to be a programming error rather than a
recoverable one).
Cheers
[-- Attachment #2: gst-plugins-base-fix-broken-test.patch --]
[-- Type: text/x-patch, Size: 874 bytes --]
Index: gst-plugins-base-1.22.1/tests/check/libs/allocators.c
===================================================================
--- gst-plugins-base-1.22.1.orig/tests/check/libs/allocators.c
+++ gst-plugins-base-1.22.1/tests/check/libs/allocators.c
@@ -80,7 +80,7 @@ GST_START_TEST (test_fdmem)
alloc = gst_fd_allocator_new ();
fail_unless (alloc);
- mem = gst_fd_allocator_alloc (alloc, fd, 10, GST_FD_MEMORY_FLAG_KEEP_MAPPED);
+ mem = gst_fd_allocator_alloc (alloc, fd, 10, GST_FD_MEMORY_FLAG_KEEP_MAPPED | GST_FD_MEMORY_FLAG_DONT_CLOSE);
fail_unless (gst_memory_map (mem, &info, GST_MAP_READ));
fail_unless (info.data[5] == '5');
@@ -95,7 +95,7 @@ GST_START_TEST (test_fdmem)
gst_memory_unmap (mem, &info);
gst_memory_unref (mem);
- fail_unless (g_close (fd, NULL) == 0);
+ fail_unless (g_close (fd, NULL));
gst_object_unref (alloc);
}
^ permalink raw reply [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team v3 01/15] gnu: librsvg-2.40: Fix test failure with Pango 1.50.
2023-03-26 19:20 [bug#62467] [PATCH gnome-team 0/5] Update fundamental packages Liliana Marie Prikler
` (29 preceding siblings ...)
2023-03-31 21:43 ` [bug#62467] [PATCH gnome-team v2 00/12] Update fundamental packages Liliana Marie Prikler
@ 2023-04-03 16:37 ` Kaelyn Takata
2023-04-11 20:52 ` Maxim Cournoyer
2023-04-10 7:08 ` [bug#62467] [PATCH gnome-team v3 14/15] gnu: inkscape: Use new package style Liliana Marie Prikler
` (2 subsequent siblings)
33 siblings, 1 reply; 64+ messages in thread
From: Kaelyn Takata @ 2023-04-03 16:37 UTC (permalink / raw)
To: 62467; +Cc: rg, Maxim Cournoyer
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain, Size: 1408 bytes --]
* gnu/packages/gnome.scm (librsvg-2.40): Fix test failure with Pango 1.50.
Signed-off-by: Andreas Enge <andreas@enge.fr>
Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
---
gnu/packages/gnome.scm | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 49ff1464f5..6db6004356 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -73,6 +73,7 @@
;;; Copyright © 2022 Rene Saavedra <nanuui@protonmail.com>
;;; Copyright © 2022 Alexandros Theodotou <alex@zrythm.org>
;;; Copyright © 2022 Arjan Adriaanse <arjan@adriaan.se>
+;;; Copyright © 2023 Kaelyn Takata <kaelyn.alexi@protonmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -3780,6 +3781,12 @@ (define-public librsvg-2.40
(("gdk_pixbuf_cache_file = .*$")
"gdk_pixbuf_cache_file = $(TMPDIR)/loaders.cache\n"))
#t))
+ (add-before 'check 'fix-test-with-pango-1.50
+ (lambda _
+ ;; Changes between pango 1.48 and 1.50 caused the text to be one
+ ;; pixel lower in the output image compared to the reference.
+ (substitute* "tests/fixtures/reftests/bugs/587721-text-transform.svg"
+ (("660\\.9") "659.9"))))
(add-before 'check 'remove-failing-tests
(lambda _
(with-directory-excursion "tests/fixtures/reftests"
--
2.39.2
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team v2 10/12] gnu: gtk+: Update to 3.24.37.
2023-03-30 4:28 ` [bug#62467] [PATCH gnome-team v2 10/12] " Liliana Marie Prikler
@ 2023-04-08 19:34 ` Maxim Cournoyer
0 siblings, 0 replies; 64+ messages in thread
From: Maxim Cournoyer @ 2023-04-08 19:34 UTC (permalink / raw)
To: Liliana Marie Prikler; +Cc: rg, 62467
Hi,
Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> * gnu/packages/gtk.scm (gtk+): Update to 3.24.37.
> [native-inputs]: Add docbook-xsl.
> [build-system]: Use meson-build-system.
> [arguments]: Add ‘glib-or-gtk?’. Adjust configure-flags accordingly.
> <#:phases>: Remove ‘generate-gdk-pixbuf-loaders-cache-file’.
> Adjust ‘disable-failing-tests’.
> Rename ‘move-desktop-files’ to ‘move-files’ and move documentation as well.
> ---
> gnu/packages/gtk.scm | 85 +++++++++++++++++++++++---------------------
> 1 file changed, 44 insertions(+), 41 deletions(-)
>
> diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
> index 196d767160..75e56d4166 100644
> --- a/gnu/packages/gtk.scm
> +++ b/gnu/packages/gtk.scm
> @@ -1101,7 +1101,7 @@ (define-public gtk+
> (package
> (inherit gtk+-2)
> (name "gtk+")
> - (version "3.24.30")
> + (version "3.24.37")
> (source
> (origin
> (method url-fetch)
> @@ -1110,7 +1110,7 @@ (define-public gtk+
> name "-" version ".tar.xz"))
> (sha256
> (base32
> - "1a9vg840fjq1mmm403b67k624qrkxh9shaz9pv7z9l8a6bzvyxds"))
> + "0mvzzgjrzzir7nzx379yz3swzk3pn1s283hgzm8l2yakq2sg0ib7"))
> (patches (search-patches "gtk3-respect-GUIX_GTK3_PATH.patch"
> "gtk3-respect-GUIX_GTK3_IM_MODULE_FILE.patch"))))
> (propagated-inputs
> @@ -1152,6 +1152,7 @@ (define-public gtk+
> rest))
> (native-inputs
> (list docbook-xml-4.1.2
> + docbook-xsl
> gettext-minimal
> `(,glib "bin")
> gobject-introspection
> @@ -1164,47 +1165,29 @@ (define-public gtk+
> ;; of updating xorg-server directly on the master branch.
> xorg-server-for-tests
> libxslt))
> + (build-system meson-build-system)
> (arguments
> - `(#:imported-modules ((guix build glib-or-gtk-build-system)
> - ,@%gnu-build-system-modules)
> - #:modules ((guix build utils)
> - (guix build gnu-build-system)
> - ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:))
> + `(#:glib-or-gtk? #t
> #:disallowed-references (,xorg-server-for-tests)
> - ;; 47 MiB goes to "out" (24 of which is locale data!), and 26 MiB goes
> - ;; to "doc".
> - #:configure-flags (list (string-append "--with-html-dir="
> - (assoc-ref %outputs "doc")
> - "/share/gtk-doc/html")
> - "--enable-cloudproviders"
> + #:configure-flags (list "-Dcloudproviders=true"
> ;; The header file <gdk/gdkwayland.h> is required
> ;; by gnome-control-center
> - "--enable-wayland-backend"
> + "-Dwayland_backend=true"
> ;; This is necessary to build both backends.
> - "--enable-x11-backend"
> + "-Dx11_backend=true"
> ;; This enables the HTML5 websocket backend.
> - "--enable-broadway-backend")
> + "-Dbroadway_backend=true"
> + "-Dman=true")
> #:phases
> (modify-phases %standard-phases
> - (add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file
> - (assoc-ref glib-or-gtk:%standard-phases
> - 'generate-gdk-pixbuf-loaders-cache-file))
> (add-after 'unpack 'disable-failing-tests
> (lambda _
> - (substitute* "testsuite/gtk/Makefile.in"
> - (("builderparser cellarea check-icon-names check-cursor-names")
> - "builderparser cellarea check-cursor-names")
> - (("notify no-gtk-init object objects-finalize papersize rbtree")
> - "no-gtk-init papersize rbtree")
> - (("stylecontext templates textbuffer textiter treemodel treepath")
> - "stylecontext textbuffer textiter treemodel treepath"))
> - (substitute* "testsuite/a11y/Makefile.in"
> - (("accessibility-dump tree-performance text children derive")
> - "tree-performance text children derive"))
> - (substitute* "testsuite/reftests/Makefile.in"
> - (("TEST_PROGS = gtk-reftest")
> - "TEST_PROGS = "))
> - #t))
> + (substitute* "testsuite/gtk/meson.build"
> + (("\\['defaultvalue'\\],") "")
> + (("\\['objects-finalize', .*\\],") ""))
> + (substitute* "testsuite/reftests/meson.build"
> + (("'flipping-icons(\\.[^.]*)?\\.ui',") "")
> + (("'gtk-icontheme-sizing(\\.[^.]*)?\\.ui',") ""))))
> (add-before 'check 'pre-check
> (lambda _
> ;; Tests require a running X server.
> @@ -1217,15 +1200,35 @@ (define-public gtk+
> ;; For missing '/etc/machine-id'.
> (setenv "DBUS_FATAL_WARNINGS" "0")
> #t))
> - (add-after 'install 'move-desktop-files
> - ;; Move desktop files into 'bin' to avoid cycle references.
> + (add-after 'install 'move-files
> (lambda* (#:key outputs #:allow-other-keys)
> - (let ((out (assoc-ref outputs "out"))
> - (bin (assoc-ref outputs "bin")))
> - (mkdir-p (string-append bin "/share"))
> - (rename-file (string-append out "/share/applications")
> - (string-append bin "/share/applications"))
> - #t))))))
> + (define-values (out bin doc)
> + (values (assoc-ref outputs "out")
> + (assoc-ref outputs "bin")
> + (assoc-ref outputs "doc")))
> + (for-each mkdir-p
> + (list
> + (string-append bin "/bin")
> + (string-append bin "/share/applications")
> + (string-append bin "/share/icons")
> + (string-append bin "/share/man")
> + (string-append bin "/share/metainfo")
> + (string-append doc "/share/doc")))
> + ;; Move programs and related files to output 'bin'.
> + (for-each (lambda (dir)
> + (rename-file
> + (string-append out dir)
> + (string-append bin dir)))
> + (list
> + "/bin"
> + "/share/applications"
> + "/share/icons"
> + "/share/man"))
> + ;; Move HTML documentation to output 'doc'.
> + (when (file-exists? (string-append out "/share/doc"))
> + (rename-file
> + (string-append out "/share/doc")
> + (string-append doc "/share/doc"))))))))
> (native-search-paths
> (list (search-path-specification
> (variable "GUIX_GTK3_PATH")
Sorry for not noticing about this earlier; I pushed a change to
core-updates already with the update, but failed to manually moved the
binaries to the "bin" output, expecting the meson build system to do
that for us (it didn't).
I'm not testing a change to the meson-build-system; will push if it
fixes this as I expect and doesn't seem to introduce new issues.
--
Thanks,
Maxim
^ permalink raw reply [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team v2 01/12] gnu: glib: Update to 2.76.1.
2023-03-26 15:39 ` [bug#62467] [PATCH gnome-team v2 01/12] " Liliana Marie Prikler
@ 2023-04-08 19:37 ` Maxim Cournoyer
2023-04-08 19:54 ` Liliana Marie Prikler
0 siblings, 1 reply; 64+ messages in thread
From: Maxim Cournoyer @ 2023-04-08 19:37 UTC (permalink / raw)
To: Liliana Marie Prikler; +Cc: rg, 62467
Hi!
Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> * gnu/packages/glib.scm (glib): Update to 2.76.1.
> [source]<snippet>: Adjust accordingly.
> [arguments]<#:phases>: Add ‘set-G_TEST_SRCDIR’. Update ‘delete-failing-tests’.
> [propagated-inputs]: Replace pcre with pcre2.
> (glib-with-documentation): Inherit from glib.
> * gnu/packages/gnome.scm (sysprof, gtranslator): Use glib.
> * gnu/packages/gtk.scm (gtksourceview): Use glib.
> * gnu/packages/guile-xyz.scm (guile-g-golf): Use glib.
> * gnu/packages/patches/glib-skip-failing-test.patch: Adjust accordingly.
> ---
> gnu/packages/glib.scm | 92 +++++--------------
> gnu/packages/gnome.scm | 8 +-
> gnu/packages/gtk.scm | 2 +-
> gnu/packages/guile-xyz.scm | 2 +-
> .../patches/glib-skip-failing-test.patch | 3 +-
> 5 files changed, 30 insertions(+), 77 deletions(-)
>
> diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
> index f85d5e3225..ecf5cb491f 100644
> --- a/gnu/packages/glib.scm
> +++ b/gnu/packages/glib.scm
> @@ -215,7 +215,7 @@ (define-public dbus-verbose
> (define glib
> (package
> (name "glib")
> - (version "2.70.2")
> + (version "2.76.1")
> (source
> (origin
> (method url-fetch)
> @@ -224,14 +224,14 @@ (define glib
> name "/" (string-take version 4) "/"
> name "-" version ".tar.xz"))
> (sha256
> - (base32 "0vw08p4jllavp9qmlqg1yl1zanmy53yid46wipas6gfdhnf4al85"))
> + (base32 "17x1zpr2avj8hjbpc6hp2sf2885lxac46v0kajsgan3929m0zp23"))
> (patches
> (search-patches "glib-appinfo-watch.patch"
> "glib-skip-failing-test.patch"))
> (modules '((guix build utils)))
> (snippet
> '(begin
> - (substitute* "tests/spawn-test.c"
> + (substitute* "glib/tests/spawn-test.c"
> (("/bin/sh") "sh"))))))
> (build-system meson-build-system)
> (outputs '("out" ;libraries, locales, etc
> @@ -256,6 +256,9 @@ (define glib
> #:phases
> (modify-phases %standard-phases
> ;; Needed to pass the test phase on slower ARM and i686 machines.
> + (add-after 'unpack 'set-G_TEST_SRCDIR
> + (lambda _
> + (setenv "G_TEST_SRCDIR" (string-append (getcwd) "/gio/tests"))))
> (add-after 'unpack 'increase-test-timeout
> (lambda _
> (substitute* "meson.build"
> @@ -270,9 +273,19 @@ (define glib
> (substitute* '("unix.c" "utils.c")
> (("[ \t]*g_test_add_func.*;") "")))
> (with-directory-excursion "gio/tests"
> - (substitute* '("contenttype.c" "gdbus-address-get-session.c"
> - "gdbus-peer.c" "appinfo.c" "desktop-app-info.c")
> - (("[ \t]*g_test_add_func.*;") "")))
> + (substitute* '("contenttype.c"
> + "gdbus-address-get-session.c"
> + "gdbus-server-auth.c"
> + "gdbus-peer.c"
> + "appinfo.c"
> + "desktop-app-info.c")
> + (("[ \t]*g_test_add_func.*;") ""))
> + (unless (which "update-desktop-database")
> + (substitute* '("file.c")
file.c doesn't need to be in a list.
> + (("[ \t]*g_test_add_func.*query-default-handler.*;") "")))
The indentation seems off here. Is it really necessary to use the
unless conditional here? I'd perhaps simply disable the test generally.
The rest LGTM.
--
Thanks,
Maxim
^ permalink raw reply [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team v2 02/12] gnu: Make pango-next the new pango.
2023-03-26 15:53 ` [bug#62467] [PATCH gnome-team v2 02/12] " Liliana Marie Prikler
@ 2023-04-08 19:39 ` Maxim Cournoyer
0 siblings, 0 replies; 64+ messages in thread
From: Maxim Cournoyer @ 2023-04-08 19:39 UTC (permalink / raw)
To: Liliana Marie Prikler; +Cc: rg, 62467
Hi,
Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> * gnu/packages/gtk.scm (pango): Update to 1.50.4.
> (pango-next): Delete variable.
> (pango-1.48): New variable, defining old pango with inheritance.
> (gtk)[propagated-inputs]: Use pango instead of pango-next.
> (pangomm)[propagated-inputs]: Likewise.
> (gtksourceview, gtk, pangomm)[inputs]: Use pango instead of pango-next.
> (pangomm-2.46)[inputs]: Use pango-1.48.
> * gnu/packages/freedesktop.scm (colord-gtk)[inputs]: Remove pango-next.
> * gnu/packages/geo.scm (gnome-maps)[inputs]: Likewise.
> * gnu/packages/gnome.scm (evolution-data-server)[inputs]: Likewise.
> (network-manager-openvpn)[inputs]: Likewise.
> (network-manager-vpnc)[inputs]: Likewise.
> (network-manager-openconnect)[inputs]: Likewise.
> (network-manager-fortisslvpn)[inputs]: Likewise.
> (gnome-bluetooth)[inputs]: Likewise.
> (baobab)[inputs]: Likewise.
> (gnome-calendar)[inputs]: Likewise.
> (gtranslator)[inputs]: Likewise.
> * gnu/packages/ibus.scm (ibus)[inputs]: Likewise.
> * gnu/packages/messaging.scm (dino)[inputs]: Likewise.
> * gnu/packages/webkit.scm (webkitgtk-next)[inputs]: Likewise.
LGTM.
--
Thanks,
Maxim
^ permalink raw reply [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team v2 03/12] gnu: pango: Update to 1.50.14.
2023-03-26 18:53 ` [bug#62467] [PATCH gnome-team v2 03/12] " Liliana Marie Prikler
@ 2023-04-08 19:39 ` Maxim Cournoyer
0 siblings, 0 replies; 64+ messages in thread
From: Maxim Cournoyer @ 2023-04-08 19:39 UTC (permalink / raw)
To: Liliana Marie Prikler; +Cc: rg, 62467
Hi,
Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> * gnu/packages/gtk.scm (pango): Update to 1.50.14.
> ---
> gnu/packages/gtk.scm | 4 ++--
> 1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
> index 29494c36b1..6d5e7f56bc 100644
> --- a/gnu/packages/gtk.scm
> +++ b/gnu/packages/gtk.scm
> @@ -427,7 +427,7 @@ (define-public libthai
> (define-public pango
> (package
> (name "pango")
> - (version "1.50.4")
> + (version "1.50.14")
> (source (origin
> (method url-fetch)
> (uri (string-append "mirror://gnome/sources/pango/"
> @@ -436,7 +436,7 @@ (define-public pango
> (patches (search-patches "pango-skip-libthai-test.patch"))
> (sha256
> (base32
> - "0qn1a7ccs3p5vc6swbqm6hdzka879l0gp9220lq4bcf2gpl67bgl"))))
> + "1s41sprfgkc944fva36zjmkmdpv8hn1bdpyg55xc4663pw2z4rqx"))))
> (build-system meson-build-system)
> (arguments
> '(#:glib-or-gtk? #t ; To wrap binaries and/or compile schemas
LGTM.
--
Thanks,
Maxim
^ permalink raw reply [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team v2 05/12] gnu: gobject-introspection: Update to 1.76.1.
2023-03-26 19:19 ` [bug#62467] [PATCH gnome-team v2 05/12] " Liliana Marie Prikler
@ 2023-04-08 19:40 ` Maxim Cournoyer
0 siblings, 0 replies; 64+ messages in thread
From: Maxim Cournoyer @ 2023-04-08 19:40 UTC (permalink / raw)
To: Liliana Marie Prikler; +Cc: rg, 62467
Hi,
Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> * gnu/packages/glib.scm (gobject-introspection): Update to 1.76.1.
> ---
> 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 09386d1652..4115e54782 100644
> --- a/gnu/packages/glib.scm
> +++ b/gnu/packages/glib.scm
> @@ -477,14 +477,14 @@ (define target-name
> (define gobject-introspection
> (package
> (name "gobject-introspection")
> - (version "1.73.1")
> + (version "1.76.1")
> (source (origin
> (method url-fetch)
> (uri (string-append "mirror://gnome/sources/"
> "gobject-introspection/" (version-major+minor version)
> "/gobject-introspection-" version ".tar.xz"))
> (sha256
> - (base32 "1gkbx32as3v2286w7k3j24fwhkxj6brr49881m2zavxamfwxdm34"))
> + (base32 "1grq6wmbi2nbnwffgvsljd481zm6darnk12dvkf02m9lcjzphq8r"))
> (patches (search-patches
> "gobject-introspection-cc.patch"
> "gobject-introspection-girepository.patch"
LGTM.
--
Thanks,
Maxim
^ permalink raw reply [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team v2 04/12] gnu: Make gobject-introspection-next the new gobject-introspection.
2023-03-26 19:14 ` [bug#62467] [PATCH gnome-team v2 04/12] " Liliana Marie Prikler
@ 2023-04-08 19:41 ` Maxim Cournoyer
0 siblings, 0 replies; 64+ messages in thread
From: Maxim Cournoyer @ 2023-04-08 19:41 UTC (permalink / raw)
To: Liliana Marie Prikler; +Cc: rg, 62467
Hi,
Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> * gnu/packages/glib.scm (gobject-introspection): Update to 1.73.1.
> (gobject-introspection-next): Delete variable.
> * gnu/packages/gtk.scm.scm (gtksourceview)[native-inputs]:
> Replace gobject-introspection-next with gobject-introspection.
> * gnu/packages/guile-xyz.scm (guile-g-golf)[native-inputs]:
> Replace gobject-introspection-next with gobject-introspection.
> * gnu/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch:
> Rename to…
> * gnu/packages/patches/gobject-introspection-absolute-shlib-path.patch:
> … this.
> * gnu/packages/patches/gobject-introspection-cc-1.72.patch: Rename to…
> * gnu/packages/patches/gobject-introspection-cc.patch: … this.
> * gnu/local.mk (dist_patch_DATA): Adjust accordingly.
LGTM.
--
Thanks,
Maxim
^ permalink raw reply [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team v2 06/12] gnu: libsoup-minimal@2: Update to 2.74.3.
2023-03-28 4:26 ` [bug#62467] [PATCH gnome-team v2 06/12] " Liliana Marie Prikler
@ 2023-04-08 19:42 ` Maxim Cournoyer
2023-04-08 19:56 ` Liliana Marie Prikler
0 siblings, 1 reply; 64+ messages in thread
From: Maxim Cournoyer @ 2023-04-08 19:42 UTC (permalink / raw)
To: Liliana Marie Prikler; +Cc: rg, 62467
Hi,
Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> * gnu/packages/gnome.scm (libsoup-minimal-2): Update to 2.74.3.
> ---
> 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 90e33d72b6..4f47e60505 100644
> --- a/gnu/packages/gnome.scm
> +++ b/gnu/packages/gnome.scm
> @@ -5263,7 +5263,7 @@ (define-public libsoup-minimal
> ;;; An older variant kept to build the 'rest' package.
> (define-public libsoup-minimal-2
> (package/inherit libsoup-minimal
> - (version "2.72.0")
> + (version "2.74.3")
> (source (origin
> (method url-fetch)
> (uri (string-append "mirror://gnome/sources/libsoup/"
> @@ -5271,7 +5271,7 @@ (define-public libsoup-minimal-2
> "libsoup-" version ".tar.xz"))
> (sha256
> (base32
> - "11skbyw2pw32178q3h8pi7xqa41b2x4k6q4k9f75zxmh8s23y30p"))))
> + "04rgv6hkyhgi7lak9865yxgbgky6gc635p7w6nhcbj64rx0prdz4"))))
> (arguments
> (substitute-keyword-arguments (package-arguments libsoup-minimal)
> ((#:phases phases)
LGTM. Hopefully we can get rid of the libsoup-2 stuff after we've
updated all of GNOME to 43 (which had a hard requirement to not rely on
libsoup@2).
--
Thanks,
Maxim
^ permalink raw reply [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team v2 07/12] gnu: python-pygobject: Set upstream-name.
2023-03-28 16:50 ` [bug#62467] [PATCH gnome-team v2 07/12] " Liliana Marie Prikler
@ 2023-04-08 19:42 ` Maxim Cournoyer
0 siblings, 0 replies; 64+ messages in thread
From: Maxim Cournoyer @ 2023-04-08 19:42 UTC (permalink / raw)
To: Liliana Marie Prikler; +Cc: rg, 62467
Hi,
Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> * gnu/packages/glib.scm (python-pygobject)[properties]: Add upstream-name.
> ---
> gnu/packages/glib.scm | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
> index 4115e54782..40d6dd3c86 100644
> --- a/gnu/packages/glib.scm
> +++ b/gnu/packages/glib.scm
> @@ -967,7 +967,8 @@ (define-public python-pygobject
> (synopsis "Python bindings for GObject")
> (description
> "Python bindings for GLib, GObject, and GIO.")
> - (license license:lgpl2.1+)))
> + (license license:lgpl2.1+)
> + (properties '((upstream-name . "pygobject")))))
LGTM.
--
Thanks,
Maxim
^ permalink raw reply [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team v2 08/12] gnu: python-pygobject: Update to 3.44.1.
2023-03-28 16:51 ` [bug#62467] [PATCH gnome-team v2 08/12] " Liliana Marie Prikler
@ 2023-04-08 19:43 ` Maxim Cournoyer
0 siblings, 0 replies; 64+ messages in thread
From: Maxim Cournoyer @ 2023-04-08 19:43 UTC (permalink / raw)
To: Liliana Marie Prikler; +Cc: rg, 62467
Hi,
Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> * gnu/packages/glib.scm (python-pygobject): Update to 3.44.1.
> ---
> 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 40d6dd3c86..24f66f133c 100644
> --- a/gnu/packages/glib.scm
> +++ b/gnu/packages/glib.scm
> @@ -922,7 +922,7 @@ (define-public glibmm-2.64
> (define-public python-pygobject
> (package
> (name "python-pygobject")
> - (version "3.40.1")
> + (version "3.44.1")
> (source
> (origin
> (method url-fetch)
> @@ -931,7 +931,7 @@ (define-public python-pygobject
> "/pygobject-" version ".tar.xz"))
> (sha256
> (base32
> - "0d80g5kgf2i9cginyhalvb7ibfk9g30yilqzmcsw6h6byj8xbih0"))
> + "042pmpyaz7bsbr68znnwdqyhs3j3cajib0k45v1hrs8v6b8has1w"))
> (modules '((guix build utils)))
> (snippet
> '(begin
LGTM.
--
Thanks,
Maxim
^ permalink raw reply [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team v2 09/12] gnu: gtk+-2: Fix build by hardening list store.
2023-03-30 18:41 ` [bug#62467] [PATCH gnome-team v2 09/12] " Liliana Marie Prikler
@ 2023-04-08 19:47 ` Maxim Cournoyer
2023-04-08 20:00 ` Liliana Marie Prikler
0 siblings, 1 reply; 64+ messages in thread
From: Maxim Cournoyer @ 2023-04-08 19:47 UTC (permalink / raw)
To: Liliana Marie Prikler; +Cc: rg, 62467
Hi,
Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> * gnu/packages/patches/gtk2-harden-list-store.patch: New file.
> * gnu/packages/gtk.scm (gtk+-2)[patches]: Add it here.
> * gnu/local.mk (dist_patch_DATA): Register it here.
> ---
> gnu/local.mk | 1 +
> gnu/packages/gtk.scm | 1 +
> .../patches/gtk2-harden-list-store.patch | 42 +++++++++++++++++++
> 3 files changed, 44 insertions(+)
> create mode 100644 gnu/packages/patches/gtk2-harden-list-store.patch
>
> diff --git a/gnu/local.mk b/gnu/local.mk
> index 3e94281ccf..31456c5be8 100644
> --- a/gnu/local.mk
> +++ b/gnu/local.mk
> @@ -1303,6 +1303,7 @@ dist_patch_DATA = \
> %D%/packages/patches/guile-rsvg-pkgconfig.patch \
> %D%/packages/patches/guile-emacs-fix-configure.patch \
> %D%/packages/patches/gtk2-fix-builder-test.patch \
> + %D%/packages/patches/gtk2-harden-list-store.patch \
> %D%/packages/patches/gtk2-respect-GUIX_GTK2_PATH.patch \
> %D%/packages/patches/gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch \
> %D%/packages/patches/gtk2-theme-paths.patch \
> diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
> index c756f39e24..196d767160 100644
> --- a/gnu/packages/gtk.scm
> +++ b/gnu/packages/gtk.scm
> @@ -1014,6 +1014,7 @@ (define-public gtk+-2
> "1nn6kks1zyvb5xikr9y2k7r9bwjy1g4b0m0s66532bclymbwfamc"))
> (patches (search-patches "gtk2-respect-GUIX_GTK2_PATH.patch"
> "gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch"
> + "gtk2-harden-list-store.patch"
> "gtk2-theme-paths.patch"
> "gtk2-fix-builder-test.patch"))))
> (build-system gnu-build-system)
> diff --git a/gnu/packages/patches/gtk2-harden-list-store.patch b/gnu/packages/patches/gtk2-harden-list-store.patch
> new file mode 100644
> index 0000000000..b107ba2bcc
> --- /dev/null
> +++ b/gnu/packages/patches/gtk2-harden-list-store.patch
> @@ -0,0 +1,42 @@
> +Mimic the implemenetation in gtk+-3.
Typo: implementation.
I'd like to see a bit more metadata in this patch; is it original work,
or was it retrieved from another distribution such as Debian? It
probably exists elsewhere, if GTK2 can't be built anymore otherwise?
Does upstream still maintain GTK2, or is it completely abandoned?
> +
> +Index: gtk+-2.24.33/gtk/gtkliststore.c
> +===================================================================
> +--- gtk+-2.24.33.orig/gtk/gtkliststore.c
> ++++ gtk+-2.24.33/gtk/gtkliststore.c
> +@@ -1195,16 +1195,31 @@ gboolean
> + gtk_list_store_iter_is_valid (GtkListStore *list_store,
> + GtkTreeIter *iter)
> + {
> ++ GSequenceIter *seq_iter;
> ++
> + g_return_val_if_fail (GTK_IS_LIST_STORE (list_store), FALSE);
> + g_return_val_if_fail (iter != NULL, FALSE);
> +
> +- if (!VALID_ITER (iter, list_store))
> +- return FALSE;
> ++ /* can't use VALID_ITER() here, because iter might point
> ++ * to random memory.
> ++ *
> ++ * We MUST NOT dereference it.
> ++ */
> +
> +- if (g_sequence_iter_get_sequence (iter->user_data) != list_store->seq)
> ++ if (iter == NULL ||
> ++ iter->user_data == NULL ||
> ++ list_store->stamp != iter->stamp)
> + return FALSE;
> +
> +- return TRUE;
> ++ for (seq_iter = g_sequence_get_begin_iter (list_store->seq);
> ++ !g_sequence_iter_is_end (seq_iter);
> ++ seq_iter = g_sequence_iter_next (seq_iter))
> ++ {
> ++ if (seq_iter == iter->user_data)
> ++ return TRUE;
> ++ }
> ++
> ++ return FALSE;
> + }
> +
> + static gboolean real_gtk_list_store_row_draggable (GtkTreeDragSource *drag_source,
I don't know my way much in this code base, but the above looks
reasonable to me, especially if it was mostly copy-pasted from GTK 3.
--
Thanks,
Maxim
^ permalink raw reply [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team v2 11/12] gnu: librsvg: Fix build.
2023-03-28 19:34 ` [bug#62467] [PATCH gnome-team v2 11/12] gnu: librsvg: Fix build Liliana Marie Prikler
@ 2023-04-08 19:49 ` Maxim Cournoyer
2023-04-08 20:03 ` Liliana Marie Prikler
2023-04-10 12:51 ` Liliana Marie Prikler
0 siblings, 2 replies; 64+ messages in thread
From: Maxim Cournoyer @ 2023-04-08 19:49 UTC (permalink / raw)
To: Liliana Marie Prikler; +Cc: rg, 62467
Hi,
Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> * gnu/packages/gnome.scm (librsvg)[#:phases]<ignore-failing-tests>: Also
> delete SVG files that have been broken by the recent updates.
> ---
> gnu/packages/gnome.scm | 7 ++++++-
> 1 file changed, 6 insertions(+), 1 deletion(-)
>
> diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
> index 4f47e60505..e43e24dd94 100644
> --- a/gnu/packages/gnome.scm
> +++ b/gnu/packages/gnome.scm
> @@ -3696,7 +3696,12 @@ (define-public librsvg
> (("fn multiple_input_files_not_allowed_for_png_output" all)
> (string-append "#[ignore] " all))
> (("fn stylesheet_option_error" all)
> - (string-append "#[ignore] " all)))))
> + (string-append "#[ignore] " all)))
> + ;; XXX: re-enable when updating this package
> + (with-directory-excursion "tests/fixtures/reftests/"
> + (delete-file "filter-component-transfer-from-reference-page.svg")
> + (delete-file "filter-morphology-from-reference-page.svg")
> + (delete-file "svg1.1/text-text-03-b.svg"))))
I think a fix for this was contributed to core-updates already; it used
another approach: adjusting the expected value. We should rebase this
branch on top of core-updates to get it.
--
Thanks,
Maxim
^ permalink raw reply [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team v2 12/12] gnu: inkscape: Update stable version to 1.2.1.
2023-03-31 18:54 ` [bug#62467] [PATCH gnome-team v2 12/12] gnu: inkscape: Update stable version to 1.2.1 Liliana Marie Prikler
@ 2023-04-08 19:51 ` Maxim Cournoyer
0 siblings, 0 replies; 64+ messages in thread
From: Maxim Cournoyer @ 2023-04-08 19:51 UTC (permalink / raw)
To: Liliana Marie Prikler; +Cc: rg, 62467
Hi,
Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> * gnu/packages/inkscape.scm (inkscape/stable): Update to 1.2.1.
> [inputs]: Add bash-minimal, librsvg and python-cssselect.
> Use lib2geom-1.2 rather than lib2geom.
Could we simply make lib2geom the latest? I think inkscape is its sole
user.
> (inkscape): Inherit build-system, arguments and inputs.
> ---
> gnu/packages/inkscape.scm | 36 +++++++++++-------------------------
> 1 file changed, 11 insertions(+), 25 deletions(-)
>
> diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm
> index d1ac5e7312..b8e78c2b11 100644
> --- a/gnu/packages/inkscape.scm
> +++ b/gnu/packages/inkscape.scm
> @@ -61,7 +61,7 @@ (define-public inkscape/stable
> (hidden-package
> (package
> (name "inkscape")
> - (version "1.1.1")
> + (version "1.2.1")
> (source
> (origin
> (method url-fetch)
> @@ -69,7 +69,7 @@ (define-public inkscape/stable
> "resources/file/"
> "inkscape-" version ".tar.xz"))
> (sha256
> - (base32 "1bvqg5xfs3m6r7qfdhmgzwhd1hx8wvg3nhvhmalwzcdm6ffhpjmf"))
> + (base32 "06scilds4p4bw337ss22nfdxy2kynv5yjw6vq6nlpjm7xfh7vkj6"))
> (modules '((guix build utils)
> (ice-9 format)))
> (snippet
> @@ -196,9 +196,14 @@ (define-public inkscape/stable
> (let ((out (assoc-ref outputs "out")))
> (wrap-program (string-append out "/bin/inkscape")
> `("GUIX_PYTHONPATH" ":" prefix
> - (,(getenv "GUIX_PYTHONPATH"))))))))))
> + (,(getenv "GUIX_PYTHONPATH")))
> + ;; Wrapping GDK_PIXBUF_MODULE_FILE allows Inkscape to load
> + ;; its own icons in pure environments.
> + `("GDK_PIXBUF_MODULE_FILE" =
> + (,(getenv "GDK_PIXBUF_MODULE_FILE"))))))))))
> (inputs
> `(("aspell" ,aspell)
> + ("bash-minimal" ,bash-minimal)
> ("autotrace" ,autotrace)
> ("gdl" ,gdl-minimal)
> ("gtkmm" ,gtkmm-3)
> @@ -206,12 +211,13 @@ (define-public inkscape/stable
> ("gtkspell3" ,gtkspell3)
> ("gsl" ,gsl)
> ("poppler" ,poppler)
> - ("lib2geom" ,lib2geom)
> + ("lib2geom" ,lib2geom-1.2)
> ("libjpeg" ,libjpeg-turbo)
> ("libpng" ,libpng)
> ("libxml2" ,libxml2)
> ("libxslt" ,libxslt)
> ("libgc" ,libgc)
> + ("librsvg" ,librsvg) ; for the pixbuf loader
> ("libsoup" ,libsoup-minimal-2)
> ("libcdr" ,libcdr)
> ("libvisio" ,libvisio)
> @@ -223,6 +229,7 @@ (define-public inkscape/stable
> ("lcms" ,lcms)
> ("boost" ,boost)
> ("python" ,python-wrapper)
> + ("python-cssselect" ,python-cssselect) ; to render qrcode
> ("python-scour" ,python-scour)
> ("python-pyserial" ,python-pyserial)
> ("python-numpy" ,python-numpy)
> @@ -255,25 +262,4 @@ (define-public inkscape
> "inkscape-" version ".tar.xz"))
It'd be nice (in a follow-up commit) to get rid of these input labels
and use gexps for the arguments, while we're touching it.
--
Thanks,
Maxim
^ permalink raw reply [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team v2 01/12] gnu: glib: Update to 2.76.1.
2023-04-08 19:37 ` Maxim Cournoyer
@ 2023-04-08 19:54 ` Liliana Marie Prikler
2023-04-09 5:03 ` Maxim Cournoyer
0 siblings, 1 reply; 64+ messages in thread
From: Liliana Marie Prikler @ 2023-04-08 19:54 UTC (permalink / raw)
To: Maxim Cournoyer; +Cc: rg, 62467
Am Samstag, dem 08.04.2023 um 15:37 -0400 schrieb Maxim Cournoyer:
> Hi!
>
> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
>
> > * gnu/packages/glib.scm (glib): Update to 2.76.1.
> > [source]<snippet>: Adjust accordingly.
> > [arguments]<#:phases>: Add ‘set-G_TEST_SRCDIR’. Update ‘delete-
> > failing-tests’.
> > [propagated-inputs]: Replace pcre with pcre2.
> > (glib-with-documentation): Inherit from glib.
> > * gnu/packages/gnome.scm (sysprof, gtranslator): Use glib.
> > * gnu/packages/gtk.scm (gtksourceview): Use glib.
> > * gnu/packages/guile-xyz.scm (guile-g-golf): Use glib.
> > * gnu/packages/patches/glib-skip-failing-test.patch: Adjust
> > accordingly.
> > ---
> > gnu/packages/glib.scm | 92 +++++----------
> > ----
> > gnu/packages/gnome.scm | 8 +-
> > gnu/packages/gtk.scm | 2 +-
> > gnu/packages/guile-xyz.scm | 2 +-
> > .../patches/glib-skip-failing-test.patch | 3 +-
> > 5 files changed, 30 insertions(+), 77 deletions(-)
> >
> > diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
> > index f85d5e3225..ecf5cb491f 100644
> > --- a/gnu/packages/glib.scm
> > +++ b/gnu/packages/glib.scm
> > @@ -215,7 +215,7 @@ (define-public dbus-verbose
> > (define glib
> > (package
> > (name "glib")
> > - (version "2.70.2")
> > + (version "2.76.1")
> > (source
> > (origin
> > (method url-fetch)
> > @@ -224,14 +224,14 @@ (define glib
> > name "/" (string-take version 4) "/"
> > name "-" version ".tar.xz"))
> > (sha256
> > - (base32
> > "0vw08p4jllavp9qmlqg1yl1zanmy53yid46wipas6gfdhnf4al85"))
> > + (base32
> > "17x1zpr2avj8hjbpc6hp2sf2885lxac46v0kajsgan3929m0zp23"))
> > (patches
> > (search-patches "glib-appinfo-watch.patch"
> > "glib-skip-failing-test.patch"))
> > (modules '((guix build utils)))
> > (snippet
> > '(begin
> > - (substitute* "tests/spawn-test.c"
> > + (substitute* "glib/tests/spawn-test.c"
> > (("/bin/sh") "sh"))))))
> > (build-system meson-build-system)
> > (outputs '("out" ;libraries, locales, etc
> > @@ -256,6 +256,9 @@ (define glib
> > #:phases
> > (modify-phases %standard-phases
> > ;; Needed to pass the test phase on slower ARM and i686
> > machines.
> > + (add-after 'unpack 'set-G_TEST_SRCDIR
> > + (lambda _
> > + (setenv "G_TEST_SRCDIR" (string-append (getcwd)
> > "/gio/tests"))))
> > (add-after 'unpack 'increase-test-timeout
> > (lambda _
> > (substitute* "meson.build"
> > @@ -270,9 +273,19 @@ (define glib
> > (substitute* '("unix.c" "utils.c")
> > (("[ \t]*g_test_add_func.*;") "")))
> > (with-directory-excursion "gio/tests"
> > - (substitute* '("contenttype.c" "gdbus-address-get-
> > session.c"
> > - "gdbus-peer.c" "appinfo.c" "desktop-
> > app-info.c")
> > - (("[ \t]*g_test_add_func.*;") "")))
> > + (substitute* '("contenttype.c"
> > + "gdbus-address-get-session.c"
> > + "gdbus-server-auth.c"
> > + "gdbus-peer.c"
> > + "appinfo.c"
> > + "desktop-app-info.c")
> > + (("[ \t]*g_test_add_func.*;") ""))
> > + (unless (which "update-desktop-database")
> > + (substitute* '("file.c")
>
> file.c doesn't need to be in a list.
Nice catch.
> > + (("[ \t]*g_test_add_func.*query-default-
> > handler.*;") "")))
>
> The indentation seems off here. Is it really necessary to use the
> unless conditional here? I'd perhaps simply disable the test
> generally.
I'd like to let it run when the input exists, but that's a circle.
We'd have to check it in glib-with-documentation.
Cheers
^ permalink raw reply [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team v2 06/12] gnu: libsoup-minimal@2: Update to 2.74.3.
2023-04-08 19:42 ` Maxim Cournoyer
@ 2023-04-08 19:56 ` Liliana Marie Prikler
2023-04-09 5:04 ` Maxim Cournoyer
0 siblings, 1 reply; 64+ messages in thread
From: Liliana Marie Prikler @ 2023-04-08 19:56 UTC (permalink / raw)
To: Maxim Cournoyer; +Cc: rg, 62467
Am Samstag, dem 08.04.2023 um 15:42 -0400 schrieb Maxim Cournoyer:
> Hi,
>
> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
>
> > * gnu/packages/gnome.scm (libsoup-minimal-2): Update to 2.74.3.
> > ---
> > 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 90e33d72b6..4f47e60505 100644
> > --- a/gnu/packages/gnome.scm
> > +++ b/gnu/packages/gnome.scm
> > @@ -5263,7 +5263,7 @@ (define-public libsoup-minimal
> > ;;; An older variant kept to build the 'rest' package.
> > (define-public libsoup-minimal-2
> > (package/inherit libsoup-minimal
> > - (version "2.72.0")
> > + (version "2.74.3")
> > (source (origin
> > (method url-fetch)
> > (uri (string-append
> > "mirror://gnome/sources/libsoup/"
> > @@ -5271,7 +5271,7 @@ (define-public libsoup-minimal-2
> > "libsoup-" version ".tar.xz"))
> > (sha256
> > (base32
> > -
> > "11skbyw2pw32178q3h8pi7xqa41b2x4k6q4k9f75zxmh8s23y30p"))))
> > +
> > "04rgv6hkyhgi7lak9865yxgbgky6gc635p7w6nhcbj64rx0prdz4"))))
> > (arguments
> > (substitute-keyword-arguments (package-arguments libsoup-
> > minimal)
> > ((#:phases phases)
>
> LGTM. Hopefully we can get rid of the libsoup-2 stuff after we've
> updated all of GNOME to 43 (which had a hard requirement to not rely
> on libsoup@2).
Well, the goal is to move to 44 directly, but aren't there non-GNOME
packages out there running libsoup-2 just like there's stuff still
running GTK 2?
^ permalink raw reply [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team v2 09/12] gnu: gtk+-2: Fix build by hardening list store.
2023-04-08 19:47 ` Maxim Cournoyer
@ 2023-04-08 20:00 ` Liliana Marie Prikler
2023-04-09 5:06 ` Maxim Cournoyer
0 siblings, 1 reply; 64+ messages in thread
From: Liliana Marie Prikler @ 2023-04-08 20:00 UTC (permalink / raw)
To: Maxim Cournoyer; +Cc: rg, 62467
Am Samstag, dem 08.04.2023 um 15:47 -0400 schrieb Maxim Cournoyer:
> Hi,
>
> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
>
> > * gnu/packages/patches/gtk2-harden-list-store.patch: New file.
> > * gnu/packages/gtk.scm (gtk+-2)[patches]: Add it here.
> > * gnu/local.mk (dist_patch_DATA): Register it here.
> > ---
> > gnu/local.mk | 1 +
> > gnu/packages/gtk.scm | 1 +
> > .../patches/gtk2-harden-list-store.patch | 42
> > +++++++++++++++++++
> > 3 files changed, 44 insertions(+)
> > create mode 100644 gnu/packages/patches/gtk2-harden-list-
> > store.patch
> >
> > diff --git a/gnu/local.mk b/gnu/local.mk
> > index 3e94281ccf..31456c5be8 100644
> > --- a/gnu/local.mk
> > +++ b/gnu/local.mk
> > @@ -1303,6 +1303,7 @@ dist_patch_DATA
> > = \
> > %D%/packages/patches/guile-rsvg-pkgconfig.patch \
> > %D%/packages/patches/guile-emacs-fix-configure.patch \
> > %D%/packages/patches/gtk2-fix-builder-test.patch \
> > + %D%/packages/patches/gtk2-harden-list-store.patch \
> > %D%/packages/patches/gtk2-respect-GUIX_GTK2_PATH.patch \
> > %D%/packages/patches/gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch
> > \
> > %D%/packages/patches/gtk2-theme-paths.patch \
> > diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
> > index c756f39e24..196d767160 100644
> > --- a/gnu/packages/gtk.scm
> > +++ b/gnu/packages/gtk.scm
> > @@ -1014,6 +1014,7 @@ (define-public gtk+-2
> >
> > "1nn6kks1zyvb5xikr9y2k7r9bwjy1g4b0m0s66532bclymbwfamc"))
> > (patches (search-patches "gtk2-respect-
> > GUIX_GTK2_PATH.patch"
> > "gtk2-respect-
> > GUIX_GTK2_IM_MODULE_FILE.patch"
> > + "gtk2-harden-list-
> > store.patch"
> > "gtk2-theme-paths.patch"
> > "gtk2-fix-builder-
> > test.patch"))))
> > (build-system gnu-build-system)
> > diff --git a/gnu/packages/patches/gtk2-harden-list-store.patch
> > b/gnu/packages/patches/gtk2-harden-list-store.patch
> > new file mode 100644
> > index 0000000000..b107ba2bcc
> > --- /dev/null
> > +++ b/gnu/packages/patches/gtk2-harden-list-store.patch
> > @@ -0,0 +1,42 @@
> > +Mimic the implemenetation in gtk+-3.
>
> Typo: implementation.
Nice catch.
> I'd like to see a bit more metadata in this patch; is it original
> work, or was it retrieved from another distribution such as Debian?
> It probably exists elsewhere, if GTK2 can't be built anymore
> otherwise?
I looked around in the GTK 3 source tree given that that package built,
but GTK 2 didn't, then tried to copy the file as-is, failed, then
copied just these relevant bits. I haven't looked at prior art in
other distros.
> Does upstream still maintain GTK2, or is it completely abandoned?
As far as I can see, we're running the latest version.
Cheers
>
^ permalink raw reply [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team v2 11/12] gnu: librsvg: Fix build.
2023-04-08 19:49 ` Maxim Cournoyer
@ 2023-04-08 20:03 ` Liliana Marie Prikler
2023-04-09 5:07 ` Maxim Cournoyer
2023-04-10 12:51 ` Liliana Marie Prikler
1 sibling, 1 reply; 64+ messages in thread
From: Liliana Marie Prikler @ 2023-04-08 20:03 UTC (permalink / raw)
To: Maxim Cournoyer; +Cc: rg, 62467
Am Samstag, dem 08.04.2023 um 15:49 -0400 schrieb Maxim Cournoyer:
> Hi,
>
> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
>
> > * gnu/packages/gnome.scm (librsvg)[#:phases]<ignore-failing-tests>:
> > Also
> > delete SVG files that have been broken by the recent updates.
> > ---
> > gnu/packages/gnome.scm | 7 ++++++-
> > 1 file changed, 6 insertions(+), 1 deletion(-)
> >
> > diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
> > index 4f47e60505..e43e24dd94 100644
> > --- a/gnu/packages/gnome.scm
> > +++ b/gnu/packages/gnome.scm
> > @@ -3696,7 +3696,12 @@ (define-public librsvg
> > (("fn
> > multiple_input_files_not_allowed_for_png_output" all)
> > (string-append "#[ignore] " all))
> > (("fn stylesheet_option_error" all)
> > - (string-append "#[ignore] " all)))))
> > + (string-append "#[ignore] " all)))
> > + ;; XXX: re-enable when updating this package
> > + (with-directory-excursion "tests/fixtures/reftests/"
> > + (delete-file "filter-component-transfer-from-
> > reference-page.svg")
> > + (delete-file "filter-morphology-from-reference-
> > page.svg")
> > + (delete-file "svg1.1/text-text-03-b.svg"))))
>
> I think a fix for this was contributed to core-updates already; it
> used another approach: adjusting the expected value. We should
> rebase this branch on top of core-updates to get it.
I'm not sure how to feel about waiting for core-updates to get through
(especially given that GStreamer, the next big project is on staging,
and the path to getting both merged is still very unclear from my POV).
I did see the core-updates patch, though, and will try cherry-picking
it.
Cheers
^ permalink raw reply [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team v2 01/12] gnu: glib: Update to 2.76.1.
2023-04-08 19:54 ` Liliana Marie Prikler
@ 2023-04-09 5:03 ` Maxim Cournoyer
0 siblings, 0 replies; 64+ messages in thread
From: Maxim Cournoyer @ 2023-04-09 5:03 UTC (permalink / raw)
To: Liliana Marie Prikler; +Cc: rg, 62467
Hi,
Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> Am Samstag, dem 08.04.2023 um 15:37 -0400 schrieb Maxim Cournoyer:
>> Hi!
>>
>> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
>>
>> > * gnu/packages/glib.scm (glib): Update to 2.76.1.
>> > [source]<snippet>: Adjust accordingly.
>> > [arguments]<#:phases>: Add ‘set-G_TEST_SRCDIR’. Update ‘delete-
>> > failing-tests’.
>> > [propagated-inputs]: Replace pcre with pcre2.
>> > (glib-with-documentation): Inherit from glib.
>> > * gnu/packages/gnome.scm (sysprof, gtranslator): Use glib.
>> > * gnu/packages/gtk.scm (gtksourceview): Use glib.
>> > * gnu/packages/guile-xyz.scm (guile-g-golf): Use glib.
>> > * gnu/packages/patches/glib-skip-failing-test.patch: Adjust
>> > accordingly.
>> > ---
>> > gnu/packages/glib.scm | 92 +++++----------
>> > ----
>> > gnu/packages/gnome.scm | 8 +-
>> > gnu/packages/gtk.scm | 2 +-
>> > gnu/packages/guile-xyz.scm | 2 +-
>> > .../patches/glib-skip-failing-test.patch | 3 +-
>> > 5 files changed, 30 insertions(+), 77 deletions(-)
>> >
>> > diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
>> > index f85d5e3225..ecf5cb491f 100644
>> > --- a/gnu/packages/glib.scm
>> > +++ b/gnu/packages/glib.scm
>> > @@ -215,7 +215,7 @@ (define-public dbus-verbose
>> > (define glib
>> > (package
>> > (name "glib")
>> > - (version "2.70.2")
>> > + (version "2.76.1")
>> > (source
>> > (origin
>> > (method url-fetch)
>> > @@ -224,14 +224,14 @@ (define glib
>> > name "/" (string-take version 4) "/"
>> > name "-" version ".tar.xz"))
>> > (sha256
>> > - (base32
>> > "0vw08p4jllavp9qmlqg1yl1zanmy53yid46wipas6gfdhnf4al85"))
>> > + (base32
>> > "17x1zpr2avj8hjbpc6hp2sf2885lxac46v0kajsgan3929m0zp23"))
>> > (patches
>> > (search-patches "glib-appinfo-watch.patch"
>> > "glib-skip-failing-test.patch"))
>> > (modules '((guix build utils)))
>> > (snippet
>> > '(begin
>> > - (substitute* "tests/spawn-test.c"
>> > + (substitute* "glib/tests/spawn-test.c"
>> > (("/bin/sh") "sh"))))))
>> > (build-system meson-build-system)
>> > (outputs '("out" ;libraries, locales, etc
>> > @@ -256,6 +256,9 @@ (define glib
>> > #:phases
>> > (modify-phases %standard-phases
>> > ;; Needed to pass the test phase on slower ARM and i686
>> > machines.
>> > + (add-after 'unpack 'set-G_TEST_SRCDIR
>> > + (lambda _
>> > + (setenv "G_TEST_SRCDIR" (string-append (getcwd)
>> > "/gio/tests"))))
>> > (add-after 'unpack 'increase-test-timeout
>> > (lambda _
>> > (substitute* "meson.build"
>> > @@ -270,9 +273,19 @@ (define glib
>> > (substitute* '("unix.c" "utils.c")
>> > (("[ \t]*g_test_add_func.*;") "")))
>> > (with-directory-excursion "gio/tests"
>> > - (substitute* '("contenttype.c" "gdbus-address-get-
>> > session.c"
>> > - "gdbus-peer.c" "appinfo.c" "desktop-
>> > app-info.c")
>> > - (("[ \t]*g_test_add_func.*;") "")))
>> > + (substitute* '("contenttype.c"
>> > + "gdbus-address-get-session.c"
>> > + "gdbus-server-auth.c"
>> > + "gdbus-peer.c"
>> > + "appinfo.c"
>> > + "desktop-app-info.c")
>> > + (("[ \t]*g_test_add_func.*;") ""))
>> > + (unless (which "update-desktop-database")
>> > + (substitute* '("file.c")
>>
>> file.c doesn't need to be in a list.
> Nice catch.
>
>> > + (("[ \t]*g_test_add_func.*query-default-
>> > handler.*;") "")))
>>
>> The indentation seems off here. Is it really necessary to use the
>> unless conditional here? I'd perhaps simply disable the test
>> generally.
> I'd like to let it run when the input exists, but that's a circle.
> We'd have to check it in glib-with-documentation.
I see. LGTM then.
--
Thanks,
Maxim
^ permalink raw reply [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team v2 06/12] gnu: libsoup-minimal@2: Update to 2.74.3.
2023-04-08 19:56 ` Liliana Marie Prikler
@ 2023-04-09 5:04 ` Maxim Cournoyer
0 siblings, 0 replies; 64+ messages in thread
From: Maxim Cournoyer @ 2023-04-09 5:04 UTC (permalink / raw)
To: Liliana Marie Prikler; +Cc: rg, 62467
Hi,
Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> Am Samstag, dem 08.04.2023 um 15:42 -0400 schrieb Maxim Cournoyer:
>> Hi,
>>
>> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
>>
>> > * gnu/packages/gnome.scm (libsoup-minimal-2): Update to 2.74.3.
>> > ---
>> > 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 90e33d72b6..4f47e60505 100644
>> > --- a/gnu/packages/gnome.scm
>> > +++ b/gnu/packages/gnome.scm
>> > @@ -5263,7 +5263,7 @@ (define-public libsoup-minimal
>> > ;;; An older variant kept to build the 'rest' package.
>> > (define-public libsoup-minimal-2
>> > (package/inherit libsoup-minimal
>> > - (version "2.72.0")
>> > + (version "2.74.3")
>> > (source (origin
>> > (method url-fetch)
>> > (uri (string-append
>> > "mirror://gnome/sources/libsoup/"
>> > @@ -5271,7 +5271,7 @@ (define-public libsoup-minimal-2
>> > "libsoup-" version ".tar.xz"))
>> > (sha256
>> > (base32
>> > -
>> > "11skbyw2pw32178q3h8pi7xqa41b2x4k6q4k9f75zxmh8s23y30p"))))
>> > +
>> > "04rgv6hkyhgi7lak9865yxgbgky6gc635p7w6nhcbj64rx0prdz4"))))
>> > (arguments
>> > (substitute-keyword-arguments (package-arguments libsoup-
>> > minimal)
>> > ((#:phases phases)
>>
>> LGTM. Hopefully we can get rid of the libsoup-2 stuff after we've
>> updated all of GNOME to 43 (which had a hard requirement to not rely
>> on libsoup@2).
> Well, the goal is to move to 44 directly, but aren't there non-GNOME
> packages out there running libsoup-2 just like there's stuff still
> running GTK 2?
Perhaps! But at least we'll hopefully get a single webkitgtk soonish, eh!
--
Thanks,
Maxim
^ permalink raw reply [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team v2 09/12] gnu: gtk+-2: Fix build by hardening list store.
2023-04-08 20:00 ` Liliana Marie Prikler
@ 2023-04-09 5:06 ` Maxim Cournoyer
0 siblings, 0 replies; 64+ messages in thread
From: Maxim Cournoyer @ 2023-04-09 5:06 UTC (permalink / raw)
To: Liliana Marie Prikler; +Cc: rg, 62467
Hi Liliana,
Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> Am Samstag, dem 08.04.2023 um 15:47 -0400 schrieb Maxim Cournoyer:
>> Hi,
>>
>> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
>>
>> > * gnu/packages/patches/gtk2-harden-list-store.patch: New file.
>> > * gnu/packages/gtk.scm (gtk+-2)[patches]: Add it here.
>> > * gnu/local.mk (dist_patch_DATA): Register it here.
>> > ---
>> > gnu/local.mk | 1 +
>> > gnu/packages/gtk.scm | 1 +
>> > .../patches/gtk2-harden-list-store.patch | 42
>> > +++++++++++++++++++
>> > 3 files changed, 44 insertions(+)
>> > create mode 100644 gnu/packages/patches/gtk2-harden-list-
>> > store.patch
>> >
>> > diff --git a/gnu/local.mk b/gnu/local.mk
>> > index 3e94281ccf..31456c5be8 100644
>> > --- a/gnu/local.mk
>> > +++ b/gnu/local.mk
>> > @@ -1303,6 +1303,7 @@ dist_patch_DATA
>> > = \
>> > %D%/packages/patches/guile-rsvg-pkgconfig.patch \
>> > %D%/packages/patches/guile-emacs-fix-configure.patch \
>> > %D%/packages/patches/gtk2-fix-builder-test.patch \
>> > + %D%/packages/patches/gtk2-harden-list-store.patch \
>> > %D%/packages/patches/gtk2-respect-GUIX_GTK2_PATH.patch \
>> > %D%/packages/patches/gtk2-respect-GUIX_GTK2_IM_MODULE_FILE.patch
>> > \
>> > %D%/packages/patches/gtk2-theme-paths.patch \
>> > diff --git a/gnu/packages/gtk.scm b/gnu/packages/gtk.scm
>> > index c756f39e24..196d767160 100644
>> > --- a/gnu/packages/gtk.scm
>> > +++ b/gnu/packages/gtk.scm
>> > @@ -1014,6 +1014,7 @@ (define-public gtk+-2
>> >
>> > "1nn6kks1zyvb5xikr9y2k7r9bwjy1g4b0m0s66532bclymbwfamc"))
>> > (patches (search-patches "gtk2-respect-
>> > GUIX_GTK2_PATH.patch"
>> > "gtk2-respect-
>> > GUIX_GTK2_IM_MODULE_FILE.patch"
>> > + "gtk2-harden-list-
>> > store.patch"
>> > "gtk2-theme-paths.patch"
>> > "gtk2-fix-builder-
>> > test.patch"))))
>> > (build-system gnu-build-system)
>> > diff --git a/gnu/packages/patches/gtk2-harden-list-store.patch
>> > b/gnu/packages/patches/gtk2-harden-list-store.patch
>> > new file mode 100644
>> > index 0000000000..b107ba2bcc
>> > --- /dev/null
>> > +++ b/gnu/packages/patches/gtk2-harden-list-store.patch
>> > @@ -0,0 +1,42 @@
>> > +Mimic the implemenetation in gtk+-3.
>>
>> Typo: implementation.
> Nice catch.
>
>> I'd like to see a bit more metadata in this patch; is it original
>> work, or was it retrieved from another distribution such as Debian?
>> It probably exists elsewhere, if GTK2 can't be built anymore
>> otherwise?
> I looked around in the GTK 3 source tree given that that package built,
> but GTK 2 didn't, then tried to copy the file as-is, failed, then
> copied just these relevant bits. I haven't looked at prior art in
> other distros.
>
>> Does upstream still maintain GTK2, or is it completely abandoned?
> As far as I can see, we're running the latest version.
OK! Perhaps stress the point more that this is backported from GTK 3 in
the patch metadata (top comment).
LGTM with this.
--
Thanks,
Maxim
^ permalink raw reply [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team v2 11/12] gnu: librsvg: Fix build.
2023-04-08 20:03 ` Liliana Marie Prikler
@ 2023-04-09 5:07 ` Maxim Cournoyer
0 siblings, 0 replies; 64+ messages in thread
From: Maxim Cournoyer @ 2023-04-09 5:07 UTC (permalink / raw)
To: Liliana Marie Prikler; +Cc: rg, 62467
Hi Liliana,
Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> Am Samstag, dem 08.04.2023 um 15:49 -0400 schrieb Maxim Cournoyer:
>> Hi,
>>
>> Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
>>
>> > * gnu/packages/gnome.scm (librsvg)[#:phases]<ignore-failing-tests>:
>> > Also
>> > delete SVG files that have been broken by the recent updates.
>> > ---
>> > gnu/packages/gnome.scm | 7 ++++++-
>> > 1 file changed, 6 insertions(+), 1 deletion(-)
>> >
>> > diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
>> > index 4f47e60505..e43e24dd94 100644
>> > --- a/gnu/packages/gnome.scm
>> > +++ b/gnu/packages/gnome.scm
>> > @@ -3696,7 +3696,12 @@ (define-public librsvg
>> > (("fn
>> > multiple_input_files_not_allowed_for_png_output" all)
>> > (string-append "#[ignore] " all))
>> > (("fn stylesheet_option_error" all)
>> > - (string-append "#[ignore] " all)))))
>> > + (string-append "#[ignore] " all)))
>> > + ;; XXX: re-enable when updating this package
>> > + (with-directory-excursion "tests/fixtures/reftests/"
>> > + (delete-file "filter-component-transfer-from-
>> > reference-page.svg")
>> > + (delete-file "filter-morphology-from-reference-
>> > page.svg")
>> > + (delete-file "svg1.1/text-text-03-b.svg"))))
>>
>> I think a fix for this was contributed to core-updates already; it
>> used another approach: adjusting the expected value. We should
>> rebase this branch on top of core-updates to get it.
> I'm not sure how to feel about waiting for core-updates to get through
> (especially given that GStreamer, the next big project is on staging,
> and the path to getting both merged is still very unclear from my POV).
> I did see the core-updates patch, though, and will try cherry-picking
> it.
Staging is at near-merge, if I can get the substitute % a bit higher and
a new python-cryptography in (it fixes a CVE).
--
Thanks,
Maxim
^ permalink raw reply [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team v3 14/15] gnu: inkscape: Use new package style.
2023-03-26 19:20 [bug#62467] [PATCH gnome-team 0/5] Update fundamental packages Liliana Marie Prikler
` (30 preceding siblings ...)
2023-04-03 16:37 ` [bug#62467] [PATCH gnome-team v3 01/15] gnu: librsvg-2.40: Fix test failure with Pango 1.50 Kaelyn Takata
@ 2023-04-10 7:08 ` Liliana Marie Prikler
2023-04-10 16:12 ` [bug#62467] [PATCH gnome-team v3 15/15] gnu: Remove lib2geom 1.1 Liliana Marie Prikler
2023-04-11 7:06 ` [bug#62467] [PATCH gnome-team v3 00/15] Update glib to 2.76.1 Liliana Marie Prikler
33 siblings, 0 replies; 64+ messages in thread
From: Liliana Marie Prikler @ 2023-04-10 7:08 UTC (permalink / raw)
To: 62467; +Cc: rg, Maxim Cournoyer
* gnu/packages/inkscape.scm (inkscape)[arguments]: Convert to list of
G-Expressions.
[inputs]: Drop labels.
---
gnu/packages/inkscape.scm | 150 +++++++++++++++++++-------------------
1 file changed, 76 insertions(+), 74 deletions(-)
diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm
index b8e78c2b11..7762271299 100644
--- a/gnu/packages/inkscape.scm
+++ b/gnu/packages/inkscape.scm
@@ -26,6 +26,7 @@
(define-module (gnu packages inkscape)
#:use-module ((guix licenses) #:prefix license:)
#:use-module (guix packages)
+ #:use-module (guix gexp)
#:use-module (guix download)
#:use-module (guix utils)
#:use-module (guix build-system cmake)
@@ -153,87 +154,88 @@ (define-public inkscape/stable
((".*find_package\\(DoubleConversion.*") ""))))))
(build-system cmake-build-system)
(arguments
- `(#:test-target "check" ;otherwise some test binaries are missing
- #:imported-modules (,@%cmake-build-system-modules
+ (list
+ #:test-target "check" ; otherwise some test binaries are missing
+ #:imported-modules `(,@%cmake-build-system-modules
(guix build glib-or-gtk-build-system))
- #:modules ((guix build cmake-build-system)
+ #:modules '((guix build cmake-build-system)
((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
(guix build utils))
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file
- (assoc-ref glib-or-gtk:%standard-phases
- 'generate-gdk-pixbuf-loaders-cache-file))
- (add-after 'unpack 'patch-icon-cache-generator
- (lambda _
- (substitute* "share/icons/application/CMakeLists.txt"
- (("gtk-update-icon-cache") "true"))))
- (add-after 'unpack 'disable-latex-export-tests
- ;; FIXME: For some reason the test.pdf_tex file generated by the
- ;; "--export-latex" lacks "some text" in its content when run in
- ;; the build environment. Skip the related tests.
- (lambda _
- (substitute* "testfiles/cli_tests/CMakeLists.txt"
- (("add_cli_test\\(export-latex")
- "message(TEST_DISABLED: export-latex"))))
- (add-after 'unpack 'set-home
- ;; Mute Inkscape warnings during tests.
- (lambda _
- (setenv "HOME" (getcwd))))
- ;; Move the check phase after the install phase, as when run in the
- ;; tests, Inkscape relies on files that are not yet installed, such
- ;; as the "share/inkscape/ui/units.xml" file.
- (delete 'check)
- (add-after 'install 'check
- (assoc-ref %standard-phases 'check))
- (add-after 'install 'glib-or-gtk-compile-schemas
- (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas))
- (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap
- (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))
- (add-after 'install 'wrap-program
- ;; Ensure Python is available at runtime.
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((out (assoc-ref outputs "out")))
- (wrap-program (string-append out "/bin/inkscape")
- `("GUIX_PYTHONPATH" ":" prefix
- (,(getenv "GUIX_PYTHONPATH")))
- ;; Wrapping GDK_PIXBUF_MODULE_FILE allows Inkscape to load
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'generate-gdk-pixbuf-loaders-cache-file
+ (assoc-ref glib-or-gtk:%standard-phases
+ 'generate-gdk-pixbuf-loaders-cache-file))
+ (add-after 'unpack 'patch-icon-cache-generator
+ (lambda _
+ (substitute* "share/icons/application/CMakeLists.txt"
+ (("gtk-update-icon-cache") "true"))))
+ (add-after 'unpack 'disable-latex-export-tests
+ ;; FIXME: For some reason the test.pdf_tex file generated by the
+ ;; "--export-latex" lacks "some text" in its content when run in
+ ;; the build environment. Skip the related tests.
+ (lambda _
+ (substitute* "testfiles/cli_tests/CMakeLists.txt"
+ (("add_cli_test\\(export-latex")
+ "message(TEST_DISABLED: export-latex"))))
+ (add-after 'unpack 'set-home
+ ;; Mute Inkscape warnings during tests.
+ (lambda _
+ (setenv "HOME" (getcwd))))
+ ;; Move the check phase after the install phase, as when run in the
+ ;; tests, Inkscape relies on files that are not yet installed, such
+ ;; as the "share/inkscape/ui/units.xml" file.
+ (delete 'check)
+ (add-after 'install 'check
+ (assoc-ref %standard-phases 'check))
+ (add-after 'install 'glib-or-gtk-compile-schemas
+ (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-compile-schemas))
+ (add-after 'glib-or-gtk-compile-schemas 'glib-or-gtk-wrap
+ (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))
+ (add-after 'install 'wrap-program
+ ;; Ensure Python is available at runtime.
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((out (assoc-ref outputs "out")))
+ (wrap-program (string-append out "/bin/inkscape")
+ `("GUIX_PYTHONPATH" ":" prefix
+ (,(getenv "GUIX_PYTHONPATH")))
+ ;; Wrapping GDK_PIXBUF_MODULE_FILE allows Inkscape to load
;; its own icons in pure environments.
`("GDK_PIXBUF_MODULE_FILE" =
(,(getenv "GDK_PIXBUF_MODULE_FILE"))))))))))
(inputs
- `(("aspell" ,aspell)
- ("bash-minimal" ,bash-minimal)
- ("autotrace" ,autotrace)
- ("gdl" ,gdl-minimal)
- ("gtkmm" ,gtkmm-3)
- ("gtk" ,gtk+)
- ("gtkspell3" ,gtkspell3)
- ("gsl" ,gsl)
- ("poppler" ,poppler)
- ("lib2geom" ,lib2geom-1.2)
- ("libjpeg" ,libjpeg-turbo)
- ("libpng" ,libpng)
- ("libxml2" ,libxml2)
- ("libxslt" ,libxslt)
- ("libgc" ,libgc)
- ("librsvg" ,librsvg) ; for the pixbuf loader
- ("libsoup" ,libsoup-minimal-2)
- ("libcdr" ,libcdr)
- ("libvisio" ,libvisio)
- ("libwpd" ,libwpd)
- ("libwpg" ,libwpg)
- ("freetype" ,freetype)
- ("popt" ,popt)
- ("potrace" ,potrace)
- ("lcms" ,lcms)
- ("boost" ,boost)
- ("python" ,python-wrapper)
- ("python-cssselect" ,python-cssselect) ; to render qrcode
- ("python-scour" ,python-scour)
- ("python-pyserial" ,python-pyserial)
- ("python-numpy" ,python-numpy)
- ("python-lxml" ,python-lxml)))
+ (list aspell
+ bash-minimal
+ autotrace
+ gdl-minimal
+ gtkmm-3
+ gtk+
+ gtkspell3
+ gsl
+ poppler
+ lib2geom-1.2
+ libjpeg-turbo
+ libpng
+ libxml2
+ libxslt
+ libgc
+ librsvg ; for the pixbuf loader
+ libsoup-minimal-2
+ libcdr
+ libvisio
+ libwpd
+ libwpg
+ freetype
+ popt
+ potrace
+ lcms
+ boost
+ python-wrapper
+ python-cssselect ; to render qrcode
+ python-scour
+ python-pyserial
+ python-numpy
+ python-lxml))
(native-inputs
(list imagemagick ;for tests
intltool
--
2.39.2
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team v2 11/12] gnu: librsvg: Fix build.
2023-04-08 19:49 ` Maxim Cournoyer
2023-04-08 20:03 ` Liliana Marie Prikler
@ 2023-04-10 12:51 ` Liliana Marie Prikler
2023-04-11 1:49 ` Maxim Cournoyer
1 sibling, 1 reply; 64+ messages in thread
From: Liliana Marie Prikler @ 2023-04-10 12:51 UTC (permalink / raw)
To: Maxim Cournoyer; +Cc: rg, 62467
Am Samstag, dem 08.04.2023 um 15:49 -0400 schrieb Maxim Cournoyer:
> > + (with-directory-excursion "tests/fixtures/reftests/"
> > + (delete-file "filter-component-transfer-from-
> > reference-page.svg")
> > + (delete-file "filter-morphology-from-reference-
> > page.svg")
> > + (delete-file "svg1.1/text-text-03-b.svg"))))
>
> I think a fix for this was contributed to core-updates already; it
> used another approach: adjusting the expected value.
Looking at the core-updates patch, it appears to be targeting
tests/fixtures/reftests/bugs/587721-text-transform.svg, not any of the
files referenced above. Am I missing something?
^ permalink raw reply [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team v3 15/15] gnu: Remove lib2geom 1.1.
2023-03-26 19:20 [bug#62467] [PATCH gnome-team 0/5] Update fundamental packages Liliana Marie Prikler
` (31 preceding siblings ...)
2023-04-10 7:08 ` [bug#62467] [PATCH gnome-team v3 14/15] gnu: inkscape: Use new package style Liliana Marie Prikler
@ 2023-04-10 16:12 ` Liliana Marie Prikler
2023-04-11 20:57 ` Maxim Cournoyer
2023-04-11 7:06 ` [bug#62467] [PATCH gnome-team v3 00/15] Update glib to 2.76.1 Liliana Marie Prikler
33 siblings, 1 reply; 64+ messages in thread
From: Liliana Marie Prikler @ 2023-04-10 16:12 UTC (permalink / raw)
To: 62467; +Cc: rg, Maxim Cournoyer
* gnu/packages/graphics.scm (lib2geom): Update to 1.2.
(lib2geom-1.2): Remove variable.
* gnu/packages/inkscape.scm (inkscape)[inputs]: Use libgeom.
---
gnu/packages/graphics.scm | 22 ++++------------------
gnu/packages/inkscape.scm | 2 +-
2 files changed, 5 insertions(+), 19 deletions(-)
diff --git a/gnu/packages/graphics.scm b/gnu/packages/graphics.scm
index bcc27cc3bf..336f1dd19d 100644
--- a/gnu/packages/graphics.scm
+++ b/gnu/packages/graphics.scm
@@ -872,16 +872,16 @@ (define-public ilmbase
(define-public lib2geom
(package
(name "lib2geom")
- (version "1.1")
+ (version "1.2")
(source (origin
(method git-fetch)
(uri (git-reference
- (url "https://gitlab.com/inkscape/lib2geom.git")
+ (url "https://gitlab.com/inkscape/lib2geom")
(commit version)))
- (file-name (git-file-name name version))
+ (file-name (git-file-name "lib2geom" version))
(sha256
(base32
- "03bx9k1m4bfhmx0ldsg0bks6i8h7fmvl5vbg6gmpq0bk0nkmpnmv"))))
+ "0dq981g894hmvhd6rmfl1w32mksg9hpvpjs1qvfxrnz87rhkknj8"))))
(build-system cmake-build-system)
(arguments
`(#:imported-modules ((guix build python-build-system)
@@ -938,20 +938,6 @@ (define-public lib2geom
;; https://gitlab.com/inkscape/inkscape/issues/784).
(license license:gpl3+)))
-(define-public lib2geom-1.2
- (package
- (inherit lib2geom)
- (version "1.2")
- (source (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://gitlab.com/inkscape/lib2geom")
- (commit version)))
- (file-name (git-file-name "lib2geom" version))
- (sha256
- (base32
- "0dq981g894hmvhd6rmfl1w32mksg9hpvpjs1qvfxrnz87rhkknj8"))))))
-
(define-public python-booleanoperations
(package
(name "python-booleanoperations")
diff --git a/gnu/packages/inkscape.scm b/gnu/packages/inkscape.scm
index 7762271299..5c1689fcc7 100644
--- a/gnu/packages/inkscape.scm
+++ b/gnu/packages/inkscape.scm
@@ -213,7 +213,7 @@ (define-public inkscape/stable
gtkspell3
gsl
poppler
- lib2geom-1.2
+ lib2geom
libjpeg-turbo
libpng
libxml2
--
2.39.2
^ permalink raw reply related [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team v2 11/12] gnu: librsvg: Fix build.
2023-04-10 12:51 ` Liliana Marie Prikler
@ 2023-04-11 1:49 ` Maxim Cournoyer
0 siblings, 0 replies; 64+ messages in thread
From: Maxim Cournoyer @ 2023-04-11 1:49 UTC (permalink / raw)
To: Liliana Marie Prikler; +Cc: rg, 62467
Hi Liliana,
Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> Am Samstag, dem 08.04.2023 um 15:49 -0400 schrieb Maxim Cournoyer:
>> > + (with-directory-excursion "tests/fixtures/reftests/"
>> > + (delete-file "filter-component-transfer-from-
>> > reference-page.svg")
>> > + (delete-file "filter-morphology-from-reference-
>> > page.svg")
>> > + (delete-file "svg1.1/text-text-03-b.svg"))))
>>
>> I think a fix for this was contributed to core-updates already; it
>> used another approach: adjusting the expected value.
> Looking at the core-updates patch, it appears to be targeting
> tests/fixtures/reftests/bugs/587721-text-transform.svg, not any of the
> files referenced above. Am I missing something?
I see; I guess it was a coincidence but that the issues really are
different? I didn't look carefully, just thought that two edits fixing
test suite bugs probably were targetting the same one :-).
--
Thanks,
Maxim
^ permalink raw reply [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team v3 00/15] Update glib to 2.76.1
2023-03-26 19:20 [bug#62467] [PATCH gnome-team 0/5] Update fundamental packages Liliana Marie Prikler
` (32 preceding siblings ...)
2023-04-10 16:12 ` [bug#62467] [PATCH gnome-team v3 15/15] gnu: Remove lib2geom 1.1 Liliana Marie Prikler
@ 2023-04-11 7:06 ` Liliana Marie Prikler
33 siblings, 0 replies; 64+ messages in thread
From: Liliana Marie Prikler @ 2023-04-11 7:06 UTC (permalink / raw)
To: 62467; +Cc: rg, Maxim Cournoyer
Hi team, hi Guix,
I've incorporated Maxim's suggestions from v2 and Kaelyn's patch for
core-updates. Sadly, it doesn't appear to work for the librsvg package
(fitting, as it targets librsvg-2.40), so we probably still need a
proper SVG patch there.
Cheers
Kaelyn Takata (1):
gnu: librsvg-2.40: Fix test failure with Pango 1.50.
Liliana Marie Prikler (14):
gnu: glib: Update to 2.76.1.
gnu: Make pango-next the new pango.
gnu: pango: Update to 1.50.14.
gnu: Make gobject-introspection-next the new gobject-introspection.
gnu: gobject-introspection: Update to 1.76.1.
gnu: libsoup-minimal@2: Update to 2.74.3.
gnu: python-pygobject: Set upstream-name.
gnu: python-pygobject: Update to 3.44.1.
gnu: gtk+-2: Fix build by hardening list store.
gnu: gtk+: Update to 3.24.37.
gnu: librsvg: Fix build.
gnu: inkscape: Update stable version to 1.2.1.
gnu: inkscape: Use new package style.
gnu: Remove lib2geom 1.1.
gnu/local.mk | 3 +-
gnu/packages/freedesktop.scm | 4 +-
gnu/packages/geo.scm | 1 -
gnu/packages/glib.scm | 118 +++---------
gnu/packages/gnome.scm | 51 +++--
gnu/packages/graphics.scm | 22 +--
gnu/packages/gtk.scm | 120 ++++++------
gnu/packages/guile-xyz.scm | 4 +-
gnu/packages/ibus.scm | 2 +-
gnu/packages/inkscape.scm | 174 ++++++++----------
gnu/packages/messaging.scm | 1 -
gnu/packages/music.scm | 6 +-
.../patches/glib-skip-failing-test.patch | 3 +-
...trospection-absolute-shlib-path-1.72.patch | 173 -----------------
...ct-introspection-absolute-shlib-path.patch | 51 ++---
.../gobject-introspection-cc-1.72.patch | 15 --
.../patches/gobject-introspection-cc.patch | 11 +-
.../patches/gtk2-harden-list-store.patch | 42 +++++
gnu/packages/webkit.scm | 3 +-
19 files changed, 285 insertions(+), 519 deletions(-)
delete mode 100644 gnu/packages/patches/gobject-introspection-absolute-shlib-path-1.72.patch
delete mode 100644 gnu/packages/patches/gobject-introspection-cc-1.72.patch
create mode 100644 gnu/packages/patches/gtk2-harden-list-store.patch
--
2.39.2
^ permalink raw reply [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team v3 01/15] gnu: librsvg-2.40: Fix test failure with Pango 1.50.
2023-04-03 16:37 ` [bug#62467] [PATCH gnome-team v3 01/15] gnu: librsvg-2.40: Fix test failure with Pango 1.50 Kaelyn Takata
@ 2023-04-11 20:52 ` Maxim Cournoyer
0 siblings, 0 replies; 64+ messages in thread
From: Maxim Cournoyer @ 2023-04-11 20:52 UTC (permalink / raw)
To: Kaelyn Takata; +Cc: rg, 62467
Hi,
Kaelyn Takata <liliana.prikler@gmail.com> writes:
> * gnu/packages/gnome.scm (librsvg-2.40): Fix test failure with Pango 1.50.
>
> Signed-off-by: Andreas Enge <andreas@enge.fr>
> Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
> ---
> gnu/packages/gnome.scm | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
> index 49ff1464f5..6db6004356 100644
> --- a/gnu/packages/gnome.scm
> +++ b/gnu/packages/gnome.scm
> @@ -73,6 +73,7 @@
> ;;; Copyright © 2022 Rene Saavedra <nanuui@protonmail.com>
> ;;; Copyright © 2022 Alexandros Theodotou <alex@zrythm.org>
> ;;; Copyright © 2022 Arjan Adriaanse <arjan@adriaan.se>
> +;;; Copyright © 2023 Kaelyn Takata <kaelyn.alexi@protonmail.com>
> ;;;
> ;;; This file is part of GNU Guix.
> ;;;
> @@ -3780,6 +3781,12 @@ (define-public librsvg-2.40
> (("gdk_pixbuf_cache_file = .*$")
> "gdk_pixbuf_cache_file = $(TMPDIR)/loaders.cache\n"))
> #t))
> + (add-before 'check 'fix-test-with-pango-1.50
> + (lambda _
> + ;; Changes between pango 1.48 and 1.50 caused the text to be one
> + ;; pixel lower in the output image compared to the reference.
> + (substitute* "tests/fixtures/reftests/bugs/587721-text-transform.svg"
> + (("660\\.9") "659.9"))))
> (add-before 'check 'remove-failing-tests
> (lambda _
> (with-directory-excursion "tests/fixtures/reftests"
LGTM, although such fragil tests perhaps could be simply disabled to
spare someone the hassle to investigate them when they break again in
the future.
--
Thanks,
Maxim
^ permalink raw reply [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team v3 15/15] gnu: Remove lib2geom 1.1.
2023-04-10 16:12 ` [bug#62467] [PATCH gnome-team v3 15/15] gnu: Remove lib2geom 1.1 Liliana Marie Prikler
@ 2023-04-11 20:57 ` Maxim Cournoyer
2023-04-12 5:33 ` Liliana Marie Prikler
0 siblings, 1 reply; 64+ messages in thread
From: Maxim Cournoyer @ 2023-04-11 20:57 UTC (permalink / raw)
To: Liliana Marie Prikler; +Cc: rg, 62467
Hi Liliana,
The whole series looks good to me (LGTM), although you may want to
cherry-pick my GTK 3 update from core-updates to avoid having to resolve
conflicts down the road.
Feel free to push it to the gnome-team branch (do we have such a branch
yet?).
--
Thanks,
Maxim
^ permalink raw reply [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team v3 15/15] gnu: Remove lib2geom 1.1.
2023-04-11 20:57 ` Maxim Cournoyer
@ 2023-04-12 5:33 ` Liliana Marie Prikler
2023-04-13 2:33 ` Maxim Cournoyer
0 siblings, 1 reply; 64+ messages in thread
From: Liliana Marie Prikler @ 2023-04-12 5:33 UTC (permalink / raw)
To: Maxim Cournoyer; +Cc: rg, 62467
Am Dienstag, dem 11.04.2023 um 16:57 -0400 schrieb Maxim Cournoyer:
> Hi Liliana,
>
> The whole series looks good to me (LGTM), although you may want to
> cherry-pick my GTK 3 update from core-updates to avoid having to
> resolve conflicts down the road.
IIRC your GTK 3 update requires some changes in Meson that are not
currently in master/gnome-team, right? Can you tell me which commits I
need to isolate for that?
> Feel free to push it to the gnome-team branch (do we have such a
> branch yet?).
We do, it's currently still tracking master (and I'd like it to stay
that way in case we're done before c-u – even if not, we can rebase it
on the merged master again).
Cheers
^ permalink raw reply [flat|nested] 64+ messages in thread
* [bug#62467] [PATCH gnome-team v3 15/15] gnu: Remove lib2geom 1.1.
2023-04-12 5:33 ` Liliana Marie Prikler
@ 2023-04-13 2:33 ` Maxim Cournoyer
2023-04-13 5:12 ` bug#62467: " Liliana Marie Prikler
0 siblings, 1 reply; 64+ messages in thread
From: Maxim Cournoyer @ 2023-04-13 2:33 UTC (permalink / raw)
To: Liliana Marie Prikler; +Cc: rg, 62467
Hi Liliana,
Liliana Marie Prikler <liliana.prikler@gmail.com> writes:
> Am Dienstag, dem 11.04.2023 um 16:57 -0400 schrieb Maxim Cournoyer:
>> Hi Liliana,
>>
>> The whole series looks good to me (LGTM), although you may want to
>> cherry-pick my GTK 3 update from core-updates to avoid having to
>> resolve conflicts down the road.
> IIRC your GTK 3 update requires some changes in Meson that are not
> currently in master/gnome-team, right? Can you tell me which commits I
> need to isolate for that?
Ah, right, it needed at least the change to the meson-build-system in
9bf0a6e4a87c76852c3115476f76056434886181; while you're at it you can
pick 22491ed9c5cc5135db819b80a7ec2ba7dceaa1ee and the meson update to
1.0.1 in 46873adc04ccf2c753362ee14c7faa81fed602c4,
311255adc0d1c3b3aa0f6bed5af58e718f0607b2,
c808cd1bf9c541c1af243bb6bc468ece40b5b05a, and the fixup commit
1887100a2f0bfa99a4670d83587bdc1af5ee1c1c.
Meson 1.1.0 has just been released... it'd be tempting to update it at the
same time since touching meson-build-system entails a full rebuild of
the meson world anyway.
I realize this may be a bit more involved than what you may had been
ready for, and I won't object if you prefer to keep your version,
knowing we'll have to fix some conflicting commit a bit later after
core-updates is merged into master.
Let me know if you hit any issue if you do attempt it, it's still fresh.
--
Thanks,
Maxim
^ permalink raw reply [flat|nested] 64+ messages in thread
* bug#62467: [PATCH gnome-team v3 15/15] gnu: Remove lib2geom 1.1.
2023-04-13 2:33 ` Maxim Cournoyer
@ 2023-04-13 5:12 ` Liliana Marie Prikler
0 siblings, 0 replies; 64+ messages in thread
From: Liliana Marie Prikler @ 2023-04-13 5:12 UTC (permalink / raw)
To: Maxim Cournoyer; +Cc: rg, 62467-done
Am Mittwoch, dem 12.04.2023 um 22:33 -0400 schrieb Maxim Cournoyer:
> Ah, right, it needed at least the change to the meson-build-system in
> 9bf0a6e4a87c76852c3115476f76056434886181; while you're at it you can
> pick 22491ed9c5cc5135db819b80a7ec2ba7dceaa1ee and the meson update to
> 1.0.1 in 46873adc04ccf2c753362ee14c7faa81fed602c4,
> 311255adc0d1c3b3aa0f6bed5af58e718f0607b2,
> c808cd1bf9c541c1af243bb6bc468ece40b5b05a, and the fixup commit
> 1887100a2f0bfa99a4670d83587bdc1af5ee1c1c.
>
> Meson 1.1.0 has just been released... it'd be tempting to update it
> at the same time since touching meson-build-system entails a full
> rebuild of the meson world anyway.
>
> I realize this may be a bit more involved than what you may had been
> ready for, and I won't object if you prefer to keep your version,
> knowing we'll have to fix some conflicting commit a bit later after
> core-updates is merged into master.
My personal plan was to bump Meson just before GStreamer, which is the
next big block – thus I'll commit this series as-is and follow up with
the Meson changes afterwards.
I'll first look into bumping Meson to 1.1.0, and if that doesn't work
out apply the commits you mentioned as necessary.
Cheers
^ permalink raw reply [flat|nested] 64+ messages in thread
end of thread, other threads:[~2023-04-13 5:14 UTC | newest]
Thread overview: 64+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-03-26 19:20 [bug#62467] [PATCH gnome-team 0/5] Update fundamental packages Liliana Marie Prikler
2023-03-26 15:39 ` [bug#62467] [PATCH gnome-team 1/5] gnu: glib: Update to 2.76.1 Liliana Marie Prikler
2023-03-26 15:39 ` [bug#62467] [PATCH gnome-team v3 02/15] " Liliana Marie Prikler
2023-03-26 15:39 ` [bug#62467] [PATCH gnome-team v2 01/12] " Liliana Marie Prikler
2023-04-08 19:37 ` Maxim Cournoyer
2023-04-08 19:54 ` Liliana Marie Prikler
2023-04-09 5:03 ` Maxim Cournoyer
2023-03-26 15:53 ` [bug#62467] [PATCH gnome-team 2/5] gnu: Make pango-next the new pango Liliana Marie Prikler
2023-03-26 15:53 ` [bug#62467] [PATCH gnome-team v3 03/15] " Liliana Marie Prikler
2023-03-26 15:53 ` [bug#62467] [PATCH gnome-team v2 02/12] " Liliana Marie Prikler
2023-04-08 19:39 ` Maxim Cournoyer
2023-03-26 18:53 ` [bug#62467] [PATCH gnome-team v3 04/15] gnu: pango: Update to 1.50.14 Liliana Marie Prikler
2023-03-26 18:53 ` [bug#62467] [PATCH gnome-team v2 03/12] " Liliana Marie Prikler
2023-04-08 19:39 ` Maxim Cournoyer
2023-03-26 18:53 ` [bug#62467] [PATCH gnome-team 3/5] " Liliana Marie Prikler
2023-03-26 19:14 ` [bug#62467] [PATCH gnome-team 4/5] gnu: Make gobject-introspection-next the new gobject-introspection Liliana Marie Prikler
2023-03-26 19:14 ` [bug#62467] [PATCH gnome-team v3 05/15] " Liliana Marie Prikler
2023-03-26 19:14 ` [bug#62467] [PATCH gnome-team v2 04/12] " Liliana Marie Prikler
2023-04-08 19:41 ` Maxim Cournoyer
2023-03-26 19:19 ` [bug#62467] [PATCH gnome-team 5/5] gnu: gobject-introspection: Update to 1.76.1 Liliana Marie Prikler
2023-03-26 19:19 ` [bug#62467] [PATCH gnome-team v2 05/12] " Liliana Marie Prikler
2023-04-08 19:40 ` Maxim Cournoyer
2023-03-26 19:19 ` [bug#62467] [PATCH gnome-team v3 06/15] " Liliana Marie Prikler
2023-03-28 4:26 ` [bug#62467] [PATCH gnome-team v3 07/15] gnu: libsoup-minimal@2: Update to 2.74.3 Liliana Marie Prikler
2023-03-28 4:26 ` [bug#62467] [PATCH gnome-team v2 06/12] " Liliana Marie Prikler
2023-04-08 19:42 ` Maxim Cournoyer
2023-04-08 19:56 ` Liliana Marie Prikler
2023-04-09 5:04 ` Maxim Cournoyer
2023-03-28 16:50 ` [bug#62467] [PATCH gnome-team v3 08/15] gnu: python-pygobject: Set upstream-name Liliana Marie Prikler
2023-03-28 16:50 ` [bug#62467] [PATCH gnome-team v2 07/12] " Liliana Marie Prikler
2023-04-08 19:42 ` Maxim Cournoyer
2023-03-28 16:51 ` [bug#62467] [PATCH gnome-team v3 09/15] gnu: python-pygobject: Update to 3.44.1 Liliana Marie Prikler
2023-03-28 16:51 ` [bug#62467] [PATCH gnome-team v2 08/12] " Liliana Marie Prikler
2023-04-08 19:43 ` Maxim Cournoyer
2023-03-28 19:34 ` [bug#62467] [PATCH gnome-team v2 11/12] gnu: librsvg: Fix build Liliana Marie Prikler
2023-04-08 19:49 ` Maxim Cournoyer
2023-04-08 20:03 ` Liliana Marie Prikler
2023-04-09 5:07 ` Maxim Cournoyer
2023-04-10 12:51 ` Liliana Marie Prikler
2023-04-11 1:49 ` Maxim Cournoyer
2023-03-28 19:34 ` [bug#62467] [PATCH gnome-team v3 12/15] " Liliana Marie Prikler
2023-03-30 4:28 ` [bug#62467] [PATCH gnome-team v3 11/15] gnu: gtk+: Update to 3.24.37 Liliana Marie Prikler
2023-03-30 4:28 ` [bug#62467] [PATCH gnome-team v2 10/12] " Liliana Marie Prikler
2023-04-08 19:34 ` Maxim Cournoyer
2023-03-30 18:41 ` [bug#62467] [PATCH gnome-team v3 10/15] gnu: gtk+-2: Fix build by hardening list store Liliana Marie Prikler
2023-03-30 18:41 ` [bug#62467] [PATCH gnome-team v2 09/12] " Liliana Marie Prikler
2023-04-08 19:47 ` Maxim Cournoyer
2023-04-08 20:00 ` Liliana Marie Prikler
2023-04-09 5:06 ` Maxim Cournoyer
2023-03-31 18:54 ` [bug#62467] [PATCH gnome-team v2 12/12] gnu: inkscape: Update stable version to 1.2.1 Liliana Marie Prikler
2023-04-08 19:51 ` Maxim Cournoyer
2023-03-31 18:54 ` [bug#62467] [PATCH gnome-team v3 13/15] " Liliana Marie Prikler
2023-03-31 21:43 ` [bug#62467] [PATCH gnome-team v2 00/12] Update fundamental packages Liliana Marie Prikler
2023-04-02 17:27 ` Raghav Gururajan via Guix-patches via
2023-04-02 18:20 ` Liliana Marie Prikler
2023-04-03 16:37 ` [bug#62467] [PATCH gnome-team v3 01/15] gnu: librsvg-2.40: Fix test failure with Pango 1.50 Kaelyn Takata
2023-04-11 20:52 ` Maxim Cournoyer
2023-04-10 7:08 ` [bug#62467] [PATCH gnome-team v3 14/15] gnu: inkscape: Use new package style Liliana Marie Prikler
2023-04-10 16:12 ` [bug#62467] [PATCH gnome-team v3 15/15] gnu: Remove lib2geom 1.1 Liliana Marie Prikler
2023-04-11 20:57 ` Maxim Cournoyer
2023-04-12 5:33 ` Liliana Marie Prikler
2023-04-13 2:33 ` Maxim Cournoyer
2023-04-13 5:12 ` bug#62467: " Liliana Marie Prikler
2023-04-11 7:06 ` [bug#62467] [PATCH gnome-team v3 00/15] Update glib to 2.76.1 Liliana Marie Prikler
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).