From 42f29689f597520389829b6d22c56ee21ace7657 Mon Sep 17 00:00:00 2001
From: Eric Hameleers <alien@slackware.com>
Date: Thu, 30 Jul 2020 19:43:34 +0200
Subject: kdelibs: fix for the relocated grantlee-qt4 includes

And remove redundant patch
---
 kde/patch/kdelibs.patch                            |  3 ++
 kde/patch/kdelibs/fixbic-4.14.6.patch              | 47 ----------------------
 .../kdelibs.grantlee-qt4.include.path.patch        | 11 +++++
 3 files changed, 14 insertions(+), 47 deletions(-)
 delete mode 100644 kde/patch/kdelibs/fixbic-4.14.6.patch
 create mode 100644 kde/patch/kdelibs/kdelibs.grantlee-qt4.include.path.patch

diff --git a/kde/patch/kdelibs.patch b/kde/patch/kdelibs.patch
index 44e201e..4f1fc45 100644
--- a/kde/patch/kdelibs.patch
+++ b/kde/patch/kdelibs.patch
@@ -25,3 +25,6 @@ cat $CWD/patch/kdelibs/kdelibs.2c3762feddf7e66cf6b64d9058f625a715694a00.patch |
 
 # Support TLS v1.1 and TLS v1.2:
 cat $CWD/patch/kdelibs/kde4libs-4.14.26.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+
+# Fix for the relocated grantlee-qt4 includes:
+cat $CWD/patch/kdelibs/kdelibs.grantlee-qt4.include.path.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
diff --git a/kde/patch/kdelibs/fixbic-4.14.6.patch b/kde/patch/kdelibs/fixbic-4.14.6.patch
deleted file mode 100644
index 585ce51..0000000
--- a/kde/patch/kdelibs/fixbic-4.14.6.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-diff --git a/khtml/dom/dom_string.h b/khtml/dom/dom_string.h
-index 087f697..b269213 100644
---- a/khtml/dom/dom_string.h
-+++ b/khtml/dom/dom_string.h
-@@ -124,10 +124,23 @@ public:
-     bool endsWith(const DOMString& str) const;
-     bool startsWith(const DOMString& str) const;
- 
--    // http://www.w3.org/TR/html/infrastructure.html#urls
-+    /**
-+     * Return a parsed url.
-+     * Used to parse SRC url attribute,
-+     * see http://www.w3.org/TR/html/infrastructure.html#urls
-+     *
-+     * @since 4.14.6
-+     */
-     DOMString parsedUrl() const;
- 
-     /**
-+     * @deprecated, use parsedUrl()
-+     */
-+#ifndef KDE_NO_DEPRECATED
-+    KDE_DEPRECATED DOMString trimSpaces() const;
-+#endif
-+
-+    /**
-      * @internal get a handle to the imlementation of the DOMString
-      * Use at own risk!!!
-      */
-diff --git a/khtml/dom/dom_string.cpp b/khtml/dom/dom_string.cpp
-index a3c4abd..4da676b 100644
---- a/khtml/dom/dom_string.cpp
-+++ b/khtml/dom/dom_string.cpp
-@@ -336,6 +336,13 @@ DOMString DOMString::parsedUrl() const
-     return out;
- }
- 
-+#ifndef KDE_NO_DEPRECATED
-+DOMString DOMString::trimSpaces() const
-+{
-+    return parsedUrl();
-+}
-+#endif
-+
- // ------------------------------------------------------------------------
- 
- bool DOM::strcasecmp( const DOMString &as, const DOMString &bs )
diff --git a/kde/patch/kdelibs/kdelibs.grantlee-qt4.include.path.patch b/kde/patch/kdelibs/kdelibs.grantlee-qt4.include.path.patch
new file mode 100644
index 0000000..fd7375f
--- /dev/null
+++ b/kde/patch/kdelibs/kdelibs.grantlee-qt4.include.path.patch
@@ -0,0 +1,11 @@
+--- ./kdeui/tests/proxymodeltestsuite/modeleventlogger.cpp.orig	2017-11-04 20:51:22.000000000 -0500
++++ ./kdeui/tests/proxymodeltestsuite/modeleventlogger.cpp	2020-07-12 14:19:32.175099684 -0500
+@@ -30,7 +30,7 @@
+ #include <QDebug>
+ 
+ #ifdef Grantlee_FOUND
+-#include <grantlee_core.h>
++#include <grantlee-qt4/grantlee_core.h>
+ #include "grantlee_paths.h"
+ 
+ /**
-- 
cgit v1.2.3