Update k3b to 1.0.3

pkgsrc change: include patch from PR kern/36030 to work around a problem
that can cause NetBSD to panic or just not read a CD.

1.0.3
=====
 * Reverted to old behaviour of reloading medium before verification. Not
   enough testing had been done before introducing this and some systems
   fail to read the medium before reload.
 * Do not crash when the currently playing audio project item is removed.
 * Added desktop actions to handle empty media with K3b.
 * Fixed read retry when reading data tracks
 * K3b's dialogs now honor the global button layout setting
 * Do not crash on mp3 files without tags if compiled with taglib support
 * Do not allow to copy a rewritable media to itself.
 * Fixed crash on startup with devices that return bogus GET PERFORMANCE
   data

1.0.2
=====
 * Properly determine the capacity of complete CD-R(W) media.
 * Mark a data project as modified if files are renamed.
 * Allow adding of all actions to the welcome window
 * Added "NoDisplay=true" property to k3b-cue.desktop and k3b-iso.desktop
 * Fixed supported write speed detection on some devices
 * No reload before verification and between writing sessions (CD copy +
   Mixed Mode CD) anymore

5 files changed, 52 insertions, 26 deletions

diff --git a/sysutils/k3b/Makefile b/sysutils/k3b/Makefile
index db699ebdfab..ff6cf4820e9 100644
--- a/sysutils/k3b/Makefile
+++ b/sysutils/k3b/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.20 2007/05/23 12:38:23 markd Exp $
+# $NetBSD: Makefile,v 1.21 2007/07/25 02:33:03 markd Exp $
 #
 
-DISTNAME=		k3b-1.0.1
-PKGREVISION=		1
+DISTNAME=		k3b-1.0.3
 CATEGORIES=		sysutils
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=k3b/}
 EXTRACT_SUFX=		.tar.bz2
diff --git a/sysutils/k3b/PLIST b/sysutils/k3b/PLIST
index c2af5624f5f..33abd0f3233 100644
--- a/sysutils/k3b/PLIST
+++ b/sysutils/k3b/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2007/03/18 13:25:56 markd Exp $
+@comment $NetBSD: PLIST,v 1.7 2007/07/25 02:33:03 markd Exp $
 bin/k3b
 bin/k3bsetup
 include/k3b_export.h
@@ -355,6 +355,8 @@ share/kde/apps/konqsidebartng/virtual_folders/services/videodvd.desktop
 share/kde/apps/konqueror/servicemenus/k3b_audiocd_rip.desktop
 share/kde/apps/konqueror/servicemenus/k3b_cd_copy.desktop
 share/kde/apps/konqueror/servicemenus/k3b_dvd_copy.desktop
+share/kde/apps/konqueror/servicemenus/k3b_handle_empty_cd.desktop
+share/kde/apps/konqueror/servicemenus/k3b_handle_empty_dvd.desktop
 share/kde/apps/konqueror/servicemenus/k3b_videodvd_rip.desktop
 share/kde/mimelnk/application/x-k3b.desktop
 share/kde/services/kfile_k3b.desktop
diff --git a/sysutils/k3b/distinfo b/sysutils/k3b/distinfo
index 3096268ac6e..d1dd59f20de 100644
--- a/sysutils/k3b/distinfo
+++ b/sysutils/k3b/distinfo
@@ -1,8 +1,9 @@
-$NetBSD: distinfo,v 1.13 2007/05/23 12:38:23 markd Exp $
+$NetBSD: distinfo,v 1.14 2007/07/25 02:33:03 markd Exp $
 
-SHA1 (k3b-1.0.1.tar.bz2) = 5473aeaf974ba058d2f9124b0314b64838d0e2bd
-RMD160 (k3b-1.0.1.tar.bz2) = e4eeab9bec1a2ac222ed91fd6688a3c272ec7670
-Size (k3b-1.0.1.tar.bz2) = 5097997 bytes
+SHA1 (k3b-1.0.3.tar.bz2) = cf9eee45eebd280a069c7f94924237bdec6bbd06
+RMD160 (k3b-1.0.3.tar.bz2) = b51dcc8cd0bd4c0b1e9b97221596360a9d6be2f1
+Size (k3b-1.0.3.tar.bz2) = 5092806 bytes
 SHA1 (patch-ab) = 4f382751e9a7ade09aad6f8d594e76f9e5bfa5d5
 SHA1 (patch-ac) = 38902921193ff0219c1769ffa3b793de6f3f4c0c
-SHA1 (patch-ad) = ec7e75ff39bf7ea7aeddcd44c77a14b8aeca2892
+SHA1 (patch-ad) = 9a1a14ee1ffb9dc46af5fe372f8fa672d87ac1f0
+SHA1 (patch-ae) = d5fb26c88710b9cdf14e19aa530f60e429b47941
diff --git a/sysutils/k3b/patches/patch-ad b/sysutils/k3b/patches/patch-ad
index 16ecbe3abc5..5d07d15075d 100644
--- a/sysutils/k3b/patches/patch-ad
+++ b/sysutils/k3b/patches/patch-ad
@@ -1,20 +1,28 @@
-$NetBSD: patch-ad,v 1.3 2007/05/23 12:38:23 markd Exp $
+$NetBSD: patch-ad,v 1.4 2007/07/25 02:33:03 markd Exp $
 
---- libk3bdevice/k3bscsicommand_netbsd.cpp.orig	2007-05-22 12:15:54.000000000 +1200
-+++ libk3bdevice/k3bscsicommand_netbsd.cpp
-@@ -83,9 +83,13 @@ int K3bDevice::ScsiCommand::transport( T
-       break;
-   }
+--- libk3bdevice/k3bdevicemanager.cpp.orig	2007-07-23 23:18:12.000000000 +1200
++++ libk3bdevice/k3bdevicemanager.cpp
+@@ -99,6 +99,7 @@ typedef unsigned char u8;
  
--  m_device->usageLock();
-+  if ( m_device ) {
-+      m_device->usageLock();
-+  }
-   int i = ::ioctl( m_deviceHandle, SCIOCCOMMAND, &d->cmd );
--  m_device->usageUnlock();
-+  if ( m_device ) {
-+      m_device->usageUnlock();
-+  }
+ #ifdef Q_OS_NETBSD
+ #include <sys/scsiio.h>
++#include <util.h>
+ #endif
+ 
+ 
+@@ -324,14 +325,7 @@ void K3bDevice::DeviceManager::NetBSDDev
+ 
+   int   i;
+ 
+-  // Whole disk mask (According to cd(4), the AMD64, i386 and BeBox ports use
+-  // 'd' as whole-disk partition, the rest uses 'c'.)
+-
+-#if defined(__i386__) || defined (__amd64__) || defined (__bebox__)
+-  static const char slicename = 'd';
+-#else
+-  static const char slicename = 'c';
+-#endif
++  static char slicename = 'a' + getrawpartition();
+ 
+   char devicename[11]; // /dev/rcdXd + trailing zero
  
-   if( needToClose )
-     m_device->close();
diff --git a/sysutils/k3b/patches/patch-ae b/sysutils/k3b/patches/patch-ae
new file mode 100644
index 00000000000..9703ddfe3ff
--- /dev/null
+++ b/sysutils/k3b/patches/patch-ae
@@ -0,0 +1,16 @@
+$NetBSD: patch-ae,v 1.3 2007/07/25 02:33:03 markd Exp $
+
+--- libk3b/jobs/k3bdatatrackreader.cpp.orig	2007-06-24 06:35:52.000000000 +1200
++++ libk3b/jobs/k3bdatatrackreader.cpp
+@@ -219,7 +219,11 @@ void K3bDataTrackReader::WorkThread::run
+   //
+   m_device->setSpeed( 0xffff, 0xffff );
+ 
++#ifdef __NetBSD__
++  s_bufferSizeSectors = 31;
++#else
+   s_bufferSizeSectors = 128;
++#endif
+   unsigned char* buffer = new unsigned char[m_usedSectorSize*s_bufferSizeSectors];
+   while( s_bufferSizeSectors > 0 && read( buffer, m_firstSector.lba(), s_bufferSizeSectors ) < 0 ) {
+     kdDebug() << "(K3bDataTrackReader) determine max read sectors: "