Import of pkgsrc-2015Q1

sysutils/k3b/patches/patch-libk3bdevice_k3bdevice.cpp

@@ -1,28 +1,29 @@
-$NetBSD: patch-libk3bdevice_k3bdevice.cpp,v 1.1 2012/03/22 06:39:01 markd Exp $
+$NetBSD: patch-libk3bdevice_k3bdevice.cpp,v 1.2 2014/11/15 03:35:26 markd Exp $
 
---- libk3bdevice/k3bdevice.cpp.orig	2009-05-07 19:08:16.000000000 +1200
+--- libk3bdevice/k3bdevice.cpp.orig	2014-11-04 18:37:31.000000000 +0000
 +++ libk3bdevice/k3bdevice.cpp
-@@ -35,6 +35,7 @@
+@@ -35,7 +35,7 @@
  #include <Solid/OpticalDrive>
  #include <Solid/Block>
  #include <Solid/StorageAccess>
-+#include <Solid/GenericInterface>
+-#ifdef __NETBSD__
++#ifdef Q_OS_NETBSD
+ #include <Solid/GenericInterface>
+ #endif
  
- #include <sys/types.h>
- #include <sys/ioctl.h>
-@@ -242,9 +243,14 @@ K3b::Device::Device::Handle K3b::Device:
+@@ -245,12 +245,12 @@ K3b::Device::Device::Handle K3b::Device:
  
  K3b::Device::Device::Device( const Solid::Device& dev )
  {
+-#ifdef __NETBSD__
+-    const Solid::GenericInterace *gi = dev.as<Solid::GenericInterface>();
++#ifdef Q_OS_NETBSD
 +    const Solid::GenericInterface *gi = dev.as<Solid::GenericInterface>();
-+
+ #endif
      d = new Private;
      d->solidDevice = dev;
--    d->blockDevice = dev.as<Solid::Block>()->device();
-+    if (gi->propertyExists("block.netbsd.raw_device"))
-+        d->blockDevice = gi->property("block.netbsd.raw_device").toString();
-+    else
-+        d->blockDevice = dev.as<Solid::Block>()->device();
-     d->writeModes = 0;
-     d->maxWriteSpeed = 0;
-     d->maxReadSpeed = 0;
+-#ifndef __NETBSD__
++#ifndef Q_OS_NETBSD
+     d->blockDevice = dev.as<Solid::Block>()->device();
+ #else
+     if (gi->propertyExists("block.netbsd.raw_device"))