diff options
| author | Patrick J Volkerding <volkerdi@slackware.com> | 2018-12-30 20:33:37 +0000 |
|---|---|---|
| committer | Eric Hameleers <alien@slackware.com> | 2018-12-31 08:59:45 +0100 |
| commit | 8e734711287e3db171361903b19d2a758f325bfc (patch) | |
| tree | eb4b7eb8c1246713f1215b473777b7d8a29fa670 /source/xap | |
| parent | 527328c5da0d2375ca5dfc2a053c9fe328839918 (diff) | |
| download | current-8e734711287e3db171361903b19d2a758f325bfc.tar.gz | |
Sun Dec 30 20:33:37 UTC 201820181230203337
a/gzip-1.10-x86_64-1.txz: Upgraded.
a/lvm2-2.03.02-x86_64-1.txz: Upgraded.
a/os-prober-1.77-x86_64-1.txz: Upgraded.
a/sysvinit-scripts-2.1-noarch-24.txz: Rebuilt.
rc.6: Don't umount /dev/shm or tmpfs mounts under /run as it causes long
warnings/timeouts at shutdown/reboot on systems using LVM.
Don't use --ignorelockingfailure when deactivating LVM.
l/gc-8.0.2-x86_64-1.txz: Upgraded.
l/imagemagick-6.9.10_21-x86_64-1.txz: Upgraded.
l/libclc-20181127_1ecb16d-x86_64-1.txz: Upgraded.
l/librsvg-2.44.11-x86_64-1.txz: Upgraded.
l/zstd-1.3.8-x86_64-1.txz: Upgraded.
xap/blueman-2.0.7-x86_64-1.txz: Upgraded.
xap/xscreensaver-5.42-x86_64-1.txz: Upgraded.
xfce/xfce4-taskmanager-1.2.2-x86_64-1.txz: Upgraded.
Diffstat (limited to 'source/xap')
| -rwxr-xr-x | source/xap/blueman/blueman.SlackBuild | 2 | ||||
| -rwxr-xr-x | source/xap/xscreensaver/xscreensaver.SlackBuild | 3 | ||||
| -rw-r--r-- | source/xap/xscreensaver/xscreensaver.fontglide.comment.style.diff | 13 |
3 files changed, 17 insertions, 1 deletions
diff --git a/source/xap/blueman/blueman.SlackBuild b/source/xap/blueman/blueman.SlackBuild index 0e4ee9b1..043ac487 100755 --- a/source/xap/blueman/blueman.SlackBuild +++ b/source/xap/blueman/blueman.SlackBuild @@ -27,7 +27,7 @@ cd $(dirname $0) ; CWD=$(pwd) PKGNAM=blueman VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | 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 diff --git a/source/xap/xscreensaver/xscreensaver.SlackBuild b/source/xap/xscreensaver/xscreensaver.SlackBuild index c4e30e35..20c46c6e 100755 --- a/source/xap/xscreensaver/xscreensaver.SlackBuild +++ b/source/xap/xscreensaver/xscreensaver.SlackBuild @@ -84,6 +84,9 @@ zcat $CWD/xscreensaver.electricsheep.diff.gz | patch -p1 --verbose --backup --su # helpful to distributions. zcat $CWD/xscreensaver.no.expiration.date.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 +# Fix C++ style comments in .c code error: +zcat $CWD/xscreensaver.fontglide.comment.style.diff.gz | patch -p1 --verbose --backup --suffix=.orig || exit 1 + chown -R root:root . find . \ \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \ diff --git a/source/xap/xscreensaver/xscreensaver.fontglide.comment.style.diff b/source/xap/xscreensaver/xscreensaver.fontglide.comment.style.diff new file mode 100644 index 00000000..a29fa459 --- /dev/null +++ b/source/xap/xscreensaver/xscreensaver.fontglide.comment.style.diff @@ -0,0 +1,13 @@ +--- ./hacks/fontglide.c.orig 2018-09-02 17:56:45.000000000 -0500 ++++ ./hacks/fontglide.c 2018-12-29 22:31:16.736418344 -0600 +@@ -2421,8 +2421,8 @@ + + textclient_close (s->tc); + +-// if (s->b && s->b != s->window) XFreePixmap (dpy, s->b); +-// if (s->ba && s->ba != s->b) XFreePixmap (dpy, s->ba); ++/* if (s->b && s->b != s->window) XFreePixmap (dpy, s->b); */ ++/* if (s->ba && s->ba != s->b) XFreePixmap (dpy, s->ba); */ + XFreeGC (dpy, s->bg_gc); + if (s->charset) free (s->charset); + if (s->font_override) free (s->font_override); |