[SCM] KDE Development Platform Libraries module packaging branch, kde4.5, updated. debian/4.4.5-1-22-g68e5b4d
George Kiagiadakis
gkiagia-guest at alioth.debian.org
Wed Jul 28 23:17:50 UTC 2010
The following commit has been merged in the kde4.5 branch:
commit 68e5b4d485fcd07aeea9e4e96c5a19038619259d
Author: George Kiagiadakis <kiagiadakis.george at gmail.com>
Date: Thu Jul 29 02:17:17 2010 +0300
Refresh patches.
---
debian/changelog | 1 +
debian/kdelibs5-dev.install | 4 +-
debian/patches/08_add_debian_build_type.diff | 2 +-
.../patches/09_disable_usr_lib_install_rpath.diff | 47 ++++++--------------
debian/patches/10_make_libkdeinit4_private.diff | 26 +++++-----
.../patches/11_default_kde4_xdg_menu_prefix.diff | 6 +-
debian/patches/13_qt4_designer_plugins_path.diff | 26 +++++-----
debian/patches/14_hardcode_ptm_device.diff | 4 +-
debian/patches/15_kfreebsd_support.diff | 12 +++---
.../22_hack_in_etc_kde4_in_kstandarddirs.diff | 2 +-
debian/patches/23_solid_no_double_build.diff | 2 +-
debian/patches/25_ld_exclude_libs_qtuitools.diff | 8 ++--
.../28_find_old_kde4_html_documentation.diff | 2 +-
debian/patches/29_hurd_support.diff | 2 +-
14 files changed, 63 insertions(+), 81 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a18e758..e4db0c5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,7 @@ kde4libs (4:4.4.95-0r1) UNRELEASED; urgency=low
* Add symbol files for the new libraries.
* Remove libkutils4.symbols as kutils is now a dummy
transitional library with no symbols.
+ * Refresh patches.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Tue, 27 Jul 2010 20:01:26 +0300
diff --git a/debian/kdelibs5-dev.install b/debian/kdelibs5-dev.install
index 7cb404c..892fe9d 100644
--- a/debian/kdelibs5-dev.install
+++ b/debian/kdelibs5-dev.install
@@ -1785,8 +1785,6 @@ usr/include/threadweaver/WeaverInterface.h
usr/include/threadweaver/WeaverObserver.h
usr/include/threadweaver/threadweaver_export.h
usr/lib/kde4/libexec/kauth-policy-gen
-usr/lib/kde4/plugins/designer/kde3supportwidgets.so
-usr/lib/kde4/plugins/designer/kdewidgets.so
usr/lib/kde4/plugins/script/libkrossqtsplugin.so
usr/lib/libkatepartinterfaces.so
usr/lib/libkcmutils.so
@@ -1825,6 +1823,8 @@ usr/lib/libnepomukquery.so
usr/lib/libplasma.so
usr/lib/libsolid.so
usr/lib/libthreadweaver.so
+usr/lib/qt4/plugins/designer/kde3supportwidgets.so
+usr/lib/qt4/plugins/designer/kdewidgets.so
usr/share/dbus-1/interfaces/org.freedesktop.PowerManagement.Inhibit.xml
usr/share/dbus-1/interfaces/org.freedesktop.PowerManagement.xml
usr/share/dbus-1/interfaces/org.kde.JobView.xml
diff --git a/debian/patches/08_add_debian_build_type.diff b/debian/patches/08_add_debian_build_type.diff
index 6d6f5d2..a41ce9f 100644
--- a/debian/patches/08_add_debian_build_type.diff
+++ b/debian/patches/08_add_debian_build_type.diff
@@ -9,7 +9,7 @@ icons.
--- a/cmake/modules/FindKDE4Internal.cmake
+++ b/cmake/modules/FindKDE4Internal.cmake
-@@ -1076,11 +1076,13 @@ if (CMAKE_COMPILER_IS_GNUCXX)
+@@ -1175,11 +1175,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 5179f95..c233d2d 100644
--- a/debian/patches/09_disable_usr_lib_install_rpath.diff
+++ b/debian/patches/09_disable_usr_lib_install_rpath.diff
@@ -11,40 +11,21 @@ Forwarded: yes
Origin: backport, http://websvn.kde.org/?view=revision&revision=1124215
Last-Update: 2010-06-23
---- a/cmake/modules/FindKDE4Internal.cmake
-+++ b/cmake/modules/FindKDE4Internal.cmake
-@@ -943,8 +943,14 @@ if (UNIX)
- if (APPLE)
- set(CMAKE_INSTALL_NAME_DIR ${LIB_INSTALL_DIR})
- else (APPLE)
-- # add our LIB_INSTALL_DIR to the RPATH and use the RPATH figured out by cmake when compiling
-- set(CMAKE_INSTALL_RPATH ${LIB_INSTALL_DIR} )
-+ # add our LIB_INSTALL_DIR to the RPATH (but only when it is not one of the standard system link
-+ # directories listed in CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES) and use the RPATH figured out by cmake when compiling
-+
-+ list(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${LIB_INSTALL_DIR}" _isSystemLibDir)
-+ if("${_isSystemLibDir}" STREQUAL "-1")
-+ set(CMAKE_INSTALL_RPATH "${LIB_INSTALL_DIR}")
-+ endif("${_isSystemLibDir}" STREQUAL "-1")
-+
- set(CMAKE_SKIP_BUILD_RPATH FALSE)
- set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
- set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
--- a/kdewidgets/CMakeLists.txt
+++ b/kdewidgets/CMakeLists.txt
-@@ -51,7 +51,6 @@ if(NOT WIN32)
- INSTALL_RPATH_USE_LINK_PATH TRUE
- SKIP_BUILD_RPATH TRUE
- BUILD_WITH_INSTALL_RPATH TRUE
-- INSTALL_RPATH ${LIB_INSTALL_DIR}
- )
- endif(NOT WIN32)
+@@ -51,7 +51,6 @@
+ INSTALL_RPATH_USE_LINK_PATH TRUE
+ SKIP_BUILD_RPATH TRUE
+ BUILD_WITH_INSTALL_RPATH TRUE
+- INSTALL_RPATH ${LIB_INSTALL_DIR}
+ )
+ endif(NOT WIN32)
-@@ -86,7 +85,6 @@ if (QT_QT3SUPPORT_FOUND)
- INSTALL_RPATH_USE_LINK_PATH TRUE
- SKIP_BUILD_RPATH TRUE
- BUILD_WITH_INSTALL_RPATH TRUE
-- INSTALL_RPATH ${LIB_INSTALL_DIR}
- )
- endif(NOT WIN32)
+@@ -86,7 +85,6 @@
+ INSTALL_RPATH_USE_LINK_PATH TRUE
+ SKIP_BUILD_RPATH TRUE
+ BUILD_WITH_INSTALL_RPATH TRUE
+- INSTALL_RPATH ${LIB_INSTALL_DIR}
+ )
+ endif(NOT WIN32)
diff --git a/debian/patches/10_make_libkdeinit4_private.diff b/debian/patches/10_make_libkdeinit4_private.diff
index 36f7f72..8fb56ef 100644
--- a/debian/patches/10_make_libkdeinit4_private.diff
+++ b/debian/patches/10_make_libkdeinit4_private.diff
@@ -21,7 +21,7 @@ Last-Update: 2010-06-07
--- a/CreateKDELibsDependenciesFile.cmake
+++ b/CreateKDELibsDependenciesFile.cmake
-@@ -31,6 +31,7 @@ endmacro(MAKE_INSTALL_PATH_ABSOLUTE out
+@@ -31,6 +31,7 @@
set(KDE4_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}")
make_install_path_absolute(KDE4_LIB_INSTALL_DIR ${LIB_INSTALL_DIR})
make_install_path_absolute(KDE4_LIBEXEC_INSTALL_DIR ${LIBEXEC_INSTALL_DIR})
@@ -29,7 +29,7 @@ Last-Update: 2010-06-07
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 @@ endif (NOT KDE4_INSTALL_DIR)
+@@ -63,6 +64,7 @@
set(KDE4_LIB_INSTALL_DIR \"${KDE4_LIB_INSTALL_DIR}\")
set(KDE4_LIBEXEC_INSTALL_DIR \"${KDE4_LIBEXEC_INSTALL_DIR}\")
@@ -39,7 +39,7 @@ Last-Update: 2010-06-07
set(KDE4_SBIN_INSTALL_DIR \"${KDE4_SBIN_INSTALL_DIR}\")
--- a/cmake/modules/FindKDE4Internal.cmake
+++ b/cmake/modules/FindKDE4Internal.cmake
-@@ -771,6 +771,7 @@ else (WIN32)
+@@ -836,6 +836,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)")
@@ -49,7 +49,7 @@ Last-Update: 2010-06-07
_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
-@@ -758,6 +758,17 @@ macro (KDE4_ADD_KDEINIT_EXECUTABLE _targ
+@@ -777,6 +777,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)
@@ -69,7 +69,7 @@ Last-Update: 2010-06-07
--- a/kinit/CMakeLists.txt
+++ b/kinit/CMakeLists.txt
-@@ -54,6 +54,17 @@ endif(Q_WS_X11)
+@@ -54,6 +54,17 @@
install(TARGETS kdeinit4 ${INSTALL_TARGETS_DEFAULT_ARGS} )
@@ -99,7 +99,7 @@ Last-Update: 2010-06-07
#define INCLUDE_INSTALL_DIR "${INCLUDE_INSTALL_DIR}"
--- a/kdecore/kde-config.cpp
+++ b/kdecore/kde-config.cpp
-@@ -144,6 +144,7 @@ int main(int argc, char **argv)
+@@ -144,6 +144,7 @@
"html", I18N_NOOP("HTML documentation"),
"icon", I18N_NOOP("Icons"),
"kcfg", I18N_NOOP("Configuration description files"),
@@ -109,7 +109,7 @@ Last-Update: 2010-06-07
"locale", I18N_NOOP("Translation files for KLocale"),
--- a/kdecore/kernel/kstandarddirs.cpp
+++ b/kdecore/kernel/kstandarddirs.cpp
-@@ -157,6 +157,8 @@ xdgconf-menu
+@@ -161,6 +161,8 @@
menus
xdgconf-autostart
autostart
@@ -118,7 +118,7 @@ Last-Update: 2010-06-07
*/
static const char types_string[] =
-@@ -211,6 +213,8 @@ static const char types_string[] =
+@@ -215,6 +217,8 @@
"menus\0"
"xdgconf-autostart\0"
"autostart\0"
@@ -127,7 +127,7 @@ Last-Update: 2010-06-07
"\0";
static const int types_indices[] = {
-@@ -220,7 +224,7 @@ static const int types_indices[] = {
+@@ -224,7 +228,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,
@@ -138,7 +138,7 @@ Last-Update: 2010-06-07
static int tokenize( QStringList& token, const QString& str,
--- a/kdecore/kernel/kstandarddirs_unix.cpp
+++ b/kdecore/kernel/kstandarddirs_unix.cpp
-@@ -39,6 +39,8 @@ QString KStandardDirs::installPath(const
+@@ -39,6 +39,8 @@
return QString::fromLatin1(KCFG_INSTALL_DIR "/");
if (strcmp("kdedir", type) == 0)
return QString::fromLatin1(KDEDIR "/");
@@ -149,7 +149,7 @@ Last-Update: 2010-06-07
if (strcmp("data", type) == 0)
--- a/kdecore/kernel/kstandarddirs_win.cpp
+++ b/kdecore/kernel/kstandarddirs_win.cpp
-@@ -47,6 +47,8 @@ QString KStandardDirs::installPath(const
+@@ -47,6 +47,8 @@
return share() + QLatin1String("config.kcfg/");
if (strcmp("kdedir", type) == 0)
return prefix();
@@ -160,7 +160,7 @@ Last-Update: 2010-06-07
if (strcmp("data", type) == 0)
--- a/kdecore/util/kpluginloader.cpp
+++ b/kdecore/util/kpluginloader.cpp
-@@ -112,6 +112,13 @@ QString findLibraryInternal(const QStrin
+@@ -112,6 +112,13 @@
libname = fileinfo.path() + QLatin1String("/lib") + fileinfo.fileName();
#endif
@@ -176,7 +176,7 @@ Last-Update: 2010-06-07
if (!kdeinit) {
--- a/kinit/kinit.cpp
+++ b/kinit/kinit.cpp
-@@ -492,11 +492,23 @@ static pid_t launch(int argc, const char
+@@ -496,11 +496,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 e91dad3..6ce7d1a 100644
--- a/debian/patches/11_default_kde4_xdg_menu_prefix.diff
+++ b/debian/patches/11_default_kde4_xdg_menu_prefix.diff
@@ -5,7 +5,7 @@
--- a/kded/CMakeLists.txt
+++ b/kded/CMakeLists.txt
-@@ -75,7 +75,7 @@ install(TARGETS kdontchangethehostname D
+@@ -63,7 +63,7 @@
if (WIN32)
install( FILES applications.menu DESTINATION ${SHARE_INSTALL_PREFIX}/xdg/menus )
else (WIN32)
@@ -16,7 +16,7 @@
install( FILES kded.upd DESTINATION ${DATA_INSTALL_DIR}/kconf_update )
--- a/kded/vfolder_menu.cpp
+++ b/kded/vfolder_menu.cpp
-@@ -772,8 +772,10 @@ VFolderMenu::locateMenuFile(const QStrin
+@@ -772,8 +772,10 @@
QString result;
QString xdgMenuPrefix = QString::fromLocal8Bit(qgetenv("XDG_MENU_PREFIX"));
@@ -29,7 +29,7 @@
QFileInfo fileInfo(fileName);
QString fileNameOnly = fileInfo.fileName();
-@@ -783,7 +785,6 @@ VFolderMenu::locateMenuFile(const QStrin
+@@ -783,7 +785,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 fa1851e..50542d3 100644
--- a/debian/patches/13_qt4_designer_plugins_path.diff
+++ b/debian/patches/13_qt4_designer_plugins_path.diff
@@ -1,20 +1,20 @@
--- a/kdewidgets/CMakeLists.txt
+++ b/kdewidgets/CMakeLists.txt
-@@ -54,7 +54,7 @@ if(NOT WIN32)
- )
- endif(NOT WIN32)
+@@ -54,7 +54,7 @@
+ )
+ endif(NOT WIN32)
--install(TARGETS kdewidgets DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer )
-+install(TARGETS kdewidgets DESTINATION /usr/lib/qt4/plugins/designer )
+- 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 @@ if (QT_QT3SUPPORT_FOUND)
- )
- endif(NOT WIN32)
+ if (QT_QT3SUPPORT_FOUND)
-- install(TARGETS kde3supportwidgets DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer )
-+ install(TARGETS kde3supportwidgets DESTINATION /usr/lib/qt4/plugins/designer )
- endif (QT_QT3SUPPORT_FOUND)
+@@ -88,7 +88,7 @@
+ )
+ endif(NOT WIN32)
+- install(TARGETS kde3supportwidgets DESTINATION ${PLUGIN_INSTALL_DIR}/plugins/designer )
++ install(TARGETS kde3supportwidgets DESTINATION /usr/lib/qt4/plugins/designer )
+ endif (QT_QT3SUPPORT_FOUND)
+ endif (QT_QTDESIGNER_FOUND)
diff --git a/debian/patches/14_hardcode_ptm_device.diff b/debian/patches/14_hardcode_ptm_device.diff
index d8c83d1..5b19b33 100644
--- a/debian/patches/14_hardcode_ptm_device.diff
+++ b/debian/patches/14_hardcode_ptm_device.diff
@@ -6,10 +6,10 @@ Bypass build time check as /dev/ptmx is alsways present at runtime.
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
-@@ -202,13 +202,7 @@ if (UNIX)
+@@ -202,13 +202,7 @@
set(HAVE_OPENPTY)
- EXECUTE_PROCESS(
+ execute_process(
- COMMAND sh -c "
- for ptm in ptc ptmx ptm ptym/clone; do
- if test -c /dev/$ptm; then
diff --git a/debian/patches/15_kfreebsd_support.diff b/debian/patches/15_kfreebsd_support.diff
index e9d512e..40042ed 100644
--- a/debian/patches/15_kfreebsd_support.diff
+++ b/debian/patches/15_kfreebsd_support.diff
@@ -12,7 +12,7 @@ cmake.
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
-@@ -164,11 +164,11 @@ if (UNIX)
+@@ -164,11 +164,11 @@
set(UTIL_LIBRARY util)
endif (login_in_libutil)
endif (NOT login_in_libc)
@@ -29,7 +29,7 @@ cmake.
if (login_in_libutil)
--- a/kio/kfile/kpropertiesdialog.cpp
+++ b/kio/kfile/kpropertiesdialog.cpp
-@@ -1912,7 +1912,15 @@ static bool fileSystemSupportsACL( const
+@@ -1911,7 +1911,15 @@
fileSystemSupportsACLs = ( statfs( path.data(), &buf ) == 0 ) && ( buf.f_flags & MNT_ACLS );
#else
fileSystemSupportsACLs =
@@ -48,7 +48,7 @@ cmake.
}
--- a/kioslave/file/file.cpp
+++ b/kioslave/file/file.cpp
-@@ -324,8 +324,10 @@ void FileProtocol::get( const KUrl& url
+@@ -315,8 +315,10 @@
}
#ifdef HAVE_FADVISE
@@ -61,7 +61,7 @@ cmake.
// This is mandatory in all slaves (for KRun/BrowserRun to work)
--- a/kioslave/file/file_unix.cpp
+++ b/kioslave/file/file_unix.cpp
-@@ -146,8 +146,10 @@ void FileProtocol::copy( const KUrl &src
+@@ -155,8 +155,10 @@
}
#ifdef HAVE_FADVISE
@@ -72,7 +72,7 @@ cmake.
// WABA: Make sure that we keep writing permissions ourselves,
// otherwise we can be in for a surprise on NFS.
mode_t initialMode;
-@@ -169,8 +171,10 @@ void FileProtocol::copy( const KUrl &src
+@@ -178,8 +180,10 @@
}
#ifdef HAVE_FADVISE
@@ -85,7 +85,7 @@ cmake.
acl = acl_get_fd(src_fd);
--- a/kpty/kpty.cpp
+++ b/kpty/kpty.cpp
-@@ -107,24 +107,24 @@ extern "C" {
+@@ -107,24 +107,24 @@
# define _NEW_TTY_CTRL
#endif
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 703dc0d..6b8c6f1 100644
--- a/debian/patches/22_hack_in_etc_kde4_in_kstandarddirs.diff
+++ b/debian/patches/22_hack_in_etc_kde4_in_kstandarddirs.diff
@@ -12,7 +12,7 @@ overridden by adding new files to /etc/kde4 by the sysadm.
--- a/kdecore/kernel/kstandarddirs.cpp
+++ b/kdecore/kernel/kstandarddirs.cpp
-@@ -1124,6 +1124,10 @@ QStringList KStandardDirs::KStandardDirs
+@@ -1135,6 +1135,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 5cad489..a57ada8 100644
--- a/debian/patches/23_solid_no_double_build.diff
+++ b/debian/patches/23_solid_no_double_build.diff
@@ -4,7 +4,7 @@
--- a/solid/solid/CMakeLists.txt
+++ b/solid/solid/CMakeLists.txt
-@@ -235,7 +235,14 @@ install(FILES org.freedesktop.PowerManag
+@@ -266,7 +266,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 e548f7e..9bf5b86 100644
--- a/debian/patches/25_ld_exclude_libs_qtuitools.diff
+++ b/debian/patches/25_ld_exclude_libs_qtuitools.diff
@@ -5,9 +5,9 @@ Forwarded: not-needed
--- a/plasma/CMakeLists.txt
+++ b/plasma/CMakeLists.txt
-@@ -212,6 +212,9 @@ target_link_libraries(plasma ${KDE4_KIO_
- ${QT_QTUITOOLS_LIBRARY} ${QT_QTWEBKIT_LIBRARY}
- kdnssd threadweaver ${KDE4_SOLID_LIBS} )
+@@ -246,6 +246,9 @@
+ ${QT_QTSCRIPT_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTXML_LIBRARY}
+ ${KDE4_KDEUI_LIBS} kdnssd threadweaver ${PLASMA_EXTRA_LIBS})
+# Do not export QtUiTools internal symbols
+set_target_properties(plasma PROPERTIES LINK_FLAGS_DEBIAN "-Wl,--exclude-libs -Wl,libQtUiTools.a")
@@ -17,7 +17,7 @@ Forwarded: not-needed
endif(QCA2_FOUND)
--- a/kjsembed/kjsembed/CMakeLists.txt
+++ b/kjsembed/kjsembed/CMakeLists.txt
-@@ -71,7 +71,8 @@ target_link_libraries(${KJSEMBEDLIBNAME}
+@@ -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/28_find_old_kde4_html_documentation.diff b/debian/patches/28_find_old_kde4_html_documentation.diff
index 6a0ceda..0459222 100644
--- a/debian/patches/28_find_old_kde4_html_documentation.diff
+++ b/debian/patches/28_find_old_kde4_html_documentation.diff
@@ -11,7 +11,7 @@ Last-Update: 2010-05-28
--- a/kdecore/kernel/kstandarddirs.cpp
+++ b/kdecore/kernel/kstandarddirs.cpp
-@@ -1796,6 +1796,11 @@ void KStandardDirs::addKDEDefaults()
+@@ -1833,6 +1833,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 1541246..e8f8b77 100644
--- a/debian/patches/29_hurd_support.diff
+++ b/debian/patches/29_hurd_support.diff
@@ -5,7 +5,7 @@ Description: preliminary GNU/Hurd support
Forwarded: no
--- a/kdecore/kernel/kstandarddirs.cpp
+++ b/kdecore/kernel/kstandarddirs.cpp
-@@ -66,6 +66,10 @@
+@@ -70,6 +70,10 @@
#include <QtCore/QFileInfo>
#include <QtCore/QSettings>
--
KDE Development Platform Libraries module packaging
More information about the pkg-kde-commits
mailing list