Package rebuilds due to poppler upgrade in slackware-current

deps:poppler
frameworks:kfilemetadata5
kdepim:kdepim-addons
applications:okular
applications-extra:calligra,krita

13 files changed, 76 insertions, 46 deletions

diff --git a/deps/poppler/poppler.remove.qt4.frontend.diff b/deps/poppler/patches/poppler.remove.qt4.frontend.diff
index 2b58eb5..2b58eb5 100644
--- a/deps/poppler/poppler.remove.qt4.frontend.diff
+++ b/deps/poppler/patches/poppler.remove.qt4.frontend.diff
diff --git a/deps/poppler/patches/poppler.splashpath.h.revert.diff b/deps/poppler/patches/poppler.splashpath.h.revert.diff
new file mode 100644
index 0000000..4f008bd
--- /dev/null
+++ b/deps/poppler/patches/poppler.splashpath.h.revert.diff
@@ -0,0 +1,11 @@
+--- ./splash/SplashPath.h.orig	2018-06-19 16:16:47.000000000 -0500
++++ ./splash/SplashPath.h	2018-06-21 14:04:25.679001859 -0500
+@@ -137,6 +137,8 @@
+ 
+   friend class SplashXPath;
+   friend class Splash;
++  // this is a temporary hack, until we read FreeType paths directly
++  friend class ArthurOutputDev;
+ };
+ 
+ #endif
diff --git a/deps/poppler/poppler.SlackBuild b/deps/poppler/poppler.SlackBuild
index 55f1d77..1825e13 100755
--- a/deps/poppler/poppler.SlackBuild
+++ b/deps/poppler/poppler.SlackBuild
@@ -26,7 +26,7 @@
 cd $(dirname $0) ; CWD=$(pwd)
 
 PKGNAM=poppler
-VERSION=${VERSION:-0.65.0}
+VERSION=${VERSION:-0.66.0}
 BUILD=${BUILD:-1}
 
 # Automatically determine the architecture we're building on:
@@ -82,10 +82,10 @@ cd ${PKGNAM}-$VERSION || exit 1
 
 # At least for now, we will revert this patch since we have
 # things that depend on it:
-cat $CWD/poppler.remove.qt4.frontend.diff | patch -p1 -R --verbose || exit 1
+cat $CWD/patches/poppler.remove.qt4.frontend.diff | patch -p1 -R --verbose || exit 1
 
 # Revert a change to SplashPath.h (in 0.63.0) that breaks compiling the qt4 frontend:
-cat $CWD/poppler.splashpath.h.revert.diff | patch -p1 --verbose || exit 1
+cat $CWD/patches/poppler.splashpath.h.revert.diff | patch -p1 --verbose || exit 1
 
 chown -R root:root .
 find . \
diff --git a/deps/poppler/poppler.splashpath.h.revert.diff b/deps/poppler/poppler.splashpath.h.revert.diff
deleted file mode 100644
index 6408606..0000000
--- a/deps/poppler/poppler.splashpath.h.revert.diff
+++ /dev/null
@@ -1,42 +0,0 @@
---- ./splash/SplashPath.h.orig	2018-03-18 13:23:49.000000000 -0500
-+++ ./splash/SplashPath.h	2017-12-03 13:25:06.000000000 -0600
-@@ -4,20 +4,6 @@
- //
- //========================================================================
- 
--//========================================================================
--//
--// Modified under the Poppler project - http://poppler.freedesktop.org
--//
--// All changes made under the Poppler project to this file are licensed
--// under GPL version 2 or later
--//
--// Copyright (C) 2018 Albert Astals Cid <aacid@kde.org>
--//
--// To see a description of the changes please see the Changelog file that
--// came with your tarball or type make ChangeLog if you are building from git
--//
--//========================================================================
--
- #ifndef SPLASHPATH_H
- #define SPLASHPATH_H
- 
-@@ -76,9 +62,6 @@
- 
-   ~SplashPath();
- 
--  SplashPath(const SplashPath&) = delete;
--  SplashPath& operator=(const SplashPath&) = delete;
--
-   // Append <path> to <this>.
-   void append(SplashPath *path);
- 
-@@ -133,6 +116,8 @@
- 
-   friend class SplashXPath;
-   friend class Splash;
-+  // this is a temporary hack, until we read FreeType paths directly
-+  friend class ArthurOutputDev;
- };
- 
- #endif
diff --git a/kde/build/calligra b/kde/build/calligra
index 7ed6ff8..1e8b314 100644
--- a/kde/build/calligra
+++ b/kde/build/calligra
@@ -1 +1 @@
-5
+6
diff --git a/kde/build/kdepim-addons b/kde/build/kdepim-addons
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/kde/build/kdepim-addons
@@ -0,0 +1 @@
+2
diff --git a/kde/build/kfilemetadata5 b/kde/build/kfilemetadata5
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/kde/build/kfilemetadata5
@@ -0,0 +1 @@
+2
diff --git a/kde/build/krita b/kde/build/krita
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/kde/build/krita
@@ -0,0 +1 @@
+2
diff --git a/kde/build/okular b/kde/build/okular
new file mode 100644
index 0000000..0cfbf08
--- /dev/null
+++ b/kde/build/okular
@@ -0,0 +1 @@
+2
diff --git a/kde/cmake/plasma-browser-integration b/kde/cmake/plasma-browser-integration
new file mode 100644
index 0000000..c9b3db9
--- /dev/null
+++ b/kde/cmake/plasma-browser-integration
@@ -0,0 +1,24 @@
+mkdir build
+cd build
+  cmake \
+    $KDE_OPT_ARGS \
+    -DKDE_PLATFORM_FEATURE_DISABLE_DEPRECATED=TRUE \
+    -DCMAKE_C_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_C_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS:STRING="$SLKCFLAGS" \
+    -DCMAKE_CXX_FLAGS_RELEASE:STRING="$SLKCFLAGS" \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    -DKDE_INSTALL_LIBDIR=lib$LIBDIRSUFFIX \
+    -DKDE_INSTALL_LIBEXECDIR=lib$LIBDIRSUFFIX \
+    -DKDE_INSTALL_MANDIR=/usr/man \
+    -DKDE_INSTALL_QTPLUGINDIR=lib$LIBDIRSUFFIX/qt5/plugins \
+    -DKDE_INSTALL_QMLDIR=lib$LIBDIRSUFFIX/qt5/qml \
+    -DKDE_INSTALL_SYSCONFDIR=/etc \
+    -DKDE_INSTALL_USE_QT_SYS_PATHS=ON \
+    -DBUILD_TESTING=OFF \
+    -DQca-qt5_DIR=/usr/lib${LIBDIRSUFFIX}/cmake/Qca \
+    -DINSTALL_CHROME_MANIFEST=ON \
+    ..
+
diff --git a/kde/patch/plasma-browser-integration.patch b/kde/patch/plasma-browser-integration.patch
new file mode 100644
index 0000000..c82fee9
--- /dev/null
+++ b/kde/patch/plasma-browser-integration.patch
@@ -0,0 +1,3 @@
+# Fix hardcoded mozilla 'lib' libdir:
+cat $CWD/patch/plasma-browser-integration/plasma-browser-integration_KDEBUG-113461.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
diff --git a/kde/patch/plasma-browser-integration/plasma-browser-integration_KDEBUG-113461.patch b/kde/patch/plasma-browser-integration/plasma-browser-integration_KDEBUG-113461.patch
new file mode 100644
index 0000000..c881edf
--- /dev/null
+++ b/kde/patch/plasma-browser-integration/plasma-browser-integration_KDEBUG-113461.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt	2018-06-07 22:22:27.000000000 +0800
++++ b/CMakeLists.txt	2018-06-20 20:55:56.000000000 +0800
+@@ -45,7 +45,7 @@
+ option(COPY_MESSAGING_HOST_FILE_HOME "Copy the native messaging hosts json file to user home dir" FALSE)
+ add_feature_info(COPY_MESSAGING_HOST_FILE_HOME ${COPY_MESSAGING_HOST_FILE_HOME} "Enable this option to copy the native messaging hosts json file to home dir if you install plasma-browser-integration to custom prefix (non-/usr)")
+ 
+-set(MOZILLA_DIR "${CMAKE_INSTALL_PREFIX}/lib/mozilla" CACHE STRING "Mozilla directory")
++set(MOZILLA_DIR "${CMAKE_INSTALL_PREFIX}/${KDE_INSTALL_LIBDIR}/mozilla" CACHE STRING "Mozilla directory")
+ add_feature_info(MOZILLA_DIR On "Mozilla directory is '${MOZILLA_DIR}'")
+ 
+ add_subdirectory(host)
diff --git a/kde/slack-desc/plasma-browser-integration b/kde/slack-desc/plasma-browser-integration
new file mode 100644
index 0000000..97d3468
--- /dev/null
+++ b/kde/slack-desc/plasma-browser-integration
@@ -0,0 +1,19 @@
+# HOW TO EDIT THIS FILE:
+# 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
+# customary to leave one space after the ':'.
+
+                          |-----handy-ruler------------------------------------------------------|
+plasma-browser-integration: plasma-browser-integration (integrate browsers into the Plasma desktop)
+plasma-browser-integration:
+plasma-browser-integration: The plasma-browser-integration package contains
+plasma-browser-integration: omponents necessary to integrate browsers into the Plasma Desktop
+plasma-browser-integration:
+plasma-browser-integration:
+plasma-browser-integration:
+plasma-browser-integration:
+plasma-browser-integration:
+plasma-browser-integration: Home page: https://www.kde.org/plasma-desktop
+plasma-browser-integration: