aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorB. Watson <yalhcru@gmail.com>2022-03-06 04:45:04 -0500
committerWilly Sudiarto Raharjo <willysr@slackbuilds.org>2022-03-07 08:45:23 +0700
commit12f9515278c1b03042928af5ba852c3181a50241 (patch)
treed1d31b5f4acddeb877c1b4351e315357163199b1
parent775ba4ffe45b1b145745a834a4bcf77488571acb (diff)
desktop/obshutdown: Fix 15.0 build.
Signed-off-by: B. Watson <yalhcru@gmail.com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--desktop/obshutdown/obshutdown.SlackBuild20
-rw-r--r--desktop/obshutdown/obshutdown.info2
2 files changed, 12 insertions, 10 deletions
diff --git a/desktop/obshutdown/obshutdown.SlackBuild b/desktop/obshutdown/obshutdown.SlackBuild
index fa566d253fb7..9f7bad919306 100644
--- a/desktop/obshutdown/obshutdown.SlackBuild
+++ b/desktop/obshutdown/obshutdown.SlackBuild
@@ -22,6 +22,8 @@
# OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# 20220305 bkw: Modified by SlackBuilds.org: fix build on 15.0.
+
cd $(dirname $0) ; CWD=$(pwd)
PRGNAM=obshutdown
@@ -38,9 +40,6 @@ if [ -z "$ARCH" ]; then
esac
fi
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
exit 0
@@ -76,14 +75,20 @@ tar xvf $CWD/$PRGNAM-$SRCVER.tar.gz || tar xvf $CWD/$SRCVER.tar.gz
mv $PRGNAM-$SRCVER $PRGNAM-$VERSION
cd $PRGNAM-$VERSION
chown -R root:root .
+rm -f missing depcomp install-sh # broken symlinks
find -L . \
\( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
- -o -perm 511 \) -exec chmod 755 {} \; -o \
+ -o -perm 511 \) -exec chmod 755 {} \+ -o \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
- -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
autoreconf -vif
+# 20220306 bkw: stupidity.
+sed -i 's,inline,,' src/main.[ch]
+
+SLKCFLAGS+=" -fcommon"
+
CFLAGS="$SLKCFLAGS" \
CXXFLAGS="$SLKCFLAGS" \
./configure \
@@ -96,10 +101,7 @@ CXXFLAGS="$SLKCFLAGS" \
--build=$ARCH-slackware-linux
make
-make install DESTDIR=$PKG
-
-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
+make install-strip DESTDIR=$PKG
mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
cp AUTHORS ChangeLog COPYING README $PKG/usr/doc/$PRGNAM-$VERSION
diff --git a/desktop/obshutdown/obshutdown.info b/desktop/obshutdown/obshutdown.info
index bc1b1b64d2e6..e78a51aa7ee0 100644
--- a/desktop/obshutdown/obshutdown.info
+++ b/desktop/obshutdown/obshutdown.info
@@ -1,7 +1,7 @@
PRGNAM="obshutdown"
VERSION="20130116"
HOMEPAGE="https://github.com/panjandrum/obshutdown/"
-DOWNLOAD="https://github.com/panjandrum/obshutdown/archive/c8c35347b13a12869850cd951ed4ebc2edd47c9c.tar.gz"
+DOWNLOAD="https://github.com/panjandrum/obshutdown/archive/obshutdown-c8c35347b13a12869850cd951ed4ebc2edd47c9c.tar.gz"
MD5SUM="93ed7131d15117549f05e60cb7c140b9"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""