[notify] glib-32: 2.58.3 -> 2.60.3 new dependency elfutils-32, removed python-32

This commit is contained in:
Danny Rawlins 2019-05-26 17:38:26 +10:00
parent 077f7fcadd
commit e0b113f15d
5 changed files with 65 additions and 43 deletions

View File

@ -1,31 +1,27 @@
drwxr-xr-x root/root lib32/
drwxr-xr-x root/root lib32/gio/
drwxr-xr-x root/root lib32/gio/modules/
lrwxrwxrwx root/root lib32/libgio-2.0.so.0 -> libgio-2.0.so.0.5800.3
-rwxr-xr-x root/root lib32/libgio-2.0.so.0.5800.3
lrwxrwxrwx root/root lib32/libglib-2.0.so.0 -> libglib-2.0.so.0.5800.3
-rwxr-xr-x root/root lib32/libglib-2.0.so.0.5800.3
lrwxrwxrwx root/root lib32/libgmodule-2.0.so.0 -> libgmodule-2.0.so.0.5800.3
-rwxr-xr-x root/root lib32/libgmodule-2.0.so.0.5800.3
lrwxrwxrwx root/root lib32/libgobject-2.0.so.0 -> libgobject-2.0.so.0.5800.3
-rwxr-xr-x root/root lib32/libgobject-2.0.so.0.5800.3
lrwxrwxrwx root/root lib32/libgthread-2.0.so.0 -> libgthread-2.0.so.0.5800.3
-rwxr-xr-x root/root lib32/libgthread-2.0.so.0.5800.3
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/
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
-rwxr-xr-x root/root usr/lib32/libgio-2.0.la
lrwxrwxrwx root/root usr/lib32/libgio-2.0.so -> ../../lib32/libgio-2.0.so.0.5800.3
-rwxr-xr-x root/root usr/lib32/libglib-2.0.la
lrwxrwxrwx root/root usr/lib32/libglib-2.0.so -> ../../lib32/libglib-2.0.so.0.5800.3
-rwxr-xr-x root/root usr/lib32/libgmodule-2.0.la
lrwxrwxrwx root/root usr/lib32/libgmodule-2.0.so -> ../../lib32/libgmodule-2.0.so.0.5800.3
-rwxr-xr-x root/root usr/lib32/libgobject-2.0.la
lrwxrwxrwx root/root usr/lib32/libgobject-2.0.so -> ../../lib32/libgobject-2.0.so.0.5800.3
-rwxr-xr-x root/root usr/lib32/libgthread-2.0.la
lrwxrwxrwx root/root usr/lib32/libgthread-2.0.so -> ../../lib32/libgthread-2.0.so.0.5800.3
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.6000.3
-rwxr-xr-x root/root usr/lib32/libgio-2.0.so.0.6000.3
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.6000.3
-rwxr-xr-x root/root usr/lib32/libglib-2.0.so.0.6000.3
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.6000.3
-rwxr-xr-x root/root usr/lib32/libgmodule-2.0.so.0.6000.3
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.6000.3
-rwxr-xr-x root/root usr/lib32/libgobject-2.0.so.0.6000.3
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.6000.3
-rwxr-xr-x root/root usr/lib32/libgthread-2.0.so.0.6000.3
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

View File

@ -1,5 +1,6 @@
untrusted comment: verify with /etc/ports/compat-32.pub
RWSwxGo/zH7eXbVgDLlPEQswALjGHDXa14k/gQlkdqEKTjNjBN5Oqs692L2uYs9APjUlZScEJLWBoQ500O/7BNVW0RmbTcalSAE=
SHA256 (Pkgfile) = 24b127b148d1dee4905e5170147b62bfac9c1873694bdde074a80137565873fa
SHA256 (.footprint) = 80f4ef2ba5915bdcd450e8f2e7a88b6780f68d2332aab9dde023a9aacc58ea6f
SHA256 (glib-2.58.3.tar.xz) = 8f43c31767e88a25da72b52a40f3301fefc49a665b56dc10ee7cc9565cbe7481
RWSwxGo/zH7eXT4UsTmWmIUjppkRAdBzc5NQCeZkRXs5hgCJlChZ565snu7f9xa5uhBgzYlAFvapgdMyQOsZEr3ltOF7+nQNNAo=
SHA256 (Pkgfile) = e9df388b21e9352931eb8994c30edea780a595523fed091234e2282b830bae14
SHA256 (.footprint) = 3009408beecfcd977220520a5be25f71f0ab29cfb5ae65c8eca6d413d4545e64
SHA256 (glib-2.60.3.tar.xz) = 04ab0d560d45790d055f50db2d69974eab8b693a77390075462c56e652b760b9
SHA256 (multilib.patch) = a0292252363f32324d03486fee0b84a79781bdcb51ad913a2bf37530d74c3b24

View File

@ -1,29 +1,25 @@
# Description: Low-level data structure handling, portability wrappers, and interfaces for runtime functionality
# URL: https://www.gtk.org/
# Maintainer: CRUX compat-32 Team, compat-32-ports at crux dot nu
# Depends on: libffi-32 libpcre-32 python-32 util-linux-32 glib
# Depends on: elfutils-32 glib libffi-32 libpcre-32 util-linux-32
name=glib-32
version=2.58.3
version=2.60.3
release=1
source=(https://download.gnome.org/sources/glib/${version:0:4}/${name%-*}-$version.tar.xz)
source=(https://download.gnome.org/sources/glib/${version:0:4}/${name%-*}-$version.tar.xz
multilib.patch)
build() {
cd ${name%-*}-$version
./autogen.sh
./configure \
--prefix=/usr \
--libdir=/usr/lib32 \
--disable-man \
--with-pcre=system \
--with-runtime-libdir=../../lib32 \
--with-gio-module-dir=/lib32/gio/modules
patch -p1 -i $SRC/multilib.patch
make
make -j 1 DESTDIR=$PKG install
meson build --prefix=/usr --libdir=/usr/lib32
DESTDIR=$PKG ninja -C build -j ${JOBS:-1} install
rm -rf $PKG/usr/share/{gtk-doc,locale}
rm -rf $PKG/usr/share/bash_completion
rm -rf $PKG/usr/{bin,include,share}
rm -r $PKG/usr/{share,include}
find $PKG/usr/bin -type f -not -name gio-querymodules -printf 'Removing %P\n' -delete
mv $PKG/usr/bin/gio-querymodules{,-32}
install -d $PKG/usr/lib32/gio/modules
}

25
glib-32/multilib.patch Normal file
View File

@ -0,0 +1,25 @@
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' : {},

4
glib-32/post-install Executable file
View File

@ -0,0 +1,4 @@
#!/bin/sh
# Updating 32-bit GIO module cache...
/usr/bin/gio-querymodules-32 /usr/lib32/gio/modules