diff options
Diffstat (limited to '')
-rw-r--r-- | kde/patch/kdelibs.patch | 3 | ||||
-rw-r--r-- | kde/patch/kdelibs/fixbic-4.14.6.patch | 47 | ||||
-rw-r--r-- | kde/patch/kdelibs/kdelibs.grantlee-qt4.include.path.patch | 11 | ||||
-rw-r--r-- | kde/patch/kdelibs4support.patch | 4 | ||||
-rw-r--r-- | kde/patch/kdelibs4support/update-FindGettext.patch | 36 |
5 files changed, 14 insertions, 87 deletions
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" + + /** diff --git a/kde/patch/kdelibs4support.patch b/kde/patch/kdelibs4support.patch index 8e9fe7b..7d6626e 100644 --- a/kde/patch/kdelibs4support.patch +++ b/kde/patch/kdelibs4support.patch @@ -1,6 +1,2 @@ -# Make FindGettext compatible with the one provided by CMake: -# Fixed in 5.1.0. -#cat $CWD/patch/kdelibs4support/update-FindGettext.patch | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } - # Allow cmake to find our doctools: cat $CWD/patch/kdelibs4support/FindDocBookXML4.cmake.diff | patch -p1 --verbose || { touch ${SLACK_KDE_BUILD_DIR}/${PKGNAME}.failed ; continue ; } diff --git a/kde/patch/kdelibs4support/update-FindGettext.patch b/kde/patch/kdelibs4support/update-FindGettext.patch deleted file mode 100644 index 1b75cd8..0000000 --- a/kde/patch/kdelibs4support/update-FindGettext.patch +++ /dev/null @@ -1,36 +0,0 @@ -From: Alex Merry <alex.merry@kde.org> -Date: Fri, 04 Jul 2014 10:10:27 +0000 -Subject: Make FindGettext compatible with the one provided by CMake -X-Git-Url: http://quickgit.kde.org/?p=kdelibs4support.git&a=commitdiff&h=581ee6b370d8b5627196c8d6d8760d3655f6daea ---- -Make FindGettext compatible with the one provided by CMake - -This version will accept the old GETTEXT_PROCESS_PO_FILES() syntax (no -PO_FILES argument), but will also accept the new syntax required by -CMake's version of this file. It will also warn when PO_FILES is not -given. - -REVIEW: 119111 ---- - - ---- a/cmake/modules/FindGettext.cmake -+++ b/cmake/modules/FindGettext.cmake -@@ -212,7 +212,16 @@ - LIST(REMOVE_AT _args 0 1) - ENDIF("${_tmp}" STREQUAL "INSTALL_DESTINATION") - --# message(STATUS "2 all ${_addToAll} dest ${_installDest} args: ${_args}") -+ LIST(GET _args 0 _tmp) -+ IF("${_tmp}" STREQUAL "PO_FILES") -+ LIST(REMOVE_AT _args 0) -+ ELSE() -+ SET(_deprecation_arg DEPRECATION) -+ IF(CMAKE_VERSION VERSION_LESS 3.0.0) -+ SET(_deprecation_arg AUTHOR_WARNING) -+ ENDIF() -+ MESSAGE(${_deprecation_arg} "GETTEXT_PROCESS_PO_FILES without a PO_FILES argument is deprecated") -+ ENDIF() - - FOREACH(_current_PO_FILE ${_args}) - GET_FILENAME_COMPONENT(_name ${_current_PO_FILE} NAME) |