[SCM] KDE Development Platform Libraries module packaging branch, master, updated. debian/4.8.4-3-12-g2ab3248
Lisandro Damián Nicanor Pérez
lisandro at alioth.debian.org
Tue Sep 25 22:28:20 UTC 2012
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde4libs.git;a=commitdiff;h=2ab3248
The following commit has been merged in the master branch:
commit 2ab3248b33bdfc045565d5b7de327a812929a8ee
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date: Tue Sep 25 19:25:32 2012 -0300
Refresh patches using the quilt option -p.
---
debian/patches/add_dlrestrictions_support.diff | 8 +++---
debian/patches/make_libkdeinit4_private.diff | 28 ++++++++++++------------
2 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/debian/patches/add_dlrestrictions_support.diff b/debian/patches/add_dlrestrictions_support.diff
index 094ecb2..ff27ac7 100644
--- a/debian/patches/add_dlrestrictions_support.diff
+++ b/debian/patches/add_dlrestrictions_support.diff
@@ -22,7 +22,7 @@ on all (or some) the targets.
--- a/cmake/modules/KDE4Macros.cmake
+++ b/cmake/modules/KDE4Macros.cmake
-@@ -1035,10 +1035,14 @@
+@@ -1035,10 +1035,14 @@ macro (KDE4_ADD_LIBRARY _target_NAME _li
if (${_lib_TYPE} STREQUAL "SHARED")
set(_first_SRC)
set(_add_lib_param SHARED)
@@ -37,7 +37,7 @@ on all (or some) the targets.
endif (${_lib_TYPE} STREQUAL "MODULE")
set(_SRCS ${_first_SRC} ${ARGN})
-@@ -1326,6 +1330,13 @@
+@@ -1326,6 +1330,13 @@ function(KDE4_INSTALL_AUTH_ACTIONS HELPE
endfunction(KDE4_INSTALL_AUTH_ACTIONS)
@@ -53,7 +53,7 @@ on all (or some) the targets.
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.")
--- a/kdecore/CMakeLists.txt
+++ b/kdecore/CMakeLists.txt
-@@ -406,6 +406,14 @@
+@@ -406,6 +406,14 @@ kde4_add_library(kdecore ${LIBRARY_TYPE}
target_link_libraries(kdecore ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${ZLIB_LIBRARY} ${kdecore_OPTIONAL_LIBS})
@@ -85,7 +85,7 @@ on all (or some) the targets.
extern int kLibraryDebugArea();
class KPluginLoaderPrivate
-@@ -259,6 +267,30 @@
+@@ -259,6 +267,30 @@ bool KPluginLoader::load()
else
d->pluginVersion = ~0U;
diff --git a/debian/patches/make_libkdeinit4_private.diff b/debian/patches/make_libkdeinit4_private.diff
index 7c5b6c8..f07fbca 100644
--- a/debian/patches/make_libkdeinit4_private.diff
+++ b/debian/patches/make_libkdeinit4_private.diff
@@ -21,7 +21,7 @@ The patch also adds support for "kdeinit" resource type to KDE Platform
libraries.
--- a/CreateKDELibsDependenciesFile.cmake
+++ b/CreateKDELibsDependenciesFile.cmake
-@@ -32,6 +32,7 @@
+@@ -32,6 +32,7 @@ set(KDE4_INSTALL_DIR "${CMAKE_INSTALL_PR
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})
@@ -29,7 +29,7 @@ libraries.
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})
-@@ -65,6 +66,7 @@
+@@ -65,6 +66,7 @@ endif (NOT KDE4_INSTALL_DIR)
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}\")
@@ -39,7 +39,7 @@ libraries.
set(KDE4_SBIN_INSTALL_DIR \"${KDE4_SBIN_INSTALL_DIR}\")
--- a/cmake/modules/FindKDE4Internal.cmake
+++ b/cmake/modules/FindKDE4Internal.cmake
-@@ -871,6 +871,7 @@
+@@ -871,6 +871,7 @@ else (WIN32)
_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)")
@@ -47,7 +47,7 @@ libraries.
_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")
-@@ -1332,6 +1333,10 @@
+@@ -1332,6 +1333,10 @@ if (CMAKE_C_COMPILER MATCHES "icc")
endif (CMAKE_C_COMPILER MATCHES "icc")
@@ -60,7 +60,7 @@ libraries.
--- a/cmake/modules/KDE4Macros.cmake
+++ b/cmake/modules/KDE4Macros.cmake
-@@ -819,6 +819,17 @@
+@@ -819,6 +819,17 @@ macro (KDE4_ADD_KDEINIT_EXECUTABLE _targ
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)
@@ -80,7 +80,7 @@ libraries.
--- a/kinit/CMakeLists.txt
+++ b/kinit/CMakeLists.txt
-@@ -58,6 +58,17 @@
+@@ -58,6 +58,17 @@ endif(Q_WS_X11)
install(TARGETS kdeinit4 ${INSTALL_TARGETS_DEFAULT_ARGS} )
@@ -110,7 +110,7 @@ libraries.
#define INCLUDE_INSTALL_DIR "${INCLUDE_INSTALL_DIR}"
--- a/kdecore/kde-config.cpp
+++ b/kdecore/kde-config.cpp
-@@ -144,6 +144,7 @@
+@@ -144,6 +144,7 @@ int main(int argc, char **argv)
"html", I18N_NOOP("HTML documentation"),
"icon", I18N_NOOP("Icons"),
"kcfg", I18N_NOOP("Configuration description files"),
@@ -120,7 +120,7 @@ libraries.
"locale", I18N_NOOP("Translation files for KLocale"),
--- a/kdecore/kernel/kstandarddirs.cpp
+++ b/kdecore/kernel/kstandarddirs.cpp
-@@ -165,6 +165,8 @@
+@@ -165,6 +165,8 @@ xdgconf-menu
menus
xdgconf-autostart
autostart
@@ -129,7 +129,7 @@ libraries.
*/
static const char types_string[] =
-@@ -219,6 +221,8 @@
+@@ -219,6 +221,8 @@ static const char types_string[] =
"menus
--
KDE Development Platform Libraries module packaging
More information about the pkg-kde-commits
mailing list