Thu Aug 1 21:26:28 UTC 201920190801212628

ap/mariadb-10.4.7-x86_64-1.txz:  Upgraded.
  This update fixes bugs and security issues.
  For more information, see:
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-2805
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-2740
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-2739
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-2737
    https://cve.mitre.org/cgi-bin/cvename.cgi?name=CVE-2019-2758
  (* Security fix *)
kde/pykde4-4.14.3-x86_64-9.txz:  Rebuilt.
kde/qtruby-4.14.3-x86_64-10.txz:  Rebuilt.
  Recompiled against QScintilla-2.11.2.
kde/smokeqt-4.14.3-x86_64-6.txz:  Rebuilt.
  Recompiled against QScintilla-2.11.2.
l/PyQt-4.12.3-x86_64-1.txz:  Upgraded.
  Thanks to alienBOB.
l/QScintilla-2.11.2-x86_64-1.txz:  Upgraded.
  Shared library .so-version bump.
  Thanks to alienBOB.
l/sip-4.19.18-x86_64-1.txz:  Upgraded.
  Thanks to alienBOB.
xap/sane-1.0.28-x86_64-1.txz:  Upgraded.

9 files changed, 54 insertions, 4 deletions

diff --git a/source/kde/build/pykde4 b/source/kde/build/pykde4
index 45a4fb75..ec635144 100644
--- a/source/kde/build/pykde4
+++ b/source/kde/build/pykde4
@@ -1 +1 @@
-8
+9
diff --git a/source/kde/build/qtruby b/source/kde/build/qtruby
index ec635144..f599e28b 100644
--- a/source/kde/build/qtruby
+++ b/source/kde/build/qtruby
@@ -1 +1 @@
-9
+10
diff --git a/source/kde/build/smokeqt b/source/kde/build/smokeqt
index 7ed6ff82..1e8b3149 100644
--- a/source/kde/build/smokeqt
+++ b/source/kde/build/smokeqt
@@ -1 +1 @@
-5
+6
diff --git a/source/kde/cmake/kdepimlibs b/source/kde/cmake/kdepimlibs
new file mode 100644
index 00000000..3cdeb397
--- /dev/null
+++ b/source/kde/cmake/kdepimlibs
@@ -0,0 +1,17 @@
+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 \
+    -DMAN_INSTALL_DIR=/usr/man \
+    -DSYSCONF_INSTALL_DIR=/etc/kde \
+    -DBoost_NO_BOOST_CMAKE=ON \
+    -DLIB_SUFFIX=${LIBDIRSUFFIX} \
+    ..
+
diff --git a/source/kde/kde.SlackBuild b/source/kde/kde.SlackBuild
index 1b58e99d..11c8f2bd 100755
--- a/source/kde/kde.SlackBuild
+++ b/source/kde/kde.SlackBuild
@@ -580,8 +580,14 @@ do
   else
     if [ -z "$PRINT_PACKAGE_NAME" ]; then
       echo "${module} failed to build."
+      touch "${SLACK_KDE_BUILD_DIR}/${kde_module}.failed"
+    fi
+    # Seems counterproductive to exit upon the first package build failure. Perhaps sending it
+    # through another time would help it, if later packages fix the build environment.
+    # If you still want to exit on first failure, set $EXIT_ON_FAIL to anything.
+    if [ ! -z "$EXIT_ON_FAIL" ]; then
+      exit 1
     fi
-    exit 1
   fi
   cd - > /dev/null
 done
diff --git a/source/kde/patch/pykde4.patch b/source/kde/patch/pykde4.patch
index 97bad9af..68be53e8 100644
--- a/source/kde/patch/pykde4.patch
+++ b/source/kde/patch/pykde4.patch
@@ -3,3 +3,4 @@ zcat $CWD/patch/pykde4/0003-Fix-build-with-sip-4.19.patch.gz | patch -p1 --verbo
 zcat $CWD/patch/pykde4/fix_kpythonpluginfactory_build.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
 zcat $CWD/patch/pykde4/Annotate-KAutoMount-as-Abstract.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
 zcat $CWD/patch/pykde4/pykde4-4.14.3-checkstate-sip-4.19.5.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+zcat $CWD/patch/pykde4/0004-Fix-build-with-sip-4.19.16.patch.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/patch/pykde4/0004-Fix-build-with-sip-4.19.16.patch b/source/kde/patch/pykde4/0004-Fix-build-with-sip-4.19.16.patch
new file mode 100644
index 00000000..a67888c8
--- /dev/null
+++ b/source/kde/patch/pykde4/0004-Fix-build-with-sip-4.19.16.patch
@@ -0,0 +1,18 @@
+--- ./sip/kdecore/typedefs.sip.orig	2014-08-14 15:17:11.000000000 -0500
++++ ./sip/kdecore/typedefs.sip	2019-07-31 14:22:50.591053652 -0500
+@@ -23,7 +23,7 @@
+ 
+ typedef long time_t;
+ 
+-typedef ulong size_t;
++// typedef ulong size_t;
+ 
+ typedef int ssize_t;
+ 
+@@ -1028,4 +1028,4 @@
+     return sipGetState(sipTransferObj);
+ %End
+ };
+-%End
+\ No newline at end of file
++%End
diff --git a/source/kde/patch/smokeqt.patch b/source/kde/patch/smokeqt.patch
new file mode 100644
index 00000000..a39121d4
--- /dev/null
+++ b/source/kde/patch/smokeqt.patch
@@ -0,0 +1 @@
+zcat $CWD/patch/smokeqt/smokeqt.qscintilla2.uintptr_t.diff.gz | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/source/kde/patch/smokeqt/smokeqt.qscintilla2.uintptr_t.diff b/source/kde/patch/smokeqt/smokeqt.qscintilla2.uintptr_t.diff
new file mode 100644
index 00000000..6f94fec5
--- /dev/null
+++ b/source/kde/patch/smokeqt/smokeqt.qscintilla2.uintptr_t.diff
@@ -0,0 +1,7 @@
+--- ./qsci/qscintilla2_includes.h.orig	2013-11-24 10:25:24.000000000 -0600
++++ ./qsci/qscintilla2_includes.h	2019-07-31 16:42:20.264301942 -0500
+@@ -1,3 +1,4 @@
++#include <stdint.h> /* for uintptr_t */
+ #include <qsciabstractapis.h>
+ #include <qsciapis.h>
+ #include <qscicommand.h>