rev 12266 - in branches/kde4/packages/kdemultimedia/debian: . patches

Ana Beatriz Guerrero López ana at alioth.debian.org
Sat Sep 27 14:22:09 UTC 2008


Author: ana
Date: 2008-09-27 14:22:09 +0000 (Sat, 27 Sep 2008)
New Revision: 12266

Added:
   branches/kde4/packages/kdemultimedia/debian/patches/11_r849896_no_HAVE_CDDA_IOCTL_DEVICE.diff
Modified:
   branches/kde4/packages/kdemultimedia/debian/changelog
   branches/kde4/packages/kdemultimedia/debian/patches/series
Log:
11_r849896_no_HAVE_CDDA_IOCTL_DEVICE.diff is needed too


Modified: branches/kde4/packages/kdemultimedia/debian/changelog
===================================================================
--- branches/kde4/packages/kdemultimedia/debian/changelog	2008-09-27 14:10:12 UTC (rev 12265)
+++ branches/kde4/packages/kdemultimedia/debian/changelog	2008-09-27 14:22:09 UTC (rev 12266)
@@ -1,8 +1,8 @@
 kdemultimedia (4:4.1.2-0) UNRELEASED; urgency=low
 
   * New upstream release.
-  * Add patch  10_r865240_cdparanoia taken from KDE rev 865240 to build against 
-    cdparanoia 10.2.
+  * Add patches 10_r865240_cdparanoia to build against cdparanoia 10.2 and 
+    11_r849896_no_HAVE_CDDA_IOCTL_DEVICE
 
  -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Thu, 25 Sep 2008 23:10:35 +0200
 

Added: branches/kde4/packages/kdemultimedia/debian/patches/11_r849896_no_HAVE_CDDA_IOCTL_DEVICE.diff
===================================================================
--- branches/kde4/packages/kdemultimedia/debian/patches/11_r849896_no_HAVE_CDDA_IOCTL_DEVICE.diff	                        (rev 0)
+++ branches/kde4/packages/kdemultimedia/debian/patches/11_r849896_no_HAVE_CDDA_IOCTL_DEVICE.diff	2008-09-27 14:22:09 UTC (rev 12266)
@@ -0,0 +1,11 @@
+--- kdemultimedia-4.1.2.orig/kioslave/audiocd/audiocd.cpp
++++ kdemultimedia-4.1.2/kioslave/audiocd/audiocd.cpp
+@@ -217,7 +217,7 @@
+ #if defined(HAVE_CDDA_IOCTL_DEVICE)
+ 	if (d->cd.deviceName() != drive->ioctl_device_name)
+ 		d->cd.setDevice(drive->ioctl_device_name, 50, false);
+-#else
++#elif (defined __FreeBSD__)
+ 	// FreeBSD's cdparanoia as of january 5th 2006 has rather broken
+ 	// support for non-SCSI devices. Although it finds ATA cdroms just
+ 	// fine, there is no straightforward way to discover the device

Modified: branches/kde4/packages/kdemultimedia/debian/patches/series
===================================================================
--- branches/kde4/packages/kdemultimedia/debian/patches/series	2008-09-27 14:10:12 UTC (rev 12265)
+++ branches/kde4/packages/kdemultimedia/debian/patches/series	2008-09-27 14:22:09 UTC (rev 12266)
@@ -1,2 +1,3 @@
 10_r865240_cdparanoia.diff
+11_r849896_no_HAVE_CDDA_IOCTL_DEVICE.diff
 97_fix_target_link_libraries.diff




More information about the pkg-kde-commits mailing list