[SCM] KDE Development Platform Libraries module packaging branch, master, updated. debian/4.10.5-1

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde4libs.git;a=commitdiff;h=047bc6d

The following commit has been merged in the master branch:
commit 047bc6d3a7ac17d97b831b2281f059b9573ed182
Author: Sune Vuorela <sune at vuorela.dk>
Date:   Sun Apr 7 22:54:29 2013 +0000

    refresh patches
---
 debian/patches/hurd_support.diff     |    4 ++--
 debian/patches/kfreebsd_support.diff |   14 +++++++-------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/debian/patches/hurd_support.diff b/debian/patches/hurd_support.diff
index 7b68acf..a1a5a06 100644
--- a/debian/patches/hurd_support.diff
+++ b/debian/patches/hurd_support.diff
@@ -34,8 +34,8 @@ Last-Update: 2012-10-01
  int build_link(const char* tmp, const char *tmp_prefix, const char *kde_prefix);
 --- a/cmake/modules/FindKDE4Internal.cmake
 +++ b/cmake/modules/FindKDE4Internal.cmake
-@@ -1220,8 +1220,8 @@ if (CMAKE_COMPILER_IS_GNUCXX)
-    endif (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU)
+@@ -1220,8 +1220,8 @@
+    endif (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU OR CMAKE_SYSTEM_NAME MATCHES kFreeBSD)
  
     if (CMAKE_SYSTEM_NAME STREQUAL GNU)
 -      set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -pthread")
diff --git a/debian/patches/kfreebsd_support.diff b/debian/patches/kfreebsd_support.diff
index 5a6ff9f..e253936 100644
--- a/debian/patches/kfreebsd_support.diff
+++ b/debian/patches/kfreebsd_support.diff
@@ -5,7 +5,7 @@ cmake.
 
 --- a/ConfigureChecks.cmake
 +++ b/ConfigureChecks.cmake
-@@ -138,11 +138,11 @@ if (UNIX)
+@@ -138,11 +138,11 @@
          set(UTIL_LIBRARY util)
        endif (login_in_libutil)
      endif (NOT login_in_libc)
@@ -22,7 +22,7 @@ cmake.
        if (login_in_libutil)
 --- a/kio/kfile/kpropertiesdialog.cpp
 +++ b/kio/kfile/kpropertiesdialog.cpp
-@@ -1901,7 +1901,15 @@ static bool fileSystemSupportsACL( const
+@@ -1901,7 +1901,15 @@
      fileSystemSupportsACLs = ( statfs( path.data(), &buf ) == 0 ) && ( buf.f_flags & MNT_ACLS );
  #else
      fileSystemSupportsACLs =
@@ -41,7 +41,7 @@ cmake.
  }
 --- a/kioslave/file/file.cpp
 +++ b/kioslave/file/file.cpp
-@@ -310,8 +310,10 @@ void FileProtocol::get( const KUrl& url
+@@ -310,8 +310,10 @@
      }
  
  #if HAVE_FADVISE
@@ -54,7 +54,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
-@@ -145,8 +145,10 @@ void FileProtocol::copy( const KUrl &src
+@@ -145,8 +145,10 @@
      }
  
  #if HAVE_FADVISE
@@ -65,7 +65,7 @@ cmake.
      // WABA: Make sure that we keep writing permissions ourselves,
      // otherwise we can be in for a surprise on NFS.
      mode_t initialMode;
-@@ -168,8 +170,10 @@ void FileProtocol::copy( const KUrl &src
+@@ -168,8 +170,10 @@
      }
  
  #if HAVE_FADVISE
@@ -78,7 +78,7 @@ cmake.
      acl = acl_get_fd(src_fd);
 --- a/kpty/kpty.cpp
 +++ b/kpty/kpty.cpp
-@@ -109,24 +109,24 @@ extern "C" {
+@@ -109,24 +109,24 @@
  # define _NEW_TTY_CTRL
  #endif
  
@@ -150,4 +150,4 @@ cmake.
 +   endif (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU OR CMAKE_SYSTEM_NAME MATCHES kFreeBSD)
  
     if (CMAKE_SYSTEM_NAME STREQUAL GNU)
-       set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -pthread -Wl,--no-fatal-warnings")
+       set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -pthread")

-- 
KDE Development Platform Libraries module packaging