rev 16829 - in kde-extras/k3b/trunk/debian: . patches

[Fathi Boudra]

Author: fabo
Date: 2010-02-08 15:09:48 +0000 (Mon, 08 Feb 2010)
New Revision: 16829

Added:
   kde-extras/k3b/trunk/debian/patches/114_fix_ftbfs_kfreebsd.diff
Modified:
   kde-extras/k3b/trunk/debian/changelog
   kde-extras/k3b/trunk/debian/patches/113_add_kfreebsd_support.diff
   kde-extras/k3b/trunk/debian/patches/series
Log:
Fix ftbfs on kFreeBSD. Thanks to Pino for hints.


Modified: kde-extras/k3b/trunk/debian/changelog
===================================================================
--- kde-extras/k3b/trunk/debian/changelog	2010-02-08 15:08:17 UTC (rev 16828)
+++ kde-extras/k3b/trunk/debian/changelog	2010-02-08 15:09:48 UTC (rev 16829)
@@ -1,3 +1,12 @@
+k3b (1.70.0~beta1-2) unstable; urgency=low
+
+  * Fix ftbfs on kFreeBSD:
+    - update 113_add_kfreebsd_support.diff patch for libcam link failure.
+    - add 114_fix_ftbfs_kfreebsd.diff - stolen upstream.
+      the last argument is always required.
+
+ -- Fathi Boudra <fabo at debian.org>  Mon, 08 Feb 2010 12:46:16 +0100
+
 k3b (1.70.0~beta1-1) unstable; urgency=low
 
   * New upstream release.

Modified: kde-extras/k3b/trunk/debian/patches/113_add_kfreebsd_support.diff
===================================================================
--- kde-extras/k3b/trunk/debian/patches/113_add_kfreebsd_support.diff	2010-02-08 15:08:17 UTC (rev 16828)
+++ kde-extras/k3b/trunk/debian/patches/113_add_kfreebsd_support.diff	2010-02-08 15:09:48 UTC (rev 16829)
@@ -14,3 +14,16 @@
  #ifdef Q_OS_FREEBSD
  struct cam_device;
  #endif
+--- a/libk3bdevice/CMakeLists.txt
++++ b/libk3bdevice/CMakeLists.txt
+@@ -29,6 +29,10 @@ target_link_libraries(k3bdevice
+   ${KDE4_SOLID_LIBS}
+ )
+ 
++if (CMAKE_SYSTEM_NAME MATCHES "kFreeBSD")
++  target_link_libraries(k3bdevice cam)
++endif (CMAKE_SYSTEM_NAME MATCHES "kFreeBSD")
++
+ set_target_properties(k3bdevice PROPERTIES VERSION ${K3B_LIB_VERSION_MAJOR}.${K3B_LIB_VERSION_MINOR}.${K3B_LIB_VERSION_RELEASE} SOVERSION ${K3B_LIB_VERSION_MAJOR})
+ install(TARGETS k3bdevice ${INSTALL_TARGETS_DEFAULT_ARGS} )
+ 

Added: kde-extras/k3b/trunk/debian/patches/114_fix_ftbfs_kfreebsd.diff
===================================================================
--- kde-extras/k3b/trunk/debian/patches/114_fix_ftbfs_kfreebsd.diff	                        (rev 0)
+++ kde-extras/k3b/trunk/debian/patches/114_fix_ftbfs_kfreebsd.diff	2010-02-08 15:09:48 UTC (rev 16829)
@@ -0,0 +1,18 @@
+Description: Fix build on non-Linux platforms -- the last argument is always required.
+             SVN commit 1085713 and 1085714
+Author: Raphael Kubo da Costa <kubito at gmail.com>
+
+--- a/src/k3bsystemproblemdialog.cpp
++++ b/src/k3bsystemproblemdialog.cpp
+@@ -175,8 +175,10 @@ void K3b::SystemProblemDialog::checkSyst
+         problems.append( K3b::SystemProblem( K3b::SystemProblem::CRITICAL,
+                                            i18n("No optical drive found."),
+                                            i18n("K3b did not find any optical device in your system."),
+-#ifdef Q_OS_LINUX
++#if defined(Q_OS_LINUX) || defined(Q_OS_FREEBSD)
+                                            i18n("Make sure HAL daemon is running, it is used by K3b for finding devices.")
++#else
++                                           QString()
+ #endif
+                                            ) );
+     }

Modified: kde-extras/k3b/trunk/debian/patches/series
===================================================================
--- kde-extras/k3b/trunk/debian/patches/series	2010-02-08 15:08:17 UTC (rev 16828)
+++ kde-extras/k3b/trunk/debian/patches/series	2010-02-08 15:09:48 UTC (rev 16829)
@@ -5,3 +5,4 @@
 111_advice_debian_libk3b3-extracodes.diff
 112_dont_require_mp3.diff
 113_add_kfreebsd_support.diff
+114_fix_ftbfs_kfreebsd.diff