kde-base/kdelibs -> kde-frameworks/kdelibs

13 files changed, 405 insertions, 0 deletions

diff --git a/kde-frameworks/kdelibs/files/dist/01_gentoo_set_xdg_menu_prefix-1.patch b/kde-frameworks/kdelibs/files/dist/01_gentoo_set_xdg_menu_prefix-1.patch
new file mode 100644
index 000000000000..c12c2aba9aeb
--- /dev/null
+++ b/kde-frameworks/kdelibs/files/dist/01_gentoo_set_xdg_menu_prefix-1.patch
@@ -0,0 +1,18 @@
+Set XDG_MENU_PREFIX to kde-4- if not set. This fixes "empty-applications-menu" when running
+KDE4 applications outside of KDE4 environment.
+
+Index: kded/vfolder_menu.cpp
+===================================================================
+--- a/kded/vfolder_menu.cpp	(revision 1014368)
++++ b/kded/vfolder_menu.cpp	(working copy)
+@@ -770,7 +770,9 @@
+    QString result;
+ 
+    QString xdgMenuPrefix = QString::fromLocal8Bit(qgetenv("XDG_MENU_PREFIX"));
+-   if (!xdgMenuPrefix.isEmpty())
++   if (xdgMenuPrefix.isEmpty())
++      xdgMenuPrefix = "kde-4-";
++
+    {
+       QFileInfo fileInfo(fileName);
+ 
diff --git a/kde-frameworks/kdelibs/files/dist/02_gentoo_append_xdg_config_dirs-1.patch b/kde-frameworks/kdelibs/files/dist/02_gentoo_append_xdg_config_dirs-1.patch
new file mode 100644
index 000000000000..074847ae9953
--- /dev/null
+++ b/kde-frameworks/kdelibs/files/dist/02_gentoo_append_xdg_config_dirs-1.patch
@@ -0,0 +1,30 @@
+Set up XDG_CONFIG_DIRS lookup in order:
+1. custom XDG_CONFIG_DIRS from env
+2. kdeprefix xdg config dirs
+3. /etc/xdg
+
+Index: kdecore/kernel/kstandarddirs.cpp
+===================================================================
+--- a/kdecore/kernel/kstandarddirs.cpp	(revision 1014759)
++++ b/kdecore/kernel/kstandarddirs.cpp	(working copy)
+@@ -1664,16 +1664,13 @@
+     {
+         tokenize(xdgdirList, xdgdirs, QString(QChar(KPATH_SEPARATOR)));
+     }
+-    else
+-    {
+-        xdgdirList.clear();
+-        xdgdirList.append(QString::fromLatin1("/etc/xdg"));
++
+ #ifdef Q_WS_WIN
+-        xdgdirList.append(installPath("kdedir") + QString::fromLatin1("etc/xdg"));
++    xdgdirList.append(installPath("kdedir") + QString::fromLatin1("etc/xdg"));
+ #else
+-        xdgdirList.append(QFile::decodeName(KDESYSCONFDIR "/xdg"));
++    xdgdirList.append(QFile::decodeName(KDESYSCONFDIR "/xdg"));
+ #endif
+-    }
++    xdgdirList.append(QString::fromLatin1("/etc/xdg"));
+ 
+     QString localXdgDir = readEnvPath("XDG_CONFIG_HOME");
+     if (!localXdgDir.isEmpty())
diff --git a/kde-frameworks/kdelibs/files/kdelibs-4.10.0-udisks.patch b/kde-frameworks/kdelibs/files/kdelibs-4.10.0-udisks.patch
new file mode 100644
index 000000000000..63e9b308838b
--- /dev/null
+++ b/kde-frameworks/kdelibs/files/kdelibs-4.10.0-udisks.patch
@@ -0,0 +1,51 @@
+udisks1 is deprecated and going away, so removing this clause
+will permit us to build without udisks at all.
+
+--- a/solid/solid/CMakeLists.txt
++++ b/solid/solid/CMakeLists.txt
+@@ -283,20 +283,6 @@
+            backends/udisks2/udisksgenericinterface.cpp
+            backends/udisks2/dbus/manager.cpp
+            )
+-       else ( WITH_SOLID_UDISKS2 )
+-           message(STATUS "Building Solid UDisks backend." )
+-           set(solid_LIB_SRCS ${solid_LIB_SRCS}
+-           backends/udisks/udisksmanager.cpp
+-           backends/udisks/udisksdevice.cpp
+-           backends/udisks/udisksblock.cpp
+-           backends/udisks/udisksstoragevolume.cpp
+-           backends/udisks/udisksdeviceinterface.cpp
+-           backends/udisks/udisksopticaldisc.cpp
+-           backends/udisks/udisksopticaldrive.cpp
+-           backends/udisks/udisksstoragedrive.cpp
+-           backends/udisks/udisksstorageaccess.cpp
+-           backends/udisks/udisksgenericinterface.cpp
+-          )
+        endif ( WITH_SOLID_UDISKS2 )
+    endif (CMAKE_SYSTEM_NAME MATCHES Linux)
+
+--- a/solid/solid/managerbase.cpp
++++ b/solid/solid/managerbase.cpp
+@@ -33,8 +33,6 @@
+ #include "backends/hal/halmanager.h"
+ #if defined (WITH_SOLID_UDISKS2)
+ #include "backends/udisks2/udisksmanager.h"
+-#else
+-#include "backends/udisks/udisksmanager.h"
+ #endif
+ #include "backends/upower/upowermanager.h"
+ 
+@@ -88,11 +86,9 @@
+                     m_backends << new Solid::Backends::UDev::UDevManager(0);
+ #               endif
+ #		if defined(WITH_SOLID_UDISKS2)
+-                m_backends << new Solid::Backends::UDisks2::Manager(0)
+-#		else
+-                m_backends << new Solid::Backends::UDisks::UDisksManager(0)
++                m_backends << new Solid::Backends::UDisks2::Manager(0);
+ #		endif
+-                           << new Solid::Backends::UPower::UPowerManager(0)
++                m_backends << new Solid::Backends::UPower::UPowerManager(0)
+                            << new Solid::Backends::Fstab::FstabManager(0);
+             }
+ #        endif
diff --git a/kde-frameworks/kdelibs/files/kdelibs-4.14.20-FindQt4.patch b/kde-frameworks/kdelibs/files/kdelibs-4.14.20-FindQt4.patch
new file mode 100644
index 000000000000..2325fb11c693
--- /dev/null
+++ b/kde-frameworks/kdelibs/files/kdelibs-4.14.20-FindQt4.patch
@@ -0,0 +1,39 @@
+Ensure that the correct version of Qt is always used.
+
+With the introduction qt-4.8.6, Qt binaries were moved from /usr/bin to
+/usr/$(get_libdir)/qt4/bin, leaving behind in their place symlinks to qtchooser.
+
+There is no guarantee to which version of Qt these symlinks might point, so it
+is necessary to find the correct version explicitly.
+
+Once qmake is found, it is queried for the correct location of all other items.
+
+Gentoo-bug: 562746
+Gentoo-bug: 583506
+
+--- a/cmake/modules/FindQt4.cmake
++++ b/cmake/modules/FindQt4.cmake
+@@ -446,6 +446,15 @@ GET_FILENAME_COMPONENT(qt_install_version "[HKEY_CURRENT_USER\\Software\\trollte
+ # check for qmake
+ # Debian uses qmake-qt4
+ # macports' Qt uses qmake-mac
++if(CMAKE_BUILD_TYPE STREQUAL Gentoo)
++  find_program(QT_QMAKE_EXECUTABLE NAMES qmake
++    PATHS
++      $ENV{EPREFIX}/usr/${CMAKE_INSTALL_LIBDIR}/qt4/bin
++      $ENV{EPREFIX}/usr/bin
++      NO_DEFAULT_PATH
++    DOC "The qmake executable for the Qt installation to use"
++  )
++else()
+ FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS
+   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Qt3Versions\\4.0.0;InstallDir]/bin"
+   "[HKEY_CURRENT_USER\\Software\\Trolltech\\Versions\\4.0.0;InstallDir]/bin"
+@@ -453,6 +462,7 @@ FIND_PROGRAM(QT_QMAKE_EXECUTABLE NAMES qmake qmake4 qmake-qt4 qmake-mac PATHS
+   $ENV{QTDIR}/bin
+   DOC "The qmake executable for the Qt installation to use"
+ )
++endif()
+ 
+ IF (QT_QMAKE_EXECUTABLE)
+ 
diff --git a/kde-frameworks/kdelibs/files/kdelibs-4.14.20-strigi-optional.patch b/kde-frameworks/kdelibs/files/kdelibs-4.14.20-strigi-optional.patch
new file mode 100644
index 000000000000..c9e96551cfbf
--- /dev/null
+++ b/kde-frameworks/kdelibs/files/kdelibs-4.14.20-strigi-optional.patch
@@ -0,0 +1,24 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e7b2bea..87147b5 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -82,17 +82,10 @@ set_package_properties(ZLIB PROPERTIES DESCRIPTION "Support for gzip compressed
+                       )
+ 
+ find_package(Strigi 0.6.3)
+-if (WIN32)
+-    set (STRIGI_TYPE "OPTIONAL")
+-    set (STRIGI_EXTRA_TEXT "")
+-else (WIN32)
+-    set (STRIGI_TYPE "REQUIRED")
+-    set (STRIGI_EXTRA_TEXT "Required by some critical kioslaves")
+-endif (WIN32)
+ set_package_properties(Strigi PROPERTIES DESCRIPTION "Desktop indexing and search support"
+                        URL "http://strigi.sourceforge.net"
+-                       TYPE ${STRIGI_TYPE}
+-                       PURPOSE ${STRIGI_EXTRA_TEXT}
++                       TYPE OPTIONAL
++                       PURPOSE "Required by some kioslaves for metadata support"
+                       )
+ 
+ find_package(LibAttica 0.4.2)
diff --git a/kde-frameworks/kdelibs/files/kdelibs-4.14.22-webkit.patch b/kde-frameworks/kdelibs/files/kdelibs-4.14.22-webkit.patch
new file mode 100644
index 000000000000..dcbb565cedc6
--- /dev/null
+++ b/kde-frameworks/kdelibs/files/kdelibs-4.14.22-webkit.patch
@@ -0,0 +1,85 @@
+--- a/CMakeLists.txt	2016-07-06 12:18:35.000000000 +0200
++++ b/CMakeLists.txt	2016-07-21 21:40:26.080328514 +0200
+@@ -45,6 +45,9 @@
+ ############### Give the user the option to build the deprecated WMI solid backend instead of the new win backend ###############
+ option(WITH_SOLID_WMI "Enables the deprecated WMI backend on Windows")
+ 
++############### Give the user the option to build without qtwebkit dependency  ###############
++option(WITH_KDEWEBKIT "Enables the deprecated kdewebkit and kdewebkit-widgets" "ON")
++
+ ############### Load the CTest options ###############
+ # CTestCustom.cmake has to be in the CTEST_BINARY_DIR.
+ # in the KDE build system, this is the same as CMAKE_BINARY_DIR.
+@@ -363,7 +366,9 @@
+ add_subdirectory( plasma )
+ endif(NOT WINCE)
+ add_subdirectory( kunitconversion )
++if(WITH_KDEWEBKIT)
+ add_subdirectory( kdewebkit )
++endif(WITH_KDEWEBKIT)
+ add_subdirectory( includes )
+ 
+ add_subdirectory( experimental )
+--- a/kdewidgets/CMakeLists.txt	2016-07-06 12:18:35.000000000 +0200
++++ b/kdewidgets/CMakeLists.txt	2016-07-21 21:39:54.031052674 +0200
+@@ -90,6 +90,7 @@
+ 
+ 
+   # kdewebkit widgets
++  if(WITH_KDEWEBKIT)
+   include_directories(
+     ${CMAKE_SOURCE_DIR}/kdewebkit
+   )
+@@ -121,7 +122,7 @@
+   endif(NOT WIN32)
+ 
+   install(TARGETS kdewebkitwidgets  DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer )
+-
++  endif(WITH_KDEWEBKIT)
+ 
+   if (QT_QT3SUPPORT_FOUND)
+ 
+--- a/plasma/CMakeLists.txt	2016-07-22 01:26:52.992198945 +0200
++++ b/plasma/CMakeLists.txt	2016-07-22 01:28:10.487904045 +0200
+@@ -10,6 +10,10 @@
+     set(PLASMA_NO_GLOBAL_SHORTCUTS TRUE)
+ endif(KDE_PLATFORM_FEATURE_BINARY_COMPATIBLE_FEATURE_REDUCTION)
+ 
++if(NOT WITH_KDEWEBKIT)
++    set(PLASMA_NO_KDEWEBKIT TRUE)
++endif(NOT WITH_KDEWEBKIT)
++
+ set(PLASMA_NO_PACKAGEKIT TRUE)
+ 
+ include_directories(${CMAKE_CURRENT_SOURCE_DIR}
+@@ -121,7 +125,6 @@
+     framesvg.cpp
+     plasma.cpp
+     popupapplet.cpp
+-    private/animablegraphicswebview.cpp
+     private/applethandle.cpp
+     private/associatedapplicationmanager.cpp
+     private/componentinstaller.cpp
+@@ -211,7 +214,6 @@
+     widgets/textbrowser.cpp
+     widgets/treeview.cpp
+     widgets/textedit.cpp
+-    widgets/webview.cpp
+ 
+     #Temporary QtJolie branch
+     private/qtjolie-branch/qtjolie/abstractadaptor.cpp
+@@ -245,6 +247,14 @@
+     )
+ endif(NOT KDE_NO_DEPRECATED)
+ 
++if(NOT PLASMA_NO_KDEWEBKIT)
++    set(plasma_LIB_SRCS
++        ${plasma_LIB_SRCS}
++        private/animablegraphicswebview.cpp
++        widgets/webview.cpp
++    )
++endif(NOT PLASMA_NO_KDEWEBKIT)
++
+ kde4_add_kcfg_files(plasma_LIB_SRCS data/kconfigxt/libplasma-theme-global.kcfgc)
+ 
+ kde4_add_ui_files(plasma_LIB_SRCS
diff --git a/kde-frameworks/kdelibs/files/kdelibs-4.14.5-fatalwarnings.patch b/kde-frameworks/kdelibs/files/kdelibs-4.14.5-fatalwarnings.patch
new file mode 100644
index 000000000000..3f571d63a03d
--- /dev/null
+++ b/kde-frameworks/kdelibs/files/kdelibs-4.14.5-fatalwarnings.patch
@@ -0,0 +1,16 @@
+Avoid build failure due to harmless warnings on some platforms (eg. ARM) being
+forced fatal.
+
+--- a/cmake/modules/FindKDE4Internal.cmake
++++ b/cmake/modules/FindKDE4Internal.cmake
+@@ -1100,8 +1100,8 @@
+ if (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU)
+    if (CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
+       set ( _KDE4_PLATFORM_DEFINITIONS -D_XOPEN_SOURCE=500 -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_GNU_SOURCE)
+-      set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}")
+-      set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_MODULE_LINKER_FLAGS}")
++      set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}")
++      set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--no-undefined -lc ${CMAKE_MODULE_LINKER_FLAGS}")
+ 
+       set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--enable-new-dtags ${CMAKE_SHARED_LINKER_FLAGS}")
+       set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--enable-new-dtags ${CMAKE_MODULE_LINKER_FLAGS}")
diff --git a/kde-frameworks/kdelibs/files/kdelibs-4.14.5-mimetypes.patch b/kde-frameworks/kdelibs/files/kdelibs-4.14.5-mimetypes.patch
new file mode 100644
index 000000000000..38cac84f6201
--- /dev/null
+++ b/kde-frameworks/kdelibs/files/kdelibs-4.14.5-mimetypes.patch
@@ -0,0 +1,27 @@
+Remove fake MIME types that cause warnings.
+
+The offending MIME types are commented out rather than
+physically removed because doing so would cause the patch
+to be too large.
+
+--- a/mimetypes/kde.xml
++++ b/mimetypes/kde.xml
+@@ -1784,7 +1784,8 @@
+     <glob pattern="*.abc"/>
+   </mime-type>
+ 
+-  <!-- all/ fake mime types -->
++  <!-- 
++  all/ fake mime types
+   <mime-type type="all/all">
+     <comment>all files and folders</comment>
+     <comment xml:lang="ar">كل الملفات و المجلدات</comment>
+@@ -1901,7 +1902,7 @@
+     <comment xml:lang="zh_CN">全部文件</comment>
+     <comment xml:lang="zh_TW">所有檔案</comment>
+   </mime-type>
+-
++  -->
+   <mime-type type="application/vnd.kde.fontspackage">
+     <sub-class-of type="application/zip"/>
+     <comment>fonts package</comment>
diff --git a/kde-frameworks/kdelibs/files/kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch b/kde-frameworks/kdelibs/files/kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch
new file mode 100644
index 000000000000..006ca00a4586
--- /dev/null
+++ b/kde-frameworks/kdelibs/files/kdelibs-4.3.80-kdeui_util_kkeyserver_mac.patch
@@ -0,0 +1,46 @@
+diff -purN kdelibs-4.3.80.orig/kdeui/util/kkeyserver_mac.cpp kdelibs-4.3.80/kdeui/util/kkeyserver_mac.cpp
+--- a/kdelibs-4.3.80.orig/kdeui/util/kkeyserver_mac.cpp	2009-12-14 17:05:26.284881642 -0500
++++ b/kdelibs-4.3.80/kdeui/util/kkeyserver_mac.cpp	2009-12-14 17:11:23.393094384 -0500
+@@ -68,7 +68,7 @@ namespace KKeyServer {
+ #ifdef QT_MAC_USE_COCOA
+     static TISInputSourceRef lastLayout = 0;
+ #else
+-    static KeyboardLayoutRef lastLayout = NULL;
++    static TISInputSourceRef lastLayout = NULL;
+ #endif
+     
+     void updateScancodes() {
+@@ -125,16 +125,27 @@ namespace KKeyServer {
+ #endif
+             lastLayout = layout;
+             scancodes.clear();
+-            void *kchr;
+-            if (KLGetKeyboardLayoutProperty(layout, kKLKCHRData, const_cast<const void**>(&kchr)) != noErr) {
++            UCKeyboardLayout *uchr = (UCKeyboardLayout *)TISGetInputSourceProperty(layout, kTISPropertyUnicodeKeyLayoutData);
++            if (uchr == NULL) {
+                 kWarning() << "Couldn't load active keyboard layout";
+             } else {
+                 for (int i = 0; i < 128; i++) {
+                     UInt32 tmpState = 0;
+-                    UInt32 chr = KeyTranslate(kchr, i, &tmpState);
+-                    if (chr && chr != kFunctionKeyCharCode) {
+-                        scancodes.insert(chr, i);
+-                    }
++                    UInt32 deadKeyState = 0;
++                    UInt32 flags = 0;
++                    UniCharCount maxStringLength = 255;
++                    UniCharCount actualStringLength = 0;
++                    UniChar unicodeString[maxStringLength];
++                    
++                    UCKeyTranslate(uchr, i, kUCKeyActionDown,
++                            flags, LMGetKbdType(),
++                            1, &deadKeyState, maxStringLength, &actualStringLength, unicodeString);
++                    fprintf(stderr, "Got key: %s\n", unicodeString);
++                    fflush(stderr);
++                    //UInt32 chr = KeyTranslate(kchr, i, &tmpState);
++                    //if (chr && chr != kFunctionKeyCharCode) {
++                    //    scancodes.insert(chr, i);
++                    //}
+                 }
+             }
+         }
diff --git a/kde-frameworks/kdelibs/files/kdelibs-4.4.90-xslt.patch b/kde-frameworks/kdelibs/files/kdelibs-4.4.90-xslt.patch
new file mode 100644
index 000000000000..0d25ada337b0
--- /dev/null
+++ b/kde-frameworks/kdelibs/files/kdelibs-4.4.90-xslt.patch
@@ -0,0 +1,12 @@
+diff -r -u kdelibs-4.4.90.orig/kdoctools/customization/htdig_index.xsl kdelibs-4.4.90/kdoctools/customization/htdig_index.xsl
+--- kdelibs-4.4.90.orig/kdoctools/customization/htdig_index.xsl	2008-05-21 13:07:13.000000000 +0200
++++ kdelibs-4.4.90/kdoctools/customization/htdig_index.xsl	2010-07-08 23:32:28.184204481 +0200
+@@ -35,7 +35,7 @@
+   </entry>
+ </xsl:template>
+ 
+-<xsl:template match="sect*/title|emphasis">
++<xsl:template match="*[starts-with(local-name(), 'sect')]/title|emphasis">
+   <entry header="2">
+     <xsl:apply-templates/>
+   </entry>
diff --git a/kde-frameworks/kdelibs/files/kdelibs-4.6.3-no_suid_kdeinit.patch b/kde-frameworks/kdelibs/files/kdelibs-4.6.3-no_suid_kdeinit.patch
new file mode 100644
index 000000000000..4b34f62c2be4
--- /dev/null
+++ b/kde-frameworks/kdelibs/files/kdelibs-4.6.3-no_suid_kdeinit.patch
@@ -0,0 +1,19 @@
+diff -urN kdelibs-4.6.3.old/kinit/CMakeLists.txt kdelibs-4.6.3/kinit/CMakeLists.txt
+--- kdelibs-4.6.3.old/kinit/CMakeLists.txt	2011-05-02 00:19:10.000000000 +0200
++++ kdelibs-4.6.3/kinit/CMakeLists.txt	2011-05-02 00:20:32.000000000 +0200
+@@ -170,15 +170,6 @@
+   install(TARGETS start_kdeinit_wrapper DESTINATION ${LIBEXEC_INSTALL_DIR})
+ endif (NOT WIN32)
+ 
+-if (CMAKE_SYSTEM_NAME MATCHES Linux)
+-    MESSAGE(STATUS "Using setuid root kdeinit wrapper in order to protect it from bad Linux OOM-killer")
+-    set(KDEINIT_OOM_PROTECT 1)
+-    install(CODE "
+-        set(START_KDEINIT_PATH \"\$ENV{DESTDIR}${LIBEXEC_INSTALL_DIR}/start_kdeinit\")
+-        EXECUTE_PROCESS(COMMAND sh -c \"chown 0 '\${START_KDEINIT_PATH}' && chmod u+s '\${START_KDEINIT_PATH}'\")
+-    ")
+-endif (CMAKE_SYSTEM_NAME MATCHES Linux)
+-
+ ########### install files ###############
+ 
+ install( FILES ${CMAKE_CURRENT_BINARY_DIR}/org.kde.KLauncher.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR} )
diff --git a/kde-frameworks/kdelibs/files/kdelibs-4.8.1-norpath.patch b/kde-frameworks/kdelibs/files/kdelibs-4.8.1-norpath.patch
new file mode 100644
index 000000000000..83d5576ac023
--- /dev/null
+++ b/kde-frameworks/kdelibs/files/kdelibs-4.8.1-norpath.patch
@@ -0,0 +1,18 @@
+diff -ruN kdelibs-4.8.1.orig/cmake/modules/FindKDE4Internal.cmake kdelibs-4.8.1/cmake/modules/FindKDE4Internal.cmake
+--- kdelibs-4.8.1.orig/cmake/modules/FindKDE4Internal.cmake	2012-02-29 22:55:52.000000000 +0100
++++ kdelibs-4.8.1/cmake/modules/FindKDE4Internal.cmake	2012-03-24 17:18:59.452942648 +0100
+@@ -1045,7 +1045,13 @@
+ 
+       set(CMAKE_SKIP_BUILD_RPATH FALSE)
+       set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
+-      set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
++
++      # the RPATH to be used when installing
++      SET(CMAKE_INSTALL_RPATH "")
++
++      # don't add the automatically determined parts of the RPATH
++      # which point to directories outside the build tree to the install RPATH
++      SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
+    endif (APPLE)
+ endif (UNIX)
+ 
diff --git a/kde-frameworks/kdelibs/files/kdelibs-4.9.3-werror.patch b/kde-frameworks/kdelibs/files/kdelibs-4.9.3-werror.patch
new file mode 100644
index 000000000000..b094d12f7227
--- /dev/null
+++ b/kde-frameworks/kdelibs/files/kdelibs-4.9.3-werror.patch
@@ -0,0 +1,20 @@
+--- a/cmake/modules/FindKDE4Internal.cmake
++++ b/cmake/modules/FindKDE4Internal.cmake
+@@ -1204,7 +1204,7 @@
+    set(CMAKE_C_FLAGS_DEBUGFULL        "-g3 -fno-inline")
+    set(CMAKE_C_FLAGS_PROFILE          "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
+ 
+-   set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
++   set(CMAKE_C_FLAGS   "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common")
+    # As of Qt 4.6.x we need to override the new exception macros if we want compile with -fno-exceptions
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-exceptions -DQT_NO_EXCEPTIONS -fno-check-new -fno-common")
+ 
+@@ -1295,7 +1295,7 @@
+       endif(NOT _compile_result)
+ 
+       if (GCC_IS_NEWER_THAN_4_2)
+-         set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=return-type -fvisibility-inlines-hidden")
++         set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden")
+       endif (GCC_IS_NEWER_THAN_4_2)
+    else (__KDE_HAVE_GCC_VISIBILITY AND GCC_IS_NEWER_THAN_4_1 AND NOT _GCC_COMPILED_WITH_BAD_ALLOCATOR AND NOT WIN32)
+       set (__KDE_HAVE_GCC_VISIBILITY 0)