diff options
Diffstat (limited to 'user/glib')
-rw-r--r-- | user/glib/0001-gquark-fix-initialization-with-c-constructors.patch | 2 | ||||
-rw-r--r-- | user/glib/APKBUILD | 43 | ||||
-rw-r--r-- | user/glib/broken-gio-tests.patch | 31 | ||||
-rw-r--r-- | user/glib/fix-spawn.patch | 22 | ||||
-rw-r--r-- | user/glib/i386-fpu-test.patch | 2 | ||||
-rw-r--r-- | user/glib/meson-sucks-and-i-hate-you-so-much-right-now.patch | 8 | ||||
-rw-r--r-- | user/glib/musl-no-locale.patch | 38 | ||||
-rw-r--r-- | user/glib/ridiculous-strerror-nonconformance.patch | 2 | ||||
-rw-r--r-- | user/glib/sigstksz.patch | 20 |
9 files changed, 58 insertions, 110 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 8640fcf1b..1de391541 100644 --- a/user/glib/APKBUILD +++ b/user/glib/APKBUILD @@ -1,48 +1,50 @@ # Contributor: Valery Kartel <valery.kartel@gmail.com> # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=glib -pkgver=2.60.6 +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="" +depends="dbus" depends_dev="perl python3 attr-dev bzip2-dev libffi-dev util-linux-dev" -checkdepends="tzdata shared-mime-info" -makedepends="$depends_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" 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 + sigstksz.patch " -subpackages="$pkgname-dbg $pkgname-doc $pkgname-static $pkgname-dev $pkgname-lang $pkgname-bash-completion:bashcomp:noarch" # secfixes: # 2.60.4-r0: # - 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,11 +77,10 @@ bashcomp() { [ "$(ls -A "$pkgdir"/usr/share)" ] || rmdir "$pkgdir"/usr/share } -sha512sums="2e079d2268e0cd4dd234501c03e7784a69258ea2303e62baa4869ff7a442d121c2ffdc742467e3b0b46ad953b831962e1dd847463d66b2b28745ba0f0bfd28d9 glib-2.60.6.tar.xz -32e5aca9a315fb985fafa0b4355e4498c1f877fc1f0b58ad4ac261fb9fbced9f026c7756a5f2af7d61ce756b55c8cd02811bb08df397040e93510056f073756b 0001-gquark-fix-initialization-with-c-constructors.patch -657d3fdf7f8ac7edd5bae572d00497f2236fbe5a91a577f3cb7ceb2ccf067f2944918b2b90308fc1061f45daf3d4910067b98642383ce8761da2a1faff6e9b4f broken-gio-tests.patch -0f0a98784aeed92f33cd9239d2f668bdc6c09b84ed020825ae88f6aacf6a922152dc3e1384c40d9f30f54c5ab78fe17e0ee5c42b268b297b595d2a6cde5b8998 fix-spawn.patch -aa7444bbdf7b88798adc67c15cdb8b7459450c0b7357caea16b74462c5c9179ba80d4018b1e656e90a5e3be5b2e3c14e9b8c0ccbb2ee4d8c92dc8fa627518b84 i386-fpu-test.patch -34129be883011d266074783b7283af5c6a45055b85026b5aab47a3a0dfa1316a0a6502aaf78ab172356f67493ea7c4867b53279c25967a8cc5bee9320dbff96a musl-no-locale.patch -56c10a0f64cbd8ce584d428f818e7e678fdeb40a32df792843208ddfa3135d362cc2077bc9fe3bfebe13ee6af0ecf6403a593ad727e0a92276074a17a9c7029c ridiculous-strerror-nonconformance.patch -d788005bc92ed1510235b77a9a26eecd78840a3e915a64e53e1e93cd1efaaeb1b9b5edb115f41352fcbdab10006b91b4aae7af20184c904e869a0d6893080368 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 0c1e3acb5..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 }, @@ -27,35 +27,24 @@ 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 -@@ -426,6 +426,7 @@ +@@ -819,6 +819,7 @@ g_assert_cmpstr (g_bytes_get_data (data, NULL), ==, "test1\n"); g_bytes_unref (data); +#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 +@@ -828,6 +828,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/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 ba38bdec2..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 -@@ -6,4 +6,5 @@ - charset_lib = static_library('charset', 'localcharset.c', - include_directories : configinc, - pic : true, -+ install : true, - c_args : [ '-DGLIB_CHARSETALIAS_DIR="@0@"'.format(charsetalias_dir) ] + glib_hidden_visibility_args) diff --git a/user/glib/musl-no-locale.patch b/user/glib/musl-no-locale.patch index 33b3c32df..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); @@ -9,20 +9,9 @@ { 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 @@ +@@ -995,7 +995,7 @@ g_test_add_func ("/conversion/no-conv", test_no_conv); g_test_add_func ("/conversion/iconv-state", test_iconv_state); @@ -32,30 +21,9 @@ + //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 @@ +@@ -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. */ |