kde-apps: Drop KDE PIM 4.14.11_pre20160211

Package-Manager: Portage-2.3.5, Repoman-2.3.1

3 files changed, 0 insertions, 251 deletions

diff --git a/kde-apps/kdepimlibs/files/kdepimlibs-4.14.11-boostincludes.patch b/kde-apps/kdepimlibs/files/kdepimlibs-4.14.11-boostincludes.patch
deleted file mode 100644
index 1b5cdcb52e46..000000000000
--- a/kde-apps/kdepimlibs/files/kdepimlibs-4.14.11-boostincludes.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Make sure that the Boost headers are actually found, since they are
-referenced in the kdepimlibs headers. 
-Patch by Alex Turbov, see https://bugs.kde.org/show_bug.cgi?id=306323
-
---- a/KdepimLibsConfig.cmake.in.org	2012-08-13 12:46:24.000000000 +0400
-+++ b/KdepimLibsConfig.cmake.in	2012-09-06 08:53:53.000000000 +0400
-@@ -15,7 +15,7 @@
- set(KDEPIMLIBS_DBUS_INTERFACES_DIR "@KDEPIMLIBS_DBUS_INTERFACES_DIR@")
- set(KDEPIMLIBS_DBUS_SERVICES_DIR   "@KDEPIMLIBS_DBUS_SERVICES_DIR@")
- set(KDEPIMLIBS_INCLUDE_DIR         "@KDEPIMLIBS_INCLUDE_DIR@")
--set(KDEPIMLIBS_INCLUDE_DIRS        "@KDEPIMLIBS_INCLUDE_DIR@" "@KDEPIMLIBS_INCLUDE_DIR@/KDE")
-+set(KDEPIMLIBS_INCLUDE_DIRS        "@KDEPIMLIBS_INCLUDE_DIR@" "@KDEPIMLIBS_INCLUDE_DIR@/KDE" "@Boost_INCLUDE_DIR@")
- set(KDEPIMLIBS_LIB_DIR             "@KDEPIMLIBS_LIB_DIR@")
- set(KDEPIMLIBS_BIN_DIR             "@KDEPIMLIBS_BIN_DIR@")
- set(KDEPIMLIBS_LIBEXEC_DIR         "@KDEPIMLIBS_LIBEXEC_DIR@")
diff --git a/kde-apps/kdepimlibs/files/kdepimlibs-4.14.11-gpgme-1.8.0.patch b/kde-apps/kdepimlibs/files/kdepimlibs-4.14.11-gpgme-1.8.0.patch
deleted file mode 100644
index 83a128c8f6ca..000000000000
--- a/kde-apps/kdepimlibs/files/kdepimlibs-4.14.11-gpgme-1.8.0.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-commit 0b684a86d8cf918a4c2ab047a4d6c3034a93c12b
-Author: Andreas Sturmlechner <andreas.sturmlechner@gmail.com>
-Date:   Sun Mar 5 18:28:45 2017 +0100
-
-    Adapt to >=gpgme-1.8.0, need for -phtread is gone
-
-diff --git a/cmake/modules/FindGpgme.cmake b/cmake/modules/FindGpgme.cmake
-index 5da9a60..268314a 100644
---- a/cmake/modules/FindGpgme.cmake
-+++ b/cmake/modules/FindGpgme.cmake
-@@ -11,12 +11,12 @@
- #    - GPGME_INCLUDES is the same for all of the above
- #    - GPGME_FOUND is set if any of the above was found
- #  - *nix:
--#    There's also three variants: gpgme{,-pthread,-pth}.
-+#    There's also two variants: gpgme{,-pth}.
- #    - The variant used determines the multithreaded use possible:
--#      - gpgme:         no multithreading support available
--#      - gpgme-pthread: multithreading available using POSIX threads
-+#      - gpgme:         >=GpgME-1.8.0 multithreading support available
- #      - gpgme-pth:     multithreading available using GNU PTH (cooperative multithreading)
--#    - GPGME_{VANILLA,PTH,PTHREAD}_{FOUND,LIBRARIES} will be set for each of the above
-+#    - GPGME_{VANILLA,PTH}_{FOUND,LIBRARIES} will be set for each of the above
-+#    - GPGME_PTHREAD_{FOUND,LIBRARIES} will be set for legacy compatibility
- #    - GPGME_INCLUDES is the same for all of the above
- #    - GPGME_FOUND is set if any of the above was found
- #
-@@ -164,7 +164,7 @@ else() # not WIN32
-   if ( _seem_to_have_cached_gpgme )
- 
-     macro_bool_to_bool( GPGME_VANILLA_LIBRARIES GPGME_VANILLA_FOUND )
--    macro_bool_to_bool( GPGME_PTHREAD_LIBRARIES GPGME_PTHREAD_FOUND )
-+    macro_bool_to_bool( GPGME_VANILLA_LIBRARIES GPGME_PTHREAD_FOUND )
-     macro_bool_to_bool( GPGME_PTH_LIBRARIES     GPGME_PTH_FOUND     )
- 
-     if ( GPGME_VANILLA_FOUND OR GPGME_PTHREAD_FOUND OR GPGME_PTH_FOUND )
-@@ -189,7 +189,7 @@ else() # not WIN32
- 
-       exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --version OUTPUT_VARIABLE GPGME_VERSION )
- 
--      set( _GPGME_MIN_VERSION "1.1.7" )
-+      set( _GPGME_MIN_VERSION "1.7.99" )
-       if( ${GPGME_VERSION} VERSION_GREATER ${_GPGME_MIN_VERSION} )
-         set( _GPGME_INSTALLED_VERSION_OK TRUE )
-       endif()
-@@ -207,7 +207,7 @@ else() # not WIN32
- 	  set( _gpgme_config_vanilla_libs )
- 	endif()
- 
--        exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS --thread=pthread --libs OUTPUT_VARIABLE _gpgme_config_pthread_libs RETURN_VALUE _ret )
-+        exec_program( ${_GPGMECONFIG_EXECUTABLE} ARGS                  --libs OUTPUT_VARIABLE _gpgme_config_pthread_libs RETURN_VALUE _ret )
- 	if ( _ret )
- 	  set( _gpgme_config_pthread_libs )
- 	endif()
-@@ -294,7 +294,7 @@ else() # not WIN32
-           # This comment above doesn't make sense, the four following lines seem to do nothing. Alex
-           set( GPGME_INCLUDES          ${GPGME_INCLUDES} )
-           set( GPGME_VANILLA_LIBRARIES ${GPGME_VANILLA_LIBRARIES} )
--          set( GPGME_PTHREAD_LIBRARIES ${GPGME_PTHREAD_LIBRARIES} )
-+          set( GPGME_PTHREAD_LIBRARIES ${GPGME_VANILLA_LIBRARIES} )
-           set( GPGME_PTH_LIBRARIES     ${GPGME_PTH_LIBRARIES} )
- 
-           if ( GPGME_VANILLA_FOUND OR GPGME_PTHREAD_FOUND OR GPGME_PTH_FOUND )
-@@ -319,7 +319,7 @@ else() # not WIN32
- 
-   macro_bool_to_01( GPGME_FOUND         HAVE_GPGME         )
-   macro_bool_to_01( GPGME_VANILLA_FOUND HAVE_GPGME_VANILLA )
--  macro_bool_to_01( GPGME_PTHREAD_FOUND HAVE_GPGME_PTHREAD )
-+  macro_bool_to_01( GPGME_VANILLA_FOUND HAVE_GPGME_PTHREAD )
-   macro_bool_to_01( GPGME_PTH_FOUND     HAVE_GPGME_PTH     )
- 
- endif() # WIN32 | Unix
-diff --git a/cmake/modules/FindQGpgme.cmake b/cmake/modules/FindQGpgme.cmake
-index 50013eb..4d94af6 100644
---- a/cmake/modules/FindQGpgme.cmake
-+++ b/cmake/modules/FindQGpgme.cmake
-@@ -12,13 +12,8 @@ find_package(Gpgme QUIET)
- 
- if(GPGME_FOUND)
- 
--   if ( WIN32 )
--      find_library(_QGPGME_EXTRA_LIBRARY gpgme++
--                   HINTS ${GPGME_LIBRARY_DIR})
--   else ( WIN32 )
--      find_library(_QGPGME_EXTRA_LIBRARY gpgme++-pthread
--                   HINTS ${GPGME_LIBRARY_DIR})
--   endif()
-+   find_library(_QGPGME_EXTRA_LIBRARY gpgme++
-+                HINTS ${GPGME_LIBRARY_DIR})
- 
-    find_library(QGPGME_LIBRARY qgpgme
-                 HINTS ${GPGME_LIBRARY_DIR})
-@@ -34,7 +29,7 @@ if(GPGME_FOUND)
-    if ( WIN32 )
-       set(QGPGME_LIBRARIES ${QGPGME_LIBRARY} ${_QGPGME_EXTRA_LIBRARY} ${GPGME_VANILLA_LIBRARIES} ${GPGME_QT_LIBRARIES})
-    else ( WIN32 )
--      set(QGPGME_LIBRARIES ${QGPGME_LIBRARY} ${_QGPGME_EXTRA_LIBRARY} ${GPGME_PTHREAD_LIBRARIES})
-+      set(QGPGME_LIBRARIES ${QGPGME_LIBRARY} ${_QGPGME_EXTRA_LIBRARY} ${GPGME_VANILLA_LIBRARIES})
-    endif()
- 
- endif()
diff --git a/kde-apps/kdepimlibs/files/kdepimlibs-CVE-2016-7966-r1.patch b/kde-apps/kdepimlibs/files/kdepimlibs-CVE-2016-7966-r1.patch
deleted file mode 100644
index 9bea5726d037..000000000000
--- a/kde-apps/kdepimlibs/files/kdepimlibs-CVE-2016-7966-r1.patch
+++ /dev/null
@@ -1,135 +0,0 @@
-From 176fee25ca79145ab5c8e2275d248f1a46a8d8cf Mon Sep 17 00:00:00 2001
-From: Montel Laurent <montel@kde.org>
-Date: Fri, 30 Sep 2016 15:55:35 +0200
-Subject: [PATCH] Backport avoid to transform as a url when we have a quote
-
----
- kpimutils/linklocator.cpp | 30 +++++++++++++++++++++++++++---
- kpimutils/linklocator.h   |  3 ++-
- 2 files changed, 29 insertions(+), 4 deletions(-)
-
-diff --git a/kpimutils/linklocator.cpp b/kpimutils/linklocator.cpp
-index f5d9afd..f30e8fc 100644
---- a/kpimutils/linklocator.cpp
-+++ b/kpimutils/linklocator.cpp
-@@ -95,6 +95,12 @@ int LinkLocator::maxAddressLen() const
- 
- QString LinkLocator::getUrl()
- {
-+    return getUrlAndCheckValidHref();
-+}
-+
-+
-+QString LinkLocator::getUrlAndCheckValidHref(bool *badurl)
-+{
-   QString url;
-   if ( atUrl() ) {
-     // NOTE: see http://tools.ietf.org/html/rfc3986#appendix-A and especially appendix-C
-@@ -129,13 +135,26 @@ QString LinkLocator::getUrl()
- 
-     url.reserve( maxUrlLen() );  // avoid allocs
-     int start = mPos;
-+    bool previousCharIsADoubleQuote = false;
-     while ( ( mPos < (int)mText.length() ) &&
-             ( mText[mPos].isPrint() || mText[mPos].isSpace() ) &&
-             ( ( afterUrl.isNull() && !mText[mPos].isSpace() ) ||
-               ( !afterUrl.isNull() && mText[mPos] != afterUrl ) ) ) {
-       if ( !mText[mPos].isSpace() ) {   // skip whitespace
--        url.append( mText[mPos] );
--        if ( url.length() > maxUrlLen() ) {
-+          if (mText[mPos] == QLatin1Char('>') && previousCharIsADoubleQuote) {
-+              //it's an invalid url
-+              if (badurl) {
-+                  *badurl = true;
-+              }
-+              return QString();
-+          }
-+          if (mText[mPos] == QLatin1Char('"')) {
-+              previousCharIsADoubleQuote = true;
-+          } else {
-+              previousCharIsADoubleQuote = false;
-+          }
-+          url.append( mText[mPos] );
-+          if ( url.length() > maxUrlLen() ) {
-           break;
-         }
-       }
-@@ -367,7 +386,12 @@ QString LinkLocator::convertToHtml( const QString &plainText, int flags,
-     } else {
-       const int start = locator.mPos;
-       if ( !( flags & IgnoreUrls ) ) {
--        str = locator.getUrl();
-+        bool badUrl = false;
-+        str = locator.getUrlAndCheckValidHref(&badUrl);
-+        if (badUrl) {
-+            return locator.mText;
-+        }
-+
-         if ( !str.isEmpty() ) {
-           QString hyperlink;
-           if ( str.left( 4 ) == QLatin1String("www.") ) {
-diff --git a/kpimutils/linklocator.h b/kpimutils/linklocator.h
-index 3049397..375498d 100644
---- a/kpimutils/linklocator.h
-+++ b/kpimutils/linklocator.h
-@@ -107,6 +107,7 @@ class KPIMUTILS_EXPORT LinkLocator
-       @return The URL at the current scan position, or an empty string.
-     */
-     QString getUrl();
-+    QString getUrlAndCheckValidHref(bool *badurl = 0);
- 
-     /**
-       Attempts to grab an email address. If there is an @ symbol at the
-@@ -155,7 +156,7 @@ class KPIMUTILS_EXPORT LinkLocator
-     */
-     static QString pngToDataUrl( const QString & iconPath );
- 
--  protected:
-+protected:
-     /**
-       The plaintext string being scanned for URLs and email addresses.
-     */
--- 
-2.7.3
-
-From 8bbe1bd3fdc55f609340edc667ff154b3d2aaab1 Mon Sep 17 00:00:00 2001
-From: Montel Laurent <montel@kde.org>
-Date: Tue, 11 Oct 2016 11:47:41 +0200
-Subject: [PATCH] Backport  show bad url text
-
----
- kpimutils/linklocator.cpp | 18 +++++++++++++++++-
- 1 file changed, 17 insertions(+), 1 deletion(-)
-
-diff --git a/kpimutils/linklocator.cpp b/kpimutils/linklocator.cpp
-index f30e8fc..4abe968 100644
---- a/kpimutils/linklocator.cpp
-+++ b/kpimutils/linklocator.cpp
-@@ -389,7 +389,23 @@ QString LinkLocator::convertToHtml( const QString &plainText, int flags,
-         bool badUrl = false;
-         str = locator.getUrlAndCheckValidHref(&badUrl);
-         if (badUrl) {
--            return locator.mText;
-+            QString resultBadUrl;
-+            const int helperTextSize(locator.mText.count());
-+            for (int i = 0; i < helperTextSize; ++i) {
-+                const QChar chBadUrl = locator.mText[i];
-+                if (chBadUrl == QLatin1Char('&')) {
-+                    resultBadUrl += QLatin1String("&amp;");
-+                } else if (chBadUrl == QLatin1Char('"')) {
-+                    resultBadUrl += QLatin1String("&quot;");
-+                } else if (chBadUrl == QLatin1Char('<')) {
-+                    resultBadUrl += QLatin1String("&lt;");
-+                } else if (chBadUrl == QLatin1Char('>')) {
-+                    resultBadUrl += QLatin1String("&gt;");
-+                } else {
-+                    resultBadUrl += chBadUrl;
-+                }
-+            }
-+            return resultBadUrl;
-         }
- 
-         if ( !str.isEmpty() ) {
--- 
-2.7.3
-