* [PR PATCH] Revert "glib: update to 2.74.0."
@ 2022-09-20 18:38 paper42
2022-09-21 21:33 ` [PR PATCH] [Updated] " paper42
2022-09-21 21:35 ` [PR PATCH] [Merged]: " paper42
0 siblings, 2 replies; 3+ messages in thread
From: paper42 @ 2022-09-20 18:38 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1363 bytes --]
There is a new pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages glib-2.74-revert
https://github.com/void-linux/void-packages/pull/39394
Revert "glib: update to 2.74.0."
#### Testing the changes
- I tested the changes in this PR: **briefly**
issues with the glib update were reported in https://github.com/void-linux/void-packages/issues/39390 and https://github.com/void-linux/void-packages/issues/39393 by @bugcrazy and @lxlml
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39394.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glib-2.74-revert-39394.patch --]
[-- Type: text/x-diff, Size: 11968 bytes --]
From 91f5b35a1f4499c663bc43d1ef55bb15564f8c9f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 20 Sep 2022 20:20:30 +0200
Subject: [PATCH 1/4] Revert "glib: update to 2.74.0."
This reverts commit 6192ddef8a8849b745391796798a0a2a13574a0d.
---
.../glib/patches/disable-broken-tests.patch | 31 ++++++++----
srcpkgs/glib/patches/test-error-musl.patch | 50 -------------------
srcpkgs/glib/template | 27 ++++------
3 files changed, 31 insertions(+), 77 deletions(-)
delete mode 100644 srcpkgs/glib/patches/test-error-musl.patch
diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 91345d2b1d26..2a5263007503 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -6,17 +6,25 @@
},
- 'converter-stream' : {},
'credentials' : {},
- 'data-input-stream' : {},
- 'data-output-stream' : {},
-@@ -198,7 +197,6 @@ endif
+ 'cxx' : {
+ 'source' : ['cxx.cpp'],
+@@ -91,7 +90,6 @@ gio_tests = {
+ 'network-monitor' : {},
+ 'network-monitor-race' : {},
+ 'permission' : {},
+- 'pollable' : {'dependencies' : [libdl_dep]},
+ 'power-profile-monitor' : {},
+ 'proxy-test' : {},
+ 'readwrite' : {},
+@@ -174,7 +172,6 @@ endif
# Test programs buildable on UNIX only
if host_machine.system() != 'windows'
gio_tests += {
- 'file' : {},
- 'gdbus-peer-object-manager' : {},
- 'gdbus-sasl' : {},
- 'live-g-file' : {},
-@@ -814,14 +812,6 @@ if meson.can_run_host_binaries()
+ 'gdbus-peer' : {
+ 'dependencies' : [libgdbus_example_objectmanager_dep],
+ 'install_rpath' : installed_tests_execdir,
+@@ -798,14 +795,6 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
test_resources_binary2,
]
endif
@@ -31,11 +39,9 @@
endif
foreach test_name, extra_args : gio_tests
-diff --git a/glib/tests/meson.build b/glib/tests/meson.build
-index d74617823..1de81a825 100644
--- a/glib/tests/meson.build
+++ b/glib/tests/meson.build
-@@ -11,22 +11,14 @@ glib_tests = {
+@@ -11,25 +11,17 @@ glib_tests = {
'cache' : {},
'charset' : {},
'checksum' : {},
@@ -43,6 +49,9 @@ index d74617823..1de81a825 100644
'completion' : {},
'cond' : {},
- 'convert' : {},
+ 'cxx' : {
+ 'source' : ['cxx.cpp'],
+ },
'dataset' : {},
- 'date' : {
- # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
@@ -59,9 +68,9 @@ index d74617823..1de81a825 100644
'suite' : ['slow'],
},
@@ -65,7 +57,6 @@ glib_tests = {
+ 'mutex' : {},
'node' : {},
'once' : {},
- 'onceinit' : {},
- 'option-context' : {},
'option-argv0' : {},
'overflow' : {},
diff --git a/srcpkgs/glib/patches/test-error-musl.patch b/srcpkgs/glib/patches/test-error-musl.patch
deleted file mode 100644
index 427df3de13c7..000000000000
--- a/srcpkgs/glib/patches/test-error-musl.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 902ba0bc0db50ede3473af576bddd2b6a2f9e326 Mon Sep 17 00:00:00 2001
-From: Michal Vasilek <michal@vasilek.cz>
-Date: Sun, 18 Sep 2022 17:30:41 +0200
-Subject: [PATCH] tests: Only run g_error_new_valist() programmer error test on
- glibc
-
-The musl implementation of vasprintf segfaults with NULL
----
- glib/tests/error.c | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/glib/tests/error.c b/glib/tests/error.c
-index 7ea04ea3ce..fa3a25969d 100644
---- a/glib/tests/error.c
-+++ b/glib/tests/error.c
-@@ -123,12 +123,12 @@ static void
- test_new_valist_invalid_va (gpointer dummy,
- ...)
- {
--#ifdef __linux__
-- /* Only worth testing this on Linux; if other platforms regress on this legacy
-- * behaviour, we don’t care. In particular, calling g_error_new_valist() with
-- * a %NULL format will crash on FreeBSD as its implementation of vasprintf()
-- * is less forgiving than Linux’s. That’s fine: it’s a programmer error in
-- * either case. */
-+#if defined(__linux__) && defined(__GLIBC__)
-+ /* Only worth testing this on Linux with glibc; if other platforms regress on
-+ * this legacy behaviour, we don’t care. In particular, calling
-+ * g_error_new_valist() with a %NULL format will crash on FreeBSD as its
-+ * implementation of vasprintf() is less forgiving than Linux’s. That’s
-+ * fine: it’s a programmer error in either case. */
- const struct
- {
- GQuark domain;
-@@ -182,9 +182,9 @@ test_new_valist_invalid_va (gpointer dummy,
-
- va_end (ap);
- }
--#else /* if !__linux__ */
-- g_test_skip ("g_error_new_valist() programmer error handling is only relevant on Linux");
--#endif /* !__linux__ */
-+#else /* if !__linux__ || !__GLIBC__ */
-+ g_test_skip ("g_error_new_valist() programmer error handling is only relevant on Linux with glibc");
-+#endif /* !__linux__ || ! __GLIBC__ */
- }
-
- static void
---
-GitLab
-
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 33c1d9e0cd7d..cc57bfa490c1 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,24 +1,24 @@
# Template file for 'glib'
pkgname=glib
-version=2.74.0
-revision=1
+reverts="2.74.0_1"
+version=2.72.2
+revision=3
build_style=meson
# static version is necessary for qemu-user-static;
# also disable LTO, otherwise there are multiple failures when linking qemu
-configure_args="-Dman=true -Dselinux=disabled
+configure_args="-Dfam=false -Dman=true -Dselinux=disabled
$(vopt_bool gtk_doc gtk_doc) --default-library=both -Db_lto=false"
hostmakedepends="gettext pkg-config libxslt docbook-xsl $(vopt_if gtk_doc gtk-doc)"
-makedepends="zlib-devel pcre2-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
+makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
checkdepends="desktop-file-utils shared-mime-info dbus python3-pytest"
short_desc="GNU library of C routines"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
+maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GLib"
-#changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-74/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-72/NEWS"
distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=3652c7f072d7b031a6b5edd623f77ebc5dcd2ae698598abcc89ff39ca75add30
-make_check_pre="dbus-run-session"
+checksum=78d599a133dba7fe2036dfa8db8fb6131ab9642783fc9578b07a20995252d2de
build_options="gtk_doc"
desc_option_gtk_doc="Build GTK API docs"
@@ -27,13 +27,8 @@ if [ -z "$CROSS_BUILD" ]; then
build_options_default+=" gtk_doc"
fi
-pre_check() {
- # machine-id is a random, non-zero value
- echo 'dcb30309cd6c8b7cc20383d85a5c7012' > /etc/machine-id
-}
-
-post_check() {
- rm /etc/machine-id
+do_check() {
+ dbus-run-session ninja -C build test
}
libglib-devel_package() {
From b2b6b9cf75ed606795a29835bcf8ffbeae9927d8 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 20 Sep 2022 20:27:25 +0200
Subject: [PATCH 2/4] Revert "gtksourceview5: update to 5.6.0."
This reverts commit bc616fa9b074a23474a78ca48012af07b5a70f2e.
---
srcpkgs/gtksourceview5/template | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gtksourceview5/template b/srcpkgs/gtksourceview5/template
index 169abbd9ddf5..5fe51b308735 100644
--- a/srcpkgs/gtksourceview5/template
+++ b/srcpkgs/gtksourceview5/template
@@ -1,7 +1,8 @@
# Template file for 'gtksourceview5'
pkgname=gtksourceview5
-version=5.6.0
-revision=1
+reverts="5.6.0_1"
+version=5.4.2
+revision=2
wrksrc="gtksourceview-${version}"
build_style=meson
build_helper="gir"
@@ -11,15 +12,15 @@ hostmakedepends="glib-devel itstool libxslt pkg-config gtk4 gettext
$(vopt_if gir vala) $(vopt_if gtk_doc gi-docgen)"
makedepends="gtk4-devel libglib-devel libxml2-devel $(vopt_if gir vala)
pcre2-devel"
-checkdepends="xvfb-run mesa-dri cantarell-fonts"
+checkdepends="xvfb-run cantarell-fonts"
short_desc="Text widget that extends GTK4 GtkTextView widget"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GtkSourceView"
-#changelog="https://gitlab.gnome.org/GNOME/gtksourceview/-/raw/gtksourceview-5-6/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/gtksourceview/-/raw/master/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gtksourceview/-/raw/master/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gtksourceview/-/raw/gtksourceview-5-4/NEWS"
distfiles="${GNOME_SITE}/gtksourceview/${version%.*}/gtksourceview-${version}.tar.xz"
-checksum=0ca3df1d2af61bde3608d0d3f233e4a41f958e2ae59b9fc209c3df6102e8afdd
+checksum=ad140e07eb841910de483c092bd4885abd29baadd6e95fa22d93ed2df0b79de7
make_check_pre="xvfb-run"
# Package build options
From 73b6b481a81ff90b74261a1b6039852dd4abdfc2 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 20 Sep 2022 20:27:40 +0200
Subject: [PATCH 3/4] Revert "gnome-text-editor: update to 43.0."
This reverts commit 96165d0fc6520ecd069e144e1e37f16e15b4fba7.
---
srcpkgs/gnome-text-editor/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-text-editor/template b/srcpkgs/gnome-text-editor/template
index 00453394e832..339257551ea3 100644
--- a/srcpkgs/gnome-text-editor/template
+++ b/srcpkgs/gnome-text-editor/template
@@ -1,17 +1,18 @@
# Template file for 'gnome-text-editor'
pkgname=gnome-text-editor
-version=43.0
-revision=1
+reverts="43.0_1"
+version=42.2
+revision=2
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel
gtk-update-icon-cache desktop-file-utils"
makedepends="libglib-devel gtk4-devel gtksourceview5-devel enchant2-devel
- icu-devel libadwaita-devel pcre2-devel editorconfig-devel"
+ icu-devel libadwaita-devel pcre2-devel"
short_desc="Simple text editor"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-3.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/gnome-text-editor"
changelog="https://gitlab.gnome.org/GNOME/gnome-text-editor/-/raw/gnome-42/NEWS"
distfiles="${GNOME_SITE}/gnome-text-editor/${version%.*}/gnome-text-editor-$version.tar.xz"
-checksum=b0fbbfcb17c6abc65dfb1ef5ff2fb1cadc1aa9536cd5e8589814b87e7812aa61
+checksum=e56d4a8cdcbce8a8f1c0881b45de799f8b25205ec0cbf2269e532025761cc5da
make_check=no # Tests were compiled with G_DISABLE_ASSERT and are likely no-ops. Aborting.
From cdfb66ab75240207ed547f4ee81957fd4d40e90e Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 20 Sep 2022 20:31:14 +0200
Subject: [PATCH 4/4] Revert "gobject-introspection: update to 1.74.0."
This reverts commit ae1c5edf4765149f34d0ae4987b54c4174cc0208.
---
srcpkgs/gobject-introspection/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template
index 9d8b142f39b0..38b0b927ef0c 100644
--- a/srcpkgs/gobject-introspection/template
+++ b/srcpkgs/gobject-introspection/template
@@ -1,7 +1,8 @@
# Template file for 'gobject-introspection'
pkgname=gobject-introspection
-version=1.74.0
-revision=1
+reverts="1.74.0_1"
+version=1.72.0
+revision=2
build_style=meson
pycompile_dirs="usr/lib/${pkgname}/giscanner"
hostmakedepends="flex pkg-config"
@@ -14,7 +15,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GObjectIntrospection"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=347b3a719e68ba4c69ff2d57ee2689233ea8c07fc492205e573386779e42d653
+checksum=02fe8e590861d88f83060dd39cda5ccaa60b2da1d21d0f95499301b186beaabc
python_version=3
if [ "$CROSS_BUILD" ]; then
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Updated] Revert "glib: update to 2.74.0."
2022-09-20 18:38 [PR PATCH] Revert "glib: update to 2.74.0." paper42
@ 2022-09-21 21:33 ` paper42
2022-09-21 21:35 ` [PR PATCH] [Merged]: " paper42
1 sibling, 0 replies; 3+ messages in thread
From: paper42 @ 2022-09-21 21:33 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1368 bytes --]
There is an updated pull request by paper42 against master on the void-packages repository
https://github.com/paper42/void-packages glib-2.74-revert
https://github.com/void-linux/void-packages/pull/39394
Revert "glib: update to 2.74.0."
#### Testing the changes
- I tested the changes in this PR: **briefly**
issues with the glib update were reported in https://github.com/void-linux/void-packages/issues/39390 and https://github.com/void-linux/void-packages/issues/39393 by @bugcrazy and @lxlml
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/39394.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-glib-2.74-revert-39394.patch --]
[-- Type: text/x-diff, Size: 12264 bytes --]
From 3c67d2913193436ea5652a92c14ab6ee58a4140f Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 20 Sep 2022 20:20:30 +0200
Subject: [PATCH 1/4] Revert "glib: update to 2.74.0."
This reverts commit 6192ddef8a8849b745391796798a0a2a13574a0d.
Gimp seems to have issues with glib 2.74, let's revert for now.
https://github.com/void-linux/void-packages/issues/39393
https://gitlab.gnome.org/GNOME/gimp/-/issues/8636
---
.../glib/patches/disable-broken-tests.patch | 31 ++++++++----
srcpkgs/glib/patches/test-error-musl.patch | 50 -------------------
srcpkgs/glib/template | 27 ++++------
3 files changed, 31 insertions(+), 77 deletions(-)
delete mode 100644 srcpkgs/glib/patches/test-error-musl.patch
diff --git a/srcpkgs/glib/patches/disable-broken-tests.patch b/srcpkgs/glib/patches/disable-broken-tests.patch
index 91345d2b1d26..2a5263007503 100644
--- a/srcpkgs/glib/patches/disable-broken-tests.patch
+++ b/srcpkgs/glib/patches/disable-broken-tests.patch
@@ -6,17 +6,25 @@
},
- 'converter-stream' : {},
'credentials' : {},
- 'data-input-stream' : {},
- 'data-output-stream' : {},
-@@ -198,7 +197,6 @@ endif
+ 'cxx' : {
+ 'source' : ['cxx.cpp'],
+@@ -91,7 +90,6 @@ gio_tests = {
+ 'network-monitor' : {},
+ 'network-monitor-race' : {},
+ 'permission' : {},
+- 'pollable' : {'dependencies' : [libdl_dep]},
+ 'power-profile-monitor' : {},
+ 'proxy-test' : {},
+ 'readwrite' : {},
+@@ -174,7 +172,6 @@ endif
# Test programs buildable on UNIX only
if host_machine.system() != 'windows'
gio_tests += {
- 'file' : {},
- 'gdbus-peer-object-manager' : {},
- 'gdbus-sasl' : {},
- 'live-g-file' : {},
-@@ -814,14 +812,6 @@ if meson.can_run_host_binaries()
+ 'gdbus-peer' : {
+ 'dependencies' : [libgdbus_example_objectmanager_dep],
+ 'install_rpath' : installed_tests_execdir,
+@@ -798,14 +795,6 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
test_resources_binary2,
]
endif
@@ -31,11 +39,9 @@
endif
foreach test_name, extra_args : gio_tests
-diff --git a/glib/tests/meson.build b/glib/tests/meson.build
-index d74617823..1de81a825 100644
--- a/glib/tests/meson.build
+++ b/glib/tests/meson.build
-@@ -11,22 +11,14 @@ glib_tests = {
+@@ -11,25 +11,17 @@ glib_tests = {
'cache' : {},
'charset' : {},
'checksum' : {},
@@ -43,6 +49,9 @@ index d74617823..1de81a825 100644
'completion' : {},
'cond' : {},
- 'convert' : {},
+ 'cxx' : {
+ 'source' : ['cxx.cpp'],
+ },
'dataset' : {},
- 'date' : {
- # FIXME: https://gitlab.gnome.org/GNOME/glib/-/issues/1392
@@ -59,9 +68,9 @@ index d74617823..1de81a825 100644
'suite' : ['slow'],
},
@@ -65,7 +57,6 @@ glib_tests = {
+ 'mutex' : {},
'node' : {},
'once' : {},
- 'onceinit' : {},
- 'option-context' : {},
'option-argv0' : {},
'overflow' : {},
diff --git a/srcpkgs/glib/patches/test-error-musl.patch b/srcpkgs/glib/patches/test-error-musl.patch
deleted file mode 100644
index 427df3de13c7..000000000000
--- a/srcpkgs/glib/patches/test-error-musl.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 902ba0bc0db50ede3473af576bddd2b6a2f9e326 Mon Sep 17 00:00:00 2001
-From: Michal Vasilek <michal@vasilek.cz>
-Date: Sun, 18 Sep 2022 17:30:41 +0200
-Subject: [PATCH] tests: Only run g_error_new_valist() programmer error test on
- glibc
-
-The musl implementation of vasprintf segfaults with NULL
----
- glib/tests/error.c | 18 +++++++++---------
- 1 file changed, 9 insertions(+), 9 deletions(-)
-
-diff --git a/glib/tests/error.c b/glib/tests/error.c
-index 7ea04ea3ce..fa3a25969d 100644
---- a/glib/tests/error.c
-+++ b/glib/tests/error.c
-@@ -123,12 +123,12 @@ static void
- test_new_valist_invalid_va (gpointer dummy,
- ...)
- {
--#ifdef __linux__
-- /* Only worth testing this on Linux; if other platforms regress on this legacy
-- * behaviour, we don’t care. In particular, calling g_error_new_valist() with
-- * a %NULL format will crash on FreeBSD as its implementation of vasprintf()
-- * is less forgiving than Linux’s. That’s fine: it’s a programmer error in
-- * either case. */
-+#if defined(__linux__) && defined(__GLIBC__)
-+ /* Only worth testing this on Linux with glibc; if other platforms regress on
-+ * this legacy behaviour, we don’t care. In particular, calling
-+ * g_error_new_valist() with a %NULL format will crash on FreeBSD as its
-+ * implementation of vasprintf() is less forgiving than Linux’s. That’s
-+ * fine: it’s a programmer error in either case. */
- const struct
- {
- GQuark domain;
-@@ -182,9 +182,9 @@ test_new_valist_invalid_va (gpointer dummy,
-
- va_end (ap);
- }
--#else /* if !__linux__ */
-- g_test_skip ("g_error_new_valist() programmer error handling is only relevant on Linux");
--#endif /* !__linux__ */
-+#else /* if !__linux__ || !__GLIBC__ */
-+ g_test_skip ("g_error_new_valist() programmer error handling is only relevant on Linux with glibc");
-+#endif /* !__linux__ || ! __GLIBC__ */
- }
-
- static void
---
-GitLab
-
diff --git a/srcpkgs/glib/template b/srcpkgs/glib/template
index 33c1d9e0cd7d..cc57bfa490c1 100644
--- a/srcpkgs/glib/template
+++ b/srcpkgs/glib/template
@@ -1,24 +1,24 @@
# Template file for 'glib'
pkgname=glib
-version=2.74.0
-revision=1
+reverts="2.74.0_1"
+version=2.72.2
+revision=3
build_style=meson
# static version is necessary for qemu-user-static;
# also disable LTO, otherwise there are multiple failures when linking qemu
-configure_args="-Dman=true -Dselinux=disabled
+configure_args="-Dfam=false -Dman=true -Dselinux=disabled
$(vopt_bool gtk_doc gtk_doc) --default-library=both -Db_lto=false"
hostmakedepends="gettext pkg-config libxslt docbook-xsl $(vopt_if gtk_doc gtk-doc)"
-makedepends="zlib-devel pcre2-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
+makedepends="zlib-devel pcre-devel libffi-devel dbus-devel elfutils-devel libmount-devel"
checkdepends="desktop-file-utils shared-mime-info dbus python3-pytest"
short_desc="GNU library of C routines"
-maintainer="Michal Vasilek <michal@vasilek.cz>"
+maintainer="Enno Boland <gottox@voidlinux.org>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GLib"
-#changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-74/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/glib/raw/main/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/glib/raw/glib-2-72/NEWS"
distfiles="${GNOME_SITE}/glib/${version%.*}/glib-${version}.tar.xz"
-checksum=3652c7f072d7b031a6b5edd623f77ebc5dcd2ae698598abcc89ff39ca75add30
-make_check_pre="dbus-run-session"
+checksum=78d599a133dba7fe2036dfa8db8fb6131ab9642783fc9578b07a20995252d2de
build_options="gtk_doc"
desc_option_gtk_doc="Build GTK API docs"
@@ -27,13 +27,8 @@ if [ -z "$CROSS_BUILD" ]; then
build_options_default+=" gtk_doc"
fi
-pre_check() {
- # machine-id is a random, non-zero value
- echo 'dcb30309cd6c8b7cc20383d85a5c7012' > /etc/machine-id
-}
-
-post_check() {
- rm /etc/machine-id
+do_check() {
+ dbus-run-session ninja -C build test
}
libglib-devel_package() {
From 5be16341c5650cabaf3a2ce328aa8051d3ab9abc Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 20 Sep 2022 20:27:25 +0200
Subject: [PATCH 2/4] Revert "gtksourceview5: update to 5.6.0."
This reverts commit bc616fa9b074a23474a78ca48012af07b5a70f2e.
depends on glib 2.74 which was reverted
---
srcpkgs/gtksourceview5/template | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/srcpkgs/gtksourceview5/template b/srcpkgs/gtksourceview5/template
index 169abbd9ddf5..5fe51b308735 100644
--- a/srcpkgs/gtksourceview5/template
+++ b/srcpkgs/gtksourceview5/template
@@ -1,7 +1,8 @@
# Template file for 'gtksourceview5'
pkgname=gtksourceview5
-version=5.6.0
-revision=1
+reverts="5.6.0_1"
+version=5.4.2
+revision=2
wrksrc="gtksourceview-${version}"
build_style=meson
build_helper="gir"
@@ -11,15 +12,15 @@ hostmakedepends="glib-devel itstool libxslt pkg-config gtk4 gettext
$(vopt_if gir vala) $(vopt_if gtk_doc gi-docgen)"
makedepends="gtk4-devel libglib-devel libxml2-devel $(vopt_if gir vala)
pcre2-devel"
-checkdepends="xvfb-run mesa-dri cantarell-fonts"
+checkdepends="xvfb-run cantarell-fonts"
short_desc="Text widget that extends GTK4 GtkTextView widget"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GtkSourceView"
-#changelog="https://gitlab.gnome.org/GNOME/gtksourceview/-/raw/gtksourceview-5-6/NEWS"
-changelog="https://gitlab.gnome.org/GNOME/gtksourceview/-/raw/master/NEWS"
+#changelog="https://gitlab.gnome.org/GNOME/gtksourceview/-/raw/master/NEWS"
+changelog="https://gitlab.gnome.org/GNOME/gtksourceview/-/raw/gtksourceview-5-4/NEWS"
distfiles="${GNOME_SITE}/gtksourceview/${version%.*}/gtksourceview-${version}.tar.xz"
-checksum=0ca3df1d2af61bde3608d0d3f233e4a41f958e2ae59b9fc209c3df6102e8afdd
+checksum=ad140e07eb841910de483c092bd4885abd29baadd6e95fa22d93ed2df0b79de7
make_check_pre="xvfb-run"
# Package build options
From f936bfcf8500c82d01efdc7d1e8af05349d422a0 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 20 Sep 2022 20:27:40 +0200
Subject: [PATCH 3/4] Revert "gnome-text-editor: update to 43.0."
This reverts commit 96165d0fc6520ecd069e144e1e37f16e15b4fba7.
depends on glib 2.74 which was reverted
---
srcpkgs/gnome-text-editor/template | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/srcpkgs/gnome-text-editor/template b/srcpkgs/gnome-text-editor/template
index 00453394e832..339257551ea3 100644
--- a/srcpkgs/gnome-text-editor/template
+++ b/srcpkgs/gnome-text-editor/template
@@ -1,17 +1,18 @@
# Template file for 'gnome-text-editor'
pkgname=gnome-text-editor
-version=43.0
-revision=1
+reverts="43.0_1"
+version=42.2
+revision=2
build_style=meson
hostmakedepends="pkg-config gettext itstool glib-devel
gtk-update-icon-cache desktop-file-utils"
makedepends="libglib-devel gtk4-devel gtksourceview5-devel enchant2-devel
- icu-devel libadwaita-devel pcre2-devel editorconfig-devel"
+ icu-devel libadwaita-devel pcre2-devel"
short_desc="Simple text editor"
maintainer="Michal Vasilek <michal@vasilek.cz>"
license="GPL-3.0-or-later"
homepage="https://gitlab.gnome.org/GNOME/gnome-text-editor"
changelog="https://gitlab.gnome.org/GNOME/gnome-text-editor/-/raw/gnome-42/NEWS"
distfiles="${GNOME_SITE}/gnome-text-editor/${version%.*}/gnome-text-editor-$version.tar.xz"
-checksum=b0fbbfcb17c6abc65dfb1ef5ff2fb1cadc1aa9536cd5e8589814b87e7812aa61
+checksum=e56d4a8cdcbce8a8f1c0881b45de799f8b25205ec0cbf2269e532025761cc5da
make_check=no # Tests were compiled with G_DISABLE_ASSERT and are likely no-ops. Aborting.
From 0ccf9bb0048cda8398244a5ec12fdc67c8e1d818 Mon Sep 17 00:00:00 2001
From: Michal Vasilek <michal@vasilek.cz>
Date: Tue, 20 Sep 2022 20:31:14 +0200
Subject: [PATCH 4/4] Revert "gobject-introspection: update to 1.74.0."
This reverts commit ae1c5edf4765149f34d0ae4987b54c4174cc0208.
depends on glib 2.74 which was reverted
---
srcpkgs/gobject-introspection/template | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/srcpkgs/gobject-introspection/template b/srcpkgs/gobject-introspection/template
index 9d8b142f39b0..38b0b927ef0c 100644
--- a/srcpkgs/gobject-introspection/template
+++ b/srcpkgs/gobject-introspection/template
@@ -1,7 +1,8 @@
# Template file for 'gobject-introspection'
pkgname=gobject-introspection
-version=1.74.0
-revision=1
+reverts="1.74.0_1"
+version=1.72.0
+revision=2
build_style=meson
pycompile_dirs="usr/lib/${pkgname}/giscanner"
hostmakedepends="flex pkg-config"
@@ -14,7 +15,7 @@ maintainer="Enno Boland <gottox@voidlinux.org>"
license="GPL-2.0-or-later, LGPL-2.1-or-later"
homepage="https://wiki.gnome.org/Projects/GObjectIntrospection"
distfiles="${GNOME_SITE}/${pkgname}/${version%.*}/${pkgname}-${version}.tar.xz"
-checksum=347b3a719e68ba4c69ff2d57ee2689233ea8c07fc492205e573386779e42d653
+checksum=02fe8e590861d88f83060dd39cda5ccaa60b2da1d21d0f95499301b186beaabc
python_version=3
if [ "$CROSS_BUILD" ]; then
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PR PATCH] [Merged]: Revert "glib: update to 2.74.0."
2022-09-20 18:38 [PR PATCH] Revert "glib: update to 2.74.0." paper42
2022-09-21 21:33 ` [PR PATCH] [Updated] " paper42
@ 2022-09-21 21:35 ` paper42
1 sibling, 0 replies; 3+ messages in thread
From: paper42 @ 2022-09-21 21:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1203 bytes --]
There's a merged pull request on the void-packages repository
Revert "glib: update to 2.74.0."
https://github.com/void-linux/void-packages/pull/39394
Description:
#### Testing the changes
- I tested the changes in this PR: **briefly**
issues with the glib update were reported in https://github.com/void-linux/void-packages/issues/39390 and https://github.com/void-linux/void-packages/issues/39393 by @bugcrazy and @lxlml
<!--
#### New package
- This new package conforms to the [package requirements](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#package-requirements): **YES**|**NO**
-->
<!-- Note: If the build is likely to take more than 2 hours, please add ci skip tag as described in
https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration
and test at least one native build and, if supported, at least one cross build.
Ignore this section if this PR is not skipping CI.
-->
<!--
#### Local build testing
- I built this PR locally for my native architecture, (ARCH-LIBC)
- I built this PR locally for these architectures (if supported. mark crossbuilds):
- aarch64-musl
- armv7l
- armv6l-musl
-->
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2022-09-21 21:35 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-09-20 18:38 [PR PATCH] Revert "glib: update to 2.74.0." paper42
2022-09-21 21:33 ` [PR PATCH] [Updated] " paper42
2022-09-21 21:35 ` [PR PATCH] [Merged]: " paper42
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 NNTP newsgroup(s).