Mon May 28 19:12:29 UTC 201820180528191229

a/pkgtools-15.0-noarch-13.txz:  Rebuilt.
  installpkg: default line length for --terselength is the number of columns.
  removepkg: added --terse mode.
  upgradepkg: default line length for --terselength is the number of columns.
  upgradepkg: accept -option in addition to --option.
ap/vim-8.1.0026-x86_64-1.txz:  Upgraded.
d/bison-3.0.5-x86_64-1.txz:  Upgraded.
e/emacs-26.1-x86_64-1.txz:  Upgraded.
kde/kopete-4.14.3-x86_64-8.txz:  Rebuilt.
  Recompiled against libidn-1.35.
n/conntrack-tools-1.4.5-x86_64-1.txz:  Upgraded.
n/libnetfilter_conntrack-1.0.7-x86_64-1.txz:  Upgraded.
n/libnftnl-1.1.0-x86_64-1.txz:  Upgraded.
n/links-2.16-x86_64-2.txz:  Rebuilt.
  Rebuilt to enable X driver for -g mode.
n/lynx-2.8.9dev.19-x86_64-1.txz:  Upgraded.
n/nftables-0.8.5-x86_64-1.txz:  Upgraded.
n/p11-kit-0.23.11-x86_64-1.txz:  Upgraded.
n/ulogd-2.0.7-x86_64-1.txz:  Upgraded.
n/whois-5.3.1-x86_64-1.txz:  Upgraded.
xap/network-manager-applet-1.8.12-x86_64-1.txz:  Upgraded.
xap/vim-gvim-8.1.0026-x86_64-1.txz:  Upgraded.

5 files changed, 43 insertions, 90 deletions

diff --git a/source/xap/blueman/0001-Notification-Also-check-if-notification-daemon-suppo.patch b/source/xap/blueman/0001-Notification-Also-check-if-notification-daemon-suppo.patch
deleted file mode 100644
index fd244f3f6..000000000
--- a/source/xap/blueman/0001-Notification-Also-check-if-notification-daemon-suppo.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From fe902c8827fccae8df93d9deff53e22917d69369 Mon Sep 17 00:00:00 2001
-From: Sander Sweers <infirit@gmail.com>
-Date: Mon, 16 May 2016 16:22:14 +0200
-Subject: [PATCH 1/2] Notification: Also check if notification daemon supports
- body
-
-This is the absolute minimum we require from the notification daemon. With
-this we fix the when no daemon is available (not running or installed).
-See [1] what prompted this change.
-
-[1] https://github.com/blueman-project/blueman/issues/519#issuecomment-218976647
----
- blueman/gui/Notification.py | 14 +++++++++++---
- 1 file changed, 11 insertions(+), 3 deletions(-)
-
-diff --git a/blueman/gui/Notification.py b/blueman/gui/Notification.py
-index 41fdd69..6f3d3dc 100644
---- a/blueman/gui/Notification.py
-+++ b/blueman/gui/Notification.py
-@@ -161,10 +161,18 @@ class Notification(object):
-     def actions_supported():
-         return "actions" in Notify.get_server_caps()
- 
-+    @staticmethod
-+    def body_supported():
-+        return "body" in Notify.get_server_caps()
-+
-     def __new__(cls, summary, message, timeout=-1, actions=None, actions_cb=None, pixbuf=None, status_icon=None):
--        if not Config('org.blueman.general')['notification-daemon'] or (actions and not cls.actions_supported()):
--            # Use fallback as user does not want to use a notification daemon or we have to show actions and the
--            # notification daemon does not provide them
-+        forced_fallback = not Config('org.blueman.general')['notification-daemon']
-+
-+        if forced_fallback or not cls.body_supported() or (actions and not cls.actions_supported()):
-+            # Use fallback in the case:
-+            # * user does not want to use a notification daemon
-+            # * the notification daemon is not available
-+            # * we have to show actions and the notification daemon does not provide them
-             klass = _NotificationDialog
-         else:
-             klass = _NotificationBubble
--- 
-2.8.3
-
diff --git a/source/xap/blueman/0002-NetConf-Treat-UnicodeDecodeError-as-if-there-was-no-.patch b/source/xap/blueman/0002-NetConf-Treat-UnicodeDecodeError-as-if-there-was-no-.patch
deleted file mode 100644
index 17820a106..000000000
--- a/source/xap/blueman/0002-NetConf-Treat-UnicodeDecodeError-as-if-there-was-no-.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 2b4c3aecff94c1093de41285bba34b40bc69ddaf Mon Sep 17 00:00:00 2001
-From: Sander Sweers <infirit@gmail.com>
-Date: Mon, 2 May 2016 14:49:13 +0200
-Subject: [PATCH 2/2] NetConf: Treat UnicodeDecodeError as if there was no file
-
-This is unfortunate but most people will not even notice we created a new
-state file.
----
- blueman/main/NetConf.py | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/blueman/main/NetConf.py b/blueman/main/NetConf.py
-index d62dc14..4d7efd8 100644
---- a/blueman/main/NetConf.py
-+++ b/blueman/main/NetConf.py
-@@ -222,7 +222,7 @@ class NetConf(object):
-             NetConf.default_inst = obj
-             f.close()
-             return obj
--        except IOError:
-+        except (IOError, UnicodeDecodeError):
-             n = cls()
-             try:
-                 n.store()
--- 
-2.8.3
-
diff --git a/source/xap/blueman/blueman.SlackBuild b/source/xap/blueman/blueman.SlackBuild
index 810b8cc21..b98391b8a 100755
--- a/source/xap/blueman/blueman.SlackBuild
+++ b/source/xap/blueman/blueman.SlackBuild
@@ -1,9 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for blueman
 
-# Copyright 2009,2015  Robby Workman, Tuscaloosa, Alabama, USA
-# Copyright 2010,2015  Patrick Volkerding, Sebeka, MN, USA
+# Copyright 2009, 2015  Robby Workman, Tuscaloosa, Alabama, USA
+# Copyright 2010, 2015, 2018  Patrick Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -23,9 +23,11 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+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
@@ -37,9 +39,16 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PKGNAM-$VERSION-$ARCH-$BUILD.txz"
+  exit 0
+fi
+
 NUMJOBS=${NUMJOBS:-" -j7 "}
 
-CWD=$(pwd)
 TMP=${TMP:-/tmp}
 PKG=$TMP/package-$PKGNAM
 
@@ -57,7 +66,10 @@ else
   LIBDIRSUFFIX=""
 fi
 
-rm -rf $PKG 
+PYTHON3VER=$(python3 -V 2>&1 | cut -f 2 -d' ' | cut -f 1-2 -d.)
+PYTHON3LIB=$( python3 -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib())' )
+
+rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf $PKGNAM-$VERSION
@@ -70,11 +82,13 @@ find . \
   \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
   -exec chmod 644 {} \;
 
-zcat $CWD/0001-Notification-Also-check-if-notification-daemon-suppo.patch.gz | patch -p1 --verbose || exit 1
-zcat $CWD/0002-NetConf-Treat-UnicodeDecodeError-as-if-there-was-no-.patch.gz | patch -p1 --verbose || exit 1
+# 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
 
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
+PYTHON=/usr/bin/python3 \
+CYTHONEXEC=/usr/bin/cython3 \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
@@ -96,14 +110,15 @@ CXXFLAGS="$SLKCFLAGS" \
 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/python2.7,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
 
 # Remove the AppIndicator.py plugin (we don't have libappindicator3
 # nor will we be getting it in the foreseeable future)
-rm $PKG/usr/lib${LIBDIRSUFFIX}/python*/site-packages/blueman/plugins/applet/AppIndicator.py*
+rm ${PKG}$PYTHON3LIB/blueman/plugins/applet/AppIndicator.py
+rm ${PKG}$PYTHON3LIB/blueman/plugins/applet/__pycache__/AppIndicator*.pyc
 
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
diff --git a/source/xap/blueman/dont-autostart-applet-in-kde.diff b/source/xap/blueman/dont-autostart-applet-in-kde.diff
new file mode 100644
index 000000000..0334321fc
--- /dev/null
+++ b/source/xap/blueman/dont-autostart-applet-in-kde.diff
@@ -0,0 +1,9 @@
+diff -Nur blueman-20170523_git_1500d60ebf3e.orig/data/blueman.desktop.in blueman-20170523_git_1500d60ebf3e/data/blueman.desktop.in
+--- blueman-20170523_git_1500d60ebf3e.orig/data/blueman.desktop.in	2014-12-19 09:25:34.000000000 -0600
++++ blueman-20170523_git_1500d60ebf3e/data/blueman.desktop.in	2017-06-27 16:59:28.121073690 -0500
+@@ -5,4 +5,5 @@
+ Exec=blueman-applet
+ Terminal=false
+ Type=Application
++NotShowIn=KDE;
+ Categories=
diff --git a/source/xap/blueman/slack-desc b/source/xap/blueman/slack-desc
index a906f3ff3..93143ff90 100644
--- a/source/xap/blueman/slack-desc
+++ b/source/xap/blueman/slack-desc
@@ -1,8 +1,8 @@
 # HOW TO EDIT THIS FILE:
-# The "handy ruler" below makes it easier to edit a package description.  Line
+# The "handy ruler" below makes it easier to edit a package description. Line
 # up the first '|' above the ':' following the base package name, and the '|'
-# on the right side marks the last column you can put a character in.  You must
-# make exactly 11 lines for the formatting to be correct.  It's also
+# on the right side marks the last column you can put a character in. You must
+# make exactly 11 lines for the formatting to be correct. It's also
 # customary to leave one space after the ':'.
 
        |-----handy-ruler------------------------------------------------------|
@@ -10,10 +10,10 @@ blueman: Blueman (Graphical Bluetooth Manager)
 blueman:
 blueman: Blueman is a GTK+ Bluetooth Manager for tasks such as:
 blueman:
-blueman:   - Connecting to 3G/EDGE/GPRS via DUN profile.
-blueman:   - Connecting to/Creating bluetooth networks
-blueman:   - Connecting to input and audio devices
-blueman:   - Sending/Receiving/Browsing files via OBEX
-blueman:   - Pairing
+blueman:  - Connecting to 3G/EDGE/GPRS via DUN profile.
+blueman:  - Connecting to/Creating bluetooth networks
+blueman:  - Connecting to input and audio devices
+blueman:  - Sending/Receiving/Browsing files via OBEX
+blueman:  - Pairing
 blueman:
-blueman: Homepage:  https://github.com/blueman-project/blueman
+blueman: Homepage: https://github.com/blueman-project/blueman