aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--main/glib/APKBUILD10
-rw-r--r--main/glib/mips-disable-memory-barrier.patch11
-rw-r--r--main/glib/mips-disable-some-gio-test-resources.patch11
-rw-r--r--main/glib/musl-libintl.patch19
4 files changed, 9 insertions, 42 deletions
diff --git a/main/glib/APKBUILD b/main/glib/APKBUILD
index 9d93418837..634422b752 100644
--- a/main/glib/APKBUILD
+++ b/main/glib/APKBUILD
@@ -3,7 +3,7 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
pkgname=glib
-pkgver=2.64.5
+pkgver=2.66.0
pkgrel=0
pkgdesc="Common C routines used by Gtk+ and other libs"
url="https://developer.gnome.org/glib/"
@@ -18,8 +18,6 @@ source="https://download.gnome.org/sources/glib/${pkgver%.*}/glib-$pkgver.tar.xz
0001-gquark-fix-initialization-with-c-constructors.patch
deprecated-no-warn.patch
musl-libintl.patch
- mips-disable-memory-barrier.patch
- mips-disable-some-gio-test-resources.patch
"
subpackages="$pkgname-dbg $pkgname-doc $pkgname-static $pkgname-dev $pkgname-lang"
@@ -66,9 +64,7 @@ static() {
mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib/
}
-sha512sums="a87537274619b6de88a0e68555059036ac18c748b5005c8d84728646b0db342fde0b8c5b303b9ad79f64d71ea4ed990d52a4fbd68cda3ca74aed5fe4d497e060 glib-2.64.5.tar.xz
+sha512sums="358e6a840b722139593eb7825c3aa70153eb26036e05d13d3286bcc6d2e962c2b4ddcb0fe5c6728b89bfffbd178101e72c576081ae714326a272a9fc34ed953e glib-2.66.0.tar.xz
32e5aca9a315fb985fafa0b4355e4498c1f877fc1f0b58ad4ac261fb9fbced9f026c7756a5f2af7d61ce756b55c8cd02811bb08df397040e93510056f073756b 0001-gquark-fix-initialization-with-c-constructors.patch
744239ea2afb47e15d5d0214c37d7c798edac53797ca3ac14d515aee4cc3999ef9716ba744c64c40198fb259edc922559f77c9051104a568fc8ee4fc790810b1 deprecated-no-warn.patch
-6ec43e76bb973367bd99c5e2077113e86df2b120b3788aeeb4692a572392bba7227e8217b28a918e02ad82fcb8ca6d260c3221b84688774d86779755af51a847 musl-libintl.patch
-f853ddb4ff8231e1df15323773af938323517b643b241fc635d05f7d6e103ff18417d203c65661c7dd0b5e44c5d74c71a497e82281c2bb4ed4e2fe9b9ed7140f mips-disable-memory-barrier.patch
-755c468622e1923967d52de4878d641ec7d31bd0f83b0756d61cb668220213d6db1a751826f4f1fb611e998b653afc1e367fe0fe475063737c9786f84ee91538 mips-disable-some-gio-test-resources.patch"
+2211140fde86c9a80f67d0ce54dfd3e9e77d61dc14aa9d4c3df6f995582dde48b334622785f54b516cdc37f9cb27e3c75018f4134a72b519801ddd64078841b8 musl-libintl.patch"
diff --git a/main/glib/mips-disable-memory-barrier.patch b/main/glib/mips-disable-memory-barrier.patch
deleted file mode 100644
index e442764792..0000000000
--- a/main/glib/mips-disable-memory-barrier.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- glib-2.62.3.orig/meson.build
-+++ glib-2.62.3/meson.build
-@@ -1586,7 +1586,7 @@
-
- # We need a more robust approach here...
- host_cpu_family = host_machine.cpu_family()
--if host_cpu_family == 'x86' or host_cpu_family == 'x86_64' or host_cpu_family == 's390' or host_cpu_family == 's390x' or host_cpu_family.startswith('arm') or host_cpu_family == 'aarch64' or host_cpu_family.startswith('crisv32') or host_cpu_family.startswith('etrax')
-+if host_cpu_family == 'x86' or host_cpu_family == 'x86_64' or host_cpu_family == 's390' or host_cpu_family == 's390x' or host_cpu_family.startswith('arm') or host_cpu_family == 'aarch64' or host_cpu_family.startswith('crisv32') or host_cpu_family.startswith('etrax') or host_cpu_family.startswith('mips')
- glib_memory_barrier_needed = false
- elif host_cpu_family.startswith('sparc') or host_cpu_family.startswith('alpha') or host_cpu_family.startswith('powerpc') or host_cpu_family == 'ia64'
- glib_memory_barrier_needed = true
diff --git a/main/glib/mips-disable-some-gio-test-resources.patch b/main/glib/mips-disable-some-gio-test-resources.patch
deleted file mode 100644
index 6327812bf0..0000000000
--- a/main/glib/mips-disable-some-gio-test-resources.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- glib-2.64.1.orig/gio/tests/meson.build
-+++ glib-2.64.1/gio/tests/meson.build
-@@ -668,7 +668,7 @@
-
- ld = find_program('ld', required : false)
-
-- if build_machine.system() == 'linux' and cc.get_id() == 'gcc' and objcopy.found() and objcopy_supports_add_symbol and ld.found()
-+ if build_machine.system() == 'linux' and cc.get_id() == 'gcc' and objcopy.found() and objcopy_supports_add_symbol and ld.found() and host_machine.cpu_family() != 'mips64'
- test_gresource_binary = custom_target('test5.gresource',
- input : 'test5.gresource.xml',
- output : 'test5.gresource',
diff --git a/main/glib/musl-libintl.patch b/main/glib/musl-libintl.patch
index d54bd3fa43..21646a20b2 100644
--- a/main/glib/musl-libintl.patch
+++ b/main/glib/musl-libintl.patch
@@ -2,27 +2,20 @@ diff --git a/meson.build b/meson.build
index 8320449..1d05edd 100644
--- a/meson.build
+++ b/meson.build
-@@ -1785,10 +1785,10 @@ endif
- # proxy-libintl subproject.
+@@ -2003,9 +2003,6 @@
# FIXME: glib-gettext.m4 has much more checks to detect broken/uncompatible
# implementations. This could be extended if issues are found in some platforms.
+ libintl_deps = []
-if cc.has_function('ngettext')
-- libintl = []
- have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset')
-else
-+#if cc.has_function('ngettext')
-+# libintl = []
-+# have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset')
-+#else
+ # First just find the bare library.
libintl = cc.find_library('intl', required : false)
- if not libintl.found()
- libintl = subproject('proxy-libintl').get_variable('intl_dep')
-@@ -1797,7 +1797,7 @@ else
+ # The bare library probably won't link without help if it's static.
+@@ -2037,7 +2034,6 @@
have_bind_textdomain_codeset = cc.has_function('bind_textdomain_codeset',
- dependencies : libintl)
+ dependencies : libintl_deps)
endif
-endif
-+#endif
glib_conf.set('HAVE_BIND_TEXTDOMAIN_CODESET', have_bind_textdomain_codeset)
-