commit 0c567ab43dc3a400e6448b2e15c7b3262895d27b Author: Tim Biermann <tbier@posteo.de> Date: Fri Mar 10 19:45:10 2023 +0100 glib-32: 2.74.6 -> 2.76.0 diff --git a/glib-32/.footprint b/glib-32/.footprint index 62a9056..8ef89fb 100644 --- a/glib-32/.footprint +++ b/glib-32/.footprint @@ -10,20 +10,20 @@ drwxr-xr-x root/root usr/lib32/glib-2.0/include/ drwxr-xr-x root/root usr/lib32/glib/ -rwxr-xr-x root/root usr/lib32/glib/gio-launch-desktop lrwxrwxrwx root/root usr/lib32/libgio-2.0.so -> libgio-2.0.so.0 -lrwxrwxrwx root/root usr/lib32/libgio-2.0.so.0 -> libgio-2.0.so.0.7400.6 --rwxr-xr-x root/root usr/lib32/libgio-2.0.so.0.7400.6 +lrwxrwxrwx root/root usr/lib32/libgio-2.0.so.0 -> libgio-2.0.so.0.7600.0 +-rwxr-xr-x root/root usr/lib32/libgio-2.0.so.0.7600.0 lrwxrwxrwx root/root usr/lib32/libglib-2.0.so -> libglib-2.0.so.0 -lrwxrwxrwx root/root usr/lib32/libglib-2.0.so.0 -> libglib-2.0.so.0.7400.6 --rwxr-xr-x root/root usr/lib32/libglib-2.0.so.0.7400.6 +lrwxrwxrwx root/root usr/lib32/libglib-2.0.so.0 -> libglib-2.0.so.0.7600.0 +-rwxr-xr-x root/root usr/lib32/libglib-2.0.so.0.7600.0 lrwxrwxrwx root/root usr/lib32/libgmodule-2.0.so -> libgmodule-2.0.so.0 -lrwxrwxrwx root/root usr/lib32/libgmodule-2.0.so.0 -> libgmodule-2.0.so.0.7400.6 --rwxr-xr-x root/root usr/lib32/libgmodule-2.0.so.0.7400.6 +lrwxrwxrwx root/root usr/lib32/libgmodule-2.0.so.0 -> libgmodule-2.0.so.0.7600.0 +-rwxr-xr-x root/root usr/lib32/libgmodule-2.0.so.0.7600.0 lrwxrwxrwx root/root usr/lib32/libgobject-2.0.so -> libgobject-2.0.so.0 -lrwxrwxrwx root/root usr/lib32/libgobject-2.0.so.0 -> libgobject-2.0.so.0.7400.6 --rwxr-xr-x root/root usr/lib32/libgobject-2.0.so.0.7400.6 +lrwxrwxrwx root/root usr/lib32/libgobject-2.0.so.0 -> libgobject-2.0.so.0.7600.0 +-rwxr-xr-x root/root usr/lib32/libgobject-2.0.so.0.7600.0 lrwxrwxrwx root/root usr/lib32/libgthread-2.0.so -> libgthread-2.0.so.0 -lrwxrwxrwx root/root usr/lib32/libgthread-2.0.so.0 -> libgthread-2.0.so.0.7400.6 --rwxr-xr-x root/root usr/lib32/libgthread-2.0.so.0.7400.6 +lrwxrwxrwx root/root usr/lib32/libgthread-2.0.so.0 -> libgthread-2.0.so.0.7600.0 +-rwxr-xr-x root/root usr/lib32/libgthread-2.0.so.0.7600.0 drwxr-xr-x root/root usr/lib32/pkgconfig/ -rw-r--r-- root/root usr/lib32/pkgconfig/gio-2.0.pc -rw-r--r-- root/root usr/lib32/pkgconfig/gio-unix-2.0.pc diff --git a/glib-32/.signature b/glib-32/.signature index b33a360..0d32cd3 100644 --- a/glib-32/.signature +++ b/glib-32/.signature @@ -1,6 +1,5 @@ untrusted comment: verify with /etc/ports/compat-32.pub -RWSwxGo/zH7eXX54co7NuNRjW3Yg31y0mE48JknC74gC3dBHfQiah20cXDranQI/WMS/mgX0GZZXNVM0xD5N//CKWBGZKaNR/gI= -SHA256 (Pkgfile) = 5b6f3040cd6341f9ceeabfa167fec6cfab42d1b70052a60035d6624f62c45453 -SHA256 (.footprint) = 3f8c0e69bd65971aa601034134ce5a6f35d128dc6bb74a2c159d1cf431c8bf3e -SHA256 (glib-2.74.6.tar.xz) = 069cf7e51cd261eb163aaf06c8d1754c6835f31252180aff5814e5afc7757fbc -SHA256 (multilib.patch) = a0292252363f32324d03486fee0b84a79781bdcb51ad913a2bf37530d74c3b24 +RWSwxGo/zH7eXQIapMYwZzUf4sJMryYsZSBxmguBpA11mw+ZNpq10mLEIobQMpE05qVsjyUnbzKODSDvFjmYdxmfaCEvC9cqFgU= +SHA256 (Pkgfile) = ab4fe0c6b336f4e43f8ef534a927f74baf7c4033cf647654000ed5b74418f732 +SHA256 (.footprint) = 69a54f0748435221fb802f10ee8ffb44d0afee9081f4e5db5066db5ebad28ecf +SHA256 (glib-2.76.0.tar.xz) = 525bb703b807142e1aee5ccf222c344e8064b21c0c45677ef594e587874c6797 diff --git a/glib-32/Pkgfile b/glib-32/Pkgfile index 624461a..eaf4df0 100644 --- a/glib-32/Pkgfile +++ b/glib-32/Pkgfile @@ -4,20 +4,18 @@ # Depends on: elfutils-32 glib libffi-32 libpcre-32 libpcre2-32 util-linux-32 name=glib-32 -version=2.74.6 +version=2.76.0 release=1 -source=(https://download.gnome.org/sources/glib/${version:0:4}/${name%-*}-$version.tar.xz - multilib.patch) +source=(https://download.gnome.org/sources/glib/${version:0:4}/${name%-*}-$version.tar.xz) build() { - patch -d ${name%-*}-$version -p1 -i $SRC/multilib.patch - meson setup build ${name%-*}-$version \ --prefix=/usr \ --libdir=/usr/lib32 \ --libexecdir=/usr/lib32/glib \ --buildtype=plain \ - --wrap-mode nodownload + --wrap-mode nodownload \ + -D tests=false meson compile -C build -j ${JOBS:-1} DESTDIR=$PKG meson install -C build diff --git a/glib-32/multilib.patch b/glib-32/multilib.patch deleted file mode 100644 index 6ba907e..0000000 --- a/glib-32/multilib.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git i/gio/tests/meson.build w/gio/tests/meson.build -index 65f43e267..3bd66bf60 100644 ---- i/gio/tests/meson.build -+++ w/gio/tests/meson.build -@@ -598,6 +598,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() - '-r', - '-b','binary', - '@INPUT@', -+ '--oformat', 'elf32-i386', - '-o','@OUTPUT@']) - - # Rename symbol to match the one in the C file -diff --git i/glib/tests/meson.build w/glib/tests/meson.build -index d54fc41fa..ad5511ca5 100644 ---- i/glib/tests/meson.build -+++ w/glib/tests/meson.build -@@ -92,7 +92,7 @@ glib_tests = { - 'test-printf' : {}, - 'thread' : {}, - 'timeout' : {}, -- 'timer' : {}, -+ 'timer' : {'suite': ['flaky']}, - 'tree' : {}, - 'utf8-performance' : {}, - 'utf8-pointer' : {},