diff options
| author | B. Watson <yalhcru@gmail.com> | 2017-03-09 04:35:45 -0500 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2017-03-18 06:58:52 +0700 |
| commit | 57ced6820ed246d3ba2602099d0c9fb5dfed8077 (patch) | |
| tree | c9536dac955291d3ada6930891e8cbf142743a29 /system/vlock/vlock.SlackBuild | |
| parent | b05afe6414221e410a01e2a08fe046df0b4f7c72 (diff) | |
system/vlock: New maintainer, make screensaver work.
Signed-off-by: B. Watson <yalhcru@gmail.com>
Diffstat (limited to 'system/vlock/vlock.SlackBuild')
| -rw-r--r-- | system/vlock/vlock.SlackBuild | 31 |
1 files changed, 23 insertions, 8 deletions
diff --git a/system/vlock/vlock.SlackBuild b/system/vlock/vlock.SlackBuild index 1bd1f04b0643a..a109720151419 100644 --- a/system/vlock/vlock.SlackBuild +++ b/system/vlock/vlock.SlackBuild @@ -4,6 +4,7 @@ # Written by Menno E. Duursma <druiloor@zonnet.nl> # Modified by Robby Workman <rworkman@slackbuilds.org> # Modified by Chris Abela <kristofru@gmail.com> +# Modified by B. Watson <yalhcru@gmail.com> # # Copyright 2014 Ryan P.C. McQuen, WA, ryanpcmcquen@member.fsf.org # @@ -26,14 +27,21 @@ # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# 20170309 bkw: +# - take over maintenance +# - i486 => i586 +# - build with caca screensaver support +# - patches to make caca screensaver actually *work* +# - BUILD=3 + PRGNAM=vlock VERSION=${VERSION:-2.2.3} -BUILD=${BUILD:-2} +BUILD=${BUILD:-3} 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 @@ -46,8 +54,8 @@ OUTPUT=${OUTPUT:-/tmp} VLOCK_GRP=${VLOCK_GROUP:-wheel} -if [ "$ARCH" = "i486" ]; then - SLKCFLAGS="-O2 -march=i486 -mtune=i686" +if [ "$ARCH" = "i586" ]; then + SLKCFLAGS="-O2 -march=i586 -mtune=i686" LIBDIRSUFFIX="" elif [ "$ARCH" = "i686" ]; then SLKCFLAGS="-O2 -march=i686 -mtune=i686" @@ -75,19 +83,26 @@ find -L . \ \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \ -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \; +# patch by B. Watson, fixes the shell script wrapper so it loads +# the caca plugin when the -t/--timeout option is passed. +patch -p1 < $CWD/fix_caca.diff + +# patch from Debian, fixes a segfault when trying to start up the +# caca plugin. +patch -p1 < $CWD/10_fix-buffer-overflow.patch + ./configure \ --prefix=/usr \ --libdir=/usr/lib${LIBDIRSUFFIX} \ --mandir=/usr/man \ + --with-modules="all.so new.so nosysrq.so caca.so" \ --enable-shadow make CFLAGS="$SLKCFLAGS -Wall -W -pedantic -std=gnu99" +strip vlock-main modules/*.so make install DESTDIR=$PKG VLOCK_GROUP="$VLOCK_GRP" -find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \ - | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true - -find $PKG/usr/man -type f -exec gzip -9 {} \; +gzip -9 $PKG/usr/man/man?/*.? mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION cp -a [A-Z][A-Z]* ChangeLog $PKG/usr/doc/$PRGNAM-$VERSION |