diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2020-05-10 23:34:28 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2020-05-11 08:59:53 +0200 |
| commit | eb9aabd4fd41cf797623d1565abb745ebd960420 (patch) | |
| tree | 193e83e7fbcd0aa5a5dd746a34ae60dc780bd20f /source/l | |
| parent | 8c0924cc550c761da0289742cfed897ee6312d14 (diff) | |
| download | current-eb9aabd4fd41cf797623d1565abb745ebd960420.tar.gz current-eb9aabd4fd41cf797623d1565abb745ebd960420.tar.xz | |
Sun May 10 23:34:28 UTC 202020200510233428
a/btrfs-progs-5.6.1-x86_64-1.txz: Upgraded.
a/kernel-generic-5.4.40-x86_64-1.txz: Upgraded.
a/kernel-huge-5.4.40-x86_64-1.txz: Upgraded.
a/kernel-modules-5.4.40-x86_64-1.txz: Upgraded.
d/bison-3.6.1-x86_64-1.txz: Upgraded.
d/kernel-headers-5.4.40-x86-1.txz: Upgraded.
d/python-setuptools-46.2.0-x86_64-1.txz: Upgraded.
k/kernel-source-5.4.40-noarch-1.txz: Upgraded.
l/pcre2-10.35-x86_64-1.txz: Upgraded.
l/shared-mime-info-2.0-x86_64-1.txz: Upgraded.
n/ModemManager-1.12.10-x86_64-1.txz: Upgraded.
isolinux/initrd.img: Rebuilt.
kernels/*: Upgraded.
usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/l')
| -rwxr-xr-x | source/l/shared-mime-info/shared-mime-info.SlackBuild | 36 | ||||
| -rw-r--r-- | source/l/shared-mime-info/shared-mime-info.skip_tests.diff | 11 |
2 files changed, 34 insertions, 13 deletions
diff --git a/source/l/shared-mime-info/shared-mime-info.SlackBuild b/source/l/shared-mime-info/shared-mime-info.SlackBuild index 93155eddb..56377ebf8 100755 --- a/source/l/shared-mime-info/shared-mime-info.SlackBuild +++ b/source/l/shared-mime-info/shared-mime-info.SlackBuild @@ -82,20 +82,30 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ -if [ ! -r configure ]; then - NOCONFIGURE=1 ./autogen.sh -fi - -CFLAGS="$SLKCFLAGS" \ -./configure \ +zcat $CWD/shared-mime-info.skip_tests.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=lib${LIBDIRSUFFIX} \ + --libexecdir=/usr/libexec \ + --bindir=/usr/bin \ + --sbindir=/usr/sbin \ + --includedir=/usr/include \ + --datadir=/usr/share \ --mandir=/usr/man \ - --docdir=/usr/doc/${PKGNAM}-$VERSION \ - --disable-update-mimedb \ - --build=$ARCH-slackware-linux || exit 1 - -make $NUMJOBS || make || exit 1 -make install DESTDIR=$PKG || exit 1 + --sysconfdir=/etc \ + --localstatedir=/var \ + --buildtype=release \ + -Dupdate-mimedb=false \ + .. || exit 1 + "${NINJA:=ninja}" $NUMJOBS || exit 1 + DESTDIR=$PKG $NINJA install || exit 1 +cd .. mkdir -p $PKG/usr/lib${LIBDIRSUFFIX} mv $PKG/usr/share/pkgconfig $PKG/usr/lib${LIBDIRSUFFIX} @@ -127,7 +137,7 @@ fi mkdir -p $PKG/usr/doc/${PKGNAM}-$VERSION cp -a \ - COPYING* HACKING NEWS README* \ + COPYING* HACKING* MAINTAINERS* NEWS* README* code-of-conduct* \ $PKG/usr/doc/${PKGNAM}-$VERSION chmod 644 $PKG/usr/doc/${PKGNAM}-$VERSION/* diff --git a/source/l/shared-mime-info/shared-mime-info.skip_tests.diff b/source/l/shared-mime-info/shared-mime-info.skip_tests.diff new file mode 100644 index 000000000..df07110c0 --- /dev/null +++ b/source/l/shared-mime-info/shared-mime-info.skip_tests.diff @@ -0,0 +1,11 @@ +--- ./meson.build.orig 2020-05-06 09:01:04.000000000 -0500 ++++ ./meson.build 2020-05-10 13:08:03.154102522 -0500 +@@ -66,7 +66,7 @@ + subdir('po') + subdir('data') + subdir('src') +-subdir('tests') ++#subdir('tests') + + if get_option('update-mimedb') + upd_tool = (meson.is_cross_build() |