[SCM] libkcompactdisc packaging branch, master, updated. debian/4.10.2-2-3-g513518d

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/libkcompactdisc.git;a=commitdiff;h=513518d

The following commit has been merged in the master branch:
commit 513518d567decc8ccff2d14be4039e531d6a30da
Author: Pino Toscano <pino at debian.org>
Date:   Tue Apr 9 12:15:02 2013 +0200

    properly link to pthread when wmlib is used
    
    backport upstream commit 943938c09e2fe44e5a20804be8ba18e72bc6d730
---
 debian/changelog                                   |    4 +++
 debian/patches/fix_target_link_libraries.diff      |   11 --------
 debian/patches/series                              |    2 +-
 ..._cmake-link-to-pthread-when-wmlib-is-used.patch |   27 ++++++++++++++++++++
 4 files changed, 32 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3fef0a1..8170a8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ libkcompactdisc (4:4.10.2-3) UNRELEASED; urgency=low
   * Instead of just removing the sys/mount.h include from plat_freebsd.c,
     replace it with sys/statfs.h; replace patch kfreebsd_extra_include.diff
     with kfreebsd_include.diff.
+  * Backport upstream commit 943938c09e2fe44e5a20804be8ba18e72bc6d730 to
+    properly link to pthread when wmlib is used; the new patch
+    upstream_cmake-link-to-pthread-when-wmlib-is-used.patch replaces patch
+    fix_target_link_libraries.diff.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 09 Apr 2013 10:27:24 +0200
 
diff --git a/debian/patches/fix_target_link_libraries.diff b/debian/patches/fix_target_link_libraries.diff
deleted file mode 100644
index c584777..0000000
--- a/debian/patches/fix_target_link_libraries.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -59,7 +59,7 @@ endif (USE_WMLIB)
- 
- kde4_add_library(kcompactdisc SHARED ${kcompactdisc_LIB_SRCS})
- 
--target_link_libraries(kcompactdisc ${KDE4_KDECORE_LIBS} ${KDE4_PHONON_LIBS} ${KDE4_SOLID_LIBS})
-+target_link_libraries(kcompactdisc ${KDE4_KDECORE_LIBS} ${KDE4_PHONON_LIBS} ${KDE4_SOLID_LIBS} ${CMAKE_THREAD_LIBS_INIT})
- if (HAVE_LIBASOUND2)
-     target_link_libraries(kcompactdisc ${ASOUND_LIBRARY})
- endif (HAVE_LIBASOUND2)
diff --git a/debian/patches/series b/debian/patches/series
index 7367c2f..0dc21d0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-fix_target_link_libraries.diff
+upstream_cmake-link-to-pthread-when-wmlib-is-used.patch
 upstream_disable-wmlib-on-GNU-Hurd.patch
 kfreebsd_include.diff
diff --git a/debian/patches/upstream_cmake-link-to-pthread-when-wmlib-is-used.patch b/debian/patches/upstream_cmake-link-to-pthread-when-wmlib-is-used.patch
new file mode 100644
index 0000000..7d76d82
--- /dev/null
+++ b/debian/patches/upstream_cmake-link-to-pthread-when-wmlib-is-used.patch
@@ -0,0 +1,27 @@
+From 943938c09e2fe44e5a20804be8ba18e72bc6d730 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino at kde.org>
+Date: Tue, 9 Apr 2013 12:02:26 +0200
+Subject: [PATCH] cmake: link to pthread when wmlib is used
+
+wmlib explicitly uses pthread, so make sure to link to it without relying on something else
+---
+ CMakeLists.txt |    3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 59aeaa5..1ab8721 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -63,6 +63,9 @@ target_link_libraries(kcompactdisc ${KDE4_KDECORE_LIBS} ${KDE4_PHONON_LIBS} ${KD
+ if (HAVE_LIBASOUND2)
+     target_link_libraries(kcompactdisc ${ASOUND_LIBRARY})
+ endif (HAVE_LIBASOUND2)
++if (USE_WMLIB)
++    target_link_libraries(kcompactdisc ${CMAKE_THREAD_LIBS_INIT})
++endif (USE_WMLIB)
+ 
+ set_target_properties(kcompactdisc PROPERTIES VERSION ${GENERIC_LIB_VERSION} SOVERSION ${GENERIC_LIB_SOVERSION} )
+ 
+-- 
+1.7.10.4
+

-- 
libkcompactdisc packaging