summaryrefslogtreecommitdiff
path: root/debian/patches
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches')
-rw-r--r--debian/patches/add_debian_build_type.diff8
-rw-r--r--debian/patches/add_dlrestrictions_support.diff22
-rw-r--r--debian/patches/hurd_support.diff16
-rw-r--r--debian/patches/kconf_update_migrate_from_kde3_icon_theme.diff10
-rw-r--r--debian/patches/kfreebsd_support.diff36
-rw-r--r--debian/patches/kubuntu_add_langpack_path.diff18
-rw-r--r--debian/patches/kubuntu_langpack_desktop_files.diff188
-rw-r--r--debian/patches/kubuntu_patched_l10n.diff19
-rw-r--r--debian/patches/kubuntu_raise_after_drkonqi.patch62
-rw-r--r--debian/patches/kubuntu_revert_findpythonlibrary.diff13
-rw-r--r--debian/patches/ld_exclude_libs_qtuitools.diff10
-rw-r--r--debian/patches/make_libkdeinit4_private.diff52
-rw-r--r--debian/patches/series6
-rw-r--r--debian/patches/upstream-make_include_style_be_the_same_for_QtCore.patch22
14 files changed, 383 insertions, 99 deletions
diff --git a/debian/patches/add_debian_build_type.diff b/debian/patches/add_debian_build_type.diff
index 80ef94e..035f529 100644
--- a/debian/patches/add_debian_build_type.diff
+++ b/debian/patches/add_debian_build_type.diff
@@ -7,9 +7,11 @@ icons.
cmake/modules/FindKDE4Internal.cmake | 2 ++
1 file changed, 2 insertions(+)
---- a/cmake/modules/FindKDE4Internal.cmake
-+++ b/cmake/modules/FindKDE4Internal.cmake
-@@ -1198,11 +1198,13 @@ if (CMAKE_COMPILER_IS_GNUCXX)
+Index: kde4libs/cmake/modules/FindKDE4Internal.cmake
+===================================================================
+--- 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 7e5d389..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 2014-02-05 14:55:06.328827225 +0100
-+++ kde4libs/kdecore/kernel/kstandarddirs.cpp 2014-02-05 14:55:06.328827225 +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 2014-02-05 14:55:06.328827225 +0100
-+++ kde4libs/kinit/lnusertemp.c 2014-02-05 14:55:06.328827225 +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,10 +38,10 @@ 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 2014-02-05 14:55:06.328827225 +0100
-+++ kde4libs/cmake/modules/FindKDE4Internal.cmake 2014-02-05 14:55:06.328827225 +0100
-@@ -1220,8 +1220,8 @@
- endif (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU OR CMAKE_SYSTEM_NAME MATCHES kFreeBSD)
+--- 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)
- set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -pthread")
diff --git a/debian/patches/kconf_update_migrate_from_kde3_icon_theme.diff b/debian/patches/kconf_update_migrate_from_kde3_icon_theme.diff
index d23bc5c..66381a2 100644
--- a/debian/patches/kconf_update_migrate_from_kde3_icon_theme.diff
+++ b/debian/patches/kconf_update_migrate_from_kde3_icon_theme.diff
@@ -13,7 +13,7 @@ Useful when upgrading from KDE 3 to KDE 4 because default KDE 3 theme
Index: kde4libs/kdeui/icons/kconf_update_migrate_from_kde3_icon_theme.cpp
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ kde4libs/kdeui/icons/kconf_update_migrate_from_kde3_icon_theme.cpp 2013-09-04 11:30:05.119636143 +0000
++++ kde4libs/kdeui/icons/kconf_update_migrate_from_kde3_icon_theme.cpp 2015-02-16 10:18:58.304627273 +0100
@@ -0,0 +1,157 @@
+/*
+ Copyright (c) 2011, Modestas Vainius <modax@debian.org>
@@ -174,9 +174,9 @@ Index: kde4libs/kdeui/icons/kconf_update_migrate_from_kde3_icon_theme.cpp
+}
Index: kde4libs/kdeui/CMakeLists.txt
===================================================================
---- kde4libs.orig/kdeui/CMakeLists.txt 2013-09-04 11:30:05.123635985 +0000
-+++ kde4libs/kdeui/CMakeLists.txt 2013-09-04 11:30:05.123635985 +0000
-@@ -469,6 +469,16 @@
+--- kde4libs.orig/kdeui/CMakeLists.txt 2015-02-16 10:18:58.304627273 +0100
++++ kde4libs/kdeui/CMakeLists.txt 2015-02-16 10:18:58.304627273 +0100
+@@ -470,6 +470,16 @@
)
install(TARGETS kdeui EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
@@ -196,7 +196,7 @@ Index: kde4libs/kdeui/CMakeLists.txt
Index: kde4libs/kdeui/kdeui.upd
===================================================================
--- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ kde4libs/kdeui/kdeui.upd 2013-09-04 11:30:05.123635985 +0000
++++ kde4libs/kdeui/kdeui.upd 2015-02-16 10:18:58.304627273 +0100
@@ -0,0 +1,6 @@
+# Migrate from crystalsvg and similar KDE 4 incompatible icon themes
+Id=kde4/migrate_from_kde3_icon_theme
diff --git a/debian/patches/kfreebsd_support.diff b/debian/patches/kfreebsd_support.diff
index e33324d..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 2014-02-05 14:54:38.164165135 +0100
-+++ kde4libs/ConfigureChecks.cmake 2014-02-05 14:54:38.160165041 +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 2014-02-05 14:54:38.164165135 +0100
-+++ kde4libs/kio/kfile/kpropertiesdialog.cpp 2014-02-05 14:54:38.160165041 +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 2014-02-05 14:54:38.164165135 +0100
-+++ kde4libs/kioslave/file/file.cpp 2014-02-05 14:54:38.160165041 +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 2014-02-05 14:54:38.164165135 +0100
-+++ kde4libs/kioslave/file/file_unix.cpp 2014-02-05 14:54:38.160165041 +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 2014-02-05 14:54:38.164165135 +0100
-+++ kde4libs/kpty/kpty.cpp 2014-02-05 14:54:38.164165135 +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,18 +127,18 @@ Index: kde4libs/kpty/kpty.cpp
#include <kdebug.h>
Index: kde4libs/cmake/modules/FindKDE4Internal.cmake
===================================================================
---- kde4libs.orig/cmake/modules/FindKDE4Internal.cmake 2014-02-05 14:54:38.164165135 +0100
-+++ kde4libs/cmake/modules/FindKDE4Internal.cmake 2014-02-05 14:54:38.164165135 +0100
-@@ -1093,7 +1093,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)
-if (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU)
+if (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU OR CMAKE_SYSTEM_NAME MATCHES kFreeBSD)
if (CMAKE_COMPILER_IS_GNUCXX OR "${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
- set ( _KDE4_PLATFORM_DEFINITIONS -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_GNU_SOURCE)
+ 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}")
-@@ -1114,7 +1114,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")
-@@ -1211,13 +1211,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")
@@ -157,9 +157,9 @@ Index: kde4libs/cmake/modules/FindKDE4Internal.cmake
# It is kept here nonetheless both for backwards compatibility in case one does not use add_definitions(${KDE4_DEFINITIONS})
# and also because it is/was needed by glibc for snprintf to be available when building C files.
# See commit 4a44862b2d178c1d2e1eb4da90010d19a1e4a42c.
- add_definitions (-D_BSD_SOURCE)
+ add_definitions (-D_DEFAULT_SOURCE -D_BSD_SOURCE)
- endif (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU)
-+ endif (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU OR CMAKE_SYSTEM_NAME MATCHES kFreeBSD)
++ endif (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU OR CMAKE_SYSTEM_NAME MATCHES kFreeBSD)
if (CMAKE_SYSTEM_NAME STREQUAL GNU)
set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -pthread")
diff --git a/debian/patches/kubuntu_add_langpack_path.diff b/debian/patches/kubuntu_add_langpack_path.diff
new file mode 100644
index 0000000..1c4dee8
--- /dev/null
+++ b/debian/patches/kubuntu_add_langpack_path.diff
@@ -0,0 +1,18 @@
+Description: Ensure KDE applications are checking langpack paths for l10n
+Author: Jonathan Riddell <jriddell@ubuntu.com>
+Forwarded: not-needed
+
+Index: kde4libs-4.13.0/kdecore/kernel/kstandarddirs.cpp
+===================================================================
+--- kde4libs-4.13.0.orig/kdecore/kernel/kstandarddirs.cpp 2014-05-20 13:22:57.000000000 +0100
++++ kde4libs-4.13.0/kdecore/kernel/kstandarddirs.cpp 2014-05-20 13:24:33.099360291 +0100
+@@ -1875,6 +1875,9 @@
+
+ addResourceDir("home", QDir::homePath(), false);
+
++ addResourceDir("locale", QLatin1String("/usr/share/locale-langpack/"), true);
++ addResourceDir("locale", QLatin1String("/usr/share/locale-kdelibs4/"), true);
++
+ addResourceType("autostart", "xdgconf-autostart", "/"); // merge them, start with xdg autostart
+ addResourceType("autostart", NULL, "share/autostart"); // KDE ones are higher priority
+ }
diff --git a/debian/patches/kubuntu_langpack_desktop_files.diff b/debian/patches/kubuntu_langpack_desktop_files.diff
new file mode 100644
index 0000000..4f1234a
--- /dev/null
+++ b/debian/patches/kubuntu_langpack_desktop_files.diff
@@ -0,0 +1,188 @@
+Description: Draws desktop file translations from gettext domains.
+ This patch is heavily inspired by a similar patch from openSUSE, it howeever
+ makes a very important assumption to decrease overhead compared to KDE.
+ Iff the Ubuntu gettext domain is set, then translations will be drawn from
+ there, regardless of whether there are translations available in the desktop
+ file itself. This implies that only those builds that actually have a
+ gettext translation will provide the entry, and no others will.
+ This allows us to keep API additions to a minimum and at the same time
+ provide more performant code in both cases.
+Forwarded: not-needed
+Origin: vendor
+Author: Harald Sitter <apachelogger@ubuntu.com>
+Last-Update: 2010-06-24
+Reviewed-by: Jonathan Riddell <jriddell@ubuntu.com>
+
+Index: kde4libs-4.11.97/kdecore/config/kdesktopfile.cpp
+===================================================================
+--- kde4libs-4.11.97.orig/kdecore/config/kdesktopfile.cpp 2013-11-28 10:56:54.669029748 +0000
++++ kde4libs-4.11.97/kdecore/config/kdesktopfile.cpp 2013-11-28 10:56:54.661029747 +0000
+@@ -34,16 +34,26 @@
+ #include "kstandarddirs.h"
+ #include "kconfigini_p.h"
+ #include "kde_file.h"
++#include "klocale.h"
+
+ class KDesktopFilePrivate : public KConfigPrivate
+ {
+ public:
+ KDesktopFilePrivate(const char * resourceType, const QString &fileName);
+ KConfigGroup desktopGroup;
++ KLocale *locale;
++ QString translationDomain;
++ virtual ~KDesktopFilePrivate()
++ {
++ if (locale != 0) {
++ delete locale;
++ }
++ }
+ };
+
+ KDesktopFilePrivate::KDesktopFilePrivate(const char * resourceType, const QString &fileName)
+- : KConfigPrivate(KGlobal::mainComponent(), KConfig::NoGlobals, resourceType)
++ : KConfigPrivate(KGlobal::mainComponent(), KConfig::NoGlobals, resourceType),
++ locale(0)
+ {
+ mBackend = new KConfigIniBackend();
+ bDynamicBackend = false;
+@@ -56,6 +66,10 @@
+ Q_D(KDesktopFile);
+ reparseConfiguration();
+ d->desktopGroup = KConfigGroup(this, "Desktop Entry");
++ if (d->desktopGroup.hasKey("X-Ubuntu-Gettext-Domain")) {
++ d->translationDomain = d->desktopGroup.readEntry("X-Ubuntu-Gettext-Domain");
++ d->locale = new KLocale(d->translationDomain);
++ }
+ }
+
+ KDesktopFile::KDesktopFile(const QString &fileName)
+@@ -64,6 +78,10 @@
+ Q_D(KDesktopFile);
+ reparseConfiguration();
+ d->desktopGroup = KConfigGroup(this, "Desktop Entry");
++ if (d->desktopGroup.hasKey("X-Ubuntu-Gettext-Domain")) {
++ d->translationDomain = d->desktopGroup.readEntry("X-Ubuntu-Gettext-Domain");
++ d->locale = new KLocale(d->translationDomain);
++ }
+ }
+
+ KDesktopFile::~KDesktopFile()
+@@ -177,6 +195,30 @@
+ return false;
+ }
+
++// Due to the very nice fact that on Ubuntu the gettext domain key (as see
++QString KDesktopFile::translatedEntry(const KConfigGroup& group, const char* key) const
++{
++ Q_D(const KDesktopFile);
++ if (d->locale == 0 || !group.hasKey(key)) {
++ return group.readEntry(key);
++ }
++
++ QString value = group.readEntryUntranslated(key);
++ QString poValue;
++ // translateRaw does not like being called with an empty value.
++ if (value.isEmpty()) {
++ return value;
++ }
++
++ d->locale->translateRawFrom(d->translationDomain.toUtf8().constData(), key, value.toUtf8().constData(), NULL, &poValue);
++
++ if (poValue == value) {
++ d->locale->translateRawFrom(d->translationDomain.toUtf8().constData(), value.toUtf8().constData(), NULL, &poValue);
++ }
++
++ return poValue;
++}
++
+ QString KDesktopFile::readType() const
+ {
+ Q_D(const KDesktopFile);
+@@ -192,19 +234,19 @@
+ QString KDesktopFile::readName() const
+ {
+ Q_D(const KDesktopFile);
+- return d->desktopGroup.readEntry("Name", QString());
++ return translatedEntry(d->desktopGroup, "Name");
+ }
+
+ QString KDesktopFile::readComment() const
+ {
+ Q_D(const KDesktopFile);
+- return d->desktopGroup.readEntry("Comment", QString());
++ return translatedEntry(d->desktopGroup, "Comment");
+ }
+
+ QString KDesktopFile::readGenericName() const
+ {
+ Q_D(const KDesktopFile);
+- return d->desktopGroup.readEntry("GenericName", QString());
++ return translatedEntry(d->desktopGroup, "GenericName");
+ }
+
+ QString KDesktopFile::readPath() const
+Index: kde4libs-4.11.97/kdecore/config/kdesktopfile.h
+===================================================================
+--- kde4libs-4.11.97.orig/kdecore/config/kdesktopfile.h 2013-11-28 10:56:54.669029748 +0000
++++ kde4libs-4.11.97/kdecore/config/kdesktopfile.h 2013-11-28 10:56:54.661029747 +0000
+@@ -243,6 +243,8 @@
+
+ const char *resource() const;
+
++ QString translatedEntry(const KConfigGroup& group, const char* key) const;
++
+ protected:
+ /** Virtual hook, used to add new "virtual" functions while maintaining
+ binary compatibility. Unused in this class.
+Index: kde4libs-4.11.97/kdecore/services/kservice.cpp
+===================================================================
+--- kde4libs-4.11.97.orig/kdecore/services/kservice.cpp 2013-11-28 10:56:54.669029748 +0000
++++ kde4libs-4.11.97/kdecore/services/kservice.cpp 2013-11-28 10:56:54.661029747 +0000
+@@ -306,7 +306,7 @@
+ << "has no Name or no Exec key";
+ } else {
+ m_actions.append(KServiceAction(group,
+- cg.readEntry("Name"),
++ config->translatedEntry(cg,"Name"),
+ cg.readEntry("Icon"),
+ cg.readEntry("Exec"),
+ cg.readEntry("NoDisplay", false)));
+Index: kde4libs-4.11.97/kdecore/services/kservicegroup.cpp
+===================================================================
+--- kde4libs-4.11.97.orig/kdecore/services/kservicegroup.cpp 2013-11-28 10:56:54.669029748 +0000
++++ kde4libs-4.11.97/kdecore/services/kservicegroup.cpp 2013-11-28 10:56:54.661029747 +0000
+@@ -56,9 +56,9 @@
+
+ const KConfigGroup config = desktopFile.desktopGroup();
+
+- m_strCaption = config.readEntry( "Name" );
+- m_strIcon = config.readEntry( "Icon" );
+- m_strComment = config.readEntry( "Comment" );
++ m_strCaption = desktopFile.readName();
++ m_strIcon = desktopFile.readIcon();
++ m_strComment = desktopFile.readComment();
+ deleted = config.readEntry("Hidden", false );
+ m_bNoDisplay = desktopFile.noDisplay();
+ m_strBaseGroupName = config.readEntry( "X-KDE-BaseGroup" );
+Index: kde4libs-4.11.97/kdecore/localization/klocale_kde.cpp
+===================================================================
+--- kde4libs-4.11.97.orig/kdecore/localization/klocale_kde.cpp 2013-11-28 10:56:54.669029748 +0000
++++ kde4libs-4.11.97/kdecore/localization/klocale_kde.cpp 2013-11-28 10:56:54.661029747 +0000
+@@ -312,6 +312,7 @@
+ // do not use insertCatalog here, that would already trigger updateCatalogs
+ m_catalogNames.append(KCatalogName(m_catalogName)); // application catalog
+
++ if (!m_catalogName.startsWith(QString::fromLatin1("desktop_"))) { //don't bother if we're looking up desktop translations
+ // catalogs from which each application can draw translations
+ const int numberOfCatalogs = m_catalogNames.size();
+ m_catalogNames.append(KCatalogName(QString::fromLatin1("libphonon")));
+@@ -321,6 +322,9 @@
+ m_catalogNames.append(KCatalogName(QString::fromLatin1("solid_qt")));
+ m_catalogNames.append(KCatalogName(QString::fromLatin1("kdecalendarsystems")));
+ m_numberOfSysCatalogs = m_catalogNames.size() - numberOfCatalogs;
++ } else {
++ m_numberOfSysCatalogs = 0;
++ }
+
+ updateCatalogs(); // evaluate this for all languages
+ }
diff --git a/debian/patches/kubuntu_patched_l10n.diff b/debian/patches/kubuntu_patched_l10n.diff
new file mode 100644
index 0000000..202605e
--- /dev/null
+++ b/debian/patches/kubuntu_patched_l10n.diff
@@ -0,0 +1,19 @@
+Description: Load Kubuntu patched localizations
+ Whenever Kubuntu has i18n patches ontop of what KDE has they get put into
+ the kubuntu-patched-l10n template. Therefore this template needs to be loaded
+ for every application.
+Forwarded: not-needed
+Author: Harald Sitter <apachelogger@kubuntu.org>
+
+Index: kde4libs-4.11.97/kdecore/localization/klocale_kde.cpp
+===================================================================
+--- kde4libs-4.11.97.orig/kdecore/localization/klocale_kde.cpp 2013-11-28 10:56:55.253029762 +0000
++++ kde4libs-4.11.97/kdecore/localization/klocale_kde.cpp 2013-11-28 10:56:55.249029762 +0000
+@@ -321,6 +321,7 @@
+ m_catalogNames.append(KCatalogName(QString::fromLatin1("kdeqt")));
+ m_catalogNames.append(KCatalogName(QString::fromLatin1("solid_qt")));
+ m_catalogNames.append(KCatalogName(QString::fromLatin1("kdecalendarsystems")));
++ m_catalogNames.append(KCatalogName(QString::fromLatin1("kubuntu-patched-l10n")));
+ m_numberOfSysCatalogs = m_catalogNames.size() - numberOfCatalogs;
+ } else {
+ m_numberOfSysCatalogs = 0;
diff --git a/debian/patches/kubuntu_raise_after_drkonqi.patch b/debian/patches/kubuntu_raise_after_drkonqi.patch
new file mode 100644
index 0000000..1722fc1
--- /dev/null
+++ b/debian/patches/kubuntu_raise_after_drkonqi.patch
@@ -0,0 +1,62 @@
+Index: kde4libs/kdeui/util/kcrash.cpp
+===================================================================
+--- kde4libs.orig/kdeui/util/kcrash.cpp 2015-02-16 10:23:28.265819116 +0100
++++ kde4libs/kdeui/util/kcrash.cpp 2015-02-16 10:23:28.265819116 +0100
+@@ -223,6 +223,39 @@
+ return s_launchDrKonqi;
+ }
+
++/**
++ * \brief possiblyRaiseForApport raises() signal to native handler.
++ * \param sig signal that was handled by KCrash
++ * \return Does not return when raised for Apport
++ */
++static void possiblyRaiseForApport(int sig)
++{
++#define BUFSIZE 256
++ char buf[BUFSIZE];
++ const size_t bufSize = readlink("/proc/self/exe", buf, BUFSIZE);
++ buf[bufSize] = '\0'; // readlink doesn't NUL terminate.
++ for (char *c = buf; *c != '\0'; ++c){
++ if (*c == '/') {
++ *c = '_';
++ }
++ }
++
++ const uid_t uid = getuid();
++ char filePath[BUFSIZE];
++ sprintf(filePath, "/var/crash/%s.%d.drkonqi-accept", buf, uid);
++
++ if (access(filePath, F_OK) != -1) {
++ // Apport needs to get a core dump to enable automatic metrics submission.
++ // So instead of exit we are raising into the native signal handler.
++ fprintf(stderr, "Re-raising signal for Apport handling.\n");
++ KCrash::setCrashHandler(0);
++ raise(sig);
++ }
++ fprintf(stderr, "Not forwarding the crash to Apport.\n");
++ // Automatic report not allowed. No-op.
++#undef BUFSIZE
++}
++
+ void
+ KCrash::setCrashHandler (HandlerType handler)
+ {
+@@ -446,6 +479,7 @@
+ fprintf(stderr, "Unable to start Dr. Konqi\n");
+ }
+
++ possiblyRaiseForApport(sig);
+ _exit(255);
+ }
+
+@@ -567,7 +601,8 @@
+ sleep(1);
+ }
+ }
+- _exit(253);
++ // Do not exit here as we need to handle end of execution inside KCrash.
++ // _exit(253);
+ }
+
+ return (pid > 0); //return true on success
diff --git a/debian/patches/kubuntu_revert_findpythonlibrary.diff b/debian/patches/kubuntu_revert_findpythonlibrary.diff
new file mode 100644
index 0000000..6645933
--- /dev/null
+++ b/debian/patches/kubuntu_revert_findpythonlibrary.diff
@@ -0,0 +1,13 @@
+Index: kde4libs-4.11.97/cmake/modules/FindPythonLibrary.cmake
+===================================================================
+--- kde4libs-4.11.97.orig/cmake/modules/FindPythonLibrary.cmake 2013-11-28 10:56:55.961029781 +0000
++++ kde4libs-4.11.97/cmake/modules/FindPythonLibrary.cmake 2013-11-28 10:56:55.953029780 +0000
+@@ -34,7 +34,7 @@
+
+ if (PYTHONINTERP_FOUND)
+
+- option(INSTALL_PYTHON_FILES_IN_PYTHON_PREFIX "Install the Python files in the Python packages dir" FALSE)
++ option(INSTALL_PYTHON_FILES_IN_PYTHON_PREFIX "Install the Python files in the Python packages dir" TRUE)
+
+ # Set the Python libraries to what we actually found for interpreters
+ set(Python_ADDITIONAL_VERSIONS "${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}")
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 4de849f..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-02-05 14:54:04.179366178 +0100
-+++ kde4libs/CreateKDELibsDependenciesFile.cmake 2014-02-05 14:54:04.175366084 +0100
+--- 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-02-05 14:54:04.179366178 +0100
-+++ kde4libs/cmake/modules/FindKDE4Internal.cmake 2014-02-05 14:54:04.175366084 +0100
-@@ -871,6 +871,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")
-@@ -1406,6 +1407,10 @@
+@@ -1378,6 +1379,10 @@
endif (CMAKE_C_COMPILER MATCHES "icc")
@@ -64,10 +64,10 @@ Index: kde4libs/cmake/modules/FindKDE4Internal.cmake
Index: kde4libs/cmake/modules/KDE4Macros.cmake
===================================================================
---- kde4libs.orig/cmake/modules/KDE4Macros.cmake 2014-02-05 14:54:04.179366178 +0100
-+++ kde4libs/cmake/modules/KDE4Macros.cmake 2014-02-05 14:54:04.175366084 +0100
-@@ -834,6 +834,17 @@
- endif(NOT _res_position EQUAL -1)
+--- 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})
+ if (UNIX AND ENABLE_LIBKDEINIT_RUNPATH)
@@ -86,8 +86,8 @@ Index: kde4libs/cmake/modules/KDE4Macros.cmake
Index: kde4libs/kinit/CMakeLists.txt
===================================================================
---- kde4libs.orig/kinit/CMakeLists.txt 2014-02-05 14:54:04.179366178 +0100
-+++ kde4libs/kinit/CMakeLists.txt 2014-02-05 14:54:04.175366084 +0100
+--- 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-02-05 14:54:04.179366178 +0100
-+++ kde4libs/config-prefix.h.cmake 2014-02-05 14:54:04.175366084 +0100
+--- 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-02-05 14:54:04.179366178 +0100
-+++ kde4libs/kdecore/kde-config.cpp 2014-02-05 14:54:04.175366084 +0100
+--- 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-02-05 14:54:04.179366178 +0100
-+++ kde4libs/kdecore/kernel/kstandarddirs.cpp 2014-02-05 14:54:04.175366084 +0100
+--- 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-02-05 14:54:04.179366178 +0100
-+++ kde4libs/kdecore/kernel/kstandarddirs_unix.cpp 2014-02-05 14:54:04.175366084 +0100
+--- 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-02-05 14:54:04.179366178 +0100
-+++ kde4libs/kdecore/kernel/kstandarddirs_win.cpp 2014-02-05 14:54:04.175366084 +0100
+--- 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-02-05 14:54:04.179366178 +0100
-+++ kde4libs/kdecore/util/kpluginloader.cpp 2014-02-05 14:54:04.175366084 +0100
+--- 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-02-05 14:54:04.179366178 +0100
-+++ kde4libs/kinit/kinit.cpp 2014-02-05 14:54:04.175366084 +0100
+--- 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
diff --git a/debian/patches/series b/debian/patches/series
index c399730..95037f4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -27,8 +27,12 @@ kde4libs_interpret_qvarianttype_as_qmetatypetype.diff
debian_standardsdirtest.diff
disable_bogus_test.diff
disable_bogus_tests
-upstream-make_include_style_be_the_same_for_QtCore.patch
fix_solidlex_destroy_signature.patch
+#kubuntu_add_langpack_path.diff
+#kubuntu_langpack_desktop_files.diff
+#kubuntu_patched_l10n.diff
+kubuntu_raise_after_drkonqi.patch
+kubuntu_revert_findpythonlibrary.diff
dyson-madvise.patch
dyson-cflags.patch
dyson-signbit.patch
diff --git a/debian/patches/upstream-make_include_style_be_the_same_for_QtCore.patch b/debian/patches/upstream-make_include_style_be_the_same_for_QtCore.patch
deleted file mode 100644
index c290624..0000000
--- a/debian/patches/upstream-make_include_style_be_the_same_for_QtCore.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-commit 96250267bd7c22b47ca93084112c97e722b18c54
-Author: Sune Vuorela <sune@vuorela.dk>
-Date: Fri May 16 18:26:06 2014 +0200
-
- Make include style be the same for QtCore includes
-
- As a side effect, it also fixes a build for some pieces of software
- that built in the past, but doesn't build now.
-
-diff --git a/kio/kio/global.h b/kio/kio/global.h
-index 8a46ae6..7613722 100644
---- a/kio/kio/global.h
-+++ b/kio/kio/global.h
-@@ -26,7 +26,7 @@
- #include <QtCore/QMap>
- #include <QtCore/QList>
- #include <QtCore/QVariant>
--#include <QFile> // for QFile::Permissions
-+#include <QtCore/QFile> // for QFile::Permissions
-
- #include <kiconloader.h>
- #include <QtGui/QPixmap> // for pixmapForUrl
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-02 02:53:19 +0000