summaryrefslogtreecommitdiffstats
path: root/source/xap
diff options
context:
space:
mode:
author Patrick J Volkerding <volkerdi@slackware.com>2019-11-01 19:35:34 +0000
committer Eric Hameleers <alien@slackware.com>2019-11-02 08:59:50 +0100
commitbea0657d72f4f4351f78df01b57a87529783d7c9 (patch)
tree6b8e6d041e62ae923aa81d3be8be8729f92812e9 /source/xap
parent8160de57c47ccc90ccb514a65cc14fde84939c8f (diff)
downloadcurrent-bea0657d72f4f4351f78df01b57a87529783d7c9.tar.gz
current-bea0657d72f4f4351f78df01b57a87529783d7c9.tar.xz
Fri Nov 1 19:35:34 UTC 201920191101193534
l/gcr-3.34.0-x86_64-1.txz: Upgraded. l/gnome-keyring-3.34.0-x86_64-1.txz: Upgraded. n/crda-4.14-x86_64-1.txz: Upgraded. Upgraded to crda-4.14 and wireless-regdb-2019.06.03. xap/blueman-2.1.1-x86_64-1.txz: Upgraded. extra/source/flashplayer-plugin/flashplayer-plugin.SlackBuild: Upgraded. Fixed URL to retrieve latest version number.
Diffstat (limited to 'source/xap')
-rwxr-xr-xsource/xap/blueman/blueman.SlackBuild11
-rw-r--r--source/xap/blueman/slack-desc2
2 files changed, 9 insertions, 4 deletions
diff --git a/source/xap/blueman/blueman.SlackBuild b/source/xap/blueman/blueman.SlackBuild
index 509a8261d..5507fdf74 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
@@ -47,7 +47,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
exit 0
fi
-NUMJOBS=${NUMJOBS:-" -j$(expr $(nproc) + 1) "}
+NUMJOBS=${NUMJOBS:-" -j7 "}
TMP=${TMP:-/tmp}
PKG=$TMP/package-$PKGNAM
@@ -82,6 +82,11 @@ 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
@@ -110,7 +115,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 python,#!/usr/bin/python${PYTHON3VER},g" module/_blueman.pyx apps/*
+sed -i "s,#!/usr/bin/env python3,#!/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 e115f7122..93143ff90 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: