From f0e6e91722ec10bf7aa6a4bf53d1aedd8aee4c74 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Mon, 22 Dec 2014 15:20:09 +0100
Subject: KDE 4.14.3 for Slackware current (post-14.1) (11nov2014)

---
 kde/KDE.options                                     |   2 +-
 kde/build/kde-workspace                             |   2 --
 kde/build/plasma-nm                                 |   2 --
 kde/modules/kdegraphics                             |   2 +-
 kde/patch/krdc.patch                                |   3 +++
 kde/patch/krdc/krdc_freerdp-1.1.0.patch.gz          | Bin 0 -> 2203 bytes
 kde/patch/smokekde.patch                            |   3 +++
 kde/patch/smokekde/smokekde_akonadi_header.patch.gz | Bin 0 -> 264 bytes
 8 files changed, 8 insertions(+), 6 deletions(-)
 delete mode 100644 kde/build/kde-workspace
 delete mode 100644 kde/build/plasma-nm
 create mode 100644 kde/patch/krdc.patch
 create mode 100644 kde/patch/krdc/krdc_freerdp-1.1.0.patch.gz
 create mode 100644 kde/patch/smokekde.patch
 create mode 100644 kde/patch/smokekde/smokekde_akonadi_header.patch.gz

(limited to 'kde')

diff --git a/kde/KDE.options b/kde/KDE.options
index 6d88efc..f67d5eb 100644
--- a/kde/KDE.options
+++ b/kde/KDE.options
@@ -3,7 +3,7 @@
 # usually has a different version number), or by setting your own
 # environment variables.
 
-[ -z $VERSION ] && export VERSION=4.13.3
+[ -z $VERSION ] && export VERSION=4.14.3
 [ -z $BUILD ] && export BUILD=1
 
 # Automatically determine the architecture we're building on:
diff --git a/kde/build/kde-workspace b/kde/build/kde-workspace
deleted file mode 100644
index 9a7456b..0000000
--- a/kde/build/kde-workspace
+++ /dev/null
@@ -1,2 +0,0 @@
-2
-
diff --git a/kde/build/plasma-nm b/kde/build/plasma-nm
deleted file mode 100644
index 9a7456b..0000000
--- a/kde/build/plasma-nm
+++ /dev/null
@@ -1,2 +0,0 @@
-2
-
diff --git a/kde/modules/kdegraphics b/kde/modules/kdegraphics
index 485b3a8..88ee13c 100644
--- a/kde/modules/kdegraphics
+++ b/kde/modules/kdegraphics
@@ -2,8 +2,8 @@ libkipi
 libkexiv2
 libkdcraw
 libksane
-okular
 kdegraphics-mobipocket
+okular
 kdegraphics-strigi-analyzer
 kdegraphics-thumbnailers
 gwenview
diff --git a/kde/patch/krdc.patch b/kde/patch/krdc.patch
new file mode 100644
index 0000000..54e82a0
--- /dev/null
+++ b/kde/patch/krdc.patch
@@ -0,0 +1,3 @@
+# Allow for the use of xfreerdp >= 1.1.0:
+zcat $CWD/patch/krdc/krdc_freerdp-1.1.0.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
diff --git a/kde/patch/krdc/krdc_freerdp-1.1.0.patch.gz b/kde/patch/krdc/krdc_freerdp-1.1.0.patch.gz
new file mode 100644
index 0000000..0c633cc
Binary files /dev/null and b/kde/patch/krdc/krdc_freerdp-1.1.0.patch.gz differ
diff --git a/kde/patch/smokekde.patch b/kde/patch/smokekde.patch
new file mode 100644
index 0000000..90fec0c
--- /dev/null
+++ b/kde/patch/smokekde.patch
@@ -0,0 +1,3 @@
+# Add missing include. Fixed just before go-live of 4.14.1.
+#zcat $CWD/patch/smokekde/smokekde_akonadi_header.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
diff --git a/kde/patch/smokekde/smokekde_akonadi_header.patch.gz b/kde/patch/smokekde/smokekde_akonadi_header.patch.gz
new file mode 100644
index 0000000..36874e7
Binary files /dev/null and b/kde/patch/smokekde/smokekde_akonadi_header.patch.gz differ
-- 
cgit v1.2.3