summaryrefslogtreecommitdiff
path: root/source/l
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2019-08-04 19:10:23 +0000
committerEric Hameleers <alien@slackware.com>2019-08-04 23:00:10 +0200
commit8519278b645c1b29046377ad42e5f723247c7b9b (patch)
treeed0fab9639450b7f074cead920e275c075b14e55 /source/l
parent11a87f467714769e1d1bd14800b4c173747b22f6 (diff)
downloadcurrent-8519278b645c1b29046377ad42e5f723247c7b9b.tar.gz
Sun Aug 4 19:10:23 UTC 201920190804191023
a/kernel-generic-4.19.63-x86_64-1.txz: Upgraded. a/kernel-huge-4.19.63-x86_64-1.txz: Upgraded. a/kernel-modules-4.19.63-x86_64-1.txz: Upgraded. a/libgudev-233-x86_64-1.txz: Upgraded. a/os-prober-1.77-x86_64-2.txz: Rebuilt. Patched to fix lvm2 detection. Thanks to USUARIONUEVO. ap/man-db-2.8.6-x86_64-1.txz: Upgraded. ap/man-pages-5.02-noarch-1.txz: Upgraded. d/kernel-headers-4.19.63-x86-1.txz: Upgraded. d/re2c-1.2-x86_64-1.txz: Upgraded. k/kernel-source-4.19.63-noarch-1.txz: Upgraded. l/Mako-1.1.0-x86_64-1.txz: Upgraded. l/babl-0.1.70-x86_64-1.txz: Upgraded. l/imagemagick-6.9.10_59-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-xsource/l/QScintilla/QScintilla.SlackBuild2
-rwxr-xr-xsource/l/babl/babl.SlackBuild43
2 files changed, 23 insertions, 22 deletions
diff --git a/source/l/QScintilla/QScintilla.SlackBuild b/source/l/QScintilla/QScintilla.SlackBuild
index e8ce59c7..92c53810 100755
--- a/source/l/QScintilla/QScintilla.SlackBuild
+++ b/source/l/QScintilla/QScintilla.SlackBuild
@@ -149,8 +149,6 @@ if qtpaths-qt5 --qt-version 1>/dev/null 2>/dev/null ; then
make clean -C Python || exit 1
fi
-# QT4 SUPPORT CURRENTLY DOES NOT COMPILE...
-# /usr/lib64/qt/include/QtCore/qglobal.h:2242:20: error: invalid application of 'sizeof' to incomplete type 'QUrl'
# QT4 support:
echo "-- Compiling Qt4 support --"
cd Qt4Qt5
diff --git a/source/l/babl/babl.SlackBuild b/source/l/babl/babl.SlackBuild
index 77b864ee..43537c7c 100755
--- a/source/l/babl/babl.SlackBuild
+++ b/source/l/babl/babl.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright 2008, 2009, 2010, 2018 Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2008, 2009, 2010, 2018, 2019 Patrick J. Volkerding, Sebeka, MN, USA
# Copyright 2008, 2009 Robby Workman, Northport, Alabama, USA
# All rights reserved.
#
@@ -52,6 +52,7 @@ PKG=$TMP/package-babl
if [ "$ARCH" = "i586" ]; then
SLKCFLAGS="-O2 -march=i586 -mtune=i686"
+ XTRA_OPTIONS=" -Denable-sse2=false "
LIBDIRSUFFIX=""
elif [ "$ARCH" = "s390" ]; then
SLKCFLAGS="-O2"
@@ -78,26 +79,28 @@ 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 \
+# Configure, build, and install:
+export CFLAGS="$SLKCFLAGS"
+export CXXFLAGS="$SLKCFLAGS"
+mkdir meson-build
+cd meson-build
+meson setup \
--prefix=/usr \
- --libdir=/usr/lib${LIBDIRSUFFIX} \
- --docdir=/usr/doc/babl-$VERSION \
- --build=$ARCH-slackware-linux || exit 1
- # Trust defaults:
- #--enable-mmx \
- #--disable-sse \
- #--enable-introspection \
-
-make $NUMJOBS || make || exit 1
-make install DESTDIR=$PKG || exit 1
-
-# Don't ship .la files:
-rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+ --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 \
+ --buildtype=release \
+ $XTRA_OPTIONS \
+ .. || exit 1
+ "${NINJA:=ninja}" $NUMJOBS || exit 1
+ DESTDIR=$PKG $NINJA install || exit 1
+cd ..
find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
| cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null