From f5ab902a68fe049fec54b4ca437395dba32e408a Mon Sep 17 00:00:00 2001
From: Robby Workman <rworkman@slackbuilds.org>
Date: Thu, 18 Aug 2016 21:19:19 -0500
Subject: desktop/slock: Updated for version 1.3.

Signed-off-by: Robby Workman <rworkman@slackbuilds.org>
---
 desktop/slock/slock.SlackBuild | 46 ++++++++++++++++++++++++------------------
 1 file changed, 26 insertions(+), 20 deletions(-)

(limited to 'desktop/slock/slock.SlackBuild')

diff --git a/desktop/slock/slock.SlackBuild b/desktop/slock/slock.SlackBuild
index e40ee6aefb..11e649d73c 100644
--- a/desktop/slock/slock.SlackBuild
+++ b/desktop/slock/slock.SlackBuild
@@ -23,13 +23,13 @@
 # Modified by Mario Preksavec <mario@slackware.hr>
 
 PRGNAM=slock
-VERSION=${VERSION:-1.2}
-BUILD=${BUILD:-3}
+VERSION=${VERSION:-1.3}
+BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
-    i?86) ARCH=i486 ;;
+    i?86) ARCH=i586 ;;
     arm*) ARCH=arm ;;
        *) ARCH=$( uname -m ) ;;
   esac
@@ -40,11 +40,8 @@ TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
 
-if [ "$ARCH" = "i486" ]; then
-  SLKCFLAGS="-O2 -march=i486 -mtune=i686"
-  LIBDIRSUFFIX=""
-elif [ "$ARCH" = "i686" ]; then
-  SLKCFLAGS="-O2 -march=i686 -mtune=i686"
+if [ "$ARCH" = "i586" ]; then
+  SLKCFLAGS="-O2 -march=i586 -mtune=i686"
   LIBDIRSUFFIX=""
 elif [ "$ARCH" = "x86_64" ]; then
   SLKCFLAGS="-O2 -fPIC"
@@ -75,18 +72,25 @@ find -L . \
 sed "s,@SLACKCFLAGS@,$SLKCFLAGS," $CWD/patches/config.mk.patch | patch -p1
 
 # Upstream patches in git
-patch -p1 < $CWD/patches/0001-applied-Dimitris-style-patch-from-Dec-14-with-some-m.patch
-patch -p1 < $CWD/patches/0002-Blank-the-screen-with-color-0-add-third-color-for-fa.patch
-patch -p1 < $CWD/patches/0003-resize-lockscreen-window-after-Xrandr-resize.patch
-patch -p1 < $CWD/patches/0004-Option-to-not-show-failure-color-on-clear.patch
-patch -p1 < $CWD/patches/0005-consistently-use-with-sizeof.patch
-patch -p1 < $CWD/patches/0006-rework-setting-window-color.patch
-patch -p1 < $CWD/patches/0007-Slightly-safer-OOM-killer-disablement-in-linux.patch
-patch -p1 < $CWD/patches/0008-Don-t-change-to-failure-colour-on-success.patch
-patch -p1 < $CWD/patches/0009-add-option-to-run-command-after-screen-is-locked.patch
-
-make PREFIX=/usr X11INC=/usr/include/X11 X11LIB=/usr/lib${LIBDIRSUFFIX}/X11
-make install PREFIX=/usr X11INC=/usr/include/X11 X11LIB=/usr/lib${LIBDIRSUFFIX}/X11 DESTDIR=$PKG
+patch -p1< $CWD/patches/0001-Simplify-the-oom-taming-function.patch
+patch -p1< $CWD/patches/0002-Clarify-config.def.h.patch
+patch -p1< $CWD/patches/0003-No-need-for-usage.patch
+patch -p1< $CWD/patches/0004-Use-argv0-instead-of-passing-slock-to-die-every-time.patch
+patch -p1< $CWD/patches/0005-revert-using-argv0-and-minor-fixup.patch
+patch -p1< $CWD/patches/0006-Revert-No-need-for-usage.patch
+patch -p1< $CWD/patches/0007-clear-passwords-with-explicit_bzero.patch
+
+make \
+  PREFIX=/usr \
+  MANPREFIX=/usr/man \
+  X11INC=/usr/include/X11 \
+  X11LIB=/usr/lib${LIBDIRSUFFIX}/X11
+make install \
+  PREFIX=/usr \
+  MANPREFIX=/usr/man \
+  X11INC=/usr/include/X11 \
+  X11LIB=/usr/lib${LIBDIRSUFFIX}/X11 \
+  DESTDIR=$PKG
 
 # This approach was preferable, but since slock must have root privs to 
 # adjust its OOM score, oh well...
@@ -97,6 +101,8 @@ chmod 4755 $PKG/usr/bin/slock
 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
 
+gzip -9 $PKG/usr/man/man?/*.?
+
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION
 cp -a $DOCS $PKG/usr/doc/$PRGNAM-$VERSION
 cat $CWD/$PRGNAM.SlackBuild > $PKG/usr/doc/$PRGNAM-$VERSION/$PRGNAM.SlackBuild
-- 
cgit v1.2.3