From bea0657d72f4f4351f78df01b57a87529783d7c9 Mon Sep 17 00:00:00 2001
From: Patrick J Volkerding <volkerdi@slackware.com>
Date: Fri, 1 Nov 2019 19:35:34 +0000
Subject: Fri Nov  1 19:35:34 UTC 2019

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.
---
 source/n/crda/crda.SlackBuild         |  6 +++---
 source/n/crda/crda.url                |  3 ++-
 source/xap/blueman/blueman.SlackBuild | 11 ++++++++---
 source/xap/blueman/slack-desc         |  2 +-
 4 files changed, 14 insertions(+), 8 deletions(-)

(limited to 'source')

diff --git a/source/n/crda/crda.SlackBuild b/source/n/crda/crda.SlackBuild
index e133bf477..c3649f6ea 100755
--- a/source/n/crda/crda.SlackBuild
+++ b/source/n/crda/crda.SlackBuild
@@ -24,8 +24,8 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=crda
-VERSION=${VERSION:-3.18}
-BUILD=${BUILD:-9}
+VERSION=${VERSION:-4.14}
+BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
 if [ -z "$ARCH" ]; then
@@ -45,7 +45,7 @@ if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   exit 0
 fi
 
-REGDBVERS=2019.03.01
+REGDBVERS=2019.06.03
 
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-crda
diff --git a/source/n/crda/crda.url b/source/n/crda/crda.url
index 29d4e08e3..ea4bf7802 100644
--- a/source/n/crda/crda.url
+++ b/source/n/crda/crda.url
@@ -1 +1,2 @@
-https://www.kernel.org/pub/software/network/crda/
+#https://www.kernel.org/pub/software/network/crda/
+https://git.kernel.org/cgit/linux/kernel/git/mcgrof/crda.git/
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:
-- 
cgit v1.2.3