summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--kde/patch/kdelibs.patch4
-rw-r--r--kde/patch/kdelibs/fixbic-4.14.6.patch47
2 files changed, 51 insertions, 0 deletions
diff --git a/kde/patch/kdelibs.patch b/kde/patch/kdelibs.patch
index e083090..7656b22 100644
--- a/kde/patch/kdelibs.patch
+++ b/kde/patch/kdelibs.patch
@@ -12,3 +12,7 @@ cat $CWD/patch/kdelibs/return-not-break.-copy-paste-error.patch | patch -R -p1 -
cat $CWD/patch/kdelibs/coding-style-fixes.patch | patch -R -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
cat $CWD/patch/kdelibs/return-application-icons-properly.patch | patch -R -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; }
+# 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 ; }
+
diff --git a/kde/patch/kdelibs/fixbic-4.14.6.patch b/kde/patch/kdelibs/fixbic-4.14.6.patch
new file mode 100644
index 0000000..585ce51
--- /dev/null
+++ b/kde/patch/kdelibs/fixbic-4.14.6.patch
@@ -0,0 +1,47 @@
+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 )