summaryrefslogtreecommitdiff
path: root/source/xap
diff options
context:
space:
mode:
authorPatrick J Volkerding <volkerdi@slackware.com>2019-07-03 21:02:58 +0000
committerEric Hameleers <alien@slackware.com>2019-07-04 08:59:47 +0200
commitdb3b9f73c4d039d80bd94aca9c0724804ef203ef (patch)
tree34a73f8cc0573657253d283185189fb6326c7521 /source/xap
parented5de188b1ed607733e4e70b83631161dc845789 (diff)
downloadcurrent-db3b9f73c4d039d80bd94aca9c0724804ef203ef.tar.gz
Wed Jul 3 21:02:58 UTC 201920190703210258
a/kernel-generic-4.19.57-x86_64-1.txz: Upgraded. a/kernel-huge-4.19.57-x86_64-1.txz: Upgraded. a/kernel-modules-4.19.57-x86_64-1.txz: Upgraded. d/kernel-headers-4.19.57-x86-1.txz: Upgraded. k/kernel-source-4.19.57-noarch-1.txz: Upgraded. l/Mako-1.0.13-x86_64-1.txz: Upgraded. l/SDL2_image-2.0.5-x86_64-1.txz: Upgraded. n/postfix-3.4.6-x86_64-1.txz: Upgraded. xap/blueman-2.0.8-x86_64-2.txz: Rebuilt. Reverted to blueman-2.0.8 as I'm also seeing connection issues here with the newer version. xap/xscreensaver-5.43-x86_64-1.txz: Upgraded. isolinux/initrd.img: Rebuilt. kernels/*: Upgraded. testing/packages/blueman-2.1-x86_64-1.txz: Upgraded. This doesn't seem to be working properly. Any patches are welcome. usb-and-pxe-installers/usbboot.img: Rebuilt.
Diffstat (limited to 'source/xap')
-rwxr-xr-xsource/xap/blueman/blueman.SlackBuild11
-rw-r--r--source/xap/blueman/slack-desc2
-rwxr-xr-xsource/xap/xscreensaver/xscreensaver.SlackBuild3
-rw-r--r--source/xap/xscreensaver/xscreensaver.fontglide.comment.style.diff13
4 files changed, 4 insertions, 25 deletions
diff --git a/source/xap/blueman/blueman.SlackBuild b/source/xap/blueman/blueman.SlackBuild
index 2d2a64d5..0e4ee9b1 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:-1}
+BUILD=${BUILD:-2}
# Automatically determine the architecture we're building on:
if [ -z "$ARCH" ]; then
@@ -47,7 +47,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
exit 0
fi
-NUMJOBS=${NUMJOBS:-" -j7 "}
+NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM
@@ -82,11 +82,6 @@ find . \
\( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
-exec chmod 644 {} \;
-# Apply git patches
-for i in $CWD/patches/*.patch ; do
- cat $i | patch -p1 || exit 1
-done
-
# Don't autostart blueman applet in KDE; it has its own bluetooth application
zcat $CWD/dont-autostart-applet-in-kde.diff.gz | patch -p1 --verbose || exit 1
@@ -115,7 +110,7 @@ CYTHONEXEC=/usr/bin/cython3 \
sed -i "s,nautilus,thunar,g" blueman/Constants.py*
# https://github.com/blueman-project/blueman/issues/435
-sed -i "s,#!/usr/bin/env python3,#!/usr/bin/python${PYTHON3VER},g" module/_blueman.pyx apps/*
+sed -i "s,#!/usr/bin/env python,#!/usr/bin/python${PYTHON3VER},g" module/_blueman.pyx apps/*
make $NUMJOBS || make || exit 1
make install DESTDIR=$PKG || exit 1
diff --git a/source/xap/blueman/slack-desc b/source/xap/blueman/slack-desc
index 93143ff9..e115f712 100644
--- a/source/xap/blueman/slack-desc
+++ b/source/xap/blueman/slack-desc
@@ -6,7 +6,7 @@
# customary to leave one space after the ':'.
|-----handy-ruler------------------------------------------------------|
-blueman: Blueman (Graphical Bluetooth Manager)
+blueman: blueman (Graphical Bluetooth Manager)
blueman:
blueman: Blueman is a GTK+ Bluetooth Manager for tasks such as:
blueman:
diff --git a/source/xap/xscreensaver/xscreensaver.SlackBuild b/source/xap/xscreensaver/xscreensaver.SlackBuild
index 20c46c6e..c4e30e35 100755
--- a/source/xap/xscreensaver/xscreensaver.SlackBuild
+++ b/source/xap/xscreensaver/xscreensaver.SlackBuild
@@ -84,9 +84,6 @@ 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
deleted file mode 100644
index a29fa459..00000000
--- a/source/xap/xscreensaver/xscreensaver.fontglide.comment.style.diff
+++ /dev/null
@@ -1,13 +0,0 @@
---- ./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);