From 39c9830009461d15c04b7735f517543e52fc5bda Mon Sep 17 00:00:00 2001 From: Luis Date: Wed, 28 Sep 2022 14:17:46 +0000 Subject: [PATCH] glib-32: update to 2.74 --- multilib/glib-32/.checksums | 2 +- multilib/glib-32/.pkgfiles | 25 +++++++++++--------- multilib/glib-32/spkgbuild | 46 ++++++++++++++++++++----------------- 3 files changed, 40 insertions(+), 33 deletions(-) diff --git a/multilib/glib-32/.checksums b/multilib/glib-32/.checksums index 234a05357..0875d2477 100644 --- a/multilib/glib-32/.checksums +++ b/multilib/glib-32/.checksums @@ -1,2 +1,2 @@ -ef67f7e19e47c8e082256d614f1ab8f4 glib-2.72.3.tar.xz +06745709784eddb4a3860e1814f795e8 glib-2.74.0.tar.xz 9d50b8009f43173571e25ca1edf0bbe6 multilib.patch diff --git a/multilib/glib-32/.pkgfiles b/multilib/glib-32/.pkgfiles index 33ad9a471..488453b97 100644 --- a/multilib/glib-32/.pkgfiles +++ b/multilib/glib-32/.pkgfiles @@ -1,26 +1,29 @@ -glib-32-2.72.3-1 +glib-32-2.74.0-1 drwxr-xr-x root/root usr/ drwxr-xr-x root/root usr/bin/ -rwxr-xr-x root/root usr/bin/gio-querymodules-32 drwxr-xr-x root/root usr/lib32/ +-rwxr-xr-x root/root usr/lib32/gio-launch-desktop +drwxr-xr-x root/root usr/lib32/gio/ +drwxr-xr-x root/root usr/lib32/gio/modules/ drwxr-xr-x root/root usr/lib32/glib-2.0/ drwxr-xr-x root/root usr/lib32/glib-2.0/include/ -rw-r--r-- root/root usr/lib32/glib-2.0/include/glibconfig.h 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.7200.3 --rwxr-xr-x root/root usr/lib32/libgio-2.0.so.0.7200.3 +lrwxrwxrwx root/root usr/lib32/libgio-2.0.so.0 -> libgio-2.0.so.0.7400.0 +-rwxr-xr-x root/root usr/lib32/libgio-2.0.so.0.7400.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.7200.3 --rwxr-xr-x root/root usr/lib32/libglib-2.0.so.0.7200.3 +lrwxrwxrwx root/root usr/lib32/libglib-2.0.so.0 -> libglib-2.0.so.0.7400.0 +-rwxr-xr-x root/root usr/lib32/libglib-2.0.so.0.7400.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.7200.3 --rwxr-xr-x root/root usr/lib32/libgmodule-2.0.so.0.7200.3 +lrwxrwxrwx root/root usr/lib32/libgmodule-2.0.so.0 -> libgmodule-2.0.so.0.7400.0 +-rwxr-xr-x root/root usr/lib32/libgmodule-2.0.so.0.7400.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.7200.3 --rwxr-xr-x root/root usr/lib32/libgobject-2.0.so.0.7200.3 +lrwxrwxrwx root/root usr/lib32/libgobject-2.0.so.0 -> libgobject-2.0.so.0.7400.0 +-rwxr-xr-x root/root usr/lib32/libgobject-2.0.so.0.7400.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.7200.3 --rwxr-xr-x root/root usr/lib32/libgthread-2.0.so.0.7200.3 +lrwxrwxrwx root/root usr/lib32/libgthread-2.0.so.0 -> libgthread-2.0.so.0.7400.0 +-rwxr-xr-x root/root usr/lib32/libgthread-2.0.so.0.7400.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/multilib/glib-32/spkgbuild b/multilib/glib-32/spkgbuild index ff7d4047a..261d345d0 100755 --- a/multilib/glib-32/spkgbuild +++ b/multilib/glib-32/spkgbuild @@ -1,34 +1,38 @@ # description : Low-level libraries useful for providing data structure handling for C, portability wrappers and interfaces -# depends : glib pcre-32 libffi-32 util-linux-32 elfutils-32 zlib-32 +# depends : glib pcre2-32 libffi-32 util-linux-32 elfutils-32 zlib-32 name=glib-32 -version=2.72.3 +version=2.74.0 release=1 -source="https://ftp.gnome.org/pub/gnome/sources/glib/${version%.*}/glib-$version.tar.xz +source="https://ftp.gnome.org/pub/gnome/sources/glib/${version%.*}/${name%-*}-$version.tar.xz multilib.patch" build() { - cd glib-$version - - patch -Np1 -i ../multilib.patch export CC="gcc -m32" export CXX="g++ -m32" export PKG_CONFIG_LIBDIR="/usr/lib32/pkgconfig" - mkdir build-glib - cd build-glib - - meson --prefix=/usr \ - --libdir=/usr/lib32 \ - -Dgtk_doc=false \ - -Dnls=disabled \ - -Dselinux=disabled \ - .. - ninja - DESTDIR=$PWD/DESTDIR ninja install - mkdir -p $PKG/usr/bin - cp DESTDIR/usr/bin/gio-querymodules $PKG/usr/bin/gio-querymodules-32 - mkdir -p $PKG/usr/lib32 - cp -Rv DESTDIR/usr/lib32/* $PKG/usr/lib32 + patch -d ${name%-*}-$version -p1 -i $SRC/multilib.patch + + venom-meson ${name%-*}-$version build \ + --libdir=/usr/lib32 \ + --libexecdir=/usr/lib32 \ + -D glib_debug=disabled \ + -D sysprof=disabled \ + -D man=false \ + -D gtk_doc=false \ + -D nls=disabled \ + -D selinux=disabled \ + -D tests=false + meson compile -C build + DESTDIR=$PKG meson install -C build + + rm -r $PKG/usr/share + rm -r $PKG/usr/include + + find $PKG/usr/bin -type f -not -name gio-querymodules -printf 'Removing %P\n' -delete + mv $PKG/usr/bin/gio-querymodules $PKG/usr/bin/gio-querymodules-32 + + install -d $PKG/usr/lib32/gio/modules }