From e0d005c66dbed44be15070995d9d9e9200c989fa Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Mon, 22 Aug 2016 21:28:52 +0200
Subject: Prepare for the KDE 5_16.08_testing release for Slackware.

---
 deps/alldeps.SlackBuild           | 8 +++++---
 deps/updates.SlackBuild           | 7 +++++--
 kde/KDE.SlackBuild                | 8 ++++----
 kdei/kde-l10n/kde-l10n.SlackBuild | 2 +-
 4 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/deps/alldeps.SlackBuild b/deps/alldeps.SlackBuild
index 1f695d9..b86b334 100755
--- a/deps/alldeps.SlackBuild
+++ b/deps/alldeps.SlackBuild
@@ -18,6 +18,8 @@ ALLDEPS=" \
   ninja \
   sni-qt \
   libinput \
+  libxkbcommon \
+  wayland \
   qt5 \
   qt5-webkit \
   OpenAL \
@@ -34,8 +36,7 @@ ALLDEPS=" \
   polkit-qt5-1 \
   grantlee \
   grantlee-qt4 \
-  wayland \
-  libxkbcommon \
+  poppler \
   json-glib \
   libdbusmenu-gtk \
   libindicator \
@@ -44,9 +45,10 @@ ALLDEPS=" \
   lmdb \
   libproxy \
   telepathy \
+  hack-font-ttf \
   noto-font-ttf \
   noto-cjk-font-ttf \
-
+  elogind \
   "
   # Not needed, conflicts with qt-gstreamer files
   #qt-gstreamer0 \
diff --git a/deps/updates.SlackBuild b/deps/updates.SlackBuild
index 396c411..97def37 100755
--- a/deps/updates.SlackBuild
+++ b/deps/updates.SlackBuild
@@ -19,6 +19,8 @@ ALLDEPS=" \
   sni-qt \
   OpenAL \
   libinput \
+  libxkbcommon \
+  wayland \
   qt5 \
   qt5-webkit \
   qca-qt5 \
@@ -30,8 +32,7 @@ ALLDEPS=" \
   polkit-qt5-1 \
   grantlee \
   grantlee-qt4 \
-  wayland \
-  libxkbcommon \
+  poppler \
   json-glib \
   libdbusmenu-gtk \
   libindicator \
@@ -40,8 +41,10 @@ ALLDEPS=" \
   lmdb \
   libproxy \
   telepathy \
+  hack-font-ttf \
   noto-font-ttf \
   noto-cjk-font-ttf \
+  elogind \
   "
   # Not needed, conflicts with qt-gstreamer files
   #qt-gstreamer0 \
diff --git a/kde/KDE.SlackBuild b/kde/KDE.SlackBuild
index fa9e1c3..5238b94 100755
--- a/kde/KDE.SlackBuild
+++ b/kde/KDE.SlackBuild
@@ -162,7 +162,7 @@ precheck() {
       echo "Source file '$(basename $SRCFILE)' is commented out: ($PKGTGT) !"
     elif cat package-blacklist |grep -v "^ *#" |grep -wq ${PKGBASE}$ ; then
       echo "Source file '$(basename $SRCFILE)' is on the package-blacklist ($PKGBASE) !"
-    elif ! cat modules/* |grep -v "^ *#" |grep -wq ${PKGBASE} ; then
+    elif ! cat modules/* |grep -v "^ *#" |grep -wq ${PKGBASE}$ ; then
       echo "Source file '$(basename $SRCFILE)' is not mentioned in 'modules' ($PKGBASE) !"
       RETVAL=1
     fi
@@ -243,7 +243,7 @@ build_mod_pkg () {
   PKG=${SLACK_KDE_BUILD_DIR}/${kde_module}/package-${kde_module}
   rm -rf $PKG
   mkdir -p $PKG
-  ( for PKGNAME in $(cat $kde_module |grep -v "^$" |grep -v "^#") ; do
+  ( for PKGNAME in $(cat $kde_module |grep -v "^$" |grep -v "^ *#") ; do
       if grep -wq "^${PKGNAME}$" ${CWD}/package-blacklist ; then
         continue
       fi
@@ -418,7 +418,7 @@ build_mod_pkg () {
     # for "<kde_module>":
     echo
     echo "Searching for packages in ${kde_module} that were not built modular:"
-    cat $CWD/modules/${kde_module} | grep -v "^#" | grep -v -w "^" | while read checkpackage ; do
+    cat $CWD/modules/${kde_module} | grep -v "^ *#" | grep -v -w "^" | while read checkpackage ; do
       if ! grep -wq "^${checkpackage}$" ${CWD}/modularize ; then
         # Non-modular package found, so we'll have to build the package below.
         # It might already have been built once, but in that case it is likely
@@ -512,7 +512,7 @@ deterministic_build() {
       if [ "${KDE_PKGS: -1}" = "," ]; then
         # Last character is a ','. Expand the list with all subsequent packages.
         START_PKG=$(echo $KDE_PKGS |rev |cut -d, -f2 |rev)
-        MOD_LIST=$(cat modules/$KDE_MOD |grep -v "^#" |grep -v "^$" |tr '\n' ',')
+        MOD_LIST=$(cat modules/$KDE_MOD |grep -v "^ *#" |grep -v "^$" |tr '\n' ',')
         KDE_PKGS="${KDE_PKGS}${MOD_LIST/#?*,${START_PKG},/}"
         echo "** SlackBuild expanding '$ENTRY' to '$KDE_MOD:$KDE_PKGS'"
       fi
diff --git a/kdei/kde-l10n/kde-l10n.SlackBuild b/kdei/kde-l10n/kde-l10n.SlackBuild
index 4fa9521..d1e960a 100755
--- a/kdei/kde-l10n/kde-l10n.SlackBuild
+++ b/kdei/kde-l10n/kde-l10n.SlackBuild
@@ -35,7 +35,7 @@ if [ ! -r ./languages ]; then
   done
 fi
 
-[ -z $VERSION ] && export VERSION=16.04.3
+[ -z $VERSION ] && export VERSION=16.08.0
 [ -z $ARCH ] && export ARCH=noarch
 [ -z $BUILD ] && export BUILD=1
 
-- 
cgit v1.2.3