[SCM] KDE Development Platform Libraries module packaging branch, kde4.11, updated. debian/4.10.5-1-17-gfc003ad
Maximiliano Curia
maxy at alioth.debian.org
Tue Sep 17 22:13:17 UTC 2013
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde4libs.git;a=commitdiff;h=0648c4d
The following commit has been merged in the kde4.11 branch:
commit 0648c4d9918dfa8ae9d485b054ecaafad581a8f0
Author: Maximiliano Curia <maxy at debian.org>
Date: Wed Sep 4 11:39:29 2013 +0000
Refresh patches.
---
debian/changelog | 1 +
debian/patches/add_dlrestrictions_support.diff | 28 +++---
debian/patches/glibc_filesystem.diff | 10 +-
.../kconf_update_migrate_from_kde3_icon_theme.diff | 22 +++--
debian/patches/kfreebsd_support.diff | 40 +++++---
debian/patches/ld_exclude_libs_qtuitools.diff | 16 ++--
debian/patches/make_libkdeinit4_private.diff | 96 ++++++++++++--------
7 files changed, 133 insertions(+), 80 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 93e6baf..374834c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,7 @@ kde4libs (4:4.11.1-1) UNRELEASED; urgency=low
[ Maximiliano Curia ]
* New upstream release.
+ * Refresh patches.
-- Maximiliano Curia <maxy at debian.org> Tue, 03 Sep 2013 20:27:11 +0200
diff --git a/debian/patches/add_dlrestrictions_support.diff b/debian/patches/add_dlrestrictions_support.diff
index 51a24d4..949d1ad 100644
--- a/debian/patches/add_dlrestrictions_support.diff
+++ b/debian/patches/add_dlrestrictions_support.diff
@@ -2,7 +2,7 @@ From: Modestas Vainius <modax at debian.org>
Subject: Add DLRestrictions support
Forwarded: not-needed
Origin: vendor
-Last-Update: 2011-05-25
+Last-Update: 2013-09-04
The patch adds DLRestrictions compatibility checks to the KPluginLoader::load()
function. Moreover, a new helper CMake macro is introduced to ease addition of
@@ -20,9 +20,11 @@ Please that either DEFAULT_DLRESTRICTIONS variable or DLRESTRICITIONS target
property must have set beforehand. Otherwise, this snippet will have no effect
on all (or some) the targets.
---- a/cmake/modules/KDE4Macros.cmake
-+++ b/cmake/modules/KDE4Macros.cmake
-@@ -1054,10 +1054,14 @@ macro (KDE4_ADD_LIBRARY _target_NAME _li
+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 @@
if (${_lib_TYPE} STREQUAL "SHARED")
set(_first_SRC)
set(_add_lib_param SHARED)
@@ -37,7 +39,7 @@ on all (or some) the targets.
endif (${_lib_TYPE} STREQUAL "MODULE")
set(_SRCS ${_first_SRC} ${ARGN})
-@@ -1368,6 +1372,13 @@ function(KDE4_INSTALL_AUTH_ACTIONS HELPE
+@@ -1368,6 +1372,13 @@
endfunction(KDE4_INSTALL_AUTH_ACTIONS)
@@ -51,9 +53,11 @@ on all (or some) the targets.
macro(_KDE4_EXPORT_LIBRARY_DEPENDENCIES _append_or_write _filename)
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
-@@ -411,6 +411,14 @@ kde4_add_library(kdecore ${LIBRARY_TYPE}
+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 @@
target_link_libraries(kdecore ${QT_QTCORE_LIBRARY} ${QT_QTNETWORK_LIBRARY} ${QT_QTDBUS_LIBRARY} ${QT_QTXML_LIBRARY} ${ZLIB_LIBRARY} ${kdecore_OPTIONAL_LIBS})
@@ -68,8 +72,10 @@ on all (or some) the targets.
if(WINCE)
target_link_libraries(kdecore ${WCECOMPAT_LIBRARIES} Ceshell.lib)
endif(WINCE)
---- a/kdecore/util/kpluginloader.cpp
-+++ b/kdecore/util/kpluginloader.cpp
+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
@@ -31,6 +31,14 @@
#include <QtCore/QDir>
#include <QtCore/QFileInfo>
@@ -85,7 +91,7 @@ on all (or some) the targets.
extern int kLibraryDebugArea();
class KPluginLoaderPrivate
-@@ -259,6 +267,30 @@ bool KPluginLoader::load()
+@@ -259,6 +267,30 @@
else
d->pluginVersion = ~0U;
diff --git a/debian/patches/glibc_filesystem.diff b/debian/patches/glibc_filesystem.diff
index acd087b..1215374 100644
--- a/debian/patches/glibc_filesystem.diff
+++ b/debian/patches/glibc_filesystem.diff
@@ -2,12 +2,14 @@ Author: Pino Toscano <pino at debian.org>
Description: Correct determineFileSystemTypeImpl() for any glibc-based system
Fixes compilation on GNU/kFreeBSD, which has no determineFileSystemTypeImpl()
being recognized by default.
-Last-Update: 2011-12-03
+Last-Update: 2013-09-04
Forwarded: no
---- a/kdecore/io/kfilesystemtype_p.cpp
-+++ b/kdecore/io/kfilesystemtype_p.cpp
-@@ -53,7 +53,7 @@ KFileSystemType::Type determineFileSyste
+Index: kde4libs/kdecore/io/kfilesystemtype_p.cpp
+===================================================================
+--- kde4libs.orig/kdecore/io/kfilesystemtype_p.cpp 2013-09-04 11:36:51.283495440 +0000
++++ kde4libs/kdecore/io/kfilesystemtype_p.cpp 2013-09-04 11:36:51.279495599 +0000
+@@ -56,7 +56,7 @@
return kde_typeFromName(buf.f_fstypename);
}
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 ffbb79e..d23bc5c 100644
--- a/debian/patches/kconf_update_migrate_from_kde3_icon_theme.diff
+++ b/debian/patches/kconf_update_migrate_from_kde3_icon_theme.diff
@@ -3,15 +3,17 @@ Subject: Migrate from crystalsvg and similar KDE 4 incompatible icon themes
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=588374
Forwarded: no
Origin: vendor
-Last-Update: 2011-01-22
+Last-Update: 2013-09-04
The patch adds a kconf_update script which resets global icon theme to default
if current one does not have some standard icons (e.g. document-open etc.)
Useful when upgrading from KDE 3 to KDE 4 because default KDE 3 theme
(crystalsvg) is exactly like this, i.e. incompatible with KDE 4.
---- /dev/null
-+++ b/kdeui/icons/kconf_update_migrate_from_kde3_icon_theme.cpp
+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
@@ -0,0 +1,157 @@
+/*
+ Copyright (c) 2011, Modestas Vainius <modax at debian.org>
@@ -170,9 +172,11 @@ Useful when upgrading from KDE 3 to KDE 4 because default KDE 3 theme
+
+ return 0;
+}
---- a/kdeui/CMakeLists.txt
-+++ b/kdeui/CMakeLists.txt
-@@ -470,6 +470,16 @@ set_target_properties(kdeui PROPERTIES V
+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 @@
)
install(TARGETS kdeui EXPORT kdelibsLibraryTargets ${INSTALL_TARGETS_DEFAULT_ARGS})
@@ -189,8 +193,10 @@ Useful when upgrading from KDE 3 to KDE 4 because default KDE 3 theme
########### install files ###############
if (Q_WS_MAC)
---- /dev/null
-+++ b/kdeui/kdeui.upd
+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
@@ -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 e253936..ed25435 100644
--- a/debian/patches/kfreebsd_support.diff
+++ b/debian/patches/kfreebsd_support.diff
@@ -1,10 +1,12 @@
Make kdelibs build in Debian's kFreeBSD.
We can not push this patch to upstream since the:
CMAKE_SYSTEM_NAME MATCHES kFreeBSD stuff, needs the Debian patched
-cmake.
+cmake.
---- a/ConfigureChecks.cmake
-+++ b/ConfigureChecks.cmake
+Index: kde4libs/ConfigureChecks.cmake
+===================================================================
+--- kde4libs.orig/ConfigureChecks.cmake 2013-09-04 11:33:40.403081551 +0000
++++ kde4libs/ConfigureChecks.cmake 2013-09-04 11:33:40.323084729 +0000
@@ -138,11 +138,11 @@
set(UTIL_LIBRARY util)
endif (login_in_libutil)
@@ -20,8 +22,10 @@ cmake.
if (HAVE_UTMPX)
set(utmp utmpx)
if (login_in_libutil)
---- a/kio/kfile/kpropertiesdialog.cpp
-+++ b/kio/kfile/kpropertiesdialog.cpp
+Index: kde4libs/kio/kfile/kpropertiesdialog.cpp
+===================================================================
+--- kde4libs.orig/kio/kfile/kpropertiesdialog.cpp 2013-09-04 11:33:40.403081551 +0000
++++ kde4libs/kio/kfile/kpropertiesdialog.cpp 2013-09-04 11:33:40.327084571 +0000
@@ -1901,7 +1901,15 @@
fileSystemSupportsACLs = ( statfs( path.data(), &buf ) == 0 ) && ( buf.f_flags & MNT_ACLS );
#else
@@ -39,8 +43,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 2013-09-04 11:33:40.403081551 +0000
++++ kde4libs/kioslave/file/file.cpp 2013-09-04 11:33:40.331084412 +0000
@@ -310,8 +310,10 @@
}
@@ -52,8 +58,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 2013-09-04 11:33:40.403081551 +0000
++++ kde4libs/kioslave/file/file_unix.cpp 2013-09-04 11:33:40.363083141 +0000
@@ -145,8 +145,10 @@
}
@@ -76,8 +84,10 @@ cmake.
#ifdef HAVE_POSIX_ACL
acl = acl_get_fd(src_fd);
---- a/kpty/kpty.cpp
-+++ b/kpty/kpty.cpp
+Index: kde4libs/kpty/kpty.cpp
+===================================================================
+--- kde4libs.orig/kpty/kpty.cpp 2013-09-04 11:33:40.403081551 +0000
++++ kde4libs/kpty/kpty.cpp 2013-09-04 11:33:40.399081710 +0000
@@ -109,24 +109,24 @@
# define _NEW_TTY_CTRL
#endif
@@ -115,15 +125,17 @@ cmake.
#endif
#include <kdebug.h>
---- a/cmake/modules/FindKDE4Internal.cmake
-+++ b/cmake/modules/FindKDE4Internal.cmake
+Index: kde4libs/cmake/modules/FindKDE4Internal.cmake
+===================================================================
+--- kde4libs.orig/cmake/modules/FindKDE4Internal.cmake 2013-09-04 11:33:40.403081551 +0000
++++ kde4libs/cmake/modules/FindKDE4Internal.cmake 2013-09-04 11:35:51.201883364 +0000
@@ -1093,7 +1093,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)
+ 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 ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}")
@@ -1114,7 +1114,7 @@
diff --git a/debian/patches/ld_exclude_libs_qtuitools.diff b/debian/patches/ld_exclude_libs_qtuitools.diff
index 4f56935..d7828de 100644
--- a/debian/patches/ld_exclude_libs_qtuitools.diff
+++ b/debian/patches/ld_exclude_libs_qtuitools.diff
@@ -3,9 +3,11 @@ Subject: Exclude QtUiTools symbols from public libraries
Currently, libplasma and libkjsembed are affected.
Forwarded: not-needed
---- a/plasma/CMakeLists.txt
-+++ b/plasma/CMakeLists.txt
-@@ -282,6 +282,9 @@ target_link_libraries(plasma ${QT_QTUITO
+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
+@@ -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,9 +17,11 @@ 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
-@@ -71,7 +71,8 @@ target_link_libraries(${KJSEMBEDLIBNAME}
+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
+@@ -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 7b379eb..36c1560 100644
--- a/debian/patches/make_libkdeinit4_private.diff
+++ b/debian/patches/make_libkdeinit4_private.diff
@@ -2,7 +2,7 @@ From: Modestas Vainius <modax at debian.org>
Subject: Framework for making libkdeinit4_*.so "private"
Forwarded: no
Origin: vendor
-Last-Update: 2012-10-01
+Last-Update: 2013-09-04
The patch adds LIBKDEINIT_INSTALL_DIR cmake flag which specifies where
libkdeinit4_*.so are supposed to end up. Please note, however, that
@@ -19,9 +19,11 @@ dh_movelibkdeinit by default.
The patch also adds support for "kdeinit" resource type to KDE Platform
libraries.
---- a/CreateKDELibsDependenciesFile.cmake
-+++ b/CreateKDELibsDependenciesFile.cmake
-@@ -32,6 +32,7 @@ set(KDE4_INSTALL_DIR "${CMAKE_INSTALL_PR
+Index: kde4libs/CreateKDELibsDependenciesFile.cmake
+===================================================================
+--- kde4libs.orig/CreateKDELibsDependenciesFile.cmake 2013-09-04 11:31:32.144178278 +0000
++++ kde4libs/CreateKDELibsDependenciesFile.cmake 2013-09-04 11:31:32.128178914 +0000
+@@ -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})
@@ -29,7 +31,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 @@ endif (NOT KDE4_INSTALL_DIR)
+@@ -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}\")
@@ -37,9 +39,11 @@ libraries.
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
-@@ -871,6 +871,7 @@ else (WIN32)
+Index: kde4libs/cmake/modules/FindKDE4Internal.cmake
+===================================================================
+--- kde4libs.orig/cmake/modules/FindKDE4Internal.cmake 2013-09-04 11:31:32.144178278 +0000
++++ kde4libs/cmake/modules/FindKDE4Internal.cmake 2013-09-04 11:31:32.128178914 +0000
+@@ -871,6 +871,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)")
@@ -47,7 +51,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")
-@@ -1331,6 +1332,10 @@ if (CMAKE_C_COMPILER MATCHES "icc")
+@@ -1391,6 +1392,10 @@
endif (CMAKE_C_COMPILER MATCHES "icc")
@@ -58,9 +62,11 @@ libraries.
########### end of platform specific stuff ##########################
---- a/cmake/modules/KDE4Macros.cmake
-+++ b/cmake/modules/KDE4Macros.cmake
-@@ -834,6 +834,17 @@ macro (KDE4_ADD_KDEINIT_EXECUTABLE _targ
+Index: kde4libs/cmake/modules/KDE4Macros.cmake
+===================================================================
+--- kde4libs.orig/cmake/modules/KDE4Macros.cmake 2013-09-04 11:31:32.144178278 +0000
++++ kde4libs/cmake/modules/KDE4Macros.cmake 2013-09-04 11:31:32.132178755 +0000
+@@ -834,6 +834,17 @@
endif(NOT _res_position EQUAL -1)
endif (Q_WS_MAC)
kde4_add_executable(${_target_NAME} "${_nogui}" ${CMAKE_CURRENT_BINARY_DIR}/${_target_NAME}_dummy.cpp ${_resourcefile})
@@ -78,9 +84,11 @@ libraries.
target_link_libraries(${_target_NAME} kdeinit_${_target_NAME})
endif(WIN32)
---- a/kinit/CMakeLists.txt
-+++ b/kinit/CMakeLists.txt
-@@ -58,6 +58,17 @@ endif(Q_WS_X11)
+Index: kde4libs/kinit/CMakeLists.txt
+===================================================================
+--- kde4libs.orig/kinit/CMakeLists.txt 2013-09-04 11:31:32.144178278 +0000
++++ kde4libs/kinit/CMakeLists.txt 2013-09-04 11:31:32.132178755 +0000
+@@ -58,6 +58,17 @@
install(TARGETS kdeinit4 ${INSTALL_TARGETS_DEFAULT_ARGS} )
@@ -98,8 +106,10 @@ libraries.
########### 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 2013-09-04 11:31:32.144178278 +0000
++++ kde4libs/config-prefix.h.cmake 2013-09-04 11:31:32.132178755 +0000
@@ -12,6 +12,7 @@
#define __KDE_EXECPREFIX "NONE"
@@ -108,9 +118,11 @@ libraries.
#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
-@@ -144,6 +144,7 @@ int main(int argc, char **argv)
+Index: kde4libs/kdecore/kde-config.cpp
+===================================================================
+--- kde4libs.orig/kdecore/kde-config.cpp 2013-09-04 11:31:32.144178278 +0000
++++ kde4libs/kdecore/kde-config.cpp 2013-09-04 11:31:32.132178755 +0000
+@@ -144,6 +144,7 @@
"html", I18N_NOOP("HTML documentation"),
"icon", I18N_NOOP("Icons"),
"kcfg", I18N_NOOP("Configuration description files"),
@@ -118,9 +130,11 @@ libraries.
"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
-@@ -165,6 +165,8 @@ xdgconf-menu
+Index: kde4libs/kdecore/kernel/kstandarddirs.cpp
+===================================================================
+--- kde4libs.orig/kdecore/kernel/kstandarddirs.cpp 2013-09-04 11:31:32.144178278 +0000
++++ kde4libs/kdecore/kernel/kstandarddirs.cpp 2013-09-04 11:31:32.136178596 +0000
+@@ -165,6 +165,8 @@
menus
xdgconf-autostart
autostart
@@ -129,7 +143,7 @@ libraries.
*/
static const char types_string[] =
-@@ -219,6 +221,8 @@ static const char types_string[] =
+@@ -219,6 +221,8 @@
"menus
--
KDE Development Platform Libraries module packaging
More information about the pkg-kde-commits
mailing list