[SCM] KDE Development Platform Libraries module packaging branch, kde4.10, updated. debian/4.8.4-3-36-ge391494
José Manuel Santamaría Lema
santa-guest at alioth.debian.org
Thu Jan 31 22:40:12 UTC 2013
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde4libs.git;a=commitdiff;h=e391494
The following commit has been merged in the kde4.10 branch:
commit e391494ecf8573997a29c2cd818d689feeff72d0
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date: Thu Jan 31 20:22:10 2013 +0100
Refresh some patches to make them apply without any offset.
---
debian/patches/add_dlrestrictions_support.diff | 6 +++---
debian/patches/hardcode_ptm_device.diff | 2 +-
debian/patches/kfreebsd_support.diff | 8 ++++----
debian/patches/ld_exclude_libs_qtuitools.diff | 2 +-
4 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/debian/patches/add_dlrestrictions_support.diff b/debian/patches/add_dlrestrictions_support.diff
index 455d58d..51a24d4 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
-@@ -1041,10 +1041,14 @@ macro (KDE4_ADD_LIBRARY _target_NAME _li
+@@ -1054,10 +1054,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})
-@@ -1351,6 +1355,13 @@ function(KDE4_INSTALL_AUTH_ACTIONS HELPE
+@@ -1368,6 +1372,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 @@ kde4_add_library(kdecore ${LIBRARY_TYPE}
+@@ -411,6 +411,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})
diff --git a/debian/patches/hardcode_ptm_device.diff b/debian/patches/hardcode_ptm_device.diff
index 276359e..9f1df94 100644
--- a/debian/patches/hardcode_ptm_device.diff
+++ b/debian/patches/hardcode_ptm_device.diff
@@ -6,7 +6,7 @@ Bypass build time check as /dev/ptmx is alsways present at runtime.
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
-@@ -186,13 +186,7 @@ if (UNIX)
+@@ -176,13 +176,7 @@ if (UNIX)
set(HAVE_OPENPTY)
execute_process(
diff --git a/debian/patches/kfreebsd_support.diff b/debian/patches/kfreebsd_support.diff
index c3e8c78..20cfbd2 100644
--- a/debian/patches/kfreebsd_support.diff
+++ b/debian/patches/kfreebsd_support.diff
@@ -12,7 +12,7 @@ cmake.
--- a/ConfigureChecks.cmake
+++ b/ConfigureChecks.cmake
-@@ -148,11 +148,11 @@ if (UNIX)
+@@ -138,11 +138,11 @@ if (UNIX)
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
-@@ -1903,7 +1903,15 @@ static bool fileSystemSupportsACL( const
+@@ -1901,7 +1901,15 @@ static bool fileSystemSupportsACL( const
fileSystemSupportsACLs = ( statfs( path.data(), &buf ) == 0 ) && ( buf.f_flags & MNT_ACLS );
#else
fileSystemSupportsACLs =
@@ -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
-@@ -156,8 +156,10 @@ void FileProtocol::copy( const KUrl &src
+@@ -145,8 +145,10 @@ void FileProtocol::copy( const KUrl &src
}
#if 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;
-@@ -179,8 +181,10 @@ void FileProtocol::copy( const KUrl &src
+@@ -168,8 +170,10 @@ void FileProtocol::copy( const KUrl &src
}
#if HAVE_FADVISE
diff --git a/debian/patches/ld_exclude_libs_qtuitools.diff b/debian/patches/ld_exclude_libs_qtuitools.diff
index 61941f9..4f56935 100644
--- a/debian/patches/ld_exclude_libs_qtuitools.diff
+++ b/debian/patches/ld_exclude_libs_qtuitools.diff
@@ -5,7 +5,7 @@ Forwarded: not-needed
--- a/plasma/CMakeLists.txt
+++ b/plasma/CMakeLists.txt
-@@ -270,6 +270,9 @@ target_link_libraries(plasma ${QT_QTUITO
+@@ -282,6 +282,9 @@ target_link_libraries(plasma ${QT_QTUITO
${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})
--
KDE Development Platform Libraries module packaging
More information about the pkg-kde-commits
mailing list