user/glib: bump { 2.71.0 --> 2.72.0 }.

5 files changed, 12 insertions, 78 deletions

diff --git a/user/glib/APKBUILD b/user/glib/APKBUILD
index 7a3417a24..5a91f0591 100644
--- a/user/glib/APKBUILD
+++ b/user/glib/APKBUILD
@@ -1,7 +1,7 @@
 # Contributor: Valery Kartel <valery.kartel@gmail.com>
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=glib
-pkgver=2.71.0
+pkgver=2.72.0
 pkgrel=0
 pkgdesc="Common C routines used by Gtk+ and other libs"
 url="https://developer.gnome.org/glib/"
@@ -18,12 +18,10 @@ subpackages="$pkgname-dbg $pkgname-doc $pkgname-static $pkgname-dev
 source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
 	0001-gquark-fix-initialization-with-c-constructors.patch
 	broken-gio-tests.patch
-	fix-spawn.patch
 	i386-fpu-test.patch
 	musl-no-locale.patch
 	ridiculous-strerror-nonconformance.patch
 	meson-sucks-and-i-hate-you-so-much-right-now.patch
-	wrong-null-type.patch
 	"
 
 # secfixes:
@@ -77,12 +75,10 @@ bashcomp() {
 	[ "$(ls -A "$pkgdir"/usr/share)" ] || rmdir "$pkgdir"/usr/share
 }
 
-sha512sums="833ac450d046e7293a2cabe3157ca393ca0aeac007163384e1705f1860933ae5f1cd1f7f733fd4732c3eaaaa42a941a1c486432c3768ce15238acb37bc2649d6  glib-2.71.0.tar.xz
+sha512sums="351ff025d26348112584bed2c1052427150a8a2f8642c813dae1583fb105184528ad20e264cdf44bbca658a26c280e36acd0e642add112d29edc1b25dfc94fad  glib-2.72.0.tar.xz
 32e5aca9a315fb985fafa0b4355e4498c1f877fc1f0b58ad4ac261fb9fbced9f026c7756a5f2af7d61ce756b55c8cd02811bb08df397040e93510056f073756b  0001-gquark-fix-initialization-with-c-constructors.patch
-479e704acc21f2c574d99e101bc78b47bda6542089b5ec654b1e917592ab3fa583972884a19437bef029c5509ffff0d22b1e4e9d9c55e9fc79ac63895d1556a1  broken-gio-tests.patch
-0f0a98784aeed92f33cd9239d2f668bdc6c09b84ed020825ae88f6aacf6a922152dc3e1384c40d9f30f54c5ab78fe17e0ee5c42b268b297b595d2a6cde5b8998  fix-spawn.patch
+48d367d21a740161431c6ea2e062415e403d1a7af40515c71c60f11a8784d8725595386dc5a801c351540d67dee4186fb4af875f0165d21d13fe1a5167e02099  broken-gio-tests.patch
 aa7444bbdf7b88798adc67c15cdb8b7459450c0b7357caea16b74462c5c9179ba80d4018b1e656e90a5e3be5b2e3c14e9b8c0ccbb2ee4d8c92dc8fa627518b84  i386-fpu-test.patch
-34129be883011d266074783b7283af5c6a45055b85026b5aab47a3a0dfa1316a0a6502aaf78ab172356f67493ea7c4867b53279c25967a8cc5bee9320dbff96a  musl-no-locale.patch
+db9de1fbf953afe76df9047d878c405ceeb6bd674c4382a8437612d788ff1c65c78012831888b2c4916f8125dab6bda50f1bba040744563dc8dcad30aeb1dd4d  musl-no-locale.patch
 56c10a0f64cbd8ce584d428f818e7e678fdeb40a32df792843208ddfa3135d362cc2077bc9fe3bfebe13ee6af0ecf6403a593ad727e0a92276074a17a9c7029c  ridiculous-strerror-nonconformance.patch
-dc1f0232433f6fb2cb2edebc8f5e15b4dcca557191af0a0ca45ff5cc5d109362e1dde4a532b08423e74c6b716801a516ad4ea105435e1332cd1a42f8131df46b  meson-sucks-and-i-hate-you-so-much-right-now.patch
-d94a8224e40bcdfb574aa35fee655d2043854b4039b3912bf27d43dcc10ebf4c70f244bf1847fa16dcda7c0d0b58d4811ce9b5bd3a2f8a0e5abdb80e9b59aded  wrong-null-type.patch"
+dc1f0232433f6fb2cb2edebc8f5e15b4dcca557191af0a0ca45ff5cc5d109362e1dde4a532b08423e74c6b716801a516ad4ea105435e1332cd1a42f8131df46b  meson-sucks-and-i-hate-you-so-much-right-now.patch"
diff --git a/user/glib/broken-gio-tests.patch b/user/glib/broken-gio-tests.patch
index e79925751..75354ad8b 100644
--- a/user/glib/broken-gio-tests.patch
+++ b/user/glib/broken-gio-tests.patch
@@ -37,12 +37,14 @@ Requires update-desktop-database
 +#if 0  // dlclose is noop on musl
        g_type_module_unuse (G_TYPE_MODULE (module));
  
-       found = g_resources_get_info ("/resourceplugin/test1.txt",
-@@ -434,6 +435,7 @@
-       g_assert (!found);
+       found = g_resources_get_info ("/resourceplugin/test1.txt", 
+--- a/gio/tests/resources.c
++++ b/gio/tests/resources.c
+@@ -763,6 +763,7 @@
+       g_assert_false (found);
        g_assert_error (error, G_RESOURCE_ERROR, G_RESOURCE_ERROR_NOT_FOUND);
        g_clear_error (&error);
 +#endif
-     }
- }
  
+       g_clear_object (&module);
+     }
diff --git a/user/glib/fix-spawn.patch b/user/glib/fix-spawn.patch
deleted file mode 100644
index df352fdc3..000000000
--- a/user/glib/fix-spawn.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- glib-2.52.1/glib/tests/spawn-singlethread.c.old	2016-10-22 00:21:35.000000000 -0500
-+++ glib-2.52.1/glib/tests/spawn-singlethread.c	2017-08-20 22:31:52.548311424 -0500
-@@ -210,7 +210,7 @@
-   g_test_init (&argc, &argv, NULL);
- 
-   dirname = g_path_get_dirname (argv[0]);
--  echo_prog_path = g_build_filename (dirname, "test-spawn-echo" EXEEXT, NULL);
-+  echo_prog_path = g_build_filename (dirname, "../test-spawn-echo" EXEEXT, NULL);
-   if (!g_file_test (echo_prog_path, G_FILE_TEST_EXISTS))
-     {
-       g_free (echo_prog_path);
---- glib-2.52.1/glib/tests/spawn-multithreaded.c.old	2016-10-22 00:21:44.000000000 -0500
-+++ glib-2.52.1/glib/tests/spawn-multithreaded.c	2017-08-20 22:32:15.981614460 -0500
-@@ -222,7 +222,7 @@
-   g_test_init (&argc, &argv, NULL);
- 
-   dirname = g_path_get_dirname (argv[0]);
--  echo_prog_path = g_build_filename (dirname, "test-spawn-echo" EXEEXT, NULL);
-+  echo_prog_path = g_build_filename (dirname, "../test-spawn-echo" EXEEXT, NULL);
-   if (!g_file_test (echo_prog_path, G_FILE_TEST_EXISTS))
-     {
-       g_free (echo_prog_path);
diff --git a/user/glib/musl-no-locale.patch b/user/glib/musl-no-locale.patch
index 33b3c32df..1624b0078 100644
--- a/user/glib/musl-no-locale.patch
+++ b/user/glib/musl-no-locale.patch
@@ -9,17 +9,6 @@
      {
        fprintf (stderr, "Cannot set locale to %s, skipping\n", locale);
        goto cleanup; 
---- glib-2.52.1/glib/tests/gdatetime.c.old	2017-03-16 20:12:05.000000000 -0500
-+++ glib-2.52.1/glib/tests/gdatetime.c	2017-08-20 22:20:37.805908983 -0500
-@@ -1068,7 +1068,7 @@
- 
-   oldlocale = g_strdup (setlocale (LC_ALL, NULL));
-   setlocale (LC_ALL, "fa_IR.utf-8");
--  if (strstr (setlocale (LC_ALL, NULL), "fa_IR") != NULL)
-+  if ((1 == 0) && strstr (setlocale (LC_ALL, NULL), "fa_IR") != NULL)
-     {
-       TEST_PRINTF_TIME (23, 0, 0, "%OH", "\333\262\333\263");    /* '23' */
-       TEST_PRINTF_TIME (23, 0, 0, "%OI", "\333\261\333\261");    /* '11' */
 --- 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 @@
@@ -32,27 +21,6 @@
 +  //g_test_add_func ("/conversion/byte-order", test_byte_order);
    g_test_add_func ("/conversion/unicode", test_unicode_conversions);
    g_test_add_func ("/conversion/filename-utf8", test_filename_utf8);
---- glib-2.54.2/glib/tests/collate.c.old	2017-03-08 21:37:21.000000000 -0600
-+++ glib-2.54.2/glib/tests/collate.c	2018-03-01 01:07:56.957714447 -0600
-@@ -279,7 +279,7 @@
- 
-   g_setenv ("LC_ALL", "en_US", TRUE);
-   locale = setlocale (LC_ALL, "");
--  if (locale == NULL || strcmp (locale, "en_US") != 0)
-+  //if (locale == NULL || strcmp (locale, "en_US") != 0)
-     {
-       g_test_message ("No suitable locale, skipping tests");
-       missing_locale = TRUE;
---- glib-2.54.2/tests/run-collate-tests.sh.old	2016-10-22 00:17:10.000000000 -0500
-+++ glib-2.54.2/tests/run-collate-tests.sh	2018-03-01 01:22:01.107722429 -0600
-@@ -1,5 +1,7 @@
- #! /bin/sh
- 
-+exit 77
-+
- fail ()
- {
-   echo "Test failed: $*"
 --- 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 @@
diff --git a/user/glib/wrong-null-type.patch b/user/glib/wrong-null-type.patch
deleted file mode 100644
index 7762f149c..000000000
--- a/user/glib/wrong-null-type.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/glib/tests/cxx.cpp        2022-01-06 14:21:52.890000000 +0000
-+++ b/glib/tests/cxx.cpp        2022-01-06 14:22:11.180000000 +0000
-@@ -56,7 +56,7 @@
- int
- main (int argc, char *argv[])
- {
--  g_test_init (&argc, &argv, NULL);
-+  g_test_init (&argc, &argv, nullptr);
- 
-   g_test_add_func ("/C++/typeof", test_typeof);