summaryrefslogtreecommitdiffstats
path: root/openbox
diff options
context:
space:
mode:
author Eric Hameleers <alien@slackware.com>2020-10-20 09:33:18 +0000
committer Eric Hameleers <alien@slackware.com>2020-10-20 09:33:18 +0000
commitd2d820bae8fe9570575ced5fa9748352d723ceee (patch)
tree820cafcd6e4cfec8a89c9c89e032c052c8cc1bff /openbox
parent6868c21d9e8f6c5be60105da965b40914bddbb79 (diff)
downloadasb-d2d820bae8fe9570575ced5fa9748352d723ceee.tar.gz
asb-d2d820bae8fe9570575ced5fa9748352d723ceee.tar.xz
openbox: recompiled for slackware-current to remove libcroco dependency
Diffstat (limited to 'openbox')
-rwxr-xr-xopenbox/build/openbox.SlackBuild16
1 files changed, 13 insertions, 3 deletions
diff --git a/openbox/build/openbox.SlackBuild b/openbox/build/openbox.SlackBuild
index 9d0f578d..e6451dd1 100755
--- a/openbox/build/openbox.SlackBuild
+++ b/openbox/build/openbox.SlackBuild
@@ -1,6 +1,6 @@
#!/bin/sh
# $Id$
-# Copyright 2008, 2009, 2013, 2016 Eric Hameleers, Eindhoven, NL
+# Copyright 2008, 2009, 2013, 2016, 2020 Eric Hameleers, Eindhoven, NL
# All rights reserved.
#
# Permission to use, copy, modify, and distribute this software for
@@ -36,6 +36,8 @@
# * Update. Borrow some of the good stuff from the SBo script.
# 3.6.1-1: 09/aug/2016 by Eric Hameleers <alien@slackware.com>
# * Update.
+# 3.6.1-2: 20/oct/2020 by Eric Hameleers <alien@slackware.com>
+# * Rebuilt for -current.
#
# Run 'sh openbox.SlackBuild' to build a Slackware package.
# The package (.tgz) plus descriptive .txt file are created in /tmp .
@@ -45,7 +47,7 @@
PRGNAM=openbox
VERSION=${VERSION:-3.6.1}
-BUILD=${BUILD:-1}
+BUILD=${BUILD:-2}
TAG=${TAG:-alien}
DOCS="ABOUT-NLS AUTHORS CHANGELOG COMPLIANCE COPYING README"
@@ -118,7 +120,7 @@ mkdir -p $TMP/tmp-$PRGNAM # location to build the source
mkdir -p $PKG # place for the package to be built
rm -rf $PKG/* # always erase old package's contents
rm -rf $TMP/tmp-$PRGNAM/* # remove the remnants of previous build
-rm -rf $OUTPUT/{configure,make,install,error,makepkg}-$PRGNAM.log
+rm -rf $OUTPUT/{configure,make,install,error,makepkg, patch}-$PRGNAM.log
# remove old log files
# Source file availability:
@@ -156,6 +158,11 @@ cd $TMP/tmp-$PRGNAM
echo "Extracting the source archive(s) for $PRGNAM..."
tar -xvf ${SOURCE}
cd ${PRGNAM}-${VERSION}
+
+# https://bugs.debian.org/887908
+cat $SRCDIR/patches/debian_bug_887908.patch | patch -p1 --verbose \
+ 2>&1 | tee $OUTPUT/patch-${PRGNAM}.log
+
chown -R root:root .
chmod -R u+w,go+r-w,a+X-s .
@@ -182,6 +189,9 @@ CFLAGS="$SLKCFLAGS" \
make 2>&1 | tee $OUTPUT/make-${PRGNAM}.log
make DESTDIR=$PKG install 2>&1 |tee $OUTPUT/install-${PRGNAM}.log
+# Don't ship .la files:
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
# Add an xinitrc files to be used by xwmconfig:
install -D -m 0755 $SRCDIR/xinitrc.openbox $PKG/etc/X11/xinit/xinitrc.openbox
install -D -m 0755 $SRCDIR/xinitrc.openbox-session $PKG/etc/X11/xinit/xinitrc.openbox-session