Refresh patches.

7 files changed, 67 insertions, 66 deletions

diff --git a/debian/changelog b/debian/changelog
index e25f3cc..70ff959 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ kde4libs (4:4.14.12-1~) UNRELEASED; urgency=medium
   [ Maximiliano Curia ]
   * New upstream release (4.14.11).
   * New upstream release (4.14.12).
+  * Refresh patches.
 
  -- Maximiliano Curia <maxy@debian.org>  Thu, 17 Sep 2015 19:59:59 +0200
 
diff --git a/debian/patches/add_debian_build_type.diff b/debian/patches/add_debian_build_type.diff
index 2ce430d..035f529 100644
--- a/debian/patches/add_debian_build_type.diff
+++ b/debian/patches/add_debian_build_type.diff
@@ -9,9 +9,9 @@ icons.
 
 Index: kde4libs/cmake/modules/FindKDE4Internal.cmake
 ===================================================================
---- kde4libs.orig/cmake/modules/FindKDE4Internal.cmake	2014-08-19 22:34:22.234287856 +0200
-+++ kde4libs/cmake/modules/FindKDE4Internal.cmake	2014-08-19 22:34:22.230288019 +0200
-@@ -1203,11 +1203,13 @@
+--- kde4libs.orig/cmake/modules/FindKDE4Internal.cmake	2015-09-19 02:00:08.537653023 +0200
++++ kde4libs/cmake/modules/FindKDE4Internal.cmake	2015-09-19 02:00:08.533653184 +0200
+@@ -1170,11 +1170,13 @@
     set(CMAKE_CXX_FLAGS_DEBUG          "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline")
     set(CMAKE_CXX_FLAGS_DEBUGFULL      "-g3 -fno-inline")
     set(CMAKE_CXX_FLAGS_PROFILE        "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
diff --git a/debian/patches/add_dlrestrictions_support.diff b/debian/patches/add_dlrestrictions_support.diff
index 949d1ad..44101fe 100644
--- a/debian/patches/add_dlrestrictions_support.diff
+++ b/debian/patches/add_dlrestrictions_support.diff
@@ -22,9 +22,9 @@ on all (or some) the targets.
 
 Index: kde4libs/cmake/modules/KDE4Macros.cmake
 ===================================================================
---- kde4libs.orig/cmake/modules/KDE4Macros.cmake	2013-09-04 11:36:45.423728340 +0000
-+++ kde4libs/cmake/modules/KDE4Macros.cmake	2013-09-04 11:36:45.391729611 +0000
-@@ -1054,10 +1054,14 @@
+--- kde4libs.orig/cmake/modules/KDE4Macros.cmake	2015-09-19 02:00:46.024140148 +0200
++++ kde4libs/cmake/modules/KDE4Macros.cmake	2015-09-19 02:00:46.008140794 +0200
+@@ -1061,10 +1061,14 @@
     if (${_lib_TYPE} STREQUAL "SHARED")
        set(_first_SRC)
        set(_add_lib_param SHARED)
@@ -39,7 +39,7 @@ Index: kde4libs/cmake/modules/KDE4Macros.cmake
     endif (${_lib_TYPE} STREQUAL "MODULE")
  
     set(_SRCS ${_first_SRC} ${ARGN})
-@@ -1368,6 +1372,13 @@
+@@ -1376,6 +1380,13 @@
  
  endfunction(KDE4_INSTALL_AUTH_ACTIONS)
  
@@ -55,11 +55,11 @@ Index: kde4libs/cmake/modules/KDE4Macros.cmake
     message(FATAL_ERROR "_KDE4_EXPORT_LIBRARY_DEPENDENCIES() was an internal macro and has been removed again. Just remove the code which calls it, there is no substitute.")
 Index: kde4libs/kdecore/CMakeLists.txt
 ===================================================================
---- kde4libs.orig/kdecore/CMakeLists.txt	2013-09-04 11:36:45.423728340 +0000
-+++ kde4libs/kdecore/CMakeLists.txt	2013-09-04 11:36:45.395729452 +0000
-@@ -413,6 +413,14 @@
+--- kde4libs.orig/kdecore/CMakeLists.txt	2015-09-19 02:00:46.024140148 +0200
++++ kde4libs/kdecore/CMakeLists.txt	2015-09-19 02:00:46.020140310 +0200
+@@ -412,6 +412,14 @@
  
- target_link_libraries(kdecore ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${ZLIB_LIBRARY} ${kdecore_OPTIONAL_LIBS})
+ target_link_libraries(kdecore LINK_PRIVATE ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${ZLIB_LIBRARY} ${kdecore_OPTIONAL_LIBS})
  
 +# Enable DLRestrictions library checking for Debian only
 +if (CMAKE_BUILD_TYPE STREQUAL "Debian")
@@ -70,12 +70,12 @@ Index: kde4libs/kdecore/CMakeLists.txt
 +endif (CMAKE_BUILD_TYPE STREQUAL "Debian")
 +
  if(WINCE)
-   target_link_libraries(kdecore ${WCECOMPAT_LIBRARIES} Ceshell.lib)
+   target_link_libraries(kdecore LINK_PRIVATE ${WCECOMPAT_LIBRARIES} Ceshell.lib)
  endif(WINCE)
 Index: kde4libs/kdecore/util/kpluginloader.cpp
 ===================================================================
---- kde4libs.orig/kdecore/util/kpluginloader.cpp	2013-09-04 11:36:45.423728340 +0000
-+++ kde4libs/kdecore/util/kpluginloader.cpp	2013-09-04 11:36:45.419728499 +0000
+--- kde4libs.orig/kdecore/util/kpluginloader.cpp	2015-09-19 02:00:46.024140148 +0200
++++ kde4libs/kdecore/util/kpluginloader.cpp	2015-09-19 02:00:46.020140310 +0200
 @@ -31,6 +31,14 @@
  #include <QtCore/QDir>
  #include <QtCore/QFileInfo>
diff --git a/debian/patches/hurd_support.diff b/debian/patches/hurd_support.diff
index f414780..0c774bc 100644
--- a/debian/patches/hurd_support.diff
+++ b/debian/patches/hurd_support.diff
@@ -8,8 +8,8 @@ Forwarded: no
 Last-Update: 2012-10-01
 Index: kde4libs/kdecore/kernel/kstandarddirs.cpp
 ===================================================================
---- kde4libs.orig/kdecore/kernel/kstandarddirs.cpp	2015-02-16 10:23:11.574487365 +0100
-+++ kde4libs/kdecore/kernel/kstandarddirs.cpp	2015-02-16 10:23:11.570487525 +0100
+--- kde4libs.orig/kdecore/kernel/kstandarddirs.cpp	2015-09-19 02:00:41.172335952 +0200
++++ kde4libs/kdecore/kernel/kstandarddirs.cpp	2015-09-19 02:00:41.168336114 +0200
 @@ -79,6 +79,10 @@
  static Qt::CaseSensitivity cs = Qt::CaseSensitive;
  #endif
@@ -23,8 +23,8 @@ Index: kde4libs/kdecore/kernel/kstandarddirs.cpp
  public:
 Index: kde4libs/kinit/lnusertemp.c
 ===================================================================
---- kde4libs.orig/kinit/lnusertemp.c	2015-02-16 10:23:11.574487365 +0100
-+++ kde4libs/kinit/lnusertemp.c	2015-02-16 10:23:11.570487525 +0100
+--- kde4libs.orig/kinit/lnusertemp.c	2015-09-19 02:00:41.172335952 +0200
++++ kde4libs/kinit/lnusertemp.c	2015-09-19 02:00:41.168336114 +0200
 @@ -36,6 +36,10 @@
  #include <limits.h>
  #endif
@@ -38,9 +38,9 @@ Index: kde4libs/kinit/lnusertemp.c
  int build_link(const char* tmp, const char *tmp_prefix, const char *kde_prefix);
 Index: kde4libs/cmake/modules/FindKDE4Internal.cmake
 ===================================================================
---- kde4libs.orig/cmake/modules/FindKDE4Internal.cmake	2015-02-16 10:23:11.574487365 +0100
-+++ kde4libs/cmake/modules/FindKDE4Internal.cmake	2015-02-16 10:23:11.570487525 +0100
-@@ -1225,8 +1225,8 @@
+--- kde4libs.orig/cmake/modules/FindKDE4Internal.cmake	2015-09-19 02:00:41.172335952 +0200
++++ kde4libs/cmake/modules/FindKDE4Internal.cmake	2015-09-19 02:00:41.168336114 +0200
+@@ -1192,8 +1192,8 @@
      endif (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU OR CMAKE_SYSTEM_NAME MATCHES kFreeBSD)
  
     if (CMAKE_SYSTEM_NAME STREQUAL GNU)
diff --git a/debian/patches/kfreebsd_support.diff b/debian/patches/kfreebsd_support.diff
index e5059d0..bd7540a 100644
--- a/debian/patches/kfreebsd_support.diff
+++ b/debian/patches/kfreebsd_support.diff
@@ -5,8 +5,8 @@ cmake.
 
 Index: kde4libs/ConfigureChecks.cmake
 ===================================================================
---- kde4libs.orig/ConfigureChecks.cmake	2015-02-16 10:21:42.510053130 +0100
-+++ kde4libs/ConfigureChecks.cmake	2015-02-16 10:21:42.506053290 +0100
+--- kde4libs.orig/ConfigureChecks.cmake	2015-09-19 02:00:23.881033787 +0200
++++ kde4libs/ConfigureChecks.cmake	2015-09-19 02:00:23.845035240 +0200
 @@ -138,11 +138,11 @@
          set(UTIL_LIBRARY util)
        endif (login_in_libutil)
@@ -24,8 +24,8 @@ Index: kde4libs/ConfigureChecks.cmake
        if (login_in_libutil)
 Index: kde4libs/kio/kfile/kpropertiesdialog.cpp
 ===================================================================
---- kde4libs.orig/kio/kfile/kpropertiesdialog.cpp	2015-02-16 10:21:42.510053130 +0100
-+++ kde4libs/kio/kfile/kpropertiesdialog.cpp	2015-02-16 10:21:42.506053290 +0100
+--- kde4libs.orig/kio/kfile/kpropertiesdialog.cpp	2015-09-19 02:00:23.881033787 +0200
++++ kde4libs/kio/kfile/kpropertiesdialog.cpp	2015-09-19 02:00:23.857034756 +0200
 @@ -1894,7 +1894,15 @@
      fileSystemSupportsACLs = ( statfs( path.data(), &buf ) == 0 ) && ( buf.f_flags & MNT_ACLS );
  #else
@@ -45,8 +45,8 @@ Index: kde4libs/kio/kfile/kpropertiesdialog.cpp
  }
 Index: kde4libs/kioslave/file/file.cpp
 ===================================================================
---- kde4libs.orig/kioslave/file/file.cpp	2015-02-16 10:21:42.510053130 +0100
-+++ kde4libs/kioslave/file/file.cpp	2015-02-16 10:21:42.506053290 +0100
+--- kde4libs.orig/kioslave/file/file.cpp	2015-09-19 02:00:23.881033787 +0200
++++ kde4libs/kioslave/file/file.cpp	2015-09-19 02:00:23.865034432 +0200
 @@ -310,8 +310,10 @@
      }
  
@@ -60,8 +60,8 @@ Index: kde4libs/kioslave/file/file.cpp
      // This is mandatory in all slaves (for KRun/BrowserRun to work)
 Index: kde4libs/kioslave/file/file_unix.cpp
 ===================================================================
---- kde4libs.orig/kioslave/file/file_unix.cpp	2015-02-16 10:21:42.510053130 +0100
-+++ kde4libs/kioslave/file/file_unix.cpp	2015-02-16 10:21:42.510053130 +0100
+--- kde4libs.orig/kioslave/file/file_unix.cpp	2015-09-19 02:00:23.881033787 +0200
++++ kde4libs/kioslave/file/file_unix.cpp	2015-09-19 02:00:23.869034272 +0200
 @@ -145,8 +145,10 @@
      }
  
@@ -86,8 +86,8 @@ Index: kde4libs/kioslave/file/file_unix.cpp
      acl = acl_get_fd(src_fd);
 Index: kde4libs/kpty/kpty.cpp
 ===================================================================
---- kde4libs.orig/kpty/kpty.cpp	2015-02-16 10:21:42.510053130 +0100
-+++ kde4libs/kpty/kpty.cpp	2015-02-16 10:21:42.510053130 +0100
+--- kde4libs.orig/kpty/kpty.cpp	2015-09-19 02:00:23.881033787 +0200
++++ kde4libs/kpty/kpty.cpp	2015-09-19 02:00:23.881033787 +0200
 @@ -109,24 +109,24 @@
  # define _NEW_TTY_CTRL
  #endif
@@ -127,9 +127,9 @@ Index: kde4libs/kpty/kpty.cpp
  #include <kdebug.h>
 Index: kde4libs/cmake/modules/FindKDE4Internal.cmake
 ===================================================================
---- kde4libs.orig/cmake/modules/FindKDE4Internal.cmake	2015-02-16 10:21:42.510053130 +0100
-+++ kde4libs/cmake/modules/FindKDE4Internal.cmake	2015-02-16 10:22:49.575368116 +0100
-@@ -1098,7 +1098,7 @@
+--- kde4libs.orig/cmake/modules/FindKDE4Internal.cmake	2015-09-19 02:00:23.881033787 +0200
++++ kde4libs/cmake/modules/FindKDE4Internal.cmake	2015-09-19 02:00:23.881033787 +0200
+@@ -1065,7 +1065,7 @@
  endif (APPLE)
  
  
@@ -138,7 +138,7 @@ Index: kde4libs/cmake/modules/FindKDE4Internal.cmake
     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}")
-@@ -1119,7 +1119,7 @@
+@@ -1086,7 +1086,7 @@
        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}")
     endif (CMAKE_C_COMPILER MATCHES "icc")
@@ -147,7 +147,7 @@ Index: kde4libs/cmake/modules/FindKDE4Internal.cmake
  
  if (UNIX)
     set ( _KDE4_PLATFORM_DEFINITIONS "${_KDE4_PLATFORM_DEFINITIONS} -D_LARGEFILE64_SOURCE")
-@@ -1216,13 +1216,13 @@
+@@ -1183,13 +1183,13 @@
     # 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")
  
diff --git a/debian/patches/ld_exclude_libs_qtuitools.diff b/debian/patches/ld_exclude_libs_qtuitools.diff
index d7828de..df0b392 100644
--- a/debian/patches/ld_exclude_libs_qtuitools.diff
+++ b/debian/patches/ld_exclude_libs_qtuitools.diff
@@ -5,8 +5,8 @@ Forwarded: not-needed
 
 Index: kde4libs/plasma/CMakeLists.txt
 ===================================================================
---- kde4libs.orig/plasma/CMakeLists.txt	2013-09-04 11:36:23.552597612 +0000
-+++ kde4libs/plasma/CMakeLists.txt	2013-09-04 11:36:23.544597932 +0000
+--- kde4libs.orig/plasma/CMakeLists.txt	2015-09-19 02:00:32.240696409 +0200
++++ kde4libs/plasma/CMakeLists.txt	2015-09-19 02:00:32.224697055 +0200
 @@ -279,6 +279,9 @@
                               ${QT_QTSCRIPT_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTSQL_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY}
                               ${KDE4_KDEUI_LIBS} ${KDE4_KDNSSD_LIBS} ${KDE4_THREADWEAVER_LIBS} ${PLASMA_EXTRA_LIBS})
@@ -15,12 +15,12 @@ Index: kde4libs/plasma/CMakeLists.txt
 +set_target_properties(plasma PROPERTIES LINK_FLAGS_DEBIAN "-Wl,--exclude-libs -Wl,libQtUiTools.a")
 +
  if(QCA2_FOUND)
-    target_link_libraries(plasma ${QCA2_LIBRARIES})
+    target_link_libraries(plasma LINK_PRIVATE ${QCA2_LIBRARIES})
  endif(QCA2_FOUND)
 Index: kde4libs/kjsembed/kjsembed/CMakeLists.txt
 ===================================================================
---- kde4libs.orig/kjsembed/kjsembed/CMakeLists.txt	2013-09-04 11:36:23.552597612 +0000
-+++ kde4libs/kjsembed/kjsembed/CMakeLists.txt	2013-09-04 11:36:23.544597932 +0000
+--- kde4libs.orig/kjsembed/kjsembed/CMakeLists.txt	2015-09-19 02:00:32.240696409 +0200
++++ kde4libs/kjsembed/kjsembed/CMakeLists.txt	2015-09-19 02:00:32.236696571 +0200
 @@ -71,7 +71,8 @@
  set_target_properties(${KJSEMBEDLIBNAME} PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
  install(TARGETS ${KJSEMBEDLIBNAME} EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
diff --git a/debian/patches/make_libkdeinit4_private.diff b/debian/patches/make_libkdeinit4_private.diff
index 30d4a7d..2d72b09 100644
--- a/debian/patches/make_libkdeinit4_private.diff
+++ b/debian/patches/make_libkdeinit4_private.diff
@@ -21,8 +21,8 @@ The patch also adds support for "kdeinit" resource type to KDE Platform
 libraries.
 Index: kde4libs/CreateKDELibsDependenciesFile.cmake
 ===================================================================
---- kde4libs.orig/CreateKDELibsDependenciesFile.cmake	2014-08-19 22:36:20.881357112 +0200
-+++ kde4libs/CreateKDELibsDependenciesFile.cmake	2014-08-19 22:36:20.877357278 +0200
+--- kde4libs.orig/CreateKDELibsDependenciesFile.cmake	2015-09-19 02:00:16.681324355 +0200
++++ kde4libs/CreateKDELibsDependenciesFile.cmake	2015-09-19 02:00:16.613327099 +0200
 @@ -32,6 +32,7 @@
  make_install_path_absolute(KDE4_LIB_INSTALL_DIR     ${LIB_INSTALL_DIR})
  make_install_path_absolute(KDE4_IMPORTS_INSTALL_DIR     ${IMPORTS_INSTALL_DIR})
@@ -41,9 +41,9 @@ Index: kde4libs/CreateKDELibsDependenciesFile.cmake
  set(KDE4_SBIN_INSTALL_DIR    \"${KDE4_SBIN_INSTALL_DIR}\")
 Index: kde4libs/cmake/modules/FindKDE4Internal.cmake
 ===================================================================
---- kde4libs.orig/cmake/modules/FindKDE4Internal.cmake	2014-08-19 22:36:20.881357112 +0200
-+++ kde4libs/cmake/modules/FindKDE4Internal.cmake	2014-08-19 22:36:20.877357278 +0200
-@@ -876,6 +876,7 @@
+--- kde4libs.orig/cmake/modules/FindKDE4Internal.cmake	2015-09-19 02:00:16.681324355 +0200
++++ kde4libs/cmake/modules/FindKDE4Internal.cmake	2015-09-19 02:00:16.613327099 +0200
+@@ -843,6 +843,7 @@
     _set_fancy(INCLUDE_INSTALL_DIR  "${CMAKE_INSTALL_PREFIX}/include"         "The subdirectory to the header prefix")
  
     _set_fancy(PLUGIN_INSTALL_DIR       "${LIB_INSTALL_DIR}/kde4"                "The subdirectory relative to the install prefix where plugins will be installed (default is ${LIB_INSTALL_DIR}/kde4)")
@@ -51,7 +51,7 @@ Index: kde4libs/cmake/modules/FindKDE4Internal.cmake
     _set_fancy(IMPORTS_INSTALL_DIR       "${PLUGIN_INSTALL_DIR}/imports"                "The subdirectory relative to the install prefix where imports will be installed")
     _set_fancy(CONFIG_INSTALL_DIR       "${SHARE_INSTALL_PREFIX}/config"         "The config file install dir")
     _set_fancy(DATA_INSTALL_DIR         "${SHARE_INSTALL_PREFIX}/apps"           "The parent directory where applications can install their data")
-@@ -1411,6 +1412,10 @@
+@@ -1378,6 +1379,10 @@
  
  endif (CMAKE_C_COMPILER MATCHES "icc")
  
@@ -64,9 +64,9 @@ Index: kde4libs/cmake/modules/FindKDE4Internal.cmake
  
 Index: kde4libs/cmake/modules/KDE4Macros.cmake
 ===================================================================
---- kde4libs.orig/cmake/modules/KDE4Macros.cmake	2014-08-19 22:36:20.881357112 +0200
-+++ kde4libs/cmake/modules/KDE4Macros.cmake	2014-08-19 22:36:20.877357278 +0200
-@@ -834,6 +834,17 @@
+--- kde4libs.orig/cmake/modules/KDE4Macros.cmake	2015-09-19 02:00:16.681324355 +0200
++++ kde4libs/cmake/modules/KDE4Macros.cmake	2015-09-19 02:00:16.617326937 +0200
+@@ -841,6 +841,17 @@
  	      endif(NOT _icon_position EQUAL -1)
        endif (Q_WS_MAC)
        kde4_add_executable(${_target_NAME} "${_nogui}" ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp ${_resourcefile})
@@ -86,8 +86,8 @@ Index: kde4libs/cmake/modules/KDE4Macros.cmake
  
 Index: kde4libs/kinit/CMakeLists.txt
 ===================================================================
---- kde4libs.orig/kinit/CMakeLists.txt	2014-08-19 22:36:20.881357112 +0200
-+++ kde4libs/kinit/CMakeLists.txt	2014-08-19 22:36:20.877357278 +0200
+--- kde4libs.orig/kinit/CMakeLists.txt	2015-09-19 02:00:16.681324355 +0200
++++ kde4libs/kinit/CMakeLists.txt	2015-09-19 02:00:16.641325969 +0200
 @@ -58,6 +58,17 @@
  
  install(TARGETS kdeinit4 ${INSTALL_TARGETS_DEFAULT_ARGS} )
@@ -108,8 +108,8 @@ Index: kde4libs/kinit/CMakeLists.txt
    set(kwrapper_SRCS kwrapper_win.cpp  )
 Index: kde4libs/config-prefix.h.cmake
 ===================================================================
---- kde4libs.orig/config-prefix.h.cmake	2014-08-19 22:36:20.881357112 +0200
-+++ kde4libs/config-prefix.h.cmake	2014-08-19 22:36:20.877357278 +0200
+--- kde4libs.orig/config-prefix.h.cmake	2015-09-19 02:00:16.681324355 +0200
++++ kde4libs/config-prefix.h.cmake	2015-09-19 02:00:16.641325969 +0200
 @@ -12,6 +12,7 @@
  #define __KDE_EXECPREFIX "NONE"
  
@@ -120,8 +120,8 @@ Index: kde4libs/config-prefix.h.cmake
  #define INCLUDE_INSTALL_DIR "${INCLUDE_INSTALL_DIR}"
 Index: kde4libs/kdecore/kde-config.cpp
 ===================================================================
---- kde4libs.orig/kdecore/kde-config.cpp	2014-08-19 22:36:20.881357112 +0200
-+++ kde4libs/kdecore/kde-config.cpp	2014-08-19 22:36:20.877357278 +0200
+--- kde4libs.orig/kdecore/kde-config.cpp	2015-09-19 02:00:16.681324355 +0200
++++ kde4libs/kdecore/kde-config.cpp	2015-09-19 02:00:16.645325808 +0200
 @@ -144,6 +144,7 @@
              "html", I18N_NOOP("HTML documentation"),
              "icon", I18N_NOOP("Icons"),
@@ -132,8 +132,8 @@ Index: kde4libs/kdecore/kde-config.cpp
              "locale", I18N_NOOP("Translation files for KLocale"),
 Index: kde4libs/kdecore/kernel/kstandarddirs.cpp
 ===================================================================
---- kde4libs.orig/kdecore/kernel/kstandarddirs.cpp	2014-08-19 22:36:20.881357112 +0200
-+++ kde4libs/kdecore/kernel/kstandarddirs.cpp	2014-08-19 22:36:20.877357278 +0200
+--- kde4libs.orig/kdecore/kernel/kstandarddirs.cpp	2015-09-19 02:00:16.681324355 +0200
++++ kde4libs/kdecore/kernel/kstandarddirs.cpp	2015-09-19 02:00:16.661325162 +0200
 @@ -171,6 +171,8 @@
  menus
  xdgconf-autostart
@@ -163,8 +163,8 @@ Index: kde4libs/kdecore/kernel/kstandarddirs.cpp
  static void tokenize(QStringList& token, const QString& str,
 Index: kde4libs/kdecore/kernel/kstandarddirs_unix.cpp
 ===================================================================
---- kde4libs.orig/kdecore/kernel/kstandarddirs_unix.cpp	2014-08-19 22:36:20.881357112 +0200
-+++ kde4libs/kdecore/kernel/kstandarddirs_unix.cpp	2014-08-19 22:36:20.877357278 +0200
+--- kde4libs.orig/kdecore/kernel/kstandarddirs_unix.cpp	2015-09-19 02:00:16.681324355 +0200
++++ kde4libs/kdecore/kernel/kstandarddirs_unix.cpp	2015-09-19 02:00:16.661325162 +0200
 @@ -40,6 +40,8 @@
                  return QFile::decodeName(KCFG_INSTALL_DIR "/");
              if (strcmp("kdedir", type) == 0)
@@ -176,8 +176,8 @@ Index: kde4libs/kdecore/kernel/kstandarddirs_unix.cpp
              if (strcmp("data", type) == 0)
 Index: kde4libs/kdecore/kernel/kstandarddirs_win.cpp
 ===================================================================
---- kde4libs.orig/kdecore/kernel/kstandarddirs_win.cpp	2014-08-19 22:36:20.881357112 +0200
-+++ kde4libs/kdecore/kernel/kstandarddirs_win.cpp	2014-08-19 22:36:20.877357278 +0200
+--- kde4libs.orig/kdecore/kernel/kstandarddirs_win.cpp	2015-09-19 02:00:16.681324355 +0200
++++ kde4libs/kdecore/kernel/kstandarddirs_win.cpp	2015-09-19 02:00:16.661325162 +0200
 @@ -47,6 +47,8 @@
                  return share() + QLatin1String("config.kcfg/");
              if (strcmp("kdedir", type) == 0)
@@ -189,8 +189,8 @@ Index: kde4libs/kdecore/kernel/kstandarddirs_win.cpp
              if (strcmp("data", type) == 0)
 Index: kde4libs/kdecore/util/kpluginloader.cpp
 ===================================================================
---- kde4libs.orig/kdecore/util/kpluginloader.cpp	2014-08-19 22:36:20.881357112 +0200
-+++ kde4libs/kdecore/util/kpluginloader.cpp	2014-08-19 22:36:20.877357278 +0200
+--- kde4libs.orig/kdecore/util/kpluginloader.cpp	2015-09-19 02:00:16.681324355 +0200
++++ kde4libs/kdecore/util/kpluginloader.cpp	2015-09-19 02:00:16.673324678 +0200
 @@ -113,6 +113,13 @@
          libname = fileinfo.path() + QLatin1String("/lib") + fileinfo.fileName();
  #endif
@@ -207,8 +207,8 @@ Index: kde4libs/kdecore/util/kpluginloader.cpp
          if (!kdeinit) {
 Index: kde4libs/kinit/kinit.cpp
 ===================================================================
---- kde4libs.orig/kinit/kinit.cpp	2014-08-19 22:36:20.881357112 +0200
-+++ kde4libs/kinit/kinit.cpp	2014-08-19 22:36:20.877357278 +0200
+--- kde4libs.orig/kinit/kinit.cpp	2015-09-19 02:00:16.681324355 +0200
++++ kde4libs/kinit/kinit.cpp	2015-09-19 02:00:16.677324517 +0200
 @@ -498,11 +498,23 @@
              // try to match an absolute path to an executable binary (either in bin/ or in libexec/)
              // to a kdeinit module in the same prefix