[SCM] KDE Development Platform Libraries module packaging branch, master, updated. debian/4.4.5-2-47-g502b181
Didier Raboud
odyx-guest at alioth.debian.org
Sat Nov 27 11:36:34 UTC 2010
The following commit has been merged in the master branch:
commit 502b181be160d053d22f0cde8abc1736236a3a3e
Author: Didier Raboud <didier at raboud.com>
Date: Sat Nov 27 12:32:10 2010 +0100
Refresh patches correctly (thanks to Pino).
---
debian/patches/08_add_debian_build_type.diff | 6 +-
.../patches/09_disable_usr_lib_install_rpath.diff | 6 +-
debian/patches/10_make_libkdeinit4_private.diff | 66 +++++++-------------
.../patches/11_default_kde4_xdg_menu_prefix.diff | 12 +---
debian/patches/13_qt4_designer_plugins_path.diff | 6 +-
debian/patches/14_hardcode_ptm_device.diff | 6 +-
debian/patches/15_kfreebsd_support.diff | 30 +++------
debian/patches/16_debian_menu.diff | 6 +-
..._findservicebydesktoppath_try_realfilepath.diff | 12 +---
.../patches/19_findqt4_optional_x11_pthread.diff | 6 +-
debian/patches/20_use_dejavu_as_default_font.diff | 6 +-
.../22_hack_in_etc_kde4_in_kstandarddirs.diff | 6 +-
debian/patches/23_solid_no_double_build.diff | 6 +-
debian/patches/25_ld_exclude_libs_qtuitools.diff | 12 +---
debian/patches/27_konsole_kfreebsd_fix.diff | 6 +-
.../28_find_old_kde4_html_documentation.diff | 6 +-
debian/patches/29_hurd_support.diff | 12 +---
.../patches/30_kfileshare_kdesu_fileshareset.diff | 6 +-
.../patches/31_relax_plugin_kde_version_check.diff | 12 +---
19 files changed, 76 insertions(+), 152 deletions(-)
diff --git a/debian/patches/08_add_debian_build_type.diff b/debian/patches/08_add_debian_build_type.diff
index 1db22eb..cda798d 100644
--- a/debian/patches/08_add_debian_build_type.diff
+++ b/debian/patches/08_add_debian_build_type.diff
@@ -7,10 +7,8 @@ icons.
cmake/modules/FindKDE4Internal.cmake | 2 ++
1 file changed, 2 insertions(+)
-Index: kde4libs/cmake/modules/FindKDE4Internal.cmake
-===================================================================
---- kde4libs.orig/cmake/modules/FindKDE4Internal.cmake 2010-10-27 21:55:42.000000000 +0200
-+++ kde4libs/cmake/modules/FindKDE4Internal.cmake 2010-11-25 16:23:01.000000000 +0100
+--- a/cmake/modules/FindKDE4Internal.cmake
++++ b/cmake/modules/FindKDE4Internal.cmake
@@ -1196,11 +1196,13 @@
set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline")
set(CMAKE_CXX_FLAGS_DEBUGFULL "-g3 -fno-inline")
diff --git a/debian/patches/09_disable_usr_lib_install_rpath.diff b/debian/patches/09_disable_usr_lib_install_rpath.diff
index fa46d48..9a2cb2e 100644
--- a/debian/patches/09_disable_usr_lib_install_rpath.diff
+++ b/debian/patches/09_disable_usr_lib_install_rpath.diff
@@ -11,10 +11,8 @@ Forwarded: yes
Origin: backport, http://websvn.kde.org/?view=revision&revision=1124215
Last-Update: 2010-06-23
-Index: kde4libs/kdewidgets/CMakeLists.txt
-===================================================================
---- kde4libs.orig/kdewidgets/CMakeLists.txt 2010-11-05 11:48:27.000000000 +0100
-+++ kde4libs/kdewidgets/CMakeLists.txt 2010-11-25 16:23:01.000000000 +0100
+--- a/kdewidgets/CMakeLists.txt
++++ b/kdewidgets/CMakeLists.txt
@@ -51,7 +51,6 @@
INSTALL_RPATH_USE_LINK_PATH TRUE
SKIP_BUILD_RPATH TRUE
diff --git a/debian/patches/10_make_libkdeinit4_private.diff b/debian/patches/10_make_libkdeinit4_private.diff
index 60badf0..23a2d2c 100644
--- a/debian/patches/10_make_libkdeinit4_private.diff
+++ b/debian/patches/10_make_libkdeinit4_private.diff
@@ -19,10 +19,8 @@ Forwarded: no
Origin: vendor
Last-Update: 2010-06-07
-Index: kde4libs/CreateKDELibsDependenciesFile.cmake
-===================================================================
---- kde4libs.orig/CreateKDELibsDependenciesFile.cmake 2010-11-25 16:30:00.000000000 +0100
-+++ kde4libs/CreateKDELibsDependenciesFile.cmake 2010-11-25 16:30:54.000000000 +0100
+--- a/CreateKDELibsDependenciesFile.cmake
++++ b/CreateKDELibsDependenciesFile.cmake
@@ -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})
@@ -39,10 +37,8 @@ Index: kde4libs/CreateKDELibsDependenciesFile.cmake
set(KDE4_INCLUDE_INSTALL_DIR \"${KDE4_INCLUDE_INSTALL_DIR}\")
set(KDE4_BIN_INSTALL_DIR \"${KDE4_BIN_INSTALL_DIR}\")
set(KDE4_SBIN_INSTALL_DIR \"${KDE4_SBIN_INSTALL_DIR}\")
-Index: kde4libs/cmake/modules/FindKDE4Internal.cmake
-===================================================================
---- kde4libs.orig/cmake/modules/FindKDE4Internal.cmake 2010-11-25 16:30:00.000000000 +0100
-+++ kde4libs/cmake/modules/FindKDE4Internal.cmake 2010-11-25 16:30:54.000000000 +0100
+--- a/cmake/modules/FindKDE4Internal.cmake
++++ b/cmake/modules/FindKDE4Internal.cmake
@@ -867,6 +867,7 @@
_set_fancy(INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" "The subdirectory to the header prefix")
@@ -51,10 +47,8 @@ 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")
-Index: kde4libs/cmake/modules/KDE4Macros.cmake
-===================================================================
---- kde4libs.orig/cmake/modules/KDE4Macros.cmake 2010-11-25 16:30:00.000000000 +0100
-+++ kde4libs/cmake/modules/KDE4Macros.cmake 2010-11-25 16:30:54.000000000 +0100
+--- a/cmake/modules/KDE4Macros.cmake
++++ b/cmake/modules/KDE4Macros.cmake
@@ -810,6 +810,17 @@
set_target_properties(kdeinit_${_target_NAME} PROPERTIES OUTPUT_NAME kdeinit4_${_target_NAME})
@@ -73,10 +67,8 @@ Index: kde4libs/cmake/modules/KDE4Macros.cmake
target_link_libraries(${_target_NAME} kdeinit_${_target_NAME})
endif(WIN32)
-Index: kde4libs/kinit/CMakeLists.txt
-===================================================================
---- kde4libs.orig/kinit/CMakeLists.txt 2010-11-25 16:30:00.000000000 +0100
-+++ kde4libs/kinit/CMakeLists.txt 2010-11-25 16:30:54.000000000 +0100
+--- a/kinit/CMakeLists.txt
++++ b/kinit/CMakeLists.txt
@@ -57,6 +57,17 @@
install(TARGETS kdeinit4 ${INSTALL_TARGETS_DEFAULT_ARGS} )
@@ -95,10 +87,8 @@ Index: kde4libs/kinit/CMakeLists.txt
########### kwrapper4 ###############
if (WIN32)
set(kwrapper_SRCS kwrapper_win.cpp )
-Index: kde4libs/config-prefix.h.cmake
-===================================================================
---- kde4libs.orig/config-prefix.h.cmake 2010-11-25 16:30:00.000000000 +0100
-+++ kde4libs/config-prefix.h.cmake 2010-11-25 16:30:54.000000000 +0100
+--- a/config-prefix.h.cmake
++++ b/config-prefix.h.cmake
@@ -12,6 +12,7 @@
#define __KDE_EXECPREFIX "NONE"
@@ -107,10 +97,8 @@ Index: kde4libs/config-prefix.h.cmake
#define DATA_INSTALL_DIR "${DATA_INSTALL_DIR}"
#define LIB_INSTALL_DIR "${LIB_INSTALL_DIR}"
#define INCLUDE_INSTALL_DIR "${INCLUDE_INSTALL_DIR}"
-Index: kde4libs/kdecore/kde-config.cpp
-===================================================================
---- kde4libs.orig/kdecore/kde-config.cpp 2010-11-25 16:30:00.000000000 +0100
-+++ kde4libs/kdecore/kde-config.cpp 2010-11-25 16:30:54.000000000 +0100
+--- a/kdecore/kde-config.cpp
++++ b/kdecore/kde-config.cpp
@@ -144,6 +144,7 @@
"html", I18N_NOOP("HTML documentation"),
"icon", I18N_NOOP("Icons"),
@@ -119,10 +107,8 @@ Index: kde4libs/kdecore/kde-config.cpp
"lib", I18N_NOOP("Libraries"),
"include", I18N_NOOP("Includes/Headers"),
"locale", I18N_NOOP("Translation files for KLocale"),
-Index: kde4libs/kdecore/kernel/kstandarddirs.cpp
-===================================================================
---- kde4libs.orig/kdecore/kernel/kstandarddirs.cpp 2010-11-25 16:30:00.000000000 +0100
-+++ kde4libs/kdecore/kernel/kstandarddirs.cpp 2010-11-25 16:30:54.000000000 +0100
+--- a/kdecore/kernel/kstandarddirs.cpp
++++ b/kdecore/kernel/kstandarddirs.cpp
@@ -165,6 +165,8 @@
menus
xdgconf-autostart
@@ -150,10 +136,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 2010-11-25 16:30:00.000000000 +0100
-+++ kde4libs/kdecore/kernel/kstandarddirs_unix.cpp 2010-11-25 16:34:51.000000000 +0100
+--- a/kdecore/kernel/kstandarddirs_unix.cpp
++++ b/kdecore/kernel/kstandarddirs_unix.cpp
@@ -40,6 +40,8 @@
return QFile::decodeName(KCFG_INSTALL_DIR "/");
if (strcmp("kdedir", type) == 0)
@@ -163,10 +147,8 @@ Index: kde4libs/kdecore/kernel/kstandarddirs_unix.cpp
break;
case 'd':
if (strcmp("data", type) == 0)
-Index: kde4libs/kdecore/kernel/kstandarddirs_win.cpp
-===================================================================
---- kde4libs.orig/kdecore/kernel/kstandarddirs_win.cpp 2010-11-25 16:30:00.000000000 +0100
-+++ kde4libs/kdecore/kernel/kstandarddirs_win.cpp 2010-11-25 16:30:54.000000000 +0100
+--- a/kdecore/kernel/kstandarddirs_win.cpp
++++ b/kdecore/kernel/kstandarddirs_win.cpp
@@ -47,6 +47,8 @@
return share() + QLatin1String("config.kcfg/");
if (strcmp("kdedir", type) == 0)
@@ -176,10 +158,8 @@ Index: kde4libs/kdecore/kernel/kstandarddirs_win.cpp
break;
case 'd':
if (strcmp("data", type) == 0)
-Index: kde4libs/kdecore/util/kpluginloader.cpp
-===================================================================
---- kde4libs.orig/kdecore/util/kpluginloader.cpp 2010-11-25 16:30:00.000000000 +0100
-+++ kde4libs/kdecore/util/kpluginloader.cpp 2010-11-25 16:30:54.000000000 +0100
+--- a/kdecore/util/kpluginloader.cpp
++++ b/kdecore/util/kpluginloader.cpp
@@ -113,6 +113,13 @@
libname = fileinfo.path() + QLatin1String("/lib") + fileinfo.fileName();
#endif
@@ -194,10 +174,8 @@ Index: kde4libs/kdecore/util/kpluginloader.cpp
libfile = cData.dirs()->findResource("lib", libname);
if (!libfile.isEmpty()) {
if (!kdeinit) {
-Index: kde4libs/kinit/kinit.cpp
-===================================================================
---- kde4libs.orig/kinit/kinit.cpp 2010-11-25 16:30:00.000000000 +0100
-+++ kde4libs/kinit/kinit.cpp 2010-11-25 16:30:54.000000000 +0100
+--- a/kinit/kinit.cpp
++++ b/kinit/kinit.cpp
@@ -499,11 +499,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/11_default_kde4_xdg_menu_prefix.diff b/debian/patches/11_default_kde4_xdg_menu_prefix.diff
index 7abdada..4c09ac4 100644
--- a/debian/patches/11_default_kde4_xdg_menu_prefix.diff
+++ b/debian/patches/11_default_kde4_xdg_menu_prefix.diff
@@ -3,10 +3,8 @@
kded/vfolder_menu.cpp | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
-Index: kde4libs/kded/CMakeLists.txt
-===================================================================
---- kde4libs.orig/kded/CMakeLists.txt 2010-10-19 15:39:07.000000000 +0200
-+++ kde4libs/kded/CMakeLists.txt 2010-11-25 16:35:46.000000000 +0100
+--- a/kded/CMakeLists.txt
++++ b/kded/CMakeLists.txt
@@ -74,7 +74,7 @@
if (WIN32)
install( FILES applications.menu DESTINATION ${SHARE_INSTALL_PREFIX}/xdg/menus )
@@ -16,10 +14,8 @@ Index: kde4libs/kded/CMakeLists.txt
endif (WIN32)
install( FILES kdedmodule.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
install( FILES kded.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update )
-Index: kde4libs/kded/vfolder_menu.cpp
-===================================================================
---- kde4libs.orig/kded/vfolder_menu.cpp 2010-10-05 13:39:50.000000000 +0200
-+++ kde4libs/kded/vfolder_menu.cpp 2010-11-25 16:35:46.000000000 +0100
+--- a/kded/vfolder_menu.cpp
++++ b/kded/vfolder_menu.cpp
@@ -768,8 +768,10 @@
QString result;
diff --git a/debian/patches/13_qt4_designer_plugins_path.diff b/debian/patches/13_qt4_designer_plugins_path.diff
index b0ffd84..492e68a 100644
--- a/debian/patches/13_qt4_designer_plugins_path.diff
+++ b/debian/patches/13_qt4_designer_plugins_path.diff
@@ -1,7 +1,5 @@
-Index: kde4libs/kdewidgets/CMakeLists.txt
-===================================================================
---- kde4libs.orig/kdewidgets/CMakeLists.txt 2010-11-25 16:30:53.000000000 +0100
-+++ kde4libs/kdewidgets/CMakeLists.txt 2010-11-25 16:35:51.000000000 +0100
+--- a/kdewidgets/CMakeLists.txt
++++ b/kdewidgets/CMakeLists.txt
@@ -54,7 +54,7 @@
)
endif(NOT WIN32)
diff --git a/debian/patches/14_hardcode_ptm_device.diff b/debian/patches/14_hardcode_ptm_device.diff
index 61bde98..5b19b33 100644
--- a/debian/patches/14_hardcode_ptm_device.diff
+++ b/debian/patches/14_hardcode_ptm_device.diff
@@ -4,10 +4,8 @@ Bypass build time check as /dev/ptmx is alsways present at runtime.
ConfigureChecks.cmake | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
-Index: kde4libs/ConfigureChecks.cmake
-===================================================================
---- kde4libs.orig/ConfigureChecks.cmake 2010-07-16 21:05:50.000000000 +0200
-+++ kde4libs/ConfigureChecks.cmake 2010-11-25 16:35:55.000000000 +0100
+--- a/ConfigureChecks.cmake
++++ b/ConfigureChecks.cmake
@@ -202,13 +202,7 @@
set(HAVE_OPENPTY)
diff --git a/debian/patches/15_kfreebsd_support.diff b/debian/patches/15_kfreebsd_support.diff
index eb2e7a6..a9ade84 100644
--- a/debian/patches/15_kfreebsd_support.diff
+++ b/debian/patches/15_kfreebsd_support.diff
@@ -10,10 +10,8 @@ cmake.
kpty/kpty.cpp | 24 ++++++++++++------------
5 files changed, 30 insertions(+), 16 deletions(-)
-Index: kde4libs/ConfigureChecks.cmake
-===================================================================
---- kde4libs.orig/ConfigureChecks.cmake 2010-11-25 16:35:55.000000000 +0100
-+++ kde4libs/ConfigureChecks.cmake 2010-11-25 16:36:07.000000000 +0100
+--- a/ConfigureChecks.cmake
++++ b/ConfigureChecks.cmake
@@ -164,11 +164,11 @@
set(UTIL_LIBRARY util)
endif (login_in_libutil)
@@ -29,10 +27,8 @@ Index: kde4libs/ConfigureChecks.cmake
if (HAVE_UTMPX)
set(utmp utmpx)
if (login_in_libutil)
-Index: kde4libs/kio/kfile/kpropertiesdialog.cpp
-===================================================================
---- kde4libs.orig/kio/kfile/kpropertiesdialog.cpp 2010-11-05 11:48:27.000000000 +0100
-+++ kde4libs/kio/kfile/kpropertiesdialog.cpp 2010-11-25 16:36:07.000000000 +0100
+--- a/kio/kfile/kpropertiesdialog.cpp
++++ b/kio/kfile/kpropertiesdialog.cpp
@@ -1910,7 +1910,15 @@
fileSystemSupportsACLs = ( statfs( path.data(), &buf ) == 0 ) && ( buf.f_flags & MNT_ACLS );
#else
@@ -50,10 +46,8 @@ Index: kde4libs/kio/kfile/kpropertiesdialog.cpp
#endif
return fileSystemSupportsACLs;
}
-Index: kde4libs/kioslave/file/file.cpp
-===================================================================
---- kde4libs.orig/kioslave/file/file.cpp 2010-10-27 21:55:44.000000000 +0200
-+++ kde4libs/kioslave/file/file.cpp 2010-11-25 16:36:07.000000000 +0100
+--- a/kioslave/file/file.cpp
++++ b/kioslave/file/file.cpp
@@ -315,8 +315,10 @@
}
@@ -65,10 +59,8 @@ Index: kde4libs/kioslave/file/file.cpp
// Determine the mimetype of the file to be retrieved, and emit it.
// 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 2010-01-14 13:54:54.000000000 +0100
-+++ kde4libs/kioslave/file/file_unix.cpp 2010-11-25 16:36:07.000000000 +0100
+--- a/kioslave/file/file_unix.cpp
++++ b/kioslave/file/file_unix.cpp
@@ -155,8 +155,10 @@
}
@@ -91,10 +83,8 @@ Index: kde4libs/kioslave/file/file_unix.cpp
#ifdef HAVE_POSIX_ACL
acl = acl_get_fd(src_fd);
-Index: kde4libs/kpty/kpty.cpp
-===================================================================
---- kde4libs.orig/kpty/kpty.cpp 2010-11-11 15:42:12.000000000 +0100
-+++ kde4libs/kpty/kpty.cpp 2010-11-25 16:38:56.000000000 +0100
+--- a/kpty/kpty.cpp
++++ b/kpty/kpty.cpp
@@ -109,24 +109,24 @@
# define _NEW_TTY_CTRL
#endif
diff --git a/debian/patches/16_debian_menu.diff b/debian/patches/16_debian_menu.diff
index bfc5445..2a145c8 100644
--- a/debian/patches/16_debian_menu.diff
+++ b/debian/patches/16_debian_menu.diff
@@ -2,10 +2,8 @@ Include the Debian menu. Else all would end up under lost & found.
Patch by Sune Vuorela.
-Index: kde4libs/kded/applications.menu
-===================================================================
---- kde4libs.orig/kded/applications.menu 2010-01-27 01:23:13.000000000 +0100
-+++ kde4libs/kded/applications.menu 2010-11-25 16:40:03.000000000 +0100
+--- a/kded/applications.menu
++++ b/kded/applications.menu
@@ -437,5 +437,12 @@
</And>
</Include>
diff --git a/debian/patches/17_findservicebydesktoppath_try_realfilepath.diff b/debian/patches/17_findservicebydesktoppath_try_realfilepath.diff
index 95e3b22..c4ad3cd 100644
--- a/debian/patches/17_findservicebydesktoppath_try_realfilepath.diff
+++ b/debian/patches/17_findservicebydesktoppath_try_realfilepath.diff
@@ -1,10 +1,8 @@
This patch is an attempt to make KDE find desktop files
and other stuff when /usr or anything else in the file
path is a symlink.
-Index: kde4libs/kdecore/services/kservicefactory.cpp
-===================================================================
---- kde4libs.orig/kdecore/services/kservicefactory.cpp 2010-11-11 15:41:40.000000000 +0100
-+++ kde4libs/kdecore/services/kservicefactory.cpp 2010-11-25 16:40:04.000000000 +0100
+--- a/kdecore/services/kservicefactory.cpp
++++ b/kdecore/services/kservicefactory.cpp
@@ -124,22 +124,16 @@
return newService;
}
@@ -58,10 +56,8 @@ Index: kde4libs/kdecore/services/kservicefactory.cpp
KService::Ptr KServiceFactory::findServiceByMenuId(const QString &_menuId)
{
-Index: kde4libs/kdecore/services/kservicefactory.h
-===================================================================
---- kde4libs.orig/kdecore/services/kservicefactory.h 2009-03-10 13:26:06.000000000 +0100
-+++ kde4libs/kdecore/services/kservicefactory.h 2010-11-25 16:40:04.000000000 +0100
+--- a/kdecore/services/kservicefactory.h
++++ b/kdecore/services/kservicefactory.h
@@ -121,6 +121,8 @@
virtual void virtual_hook( int id, void* data );
private:
diff --git a/debian/patches/19_findqt4_optional_x11_pthread.diff b/debian/patches/19_findqt4_optional_x11_pthread.diff
index 35a7184..0782be4 100644
--- a/debian/patches/19_findqt4_optional_x11_pthread.diff
+++ b/debian/patches/19_findqt4_optional_x11_pthread.diff
@@ -3,10 +3,8 @@ Qt doesn't expose the X11 headers to the world, so no need to make it required.
cmake/modules/Qt4ConfigDependentSettings.cmake | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
-Index: kde4libs/cmake/modules/Qt4ConfigDependentSettings.cmake
-===================================================================
---- kde4libs.orig/cmake/modules/Qt4ConfigDependentSettings.cmake 2010-03-10 11:43:13.000000000 +0100
-+++ kde4libs/cmake/modules/Qt4ConfigDependentSettings.cmake 2010-11-25 16:40:05.000000000 +0100
+--- a/cmake/modules/Qt4ConfigDependentSettings.cmake
++++ b/cmake/modules/Qt4ConfigDependentSettings.cmake
@@ -27,10 +27,9 @@
IF(UNIX)
# on OS X X11 may not be required
diff --git a/debian/patches/20_use_dejavu_as_default_font.diff b/debian/patches/20_use_dejavu_as_default_font.diff
index 4760635..ad4eed7 100644
--- a/debian/patches/20_use_dejavu_as_default_font.diff
+++ b/debian/patches/20_use_dejavu_as_default_font.diff
@@ -4,10 +4,8 @@ needed).
kdeui/kernel/kglobalsettings.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
-Index: kde4libs/kdeui/kernel/kglobalsettings.cpp
-===================================================================
---- kde4libs.orig/kdeui/kernel/kglobalsettings.cpp 2010-11-11 15:42:13.000000000 +0100
-+++ kde4libs/kdeui/kernel/kglobalsettings.cpp 2010-11-25 16:40:06.000000000 +0100
+--- a/kdeui/kernel/kglobalsettings.cpp
++++ b/kdeui/kernel/kglobalsettings.cpp
@@ -397,7 +397,7 @@
// NOTE: keep in sync with kdebase/workspace/kcontrol/fonts/fonts.cpp
diff --git a/debian/patches/22_hack_in_etc_kde4_in_kstandarddirs.diff b/debian/patches/22_hack_in_etc_kde4_in_kstandarddirs.diff
index 5a28186..624dc3b 100644
--- a/debian/patches/22_hack_in_etc_kde4_in_kstandarddirs.diff
+++ b/debian/patches/22_hack_in_etc_kde4_in_kstandarddirs.diff
@@ -10,10 +10,8 @@ The priorities is as follows:
With this patch, we can also install all config files into /usr/ as they just can get
overridden by adding new files to /etc/kde4 by the sysadm.
-Index: kde4libs/kdecore/kernel/kstandarddirs.cpp
-===================================================================
---- kde4libs.orig/kdecore/kernel/kstandarddirs.cpp 2010-11-25 16:30:54.000000000 +0100
-+++ kde4libs/kdecore/kernel/kstandarddirs.cpp 2010-11-25 16:40:08.000000000 +0100
+--- a/kdecore/kernel/kstandarddirs.cpp
++++ b/kdecore/kernel/kstandarddirs.cpp
@@ -1147,6 +1147,10 @@
if ((local || testdir.exists()) && !candidates.contains(path))
candidates.append(path);
diff --git a/debian/patches/23_solid_no_double_build.diff b/debian/patches/23_solid_no_double_build.diff
index dce268a..fddcfcd 100644
--- a/debian/patches/23_solid_no_double_build.diff
+++ b/debian/patches/23_solid_no_double_build.diff
@@ -2,10 +2,8 @@
solid/solid/CMakeLists.txt | 7 +++++++
1 file changed, 7 insertions(+)
-Index: kde4libs/solid/solid/CMakeLists.txt
-===================================================================
---- kde4libs.orig/solid/solid/CMakeLists.txt 2010-11-19 11:52:33.000000000 +0100
-+++ kde4libs/solid/solid/CMakeLists.txt 2010-11-25 16:40:09.000000000 +0100
+--- a/solid/solid/CMakeLists.txt
++++ b/solid/solid/CMakeLists.txt
@@ -362,7 +362,14 @@
install(FILES org.freedesktop.PowerManagement.Inhibit.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
diff --git a/debian/patches/25_ld_exclude_libs_qtuitools.diff b/debian/patches/25_ld_exclude_libs_qtuitools.diff
index aa46665..7537f73 100644
--- a/debian/patches/25_ld_exclude_libs_qtuitools.diff
+++ b/debian/patches/25_ld_exclude_libs_qtuitools.diff
@@ -3,10 +3,8 @@ Subject: Exclude QtUiTools symbols from public libraries
Currently, libplasma and libkjsembed are affected.
Forwarded: not-needed
-Index: kde4libs/plasma/CMakeLists.txt
-===================================================================
---- kde4libs.orig/plasma/CMakeLists.txt 2010-11-05 11:48:32.000000000 +0100
-+++ kde4libs/plasma/CMakeLists.txt 2010-11-25 16:40:10.000000000 +0100
+--- a/plasma/CMakeLists.txt
++++ b/plasma/CMakeLists.txt
@@ -253,6 +253,9 @@
${QT_QTSCRIPT_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTXML_LIBRARY} ${QT_QTSQL_LIBRARY} ${QT_QTDECLARATIVE_LIBRARY}
${KDE4_KDEUI_LIBS} kdnssd threadweaver ${PLASMA_EXTRA_LIBS})
@@ -17,10 +15,8 @@ Index: kde4libs/plasma/CMakeLists.txt
if(QCA2_FOUND)
target_link_libraries(plasma ${QCA2_LIBRARIES})
endif(QCA2_FOUND)
-Index: kde4libs/kjsembed/kjsembed/CMakeLists.txt
-===================================================================
---- kde4libs.orig/kjsembed/kjsembed/CMakeLists.txt 2010-08-05 18:56:18.000000000 +0200
-+++ kde4libs/kjsembed/kjsembed/CMakeLists.txt 2010-11-25 16:40:10.000000000 +0100
+--- a/kjsembed/kjsembed/CMakeLists.txt
++++ b/kjsembed/kjsembed/CMakeLists.txt
@@ -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/27_konsole_kfreebsd_fix.diff b/debian/patches/27_konsole_kfreebsd_fix.diff
index f176858..7fed5b1 100644
--- a/debian/patches/27_konsole_kfreebsd_fix.diff
+++ b/debian/patches/27_konsole_kfreebsd_fix.diff
@@ -1,10 +1,8 @@
This patch makes konsole work on kfreebsd.
Without it, konsole doesn't display anything in the terminal area.
Inspired from http://lists.kde.org/?l=kde-commits&m=122713720905453&w=2
-Index: kde4libs/kpty/kptydevice.cpp
-===================================================================
---- kde4libs.orig/kpty/kptydevice.cpp 2010-11-11 15:42:12.000000000 +0100
-+++ kde4libs/kpty/kptydevice.cpp 2010-11-25 16:40:11.000000000 +0100
+--- a/kpty/kptydevice.cpp
++++ b/kpty/kptydevice.cpp
@@ -44,7 +44,7 @@
# include <sys/time.h>
#endif
diff --git a/debian/patches/28_find_old_kde4_html_documentation.diff b/debian/patches/28_find_old_kde4_html_documentation.diff
index 6bbed47..cadc7d3 100644
--- a/debian/patches/28_find_old_kde4_html_documentation.diff
+++ b/debian/patches/28_find_old_kde4_html_documentation.diff
@@ -9,10 +9,8 @@ Forwarded: not-needed
Origin: vendor
Last-Update: 2010-05-28
-Index: kde4libs/kdecore/kernel/kstandarddirs.cpp
-===================================================================
---- kde4libs.orig/kdecore/kernel/kstandarddirs.cpp 2010-11-25 16:40:08.000000000 +0100
-+++ kde4libs/kdecore/kernel/kstandarddirs.cpp 2010-11-25 16:40:12.000000000 +0100
+--- a/kdecore/kernel/kstandarddirs.cpp
++++ b/kdecore/kernel/kstandarddirs.cpp
@@ -1856,6 +1856,11 @@
addResourceType("autostart", "xdgconf-autostart", "/"); // merge them, start with xdg autostart
diff --git a/debian/patches/29_hurd_support.diff b/debian/patches/29_hurd_support.diff
index 623eefb..06d7aa6 100644
--- a/debian/patches/29_hurd_support.diff
+++ b/debian/patches/29_hurd_support.diff
@@ -3,10 +3,8 @@ Description: preliminary GNU/Hurd support
Adds "support" for GNU/Hurd by defining MAXPATHLEN and PATH_MAX where needed.
Not forwarded, better fixes should be done upstream.
Forwarded: no
-Index: kde4libs/kdecore/kernel/kstandarddirs.cpp
-===================================================================
---- kde4libs.orig/kdecore/kernel/kstandarddirs.cpp 2010-11-25 16:40:12.000000000 +0100
-+++ kde4libs/kdecore/kernel/kstandarddirs.cpp 2010-11-25 16:40:13.000000000 +0100
+--- a/kdecore/kernel/kstandarddirs.cpp
++++ b/kdecore/kernel/kstandarddirs.cpp
@@ -73,6 +73,10 @@
#include <QtCore/QFileInfo>
#include <QtCore/QSettings>
@@ -18,10 +16,8 @@ Index: kde4libs/kdecore/kernel/kstandarddirs.cpp
class KStandardDirs::KStandardDirsPrivate
{
public:
-Index: kde4libs/kinit/lnusertemp.c
-===================================================================
---- kde4libs.orig/kinit/lnusertemp.c 2008-06-18 14:42:25.000000000 +0200
-+++ kde4libs/kinit/lnusertemp.c 2010-11-25 16:40:13.000000000 +0100
+--- a/kinit/lnusertemp.c
++++ b/kinit/lnusertemp.c
@@ -36,6 +36,10 @@
#include <limits.h>
#endif
diff --git a/debian/patches/30_kfileshare_kdesu_fileshareset.diff b/debian/patches/30_kfileshare_kdesu_fileshareset.diff
index 42accb5..cf470c5 100644
--- a/debian/patches/30_kfileshare_kdesu_fileshareset.diff
+++ b/debian/patches/30_kfileshare_kdesu_fileshareset.diff
@@ -7,10 +7,8 @@ Origin: vendor
Last-Update: 2010-05-31
-Index: kde4libs/kio/kio/kfileshare.cpp
-===================================================================
---- kde4libs.orig/kio/kio/kfileshare.cpp 2010-02-20 12:32:33.000000000 +0100
-+++ kde4libs/kio/kio/kfileshare.cpp 2010-11-25 16:40:14.000000000 +0100
+--- a/kio/kio/kfileshare.cpp
++++ b/kio/kio/kfileshare.cpp
@@ -239,17 +239,19 @@
return false;
diff --git a/debian/patches/31_relax_plugin_kde_version_check.diff b/debian/patches/31_relax_plugin_kde_version_check.diff
index d9dec91..ac57543 100644
--- a/debian/patches/31_relax_plugin_kde_version_check.diff
+++ b/debian/patches/31_relax_plugin_kde_version_check.diff
@@ -16,10 +16,8 @@ Forwarded: not-needed
Origin: vendor
Last-Update: 2010-06-22
-Index: kde4libs/kdecore/util/kpluginloader.cpp
-===================================================================
---- kde4libs.orig/kdecore/util/kpluginloader.cpp 2010-11-25 16:30:54.000000000 +0100
-+++ kde4libs/kdecore/util/kpluginloader.cpp 2010-11-25 16:40:15.000000000 +0100
+--- a/kdecore/util/kpluginloader.cpp
++++ b/kdecore/util/kpluginloader.cpp
@@ -244,7 +244,6 @@
d->verificationData = (KDEPluginVerificationData *) lib.resolve("kde_plugin_verification_data");
if (d->verificationData) {
@@ -28,10 +26,8 @@ Index: kde4libs/kdecore/util/kpluginloader.cpp
|| (KDE_VERSION_MAJOR << 16 != (d->verificationData->KDEVersion & 0xFF0000)))
{
d->errorString = i18n("The plugin '%1' uses an incompatible KDE library (%2).", d->name, QString::fromLatin1(d->verificationData->KDEVersionString));
-Index: kde4libs/plasma/version.cpp
-===================================================================
---- kde4libs.orig/plasma/version.cpp 2010-08-11 12:08:49.000000000 +0200
-+++ kde4libs/plasma/version.cpp 2010-11-25 16:40:15.000000000 +0100
+--- a/plasma/version.cpp
++++ b/plasma/version.cpp
@@ -58,12 +58,11 @@
// we require PLASMA_VERSION_MAJOR and PLASMA_VERSION_MINOR
--
KDE Development Platform Libraries module packaging
More information about the pkg-kde-commits
mailing list