summaryrefslogtreecommitdiff
path: root/desktop/slock/slock.SlackBuild
diff options
context:
space:
mode:
Diffstat (limited to 'desktop/slock/slock.SlackBuild')
-rw-r--r--desktop/slock/slock.SlackBuild21
1 files changed, 13 insertions, 8 deletions
diff --git a/desktop/slock/slock.SlackBuild b/desktop/slock/slock.SlackBuild
index 0b51ea5f65..e40ee6aefb 100644
--- a/desktop/slock/slock.SlackBuild
+++ b/desktop/slock/slock.SlackBuild
@@ -24,7 +24,7 @@
PRGNAM=slock
VERSION=${VERSION:-1.2}
-BUILD=${BUILD:-2}
+BUILD=${BUILD:-3}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@@ -71,14 +71,19 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-# Support upstream failcolor patch
-# http://tools.suckless.org/slock/patches/failcolor
-if [ "${FAILCOLOR:-no}" != "no" ]; then
- patch -p1 <$CWD/slock-1.2-failcolor.diff
-fi
-
# This uses our CFLAGS defined above
-sed "s/@SLACKCFLAGS@/$SLKCFLAGS/" $CWD/config.mk.patch | patch -p1
+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