[SCM] KDE Development Platform Libraries module packaging branch, master, updated. debian/4.4.5-1-53-gc616ff8
Modestas Vainius
modax at alioth.debian.org
Fri Nov 26 20:19:19 UTC 2010
The following commit has been merged in the master branch:
commit e05818212a99d924f0726e51502f5038afbe58ac
Author: Didier Raboud <didier at raboud.com>
Date: Thu Nov 25 16:43:45 2010 +0100
Refresh patches for 4.5.80
---
debian/changelog | 3 +
debian/patches/08_add_debian_build_type.diff | 8 +-
.../patches/09_disable_usr_lib_install_rpath.diff | 8 +-
debian/patches/10_make_libkdeinit4_private.diff | 102 ++++++++++++--------
.../patches/11_default_kde4_xdg_menu_prefix.diff | 18 ++--
debian/patches/13_qt4_designer_plugins_path.diff | 12 ++-
debian/patches/14_hardcode_ptm_device.diff | 6 +-
debian/patches/15_kfreebsd_support.diff | 38 +++++---
debian/patches/16_debian_menu.diff | 6 +-
..._findservicebydesktoppath_try_realfilepath.diff | 18 ++--
.../patches/19_findqt4_optional_x11_pthread.diff | 6 +-
debian/patches/20_use_dejavu_as_default_font.diff | 10 +-
.../22_hack_in_etc_kde4_in_kstandarddirs.diff | 8 +-
debian/patches/23_solid_no_double_build.diff | 8 +-
debian/patches/25_ld_exclude_libs_qtuitools.diff | 16 ++-
debian/patches/27_konsole_kfreebsd_fix.diff | 8 +-
.../28_find_old_kde4_html_documentation.diff | 8 +-
debian/patches/29_hurd_support.diff | 14 ++-
.../patches/30_kfileshare_kdesu_fileshareset.diff | 8 +-
.../patches/31_relax_plugin_kde_version_check.diff | 18 ++--
20 files changed, 201 insertions(+), 122 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e471d66..b2923f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -39,6 +39,9 @@ kde4libs (4:4.5.80-0r1) UNRELEASED; urgency=low
as it is required for building all of kde's documentation.
* Bump kdebase-runtime Breaks/Recommends to version 4.5.
+ [ Didier Raboud ]
+ * Refresh patches for 4.5.80.
+
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Sun, 14 Nov 2010 13:19:41 +0200
kde4libs (4:4.4.5-1) unstable; urgency=low
diff --git a/debian/patches/08_add_debian_build_type.diff b/debian/patches/08_add_debian_build_type.diff
index a41ce9f..1db22eb 100644
--- a/debian/patches/08_add_debian_build_type.diff
+++ b/debian/patches/08_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
-@@ -1175,11 +1175,13 @@
+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
+@@ -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")
set(CMAKE_CXX_FLAGS_PROFILE "-g3 -fno-inline -ftest-coverage -fprofile-arcs")
diff --git a/debian/patches/09_disable_usr_lib_install_rpath.diff b/debian/patches/09_disable_usr_lib_install_rpath.diff
index c233d2d..fa46d48 100644
--- a/debian/patches/09_disable_usr_lib_install_rpath.diff
+++ b/debian/patches/09_disable_usr_lib_install_rpath.diff
@@ -11,8 +11,10 @@ Forwarded: yes
Origin: backport, http://websvn.kde.org/?view=revision&revision=1124215
Last-Update: 2010-06-23
---- a/kdewidgets/CMakeLists.txt
-+++ b/kdewidgets/CMakeLists.txt
+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
@@ -51,7 +51,6 @@
INSTALL_RPATH_USE_LINK_PATH TRUE
SKIP_BUILD_RPATH TRUE
@@ -21,7 +23,7 @@ Last-Update: 2010-06-23
)
endif(NOT WIN32)
-@@ -86,7 +85,6 @@
+@@ -152,7 +151,6 @@
INSTALL_RPATH_USE_LINK_PATH TRUE
SKIP_BUILD_RPATH TRUE
BUILD_WITH_INSTALL_RPATH TRUE
diff --git a/debian/patches/10_make_libkdeinit4_private.diff b/debian/patches/10_make_libkdeinit4_private.diff
index 8fb56ef..60badf0 100644
--- a/debian/patches/10_make_libkdeinit4_private.diff
+++ b/debian/patches/10_make_libkdeinit4_private.diff
@@ -19,37 +19,43 @@ Forwarded: no
Origin: vendor
Last-Update: 2010-06-07
---- a/CreateKDELibsDependenciesFile.cmake
-+++ b/CreateKDELibsDependenciesFile.cmake
-@@ -31,6 +31,7 @@
- set(KDE4_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}")
+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
+@@ -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})
make_install_path_absolute(KDE4_LIBEXEC_INSTALL_DIR ${LIBEXEC_INSTALL_DIR})
+make_install_path_absolute(KDE4_LIBKDEINIT_INSTALL_DIR ${LIBKDEINIT_INSTALL_DIR})
make_install_path_absolute(KDE4_INCLUDE_INSTALL_DIR ${INCLUDE_INSTALL_DIR})
make_install_path_absolute(KDE4_BIN_INSTALL_DIR ${BIN_INSTALL_DIR})
make_install_path_absolute(KDE4_SBIN_INSTALL_DIR ${SBIN_INSTALL_DIR})
-@@ -63,6 +64,7 @@
-
+@@ -65,6 +66,7 @@
set(KDE4_LIB_INSTALL_DIR \"${KDE4_LIB_INSTALL_DIR}\")
+ set(KDE4_IMPORTS_INSTALL_DIR \"${KDE4_IMPORTS_INSTALL_DIR}\")
set(KDE4_LIBEXEC_INSTALL_DIR \"${KDE4_LIBEXEC_INSTALL_DIR}\")
+set(KDE4_LIBKDEINIT_INSTALL_DIR \"${KDE4_LIBKDEINIT_INSTALL_DIR}\")
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}\")
---- a/cmake/modules/FindKDE4Internal.cmake
-+++ b/cmake/modules/FindKDE4Internal.cmake
-@@ -836,6 +836,7 @@
+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
+@@ -867,6 +867,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)")
+ _set_fancy(LIBKDEINIT_INSTALL_DIR "${LIB_INSTALL_DIR}" "The subdirectory relative to the install prefix where core libraries of the kdeinit based executables may be installed (default is ${LIB_INSTALL_DIR})")
+ _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")
- _set_fancy(HTML_INSTALL_DIR "${SHARE_INSTALL_PREFIX}/doc/HTML" "The HTML install dir for documentation")
---- a/cmake/modules/KDE4Macros.cmake
-+++ b/cmake/modules/KDE4Macros.cmake
-@@ -777,6 +777,17 @@
+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
+@@ -810,6 +810,17 @@
set_target_properties(kdeinit_${_target_NAME} PROPERTIES OUTPUT_NAME kdeinit4_${_target_NAME})
kde4_add_executable(${_target_NAME} "${_nogui}" ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp)
@@ -67,9 +73,11 @@ Last-Update: 2010-06-07
target_link_libraries(${_target_NAME} kdeinit_${_target_NAME})
endif(WIN32)
---- a/kinit/CMakeLists.txt
-+++ b/kinit/CMakeLists.txt
-@@ -54,6 +54,17 @@
+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
+@@ -57,6 +57,17 @@
install(TARGETS kdeinit4 ${INSTALL_TARGETS_DEFAULT_ARGS} )
@@ -87,8 +95,10 @@ Last-Update: 2010-06-07
########### kwrapper4 ###############
if (WIN32)
set(kwrapper_SRCS kwrapper_win.cpp )
---- a/config-prefix.h.cmake
-+++ b/config-prefix.h.cmake
+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
@@ -12,6 +12,7 @@
#define __KDE_EXECPREFIX "NONE"
@@ -97,8 +107,10 @@ Last-Update: 2010-06-07
#define DATA_INSTALL_DIR "${DATA_INSTALL_DIR}"
#define LIB_INSTALL_DIR "${LIB_INSTALL_DIR}"
#define INCLUDE_INSTALL_DIR "${INCLUDE_INSTALL_DIR}"
---- a/kdecore/kde-config.cpp
-+++ b/kdecore/kde-config.cpp
+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
@@ -144,6 +144,7 @@
"html", I18N_NOOP("HTML documentation"),
"icon", I18N_NOOP("Icons"),
@@ -107,9 +119,11 @@ Last-Update: 2010-06-07
"lib", I18N_NOOP("Libraries"),
"include", I18N_NOOP("Includes/Headers"),
"locale", I18N_NOOP("Translation files for KLocale"),
---- a/kdecore/kernel/kstandarddirs.cpp
-+++ b/kdecore/kernel/kstandarddirs.cpp
-@@ -161,6 +161,8 @@
+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
+@@ -165,6 +165,8 @@
menus
xdgconf-autostart
autostart
@@ -118,7 +132,7 @@ Last-Update: 2010-06-07
*/
static const char types_string[] =
-@@ -215,6 +217,8 @@
+@@ -219,6 +221,8 @@
"menus\0"
"xdgconf-autostart\0"
"autostart\0"
@@ -127,7 +141,7 @@ Last-Update: 2010-06-07
"\0";
static const int types_indices[] = {
-@@ -224,7 +228,7 @@
+@@ -228,7 +232,7 @@
248, 258, 275, 285, 301, 305, 309, 316,
326, 336, 354, 359, 377, 387, 403, 416,
429, 442, 448, 463, 471, 484, 504, 217,
@@ -135,20 +149,24 @@ Last-Update: 2010-06-07
+ 517, 530, 536, 554, 564, 572, -1
};
- static int tokenize( QStringList& token, const QString& str,
---- a/kdecore/kernel/kstandarddirs_unix.cpp
-+++ b/kdecore/kernel/kstandarddirs_unix.cpp
-@@ -39,6 +39,8 @@
- return QString::fromLatin1(KCFG_INSTALL_DIR "/");
+ 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
+@@ -40,6 +40,8 @@
+ return QFile::decodeName(KCFG_INSTALL_DIR "/");
if (strcmp("kdedir", type) == 0)
- return QString::fromLatin1(KDEDIR "/");
+ return QFile::decodeName(KDEDIR "/");
+ if (strcmp("kdeinit", type) == 0)
-+ return QString::fromLatin1(LIBKDEINIT_INSTALL_DIR "/");
++ return QFile::decodeName(LIBKDEINIT_INSTALL_DIR "/");
break;
case 'd':
if (strcmp("data", type) == 0)
---- a/kdecore/kernel/kstandarddirs_win.cpp
-+++ b/kdecore/kernel/kstandarddirs_win.cpp
+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
@@ -47,6 +47,8 @@
return share() + QLatin1String("config.kcfg/");
if (strcmp("kdedir", type) == 0)
@@ -158,9 +176,11 @@ Last-Update: 2010-06-07
break;
case 'd':
if (strcmp("data", type) == 0)
---- a/kdecore/util/kpluginloader.cpp
-+++ b/kdecore/util/kpluginloader.cpp
-@@ -112,6 +112,13 @@
+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
+@@ -113,6 +113,13 @@
libname = fileinfo.path() + QLatin1String("/lib") + fileinfo.fileName();
#endif
@@ -174,9 +194,11 @@ Last-Update: 2010-06-07
libfile = cData.dirs()->findResource("lib", libname);
if (!libfile.isEmpty()) {
if (!kdeinit) {
---- a/kinit/kinit.cpp
-+++ b/kinit/kinit.cpp
-@@ -496,11 +496,23 @@
+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
+@@ -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
if( lib.contains( QLatin1String( "/lib" KDELIBSUFF "/kde4/libexec/" ))) {
diff --git a/debian/patches/11_default_kde4_xdg_menu_prefix.diff b/debian/patches/11_default_kde4_xdg_menu_prefix.diff
index 6ce7d1a..7abdada 100644
--- a/debian/patches/11_default_kde4_xdg_menu_prefix.diff
+++ b/debian/patches/11_default_kde4_xdg_menu_prefix.diff
@@ -3,9 +3,11 @@
kded/vfolder_menu.cpp | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
---- a/kded/CMakeLists.txt
-+++ b/kded/CMakeLists.txt
-@@ -63,7 +63,7 @@
+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
+@@ -74,7 +74,7 @@
if (WIN32)
install( FILES applications.menu DESTINATION ${SHARE_INSTALL_PREFIX}/xdg/menus )
else (WIN32)
@@ -14,9 +16,11 @@
endif (WIN32)
install( FILES kdedmodule.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR} )
install( FILES kded.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update )
---- a/kded/vfolder_menu.cpp
-+++ b/kded/vfolder_menu.cpp
-@@ -772,8 +772,10 @@
+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
+@@ -768,8 +768,10 @@
QString result;
QString xdgMenuPrefix = QString::fromLocal8Bit(qgetenv("XDG_MENU_PREFIX"));
@@ -29,7 +33,7 @@
QFileInfo fileInfo(fileName);
QString fileNameOnly = fileInfo.fileName();
-@@ -783,7 +785,6 @@
+@@ -779,7 +781,6 @@
QString baseName = QDir::cleanPath(m_docInfo.baseDir +
fileInfo.path() + '/' + fileNameOnly);
result = KStandardDirs::locate("xdgconf-menu", baseName);
diff --git a/debian/patches/13_qt4_designer_plugins_path.diff b/debian/patches/13_qt4_designer_plugins_path.diff
index 50542d3..b0ffd84 100644
--- a/debian/patches/13_qt4_designer_plugins_path.diff
+++ b/debian/patches/13_qt4_designer_plugins_path.diff
@@ -1,5 +1,7 @@
---- a/kdewidgets/CMakeLists.txt
-+++ b/kdewidgets/CMakeLists.txt
+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
@@ -54,7 +54,7 @@
)
endif(NOT WIN32)
@@ -7,9 +9,9 @@
- install(TARGETS kdewidgets DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer )
+ install(TARGETS kdewidgets DESTINATION /usr/lib/qt4/plugins/designer )
- if (QT_QT3SUPPORT_FOUND)
-
-@@ -88,7 +88,7 @@
+ # deprecated widgets
+ if(NOT KDE_NO_DEPRECATED)
+@@ -154,7 +154,7 @@
)
endif(NOT WIN32)
diff --git a/debian/patches/14_hardcode_ptm_device.diff b/debian/patches/14_hardcode_ptm_device.diff
index 5b19b33..61bde98 100644
--- a/debian/patches/14_hardcode_ptm_device.diff
+++ b/debian/patches/14_hardcode_ptm_device.diff
@@ -4,8 +4,10 @@ Bypass build time check as /dev/ptmx is alsways present at runtime.
ConfigureChecks.cmake | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
---- a/ConfigureChecks.cmake
-+++ b/ConfigureChecks.cmake
+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
@@ -202,13 +202,7 @@
set(HAVE_OPENPTY)
diff --git a/debian/patches/15_kfreebsd_support.diff b/debian/patches/15_kfreebsd_support.diff
index 40042ed..eb2e7a6 100644
--- a/debian/patches/15_kfreebsd_support.diff
+++ b/debian/patches/15_kfreebsd_support.diff
@@ -10,8 +10,10 @@ cmake.
kpty/kpty.cpp | 24 ++++++++++++------------
5 files changed, 30 insertions(+), 16 deletions(-)
---- a/ConfigureChecks.cmake
-+++ b/ConfigureChecks.cmake
+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
@@ -164,11 +164,11 @@
set(UTIL_LIBRARY util)
endif (login_in_libutil)
@@ -27,9 +29,11 @@ cmake.
if (HAVE_UTMPX)
set(utmp utmpx)
if (login_in_libutil)
---- a/kio/kfile/kpropertiesdialog.cpp
-+++ b/kio/kfile/kpropertiesdialog.cpp
-@@ -1911,7 +1911,15 @@
+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
+@@ -1910,7 +1910,15 @@
fileSystemSupportsACLs = ( statfs( path.data(), &buf ) == 0 ) && ( buf.f_flags & MNT_ACLS );
#else
fileSystemSupportsACLs =
@@ -46,8 +50,10 @@ cmake.
#endif
return fileSystemSupportsACLs;
}
---- a/kioslave/file/file.cpp
-+++ b/kioslave/file/file.cpp
+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
@@ -315,8 +315,10 @@
}
@@ -59,8 +65,10 @@ cmake.
// Determine the mimetype of the file to be retrieved, and emit it.
// This is mandatory in all slaves (for KRun/BrowserRun to work)
---- a/kioslave/file/file_unix.cpp
-+++ b/kioslave/file/file_unix.cpp
+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
@@ -155,8 +155,10 @@
}
@@ -83,9 +91,11 @@ cmake.
#ifdef HAVE_POSIX_ACL
acl = acl_get_fd(src_fd);
---- a/kpty/kpty.cpp
-+++ b/kpty/kpty.cpp
-@@ -107,24 +107,24 @@
+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
+@@ -109,24 +109,24 @@
# define _NEW_TTY_CTRL
#endif
@@ -97,7 +107,7 @@ cmake.
+#elif defined(TCGETS)
+# define _tcgetattr(fd, ttmode) ioctl(fd, TCGETS, (char *)ttmode)
#else
--# if defined(_HPUX_SOURCE) || defined(__Lynx__) || defined (__CYGWIN__)
+-# if defined(_HPUX_SOURCE) || defined(__Lynx__) || defined (__CYGWIN__) || defined(__sun)
-# define _tcgetattr(fd, ttmode) tcgetattr(fd, ttmode)
-# else
-# define _tcgetattr(fd, ttmode) ioctl(fd, TCGETS, (char *)ttmode)
@@ -113,7 +123,7 @@ cmake.
+#elif defined(TCSETS)
+# define _tcsetattr(fd, ttmode) ioctl(fd, TCSETS, (char *)ttmode)
#else
--# if defined(_HPUX_SOURCE) || defined(__CYGWIN__)
+-# if defined(_HPUX_SOURCE) || defined(__CYGWIN__) || defined(__sun)
-# define _tcsetattr(fd, ttmode) tcsetattr(fd, TCSANOW, ttmode)
-# else
-# define _tcsetattr(fd, ttmode) ioctl(fd, TCSETS, (char *)ttmode)
diff --git a/debian/patches/16_debian_menu.diff b/debian/patches/16_debian_menu.diff
index 2a145c8..bfc5445 100644
--- a/debian/patches/16_debian_menu.diff
+++ b/debian/patches/16_debian_menu.diff
@@ -2,8 +2,10 @@ Include the Debian menu. Else all would end up under lost & found.
Patch by Sune Vuorela.
---- a/kded/applications.menu
-+++ b/kded/applications.menu
+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
@@ -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 a1802eb..95e3b22 100644
--- a/debian/patches/17_findservicebydesktoppath_try_realfilepath.diff
+++ b/debian/patches/17_findservicebydesktoppath_try_realfilepath.diff
@@ -1,9 +1,11 @@
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.
---- a/kdecore/services/kservicefactory.cpp
-+++ b/kdecore/services/kservicefactory.cpp
-@@ -124,22 +124,16 @@ KService::Ptr KServiceFactory::findServi
+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
+@@ -124,22 +124,16 @@
return newService;
}
@@ -28,7 +30,7 @@ path is a symlink.
}
// Check whether the dictionary was right
// It's ok that it's wrong, for the case where we're looking up an unknown service,
-@@ -150,6 +144,27 @@ KService::Ptr KServiceFactory::findServi
+@@ -150,6 +144,27 @@
}
return newService;
}
@@ -56,9 +58,11 @@ path is a symlink.
KService::Ptr KServiceFactory::findServiceByMenuId(const QString &_menuId)
{
---- a/kdecore/services/kservicefactory.h
-+++ b/kdecore/services/kservicefactory.h
-@@ -121,6 +121,8 @@ protected:
+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
+@@ -121,6 +121,8 @@
virtual void virtual_hook( int id, void* data );
private:
class KServiceFactoryPrivate* d;
diff --git a/debian/patches/19_findqt4_optional_x11_pthread.diff b/debian/patches/19_findqt4_optional_x11_pthread.diff
index 0782be4..35a7184 100644
--- a/debian/patches/19_findqt4_optional_x11_pthread.diff
+++ b/debian/patches/19_findqt4_optional_x11_pthread.diff
@@ -3,8 +3,10 @@ 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(-)
---- a/cmake/modules/Qt4ConfigDependentSettings.cmake
-+++ b/cmake/modules/Qt4ConfigDependentSettings.cmake
+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
@@ -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 20d560d..4760635 100644
--- a/debian/patches/20_use_dejavu_as_default_font.diff
+++ b/debian/patches/20_use_dejavu_as_default_font.diff
@@ -4,9 +4,11 @@ needed).
kdeui/kernel/kglobalsettings.cpp | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
---- a/kdeui/kernel/kglobalsettings.cpp
-+++ b/kdeui/kernel/kglobalsettings.cpp
-@@ -381,7 +381,7 @@ struct KFontData
+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
+@@ -397,7 +397,7 @@
// NOTE: keep in sync with kdebase/workspace/kcontrol/fonts/fonts.cpp
static const char GeneralId[] = "General";
@@ -15,7 +17,7 @@ needed).
#ifdef Q_WS_MAC
static const char DefaultMacFont[] = "Lucida Grande";
#endif
-@@ -395,7 +395,7 @@ static const KFontData DefaultFontData[K
+@@ -411,7 +411,7 @@
{ GeneralId, "menuFont", DefaultMacFont, 13, -1, QFont::SansSerif },
#else
{ GeneralId, "font", DefaultFont, 9, -1, QFont::SansSerif },
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 6b8c6f1..5a28186 100644
--- a/debian/patches/22_hack_in_etc_kde4_in_kstandarddirs.diff
+++ b/debian/patches/22_hack_in_etc_kde4_in_kstandarddirs.diff
@@ -10,9 +10,11 @@ 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.
---- a/kdecore/kernel/kstandarddirs.cpp
-+++ b/kdecore/kernel/kstandarddirs.cpp
-@@ -1135,6 +1135,10 @@
+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
+@@ -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 a57ada8..dce268a 100644
--- a/debian/patches/23_solid_no_double_build.diff
+++ b/debian/patches/23_solid_no_double_build.diff
@@ -2,9 +2,11 @@
solid/solid/CMakeLists.txt | 7 +++++++
1 file changed, 7 insertions(+)
---- a/solid/solid/CMakeLists.txt
-+++ b/solid/solid/CMakeLists.txt
-@@ -266,7 +266,14 @@
+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
+@@ -362,7 +362,14 @@
install(FILES org.freedesktop.PowerManagement.Inhibit.xml DESTINATION ${DBUS_INTERFACES_INSTALL_DIR})
########### static lib for tests ###############
diff --git a/debian/patches/25_ld_exclude_libs_qtuitools.diff b/debian/patches/25_ld_exclude_libs_qtuitools.diff
index 9bf5b86..aa46665 100644
--- a/debian/patches/25_ld_exclude_libs_qtuitools.diff
+++ b/debian/patches/25_ld_exclude_libs_qtuitools.diff
@@ -3,10 +3,12 @@ Subject: Exclude QtUiTools symbols from public libraries
Currently, libplasma and libkjsembed are affected.
Forwarded: not-needed
---- a/plasma/CMakeLists.txt
-+++ b/plasma/CMakeLists.txt
-@@ -246,6 +246,9 @@
- ${QT_QTSCRIPT_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTXML_LIBRARY}
+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
+@@ -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})
+# Do not export QtUiTools internal symbols
@@ -15,8 +17,10 @@ Forwarded: not-needed
if(QCA2_FOUND)
target_link_libraries(plasma ${QCA2_LIBRARIES})
endif(QCA2_FOUND)
---- a/kjsembed/kjsembed/CMakeLists.txt
-+++ b/kjsembed/kjsembed/CMakeLists.txt
+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
@@ -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 d3d0aa3..f176858 100644
--- a/debian/patches/27_konsole_kfreebsd_fix.diff
+++ b/debian/patches/27_konsole_kfreebsd_fix.diff
@@ -1,9 +1,11 @@
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
---- a/kpty/kptydevice.cpp
-+++ b/kpty/kptydevice.cpp
-@@ -42,7 +42,7 @@
+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
+@@ -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 0459222..6bbed47 100644
--- a/debian/patches/28_find_old_kde4_html_documentation.diff
+++ b/debian/patches/28_find_old_kde4_html_documentation.diff
@@ -9,9 +9,11 @@ Forwarded: not-needed
Origin: vendor
Last-Update: 2010-05-28
---- a/kdecore/kernel/kstandarddirs.cpp
-+++ b/kdecore/kernel/kstandarddirs.cpp
-@@ -1833,6 +1833,11 @@
+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
+@@ -1856,6 +1856,11 @@
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/29_hurd_support.diff b/debian/patches/29_hurd_support.diff
index e8f8b77..623eefb 100644
--- a/debian/patches/29_hurd_support.diff
+++ b/debian/patches/29_hurd_support.diff
@@ -3,9 +3,11 @@ 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
---- a/kdecore/kernel/kstandarddirs.cpp
-+++ b/kdecore/kernel/kstandarddirs.cpp
-@@ -70,6 +70,10 @@
+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
+@@ -73,6 +73,10 @@
#include <QtCore/QFileInfo>
#include <QtCore/QSettings>
@@ -16,8 +18,10 @@ Forwarded: no
class KStandardDirs::KStandardDirsPrivate
{
public:
---- a/kinit/lnusertemp.c
-+++ b/kinit/lnusertemp.c
+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
@@ -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 f6c9993..42accb5 100644
--- a/debian/patches/30_kfileshare_kdesu_fileshareset.diff
+++ b/debian/patches/30_kfileshare_kdesu_fileshareset.diff
@@ -7,9 +7,11 @@ Origin: vendor
Last-Update: 2010-05-31
---- a/kio/kio/kfileshare.cpp
-+++ b/kio/kio/kfileshare.cpp
-@@ -239,17 +239,19 @@ bool KFileShare::setShared( const QStrin
+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
+@@ -239,17 +239,19 @@
return false;
kDebug(7000) << path << "," << shared;
diff --git a/debian/patches/31_relax_plugin_kde_version_check.diff b/debian/patches/31_relax_plugin_kde_version_check.diff
index 1a0cd81..d9dec91 100644
--- a/debian/patches/31_relax_plugin_kde_version_check.diff
+++ b/debian/patches/31_relax_plugin_kde_version_check.diff
@@ -16,19 +16,23 @@ Forwarded: not-needed
Origin: vendor
Last-Update: 2010-06-22
---- a/kdecore/util/kpluginloader.cpp
-+++ b/kdecore/util/kpluginloader.cpp
-@@ -242,7 +242,6 @@
+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
+@@ -244,7 +244,6 @@
d->verificationData = (KDEPluginVerificationData *) lib.resolve("kde_plugin_verification_data");
if (d->verificationData) {
if (d->verificationData->dataVersion < KDEPluginVerificationData::PluginVerificationDataVersion
- || (d->verificationData->KDEVersion > KDE_VERSION)
|| (KDE_VERSION_MAJOR << 16 != (d->verificationData->KDEVersion & 0xFF0000)))
{
- d->errorString = i18n("The plugin '%1' uses an incompatible KDE library (%2).", d->name, d->verificationData->KDEVersionString);
---- a/plasma/version.cpp
-+++ b/plasma/version.cpp
-@@ -57,12 +57,11 @@
+ 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
+@@ -58,12 +58,11 @@
// we require PLASMA_VERSION_MAJOR and PLASMA_VERSION_MINOR
const quint32 minVersion = PLASMA_MAKE_VERSION(PLASMA_VERSION_MAJOR, 0, 0);
--
KDE Development Platform Libraries module packaging
More information about the pkg-kde-commits
mailing list