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

[Pino Toscano]

The following commit has been merged in the master branch:
commit a93b2b002351502b40a77d004c83ff882de44bcc
Author: Pino Toscano <pino at kde.org>
Date:   Mon May 30 00:23:58 2011 +0200

    hurd_support.diff: do not turn the linker warnings as errors
---
 debian/changelog                 |    1 +
 debian/patches/hurd_support.diff |   16 ++++++++++++++++
 2 files changed, 17 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a7ca097..64be6be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ kde4libs (4:4.6.3-2) UNRELEASED; urgency=low
   [ Pino Toscano ]
   * Drop the go.xml kate syntax highlighting, as kate-syntax-go will provide
     it. (Closes: #628161)
+  * hurd_support.diff: do not turn the linker warnings as errors.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 29 May 2011 11:13:46 +0200
 
diff --git a/debian/patches/hurd_support.diff b/debian/patches/hurd_support.diff
index 06d7aa6..d19c64e 100644
--- a/debian/patches/hurd_support.diff
+++ b/debian/patches/hurd_support.diff
@@ -2,7 +2,10 @@ Author: Pino Toscano <pino at kde.org>
 Description: preliminary GNU/Hurd support
  Adds "support" for GNU/Hurd by defining MAXPATHLEN and PATH_MAX where needed.
  Not forwarded, better fixes should be done upstream.
+ Also disable the fatal warnings for the linker, as we might hit symbols
+ which are not implemented and will always fail.
 Forwarded: no
+Last-Update: 2011-05-30
 --- a/kdecore/kernel/kstandarddirs.cpp
 +++ b/kdecore/kernel/kstandarddirs.cpp
 @@ -73,6 +73,10 @@
@@ -29,3 +32,16 @@ Forwarded: no
  int check_tmp_dir(const char *tmp_dir, int check_ownership);
  int create_link(const char *file, const char *tmp_dir);
  int build_link(const char* tmp, const char *tmp_prefix, const char *kde_prefix);
+--- a/cmake/modules/FindKDE4Internal.cmake
++++ b/cmake/modules/FindKDE4Internal.cmake
+@@ -1218,8 +1218,8 @@ if (CMAKE_COMPILER_IS_GNUCXX)
+    endif (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU)
+ 
+    if (CMAKE_SYSTEM_NAME STREQUAL GNU)
+-      set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -pthread")
+-      set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -pthread")
++      set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -pthread -Wl,--no-fatal-warnings")
++      set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -pthread -Wl,--no-fatal-warnings")
+    endif (CMAKE_SYSTEM_NAME STREQUAL GNU)
+ 
+    # gcc under Windows

-- 
KDE Development Platform Libraries module packaging