diff options
| author |   Patrick J Volkerding <volkerdi@slackware.com> | 2019-12-07 00:22:04 +0000 |
|---|---|---|
| committer |   Eric Hameleers <alien@slackware.com> | 2019-12-07 08:59:52 +0100 |
| commit | 47964291693dfba44143431da5eefd00717e005b (patch) | |
| tree | fec58dde2a6b69126112715fbe5cf37d6312846a /source/xap | |
| parent | 4fc798c4ca2a975ab8af459a6c27ee592baf0605 (diff) | |
| download | current-47964291693dfba44143431da5eefd00717e005b.tar.gz current-47964291693dfba44143431da5eefd00717e005b.tar.xz | |
Sat Dec 7 00:22:04 UTC 201920191207002204
a/aaa_terminfo-6.1_20191130-x86_64-1.txz: Upgraded.
a/shadow-4.8-x86_64-1.txz: Upgraded.
d/mercurial-5.2.1-x86_64-1.txz: Upgraded.
l/mozilla-nss-3.48-x86_64-1.txz: Upgraded.
Upgraded to nss-3.48 and nspr-4.24.
l/ncurses-6.1_20191130-x86_64-1.txz: Upgraded.
x/libglvnd-1.3.0-x86_64-1.txz: Upgraded.
xap/xlockmore-5.60-x86_64-1.txz: Upgraded.
extra/bash-completion/bash-completion-2.10-noarch-1.txz: Upgraded.
Diffstat (limited to 'source/xap')
| -rwxr-xr-x | source/xap/xlockmore/xlockmore.SlackBuild | 7 | ||||
| -rw-r--r-- | source/xap/xlockmore/xlockmore.gltrackball_init.diff | 11 |
2 files changed, 16 insertions, 2 deletions
diff --git a/source/xap/xlockmore/xlockmore.SlackBuild b/source/xap/xlockmore/xlockmore.SlackBuild index ef6d12c72..e92b19dc7 100755 --- a/source/xap/xlockmore/xlockmore.SlackBuild +++ b/source/xap/xlockmore/xlockmore.SlackBuild @@ -1,6 +1,6 @@ #!/bin/bash -# Copyright 2008, 2009, 2011, 2012, 2013, 2015, 2017, 2018 Patrick J. Volkerding, Sebeka, MN, USA +# Copyright 2008, 2009, 2011, 2012, 2013, 2015, 2017, 2018, 2019 Patrick J. Volkerding, Sebeka, MN, USA # All rights reserved. # # Redistribution and use of this script, with or without modification, is @@ -24,7 +24,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=xlockmore VERSION=${VERSION:-$(echo $PKGNAM-*.tar.xz | rev | cut -f 3- -d . | cut -f 1 -d - | rev)} -BUILD=${BUILD:-2} +BUILD=${BUILD:-1} # Automatically determine the architecture we're building on: if [ -z "$ARCH" ]; then @@ -76,6 +76,9 @@ find . \ \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \ -exec chmod 644 {} \+ +# Fix a trivial coding bug in 5.60: +zcat $CWD/xlockmore.gltrackball_init.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 + zcat $CWD/xlockmore.bitmap.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 mkdir -p $PKG/usr/include/X11/bitmaps cp $CWD/l-bob.xbm $PKG/usr/include/X11/bitmaps diff --git a/source/xap/xlockmore/xlockmore.gltrackball_init.diff b/source/xap/xlockmore/xlockmore.gltrackball_init.diff new file mode 100644 index 000000000..8aed3ae6e --- /dev/null +++ b/source/xap/xlockmore/xlockmore.gltrackball_init.diff @@ -0,0 +1,11 @@ +--- ./modes/glx/juggler3d.c.orig 2019-09-11 00:06:52.000000000 -0500 ++++ ./modes/glx/juggler3d.c 2019-12-06 15:03:43.465002755 -0600 +@@ -2729,7 +2729,7 @@ + double spin_accel = 0.05; + sp->rot = make_rotator (0, spin_speed, 0, + spin_accel, wander_speed, False); +- sp->trackball = gltrackball_init (); ++ sp->trackball = gltrackball_init ( 0 ); + } + + if (only && *only && strcmp(only, " ")) { |