From 336a8d0f0ba5525ffaf4384fe16e1546f7aa6ccc Mon Sep 17 00:00:00 2001
From: Zach van Rijn <me@zv.io>
Date: Thu, 6 Jan 2022 14:28:45 +0000
Subject: user/glib: bump { 2.62.6 --> 2.71.0 } to support newer
'user/glib-networking'. fixes #426.
---
user/glib/APKBUILD | 10 ++++++----
user/glib/broken-gio-tests.patch | 13 -------------
user/glib/wrong-null-type.patch | 10 ++++++++++
3 files changed, 16 insertions(+), 17 deletions(-)
create mode 100644 user/glib/wrong-null-type.patch
diff --git a/user/glib/APKBUILD b/user/glib/APKBUILD
index 083aee633..7a3417a24 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.62.6
+pkgver=2.71.0
pkgrel=0
pkgdesc="Common C routines used by Gtk+ and other libs"
url="https://developer.gnome.org/glib/"
@@ -23,6 +23,7 @@ source="https://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgve
musl-no-locale.patch
ridiculous-strerror-nonconformance.patch
meson-sucks-and-i-hate-you-so-much-right-now.patch
+ wrong-null-type.patch
"
# secfixes:
@@ -76,11 +77,12 @@ bashcomp() {
[ "$(ls -A "$pkgdir"/usr/share)" ] || rmdir "$pkgdir"/usr/share
}
-sha512sums="8e3972a371f3c1a50b7d245b30e4f740583ad72ba4ab325e0e15e0732be44dfb69b603fb39dcf4989255a23a181e9ea5dd25982dd94c386cd9f21952243ad6f5 glib-2.62.6.tar.xz
+sha512sums="833ac450d046e7293a2cabe3157ca393ca0aeac007163384e1705f1860933ae5f1cd1f7f733fd4732c3eaaaa42a941a1c486432c3768ce15238acb37bc2649d6 glib-2.71.0.tar.xz
32e5aca9a315fb985fafa0b4355e4498c1f877fc1f0b58ad4ac261fb9fbced9f026c7756a5f2af7d61ce756b55c8cd02811bb08df397040e93510056f073756b 0001-gquark-fix-initialization-with-c-constructors.patch
-657d3fdf7f8ac7edd5bae572d00497f2236fbe5a91a577f3cb7ceb2ccf067f2944918b2b90308fc1061f45daf3d4910067b98642383ce8761da2a1faff6e9b4f broken-gio-tests.patch
+479e704acc21f2c574d99e101bc78b47bda6542089b5ec654b1e917592ab3fa583972884a19437bef029c5509ffff0d22b1e4e9d9c55e9fc79ac63895d1556a1 broken-gio-tests.patch
0f0a98784aeed92f33cd9239d2f668bdc6c09b84ed020825ae88f6aacf6a922152dc3e1384c40d9f30f54c5ab78fe17e0ee5c42b268b297b595d2a6cde5b8998 fix-spawn.patch
aa7444bbdf7b88798adc67c15cdb8b7459450c0b7357caea16b74462c5c9179ba80d4018b1e656e90a5e3be5b2e3c14e9b8c0ccbb2ee4d8c92dc8fa627518b84 i386-fpu-test.patch
34129be883011d266074783b7283af5c6a45055b85026b5aab47a3a0dfa1316a0a6502aaf78ab172356f67493ea7c4867b53279c25967a8cc5bee9320dbff96a musl-no-locale.patch
56c10a0f64cbd8ce584d428f818e7e678fdeb40a32df792843208ddfa3135d362cc2077bc9fe3bfebe13ee6af0ecf6403a593ad727e0a92276074a17a9c7029c ridiculous-strerror-nonconformance.patch
-dc1f0232433f6fb2cb2edebc8f5e15b4dcca557191af0a0ca45ff5cc5d109362e1dde4a532b08423e74c6b716801a516ad4ea105435e1332cd1a42f8131df46b meson-sucks-and-i-hate-you-so-much-right-now.patch"
+dc1f0232433f6fb2cb2edebc8f5e15b4dcca557191af0a0ca45ff5cc5d109362e1dde4a532b08423e74c6b716801a516ad4ea105435e1332cd1a42f8131df46b meson-sucks-and-i-hate-you-so-much-right-now.patch
+d94a8224e40bcdfb574aa35fee655d2043854b4039b3912bf27d43dcc10ebf4c70f244bf1847fa16dcda7c0d0b58d4811ce9b5bd3a2f8a0e5abdb80e9b59aded wrong-null-type.patch"
diff --git a/user/glib/broken-gio-tests.patch b/user/glib/broken-gio-tests.patch
index 0c1e3acb5..e79925751 100644
--- a/user/glib/broken-gio-tests.patch
+++ b/user/glib/broken-gio-tests.patch
@@ -27,19 +27,6 @@ Requires working iconv
-Requires dconf
---- glib-2.52.1/gio/tests/gsettings.c.old 2017-08-20 23:26:31.284378974 -0500
-+++ glib-2.52.1/gio/tests/gsettings.c 2017-08-20 23:26:46.637699607 -0500
-@@ -2603,6 +2603,8 @@
- gchar *schema_text;
- gchar *enums;
- gint result;
-+ printf("1..0\n");
-+ return 0;
-
- setlocale (LC_ALL, "");
-
-
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
diff --git a/user/glib/wrong-null-type.patch b/user/glib/wrong-null-type.patch
new file mode 100644
index 000000000..7762f149c
--- /dev/null
+++ b/user/glib/wrong-null-type.patch
@@ -0,0 +1,10 @@
+--- 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);
--
cgit v1.2.3-70-g09d2