[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=83a1b7f

The following commit has been merged in the master branch:
commit 83a1b7f00df706497801cffe1cf22306b60e6f3b
Author: Pino Toscano <pino at debian.org>
Date:   Sun Apr 7 21:23:34 2013 +0200

    kfreebsd_support.diff: extend with linux/hurd C-/CXX-/LD-FLAGS
---
 debian/changelog                     |    2 ++
 debian/patches/kfreebsd_support.diff |   49 +++++++++++++++++++++++++++-------
 2 files changed, 41 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 76abc29..84b850b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ kde4libs (4:4.10.2-2) UNRELEASED; urgency=low
     building on Hurd; patch upstream_Remove-extra-sys-mount.h-include.patch.
   * Make kdelibs-bin conflict with kdelibs4c2a, since now it provides
     kmailservice/ktelnetservice in /usr/bin. (Closes: #704669)
+  * Extend patch kfreebsd_support.diff with the addition on GNU/kFreeBSD of the
+    C-/CXX-/LD-FLAGS used on Linux and Hurd too.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 03 Apr 2013 20:15:12 +0200
 
diff --git a/debian/patches/kfreebsd_support.diff b/debian/patches/kfreebsd_support.diff
index 20cfbd2..5a6ff9f 100644
--- a/debian/patches/kfreebsd_support.diff
+++ b/debian/patches/kfreebsd_support.diff
@@ -2,13 +2,6 @@ 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. 
----
- ConfigureChecks.cmake           |    6 +++---
- kio/kfile/kpropertiesdialog.cpp |   10 +++++++++-
- kioslave/file/file.cpp          |    2 ++
- kioslave/file/file_unix.cpp     |    4 ++++
- kpty/kpty.cpp                   |   24 ++++++++++++------------
- 5 files changed, 30 insertions(+), 16 deletions(-)
 
 --- a/ConfigureChecks.cmake
 +++ b/ConfigureChecks.cmake
@@ -17,13 +10,13 @@ cmake.
        endif (login_in_libutil)
      endif (NOT login_in_libc)
 -    if (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME MATCHES Darwin OR CMAKE_SYSTEM_NAME MATCHES GNU/FreeBSD OR CMAKE_SYSTEM_NAME STREQUAL GNU)
-+    if (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME MATCHES Darwin OR CMAKE_SYSTEM_NAME MATCHES GNU/FreeBSD OR CMAKE_SYSTEM_NAME STREQUAL GNU  OR CMAKE_SYSTEM_NAME MATCHES kFreeBSD)
++    if (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME MATCHES Darwin OR CMAKE_SYSTEM_NAME MATCHES GNU/FreeBSD OR CMAKE_SYSTEM_NAME STREQUAL GNU OR CMAKE_SYSTEM_NAME MATCHES kFreeBSD)
        set (HAVE_UTMPX)
 -    else (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME MATCHES Darwin OR CMAKE_SYSTEM_NAME MATCHES GNU/FreeBSD OR CMAKE_SYSTEM_NAME STREQUAL GNU)
-+    else (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME MATCHES Darwin OR CMAKE_SYSTEM_NAME MATCHES GNU/FreeBSD OR CMAKE_SYSTEM_NAME STREQUAL GNU  OR CMAKE_SYSTEM_NAME MATCHES kFreeBSD)
++    else (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME MATCHES Darwin OR CMAKE_SYSTEM_NAME MATCHES GNU/FreeBSD OR CMAKE_SYSTEM_NAME STREQUAL GNU OR CMAKE_SYSTEM_NAME MATCHES kFreeBSD)
        check_function_exists(getutxent HAVE_UTMPX)
 -    endif (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME MATCHES Darwin OR CMAKE_SYSTEM_NAME MATCHES GNU/FreeBSD OR CMAKE_SYSTEM_NAME STREQUAL GNU)
-+    endif (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME MATCHES Darwin OR CMAKE_SYSTEM_NAME MATCHES GNU/FreeBSD OR CMAKE_SYSTEM_NAME STREQUAL GNU  OR CMAKE_SYSTEM_NAME MATCHES kFreeBSD)
++    endif (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME MATCHES Darwin OR CMAKE_SYSTEM_NAME MATCHES GNU/FreeBSD OR CMAKE_SYSTEM_NAME STREQUAL GNU OR CMAKE_SYSTEM_NAME MATCHES kFreeBSD)
      if (HAVE_UTMPX)
        set(utmp utmpx)
        if (login_in_libutil)
@@ -122,3 +115,39 @@ cmake.
  #endif
  
  #include <kdebug.h>
+--- a/cmake/modules/FindKDE4Internal.cmake
++++ b/cmake/modules/FindKDE4Internal.cmake
+@@ -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)
+       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 @@
+       set ( CMAKE_SHARED_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_SHARED_LINKER_FLAGS}")
+       set ( CMAKE_MODULE_LINKER_FLAGS "-Wl,--fatal-warnings -Wl,--no-undefined -lc ${CMAKE_MODULE_LINKER_FLAGS}")
+    endif (CMAKE_C_COMPILER MATCHES "icc")
+-endif (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU)
++endif (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU OR CMAKE_SYSTEM_NAME MATCHES kFreeBSD)
+ 
+ if (UNIX)
+    set ( _KDE4_PLATFORM_DEFINITIONS "${_KDE4_PLATFORM_DEFINITIONS} -D_LARGEFILE64_SOURCE")
+@@ -1211,13 +1211,13 @@
+    # As of Qt 4.6.x we need to override the new exception macros if we want compile with -fno-exceptions
+    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-exceptions -DQT_NO_EXCEPTIONS -fno-check-new -fno-common")
+ 
+-   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)
+      # This should not be needed, as it is also part of _KDE4_PLATFORM_DEFINITIONS below.
+      # It is kept here nonetheless both for backwards compatibility in case one does not use add_definitions(${KDE4_DEFINITIONS})
+      # and also because it is/was needed by glibc for snprintf to be available when building C files.
+      # See commit 4a44862b2d178c1d2e1eb4da90010d19a1e4a42c.
+      add_definitions (-D_BSD_SOURCE)
+-   endif (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU)
++   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")

-- 
KDE Development Platform Libraries module packaging