user/glib: Update to 2.84.0

Patch is needed until musl has a fix for _SC_MINSIGSTKSZ on ppc64.

Closes: #1314

8 files changed, 49 insertions, 35 deletions

diff --git a/user/glib/0001-gquark-fix-initialization-with-c-constructors.patch b/user/glib/0001-gquark-fix-initialization-with-c-constructors.patch
index 50a9a8c28..ba4c03906 100644
--- a/user/glib/0001-gquark-fix-initialization-with-c-constructors.patch
+++ b/user/glib/0001-gquark-fix-initialization-with-c-constructors.patch
@@ -20,7 +20,7 @@ diff --git a/glib/gquark.c b/glib/gquark.c
 index 9e51a92..17ecd7f 100644
 --- a/glib/gquark.c
 +++ b/glib/gquark.c
-@@ -57,6 +57,11 @@ static gint           quark_block_offset = 0;
+@@ -60,6 +60,11 @@ static gint           quark_block_offset = 0;
  void
  g_quark_init (void)
  {
diff --git a/user/glib/APKBUILD b/user/glib/APKBUILD
index 45d91ed79..1de391541 100644
--- a/user/glib/APKBUILD
+++ b/user/glib/APKBUILD
@@ -1,17 +1,16 @@
 # Contributor: Valery Kartel <valery.kartel@gmail.com>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=glib
-pkgver=2.72.4
+pkgver=2.84.0
 pkgrel=0
 pkgdesc="Common C routines used by Gtk+ and other libs"
 url="https://developer.gnome.org/glib/"
 arch="all"
-options="!check" # Now requires D-Bus running.
 license="LGPL-2.1+"
 depends="dbus"
 depends_dev="perl python3 attr-dev bzip2-dev libffi-dev util-linux-dev"
-checkdepends="tzdata shared-mime-info"
-makedepends="$depends_dev dbus-dev meson ninja pcre-dev xmlto zlib-dev"
+checkdepends="dbus-x11 tzdata shared-mime-info"
+makedepends="$depends_dev dbus-dev meson pcre2-dev py3-docutils xmlto zlib-dev"
 triggers="$pkgname.trigger=/usr/share/glib-2.0/schemas:/usr/lib/gio/modules"
 subpackages="$pkgname-dbg $pkgname-doc $pkgname-static $pkgname-dev
 	$pkgname-lang $pkgname-bash-completion:bashcomp:noarch"
@@ -21,7 +20,7 @@ source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgve
 	i386-fpu-test.patch
 	musl-no-locale.patch
 	ridiculous-strerror-nonconformance.patch
-	meson-sucks-and-i-hate-you-so-much-right-now.patch
+	sigstksz.patch
 	"
 
 # secfixes:
@@ -29,20 +28,23 @@ source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgve
 #     - CVE-2019-12450
 
 build() {
-	meson --default-library=both \
+	meson setup \
+		--default-library=both \
 		-Dprefix=/usr \
 		-Dselinux=disabled \
-		-Dman=true build
-	ninja -C build
+		-Dman-pages=enabled \
+		--wrap-mode=nofallback \
+		build
+	meson compile -C build
 }
 
 check() {
 	# workaround if a user builds it on a computer running X11
-	DISPLAY= ninja -C build test
+	DISPLAY= dbus-run-session meson test -C build
 }
 
 package() {
-	DESTDIR="$pkgdir" ninja -C build install
+	DESTDIR="$pkgdir" meson install -C build
 	rm -rf "$pkgdir"/usr/lib/charset.alias
 }
 
@@ -75,10 +77,10 @@ bashcomp() {
 	[ "$(ls -A "$pkgdir"/usr/share)" ] || rmdir "$pkgdir"/usr/share
 }
 
-sha512sums="b4e2e0985e2184ee9656c4f1b4e15d8d1264f3d23d31349bc43d92e8432cffa48e1685c40517efb08dc5b57b8285acf65f2747deeb50e50d9cacec7160e7edf8  glib-2.72.4.tar.xz
-32e5aca9a315fb985fafa0b4355e4498c1f877fc1f0b58ad4ac261fb9fbced9f026c7756a5f2af7d61ce756b55c8cd02811bb08df397040e93510056f073756b  0001-gquark-fix-initialization-with-c-constructors.patch
-48d367d21a740161431c6ea2e062415e403d1a7af40515c71c60f11a8784d8725595386dc5a801c351540d67dee4186fb4af875f0165d21d13fe1a5167e02099  broken-gio-tests.patch
-aa7444bbdf7b88798adc67c15cdb8b7459450c0b7357caea16b74462c5c9179ba80d4018b1e656e90a5e3be5b2e3c14e9b8c0ccbb2ee4d8c92dc8fa627518b84  i386-fpu-test.patch
-db9de1fbf953afe76df9047d878c405ceeb6bd674c4382a8437612d788ff1c65c78012831888b2c4916f8125dab6bda50f1bba040744563dc8dcad30aeb1dd4d  musl-no-locale.patch
-56c10a0f64cbd8ce584d428f818e7e678fdeb40a32df792843208ddfa3135d362cc2077bc9fe3bfebe13ee6af0ecf6403a593ad727e0a92276074a17a9c7029c  ridiculous-strerror-nonconformance.patch
-dc1f0232433f6fb2cb2edebc8f5e15b4dcca557191af0a0ca45ff5cc5d109362e1dde4a532b08423e74c6b716801a516ad4ea105435e1332cd1a42f8131df46b  meson-sucks-and-i-hate-you-so-much-right-now.patch"
+sha512sums="72b85e30c535c5da7d8598d1cec02b1b481c467e612dbb396a0a64ad1d37cf2f1802c6fa576885c99cf8a22f4f0fc7dfdf42a3f32f7f40394f72db588fdbebb7  glib-2.84.0.tar.xz
+ee128ea2f1b4d1b3179bbc4af56ebb671e1e6a1d0c4d9b279ecf77bc33dc6ab34d5dcbe35af7f5fd703c4eda3cc06cfabe1ee39ead059401ff7902500f2eefe6  0001-gquark-fix-initialization-with-c-constructors.patch
+348fa10b38c8d7ea4181dbfd321c33d62475fc83461235e33ff5fb5170f2af44e587bd2f4805c49004ef6e33ed89252a493cf88687a246c4e34c1c09e14cb047  broken-gio-tests.patch
+69e23d20b2682eb6adc013f78160902ad9a9703e06904b98725541b6d20f6bf5ce8958a5b43831485c87f6d8116768f591a5d5ee6c2c6ce6843581d6d05b8599  i386-fpu-test.patch
+0b5515a9fd4bfe566d2d236374a8cdbec49191030aa74c56e0fe1b297daf65b172ce5e02477d3bc1e67a2c07bc979fd9de4ce2fb7a00a9754f88b5e76d2dddf2  musl-no-locale.patch
+06af1c22004c34ae896bb5eaeb94599b42e46769408ac4c2575d809307922005d65d0053b9aeccb2049b85303cc1ba5d26cac733608aa2d407ad9ae39210beb0  ridiculous-strerror-nonconformance.patch
+893a61dac6b4da6330bab9d5b9a9f7b3ae6643f4681895e24cc4a55518bdf16996af6175149299fbf782e633f7a37e308e7c3b52f9eb58d24f7fcf0c015e947b  sigstksz.patch"
diff --git a/user/glib/broken-gio-tests.patch b/user/glib/broken-gio-tests.patch
index 75354ad8b..bb5b32418 100644
--- a/user/glib/broken-gio-tests.patch
+++ b/user/glib/broken-gio-tests.patch
@@ -1,7 +1,7 @@
 Requires update-desktop-database
 --- glib-2.52.1/gio/tests/appinfo.c.old	2016-10-22 00:17:49.000000000 -0500
 +++ glib-2.52.1/gio/tests/appinfo.c	2017-08-20 23:23:32.581229536 -0500
-@@ -486,7 +486,7 @@
+@@ -637,7 +637,7 @@
    g_test_add_func ("/appinfo/launch-context", test_launch_context);
    g_test_add_func ("/appinfo/launch-context-signals", test_launch_context_signals);
    g_test_add_func ("/appinfo/tryexec", test_tryexec);
@@ -15,7 +15,7 @@ Requires update-desktop-database
 Requires working iconv
 --- glib-2.52.1/gio/tests/converter-stream.c.old	2016-10-22 00:18:11.000000000 -0500
 +++ glib-2.52.1/gio/tests/converter-stream.c	2017-08-20 23:21:31.711358101 -0500
-@@ -1203,7 +1203,7 @@
+@@ -1208,7 +1208,7 @@
    };
    CharsetTest charset_tests[] = {
      { "/converter-input-stream/charset/utf8->latin1", "UTF-8", "\303\205rr Sant\303\251", "ISO-8859-1", "\305rr Sant\351", 0 },
@@ -30,7 +30,7 @@ Requires working iconv
 Requires update-desktop-database
 --- glib-2.52.1/gio/tests/resources.c.old	2016-10-22 00:18:12.000000000 -0500
 +++ glib-2.52.1/gio/tests/resources.c	2017-08-20 23:39:47.127025718 -0500
-@@ -426,6 +426,7 @@
+@@ -819,6 +819,7 @@
        g_assert_cmpstr (g_bytes_get_data (data, NULL), ==, "test1\n");
        g_bytes_unref (data);
  
@@ -40,7 +40,7 @@ Requires update-desktop-database
        found = g_resources_get_info ("/resourceplugin/test1.txt", 
 --- a/gio/tests/resources.c
 +++ b/gio/tests/resources.c
-@@ -763,6 +763,7 @@
+@@ -828,6 +828,7 @@
        g_assert_false (found);
        g_assert_error (error, G_RESOURCE_ERROR, G_RESOURCE_ERROR_NOT_FOUND);
        g_clear_error (&error);
diff --git a/user/glib/i386-fpu-test.patch b/user/glib/i386-fpu-test.patch
index 986c33164..f400a10d6 100644
--- a/user/glib/i386-fpu-test.patch
+++ b/user/glib/i386-fpu-test.patch
@@ -1,6 +1,6 @@
 --- glib-2.54.2/glib/tests/timer.c.old	2016-10-22 00:21:30.000000000 -0500
 +++ glib-2.54.2/glib/tests/timer.c	2018-03-03 18:39:40.424741042 -0600
-@@ -203,7 +203,10 @@
+@@ -386,7 +386,10 @@
  {
    g_test_init (&argc, &argv, NULL);
  
diff --git a/user/glib/meson-sucks-and-i-hate-you-so-much-right-now.patch b/user/glib/meson-sucks-and-i-hate-you-so-much-right-now.patch
deleted file mode 100644
index 1e63ac0f4..000000000
--- a/user/glib/meson-sucks-and-i-hate-you-so-much-right-now.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- glib-2.58.0/glib/libcharset/meson.build.old	2018-08-30 17:12:09.000000000 +0000
-+++ glib-2.58.0/glib/libcharset/meson.build	2018-09-10 03:42:01.930000000 +0000
-@@ -1,4 +1,5 @@
- charset_lib = static_library('charset', 'localcharset.c',
-   include_directories : configinc,
-   pic : true,
-+  install : true,
-   c_args : [ '-DGLIB_CHARSETALIAS_DIR="@0@"'.format(glib_charsetaliasdir) ] + glib_hidden_visibility_args)
diff --git a/user/glib/musl-no-locale.patch b/user/glib/musl-no-locale.patch
index 1624b0078..461454fc0 100644
--- a/user/glib/musl-no-locale.patch
+++ b/user/glib/musl-no-locale.patch
@@ -1,6 +1,6 @@
 --- glib-2.52.1/glib/tests/option-context.c.old	2016-10-22 05:21:34.000000000 +0000
 +++ glib-2.52.1/glib/tests/option-context.c	2017-08-20 23:14:46.364133517 +0000
-@@ -638,7 +638,7 @@
+@@ -641,7 +641,7 @@
    
    old_locale = g_strdup (setlocale (LC_NUMERIC, locale));
    current_locale = setlocale (LC_NUMERIC, NULL);
@@ -11,7 +11,7 @@
        goto cleanup; 
 --- glib-2.52.1/glib/tests/convert.c.old	2016-10-22 00:21:34.000000000 -0500
 +++ glib-2.52.1/glib/tests/convert.c	2017-08-20 22:51:48.363430954 -0500
-@@ -707,7 +707,7 @@
+@@ -995,7 +995,7 @@
  
    g_test_add_func ("/conversion/no-conv", test_no_conv);
    g_test_add_func ("/conversion/iconv-state", test_iconv_state);
@@ -23,7 +23,7 @@
    g_test_add_func ("/conversion/filename-utf8", test_filename_utf8);
 --- glib-2.56.1/glib/tests/gdatetime.c.old	2018-07-02 21:11:49.890000000 -0500
 +++ glib-2.56.1/glib/tests/gdatetime.c	2018-07-02 21:19:30.340000000 -0500
-@@ -2329,7 +2329,6 @@
+@@ -3547,7 +3547,6 @@
    g_test_add_func ("/GDateTime/printf", test_GDateTime_printf);
    g_test_add_func ("/GDateTime/non_utf8_printf", test_non_utf8_printf);
    g_test_add_func ("/GDateTime/strftime", test_strftime);
diff --git a/user/glib/ridiculous-strerror-nonconformance.patch b/user/glib/ridiculous-strerror-nonconformance.patch
index 3ffc0aafa..b900672a8 100644
--- a/user/glib/ridiculous-strerror-nonconformance.patch
+++ b/user/glib/ridiculous-strerror-nonconformance.patch
@@ -1,6 +1,6 @@
 --- glib-2.52.1/glib/tests/strfuncs.c.old	2016-10-22 00:21:44.000000000 -0500
 +++ glib-2.52.1/glib/tests/strfuncs.c	2017-08-20 22:48:18.233702952 -0500
-@@ -1335,7 +1335,7 @@
+@@ -2067,7 +2067,7 @@
    setlocale (LC_ALL, "C");
  
    strs = g_hash_table_new (g_str_hash, g_str_equal);
diff --git a/user/glib/sigstksz.patch b/user/glib/sigstksz.patch
new file mode 100644
index 000000000..b0de031f1
--- /dev/null
+++ b/user/glib/sigstksz.patch
@@ -0,0 +1,20 @@
+See-also: https://inbox.vuxu.org/musl/D3S38EL8UO9V.U731IQFLR32X@ayaya.dev/
+
+--- glib-2.84.0/glib/tests/unix.c.old	2025-03-06 07:09:13.000000000 -0600
++++ glib-2.84.0/glib/tests/unix.c	2025-05-04 21:55:45.796547202 -0500
+@@ -588,13 +588,13 @@
+ #ifndef SA_ONSTACK
+   g_test_skip ("alternate stack is not supported");
+ #else
+-  size_t minsigstksz = MINSIGSTKSZ;
++  size_t minsigstksz = 32768;
+   guint8 *stack_memory = NULL;
+   guint8 *zero_mem = NULL;
+   stack_t stack = { 0 };
+   stack_t old_stack = { 0 };
+ 
+-#ifdef _SC_MINSIGSTKSZ
++#if 0
+   /* Use the kernel-provided minimum stack size, if available. Otherwise default
+    * to MINSIGSTKSZ. Unfortunately that might not be big enough for huge
+    * register files for big CPU instruction set extensions. */