summaryrefslogtreecommitdiff
path: root/source/xap
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2018-11-09 21:46:09 +0000
committerEric Hameleers <alien@slackware.com>2018-11-10 08:59:45 +0100
commit374248fe50672549bd1e5cd53ddb5bdfdcc66b65 (patch)
treefbac9f1c41679d79634ef08ac614cb4b708c8386 /source/xap
parent0e6f7049d6a514115df0164db47fbd8763cf5148 (diff)
downloadcurrent-374248fe50672549bd1e5cd53ddb5bdfdcc66b65.tar.gz
Fri Nov 9 21:46:09 UTC 201820181109214609
a/udisks2-2.6.5-x86_64-3.txz: Rebuilt. Recompiled against net-snmp-5.8. ap/hplip-3.18.10-x86_64-2.txz: Rebuilt. Recompiled against net-snmp-5.8. d/bison-3.2.1-x86_64-1.txz: Upgraded. d/meson-0.48.2-x86_64-1.txz: Upgraded. l/pycairo-1.18.0-x86_64-1.txz: Upgraded. n/bridge-utils-1.6-x86_64-1.txz: Upgraded. n/net-snmp-5.8-x86_64-1.txz: Upgraded. Shared library .so-version bump. n/ntp-4.2.8p12-x86_64-2.txz: Rebuilt. Recompiled against net-snmp-5.8. n/php-7.2.12-x86_64-2.txz: Rebuilt. Recompiled against net-snmp-5.8. xap/blackbox-0.74-x86_64-2.txz: Rebuilt. When building, don't install anything to the system. Thanks to Didier Spaier. xap/sane-1.0.27-x86_64-4.txz: Rebuilt. Recompiled against net-snmp-5.8. extra/aspell-word-lists/aspell-ar-1.2_0-x86_64-1.txz: Added. extra/aspell-word-lists/aspell-ast-0.01-x86_64-1.txz: Added. extra/aspell-word-lists/aspell-ca-2.1.5_1-x86_64-1.txz: Upgraded. extra/aspell-word-lists/aspell-de_alt-2.1_1-x86_64-1.txz: Added. extra/aspell-word-lists/aspell-fy-0.12_0-x86_64-1.txz: Added. extra/aspell-word-lists/aspell-grc-0.02_0-x86_64-1.txz: Added. extra/aspell-word-lists/aspell-hy-0.10.0_0-x86_64-1.txz: Added. extra/aspell-word-lists/aspell-ky-0.01_0-x86_64-1.txz: Added. extra/aspell-word-lists/aspell-ml-0.03_1-x86_64-1.txz: Added. extra/aspell-word-lists/aspell-pt_PT-20070510_0-x86_64-1.txz: Added. extra/aspell-word-lists/aspell-tk-0.01_0-x86_64-1.txz: Added.
Diffstat (limited to 'source/xap')
-rwxr-xr-xsource/xap/blackbox/blackbox.SlackBuild13
-rwxr-xr-xsource/xap/sane/sane.SlackBuild2
2 files changed, 10 insertions, 5 deletions
diff --git a/source/xap/blackbox/blackbox.SlackBuild b/source/xap/blackbox/blackbox.SlackBuild
index 570222e9..2246e8cc 100755
--- a/source/xap/blackbox/blackbox.SlackBuild
+++ b/source/xap/blackbox/blackbox.SlackBuild
@@ -29,7 +29,7 @@ PKGNAM=blackbox
SRCNAM=blackbox
VERSION=${VERSION:-0.74}
BBKEYSVER=${BBKEYSVER:-0.9.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -110,9 +110,6 @@ CFLAGS="$SLKCFLAGS" \
# Build:
make $NUMJOBS || make || exit 1
-# Install onto filesystem - needed for bbkeys to find libbt:
-make install || exit 1
-
# Install into package:
make install DESTDIR=$PKG || exit 1
mkdir -p $PKG/etc/X11/xinit
@@ -154,6 +151,14 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
+# The blackbox's libbt won't be met. We could make the LIBBT_CFLAGS and
+# LIBBT_LIBS environment to point in the temporary root, but we will
+# rather try to keep going with pkg-config, in case the requirements are
+# updated in the future.
+export PKG_CONFIG_PATH="$(pwd)/pkgconfig.$$"
+mkdir "$PKG_CONFIG_PATH"
+sed "s,=/usr,=$PKG/usr," "$PKG/usr/lib${LIBDIRSUFFIX}/pkgconfig/libbt.pc" >"$PKG_CONFIG_PATH/libbt.pc"
+
# Configure:
CFLAGS="$SLKCFLAGS" \
./configure \
diff --git a/source/xap/sane/sane.SlackBuild b/source/xap/sane/sane.SlackBuild
index 7e641135..13f61445 100755
--- a/source/xap/sane/sane.SlackBuild
+++ b/source/xap/sane/sane.SlackBuild
@@ -26,7 +26,7 @@ PKGNAM=sane
VERSION=1.0.27
BACKVER=1.0.27
FRONTVER=1.0.14
-BUILD=${BUILD:-3}
+BUILD=${BUILD:-4}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then