diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2020-03-11 19:54:51 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2020-03-12 08:59:49 +0100 |
| commit | 2c7220ae76c6e36f190d5a0591e8412c4b965c34 (patch) | |
| tree | 6b44df279b3bfc28523fa3dbc7dfc8034624a965 /source/l/gcr | |
| parent | 35fc44d178d36d3aa9d6ff6aca6af5fa87ed2e29 (diff) | |
| download | current-2c7220ae76c6e36f190d5a0591e8412c4b965c34.tar.gz current-2c7220ae76c6e36f190d5a0591e8412c4b965c34.tar.xz | |
Wed Mar 11 19:54:51 UTC 202020200311195451
ap/hplip-3.20.3-x86_64-1.txz: Upgraded.
d/vala-0.48.1-x86_64-1.txz: Upgraded.
l/SDL2-2.0.12-x86_64-1.txz: Upgraded.
l/gcr-3.36.0-x86_64-1.txz: Upgraded.
l/glib2-2.64.1-x86_64-1.txz: Upgraded.
l/gnome-keyring-3.36.0-x86_64-1.txz: Upgraded.
l/libsecret-0.20.2-x86_64-1.txz: Upgraded.
n/curl-7.69.1-x86_64-1.txz: Upgraded.
testing/packages/PAM/gnome-keyring-3.36.0-x86_64-1_pam.txz: Upgraded.
testing/packages/PAM/hplip-3.20.3-x86_64-1_pam.txz: Upgraded.
Diffstat (limited to 'source/l/gcr')
| -rwxr-xr-x | source/l/gcr/gcr.SlackBuild | 44 | ||||
| -rw-r--r-- | source/l/gcr/gcr.meson.disable.schemas-compile.update-mime.update-icon-cache.diff | 14 |
2 files changed, 39 insertions, 19 deletions
diff --git a/source/l/gcr/gcr.SlackBuild b/source/l/gcr/gcr.SlackBuild index aaeb63eff..857116c79 100755 --- a/source/l/gcr/gcr.SlackBuild +++ b/source/l/gcr/gcr.SlackBuild @@ -76,28 +76,34 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -CFLAGS="$SLKCFLAGS" \ -CXXFLAGS="$SLKCFLAGS" \ -./configure \ +# We disabled these before through ./configure options that don't exist with +# meson. +zcat $CWD/gcr.meson.disable.schemas-compile.update-mime.update-icon-cache.diff.gz | patch -p1 --verbose || exit 1 + +# Configure, build, and install: +export CFLAGS="$SLKCFLAGS" +export CXXFLAGS="$SLKCFLAGS" +mkdir meson-build +cd meson-build +meson setup \ --prefix=/usr \ - --libdir=/usr/lib${LIBDIRSUFFIX} \ + --libdir=lib${LIBDIRSUFFIX} \ + --libexecdir=/usr/libexec \ + --bindir=/usr/bin \ + --sbindir=/usr/sbin \ + --includedir=/usr/include \ + --datadir=/usr/share \ + --mandir=/usr/man \ --sysconfdir=/etc \ --localstatedir=/var \ - --mandir=/usr/man \ - --docdir=/usr/doc/$PKGNAM-$VERSION \ - --enable-introspection=yes \ - --enable-vala=yes \ - --disable-schemas-compile \ - --disable-update-mime \ - --disable-update-icon-cache \ - --disable-debug \ - --build=$ARCH-slackware-linux || exit 1 - -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 - -# Don't ship .la files: -rm -f $PKG/usr/lib${LIBDIRSUFFIX}/*.la + --buildtype=release \ + -Dintrospection=true \ + -Dgtk=true \ + -Dgtk_doc=true \ + .. || exit 1 + "${NINJA:=ninja}" $NUMJOBS || exit 1 + DESTDIR=$PKG $NINJA install || exit 1 +cd .. find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | \ grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true diff --git a/source/l/gcr/gcr.meson.disable.schemas-compile.update-mime.update-icon-cache.diff b/source/l/gcr/gcr.meson.disable.schemas-compile.update-mime.update-icon-cache.diff new file mode 100644 index 000000000..44b42f513 --- /dev/null +++ b/source/l/gcr/gcr.meson.disable.schemas-compile.update-mime.update-icon-cache.diff @@ -0,0 +1,14 @@ +--- ./meson.build.orig 2020-03-11 02:09:56.000000000 -0500 ++++ ./meson.build 2020-03-11 13:56:34.683898676 -0500 +@@ -85,11 +85,3 @@ + if get_option('gtk_doc') + subdir('docs') + endif +- +-# Post-install scripts +-meson.add_install_script('meson_post_install.py', +- get_option('datadir'), +- get_option('libdir'), +- gcr_major_version.to_string(), +- gcr_soversion, +-) |