From 36f31e1ddc375ef7804d68bd6c3e1857d3ab9f7c Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Thu, 30 Apr 2015 14:57:49 +0200
Subject: Apply remaining bits for the new release of KDE 5.

---
 kde/KDE.SlackBuild                | 9 ++-------
 kde/doinst.sh/ktp-contact-list    | 5 +++++
 kde/doinst.sh/ktp-text-ui         | 5 +++++
 kde/patch/kdelibs.patch           | 2 +-
 kdei/kde-l10n/kde-l10n.SlackBuild | 2 +-
 5 files changed, 14 insertions(+), 9 deletions(-)
 create mode 100644 kde/doinst.sh/ktp-contact-list
 create mode 100644 kde/doinst.sh/ktp-text-ui

diff --git a/kde/KDE.SlackBuild b/kde/KDE.SlackBuild
index d374f98..2efd2cf 100755
--- a/kde/KDE.SlackBuild
+++ b/kde/KDE.SlackBuild
@@ -545,17 +545,12 @@ mkdir -p $SLACK_KDE_BUILD_DIR
 # kde-baseapps is rebuilt after kdewebdev because it can then pickup
 #   libtidy and enable the Konqueror validators plugin to validate HTML.
 KDEMODS=" \
-  kdelibs \
-  kdebase:nepomuk-core \
-  kdepimlibs \
-  kdebase \
-  kdebindings
-  kdepim \
+  kde4 \
   frameworks \
   plasma \
   plasma-extra \
   applications \
-  extragear \
+  kde4-extragear \
   "
 
 # Allow for specification of individual packages to be built:
diff --git a/kde/doinst.sh/ktp-contact-list b/kde/doinst.sh/ktp-contact-list
new file mode 100644
index 0000000..e376b59
--- /dev/null
+++ b/kde/doinst.sh/ktp-contact-list
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/kde/doinst.sh/ktp-text-ui b/kde/doinst.sh/ktp-text-ui
new file mode 100644
index 0000000..e376b59
--- /dev/null
+++ b/kde/doinst.sh/ktp-text-ui
@@ -0,0 +1,5 @@
+
+if [ -x /usr/bin/update-desktop-database ]; then
+  /usr/bin/update-desktop-database /usr/share/applications >/dev/null 2>&1
+fi
+
diff --git a/kde/patch/kdelibs.patch b/kde/patch/kdelibs.patch
index 7656b22..8fefb2e 100644
--- a/kde/patch/kdelibs.patch
+++ b/kde/patch/kdelibs.patch
@@ -14,5 +14,5 @@ cat $CWD/patch/kdelibs/return-application-icons-properly.patch | patch -R -p1 --
 
 # Patch a BIC (binary incompatibility) introduced by mistake in 4.14.6.
 # Will be fixed in 4.14.7:
-cat $CWD/patch/kdelibs/fixbic-4.14.6.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+#cat $CWD/patch/kdelibs/fixbic-4.14.6.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
 
diff --git a/kdei/kde-l10n/kde-l10n.SlackBuild b/kdei/kde-l10n/kde-l10n.SlackBuild
index 1360846..8fe46b8 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=14.12.3
+[ -z $VERSION ] && export VERSION=15.04.0
 [ -z $ARCH ] && export ARCH=noarch
 [ -z $BUILD ] && export BUILD=1
 
-- 
cgit v1.2.3