diff --git a/multimedia/k3b/patches/patch-libk3bdevice_k3bdevice_cpp b/multimedia/k3b/patches/patch-libk3bdevice_k3bdevice_cpp index 4df952a843c..a43a7b32621 100644 --- a/multimedia/k3b/patches/patch-libk3bdevice_k3bdevice_cpp +++ b/multimedia/k3b/patches/patch-libk3bdevice_k3bdevice_cpp @@ -1,16 +1,18 @@ -$OpenBSD: patch-libk3bdevice_k3bdevice_cpp,v 1.1.1.1 2008/05/11 22:18:35 jakemsr Exp $ ---- libk3bdevice/k3bdevice.cpp.orig Fri Nov 2 07:13:54 2007 -+++ libk3bdevice/k3bdevice.cpp Fri Feb 1 09:15:37 2008 -@@ -65,7 +65,7 @@ typedef unsigned char u8; +$OpenBSD: patch-libk3bdevice_k3bdevice_cpp,v 1.2 2010/05/20 15:24:24 naddy Exp $ +--- libk3bdevice/k3bdevice.cpp.orig Fri Nov 2 08:13:54 2007 ++++ libk3bdevice/k3bdevice.cpp Thu May 20 09:06:54 2010 +@@ -65,8 +65,9 @@ typedef unsigned char u8; #define CD_FRAMESIZE_RAW 2352 #endif -#ifdef Q_OS_NETBSD +#if defined(Q_OS_NETBSD) || defined(Q_OS_OPENBSD) #include ++#include #endif -@@ -106,7 +106,7 @@ const char* K3bDevice::Device::cdrdao_drivers[] = + #ifdef HAVE_RESMGR +@@ -106,7 +107,7 @@ const char* K3bDevice::Device::cdrdao_drivers[] = }; @@ -19,7 +21,7 @@ $OpenBSD: patch-libk3bdevice_k3bdevice_cpp,v 1.1.1.1 2008/05/11 22:18:35 jakemsr int K3bDevice::openDevice( const char* name, bool write ) { int fd = -1; -@@ -149,7 +149,7 @@ class K3bDevice::Device::Private (public) +@@ -149,7 +150,7 @@ class K3bDevice::Device::Private (public) #ifdef Q_OS_LINUX deviceFd(-1), #endif @@ -28,7 +30,7 @@ $OpenBSD: patch-libk3bdevice_k3bdevice_cpp,v 1.1.1.1 2008/05/11 22:18:35 jakemsr deviceFd(-1), #endif #ifdef Q_OS_FREEBSD -@@ -166,7 +166,7 @@ class K3bDevice::Device::Private (public) +@@ -166,7 +167,7 @@ class K3bDevice::Device::Private (public) #ifdef Q_OS_LINUX int deviceFd; #endif @@ -37,7 +39,7 @@ $OpenBSD: patch-libk3bdevice_k3bdevice_cpp,v 1.1.1.1 2008/05/11 22:18:35 jakemsr int deviceFd; #endif #ifdef Q_OS_FREEBSD -@@ -1494,7 +1494,7 @@ bool K3bDevice::Device::block( bool b ) const +@@ -1494,7 +1495,7 @@ bool K3bDevice::Device::block( bool b ) const usageUnlock(); if ( success ) return success; @@ -46,7 +48,7 @@ $OpenBSD: patch-libk3bdevice_k3bdevice_cpp,v 1.1.1.1 2008/05/11 22:18:35 jakemsr bool success = false; bool needToClose = !isOpen(); int arg = b ? 1 : 0; -@@ -1542,7 +1542,7 @@ bool K3bDevice::Device::rewritable() const +@@ -1542,7 +1543,7 @@ bool K3bDevice::Device::rewritable() const bool K3bDevice::Device::eject() const { @@ -55,7 +57,7 @@ $OpenBSD: patch-libk3bdevice_k3bdevice_cpp,v 1.1.1.1 2008/05/11 22:18:35 jakemsr bool success = false; bool needToClose = !isOpen(); int arg = 0; -@@ -1591,7 +1591,7 @@ bool K3bDevice::Device::eject() const +@@ -1591,7 +1592,7 @@ bool K3bDevice::Device::eject() const bool K3bDevice::Device::load() const { @@ -64,7 +66,7 @@ $OpenBSD: patch-libk3bdevice_k3bdevice_cpp,v 1.1.1.1 2008/05/11 22:18:35 jakemsr bool success = false; bool needToClose = !isOpen(); int arg = 0; -@@ -1690,7 +1690,7 @@ bool K3bDevice::Device::open( bool write ) const +@@ -1690,7 +1691,7 @@ bool K3bDevice::Device::open( bool write ) const return (d->cam != 0); #endif @@ -73,7 +75,7 @@ $OpenBSD: patch-libk3bdevice_k3bdevice_cpp,v 1.1.1.1 2008/05/11 22:18:35 jakemsr if( d->deviceFd == -1 ) d->deviceFd = openDevice( QFile::encodeName(devicename()), write ); -@@ -1709,7 +1709,7 @@ void K3bDevice::Device::close() const +@@ -1709,7 +1710,7 @@ void K3bDevice::Device::close() const d->cam = 0; } #endif @@ -82,7 +84,7 @@ $OpenBSD: patch-libk3bdevice_k3bdevice_cpp,v 1.1.1.1 2008/05/11 22:18:35 jakemsr if( d->deviceFd != -1 ) { ::close( d->deviceFd ); d->deviceFd = -1; -@@ -1723,7 +1723,7 @@ bool K3bDevice::Device::isOpen() const +@@ -1723,7 +1724,7 @@ bool K3bDevice::Device::isOpen() const #ifdef Q_OS_FREEBSD return d->cam; #endif @@ -91,7 +93,7 @@ $OpenBSD: patch-libk3bdevice_k3bdevice_cpp,v 1.1.1.1 2008/05/11 22:18:35 jakemsr return ( d->deviceFd != -1 ); #endif } -@@ -3624,7 +3624,7 @@ QCString K3bDevice::Device::mediaId( int mediaType ) c +@@ -3624,7 +3625,7 @@ QCString K3bDevice::Device::mediaId( int mediaType ) c // int K3bDevice::Device::ioctl( int request, ... ) const // { // int r = -1;