head	1.3;
access;
symbols
	pkgsrc-2019Q3:1.2.0.42
	pkgsrc-2019Q3-base:1.2
	pkgsrc-2019Q2:1.2.0.40
	pkgsrc-2019Q2-base:1.2
	pkgsrc-2019Q1:1.2.0.38
	pkgsrc-2019Q1-base:1.2
	pkgsrc-2018Q4:1.2.0.36
	pkgsrc-2018Q4-base:1.2
	pkgsrc-2018Q3:1.2.0.34
	pkgsrc-2018Q3-base:1.2
	pkgsrc-2018Q2:1.2.0.32
	pkgsrc-2018Q2-base:1.2
	pkgsrc-2018Q1:1.2.0.30
	pkgsrc-2018Q1-base:1.2
	pkgsrc-2017Q4:1.2.0.28
	pkgsrc-2017Q4-base:1.2
	pkgsrc-2017Q3:1.2.0.26
	pkgsrc-2017Q3-base:1.2
	pkgsrc-2017Q2:1.2.0.22
	pkgsrc-2017Q2-base:1.2
	pkgsrc-2017Q1:1.2.0.20
	pkgsrc-2017Q1-base:1.2
	pkgsrc-2016Q4:1.2.0.18
	pkgsrc-2016Q4-base:1.2
	pkgsrc-2016Q3:1.2.0.16
	pkgsrc-2016Q3-base:1.2
	pkgsrc-2016Q2:1.2.0.14
	pkgsrc-2016Q2-base:1.2
	pkgsrc-2016Q1:1.2.0.12
	pkgsrc-2016Q1-base:1.2
	pkgsrc-2015Q4:1.2.0.10
	pkgsrc-2015Q4-base:1.2
	pkgsrc-2015Q3:1.2.0.8
	pkgsrc-2015Q3-base:1.2
	pkgsrc-2015Q2:1.2.0.6
	pkgsrc-2015Q2-base:1.2
	pkgsrc-2015Q1:1.2.0.4
	pkgsrc-2015Q1-base:1.2
	pkgsrc-2014Q4:1.2.0.2
	pkgsrc-2014Q4-base:1.2
	pkgsrc-2014Q3:1.1.0.22
	pkgsrc-2014Q3-base:1.1
	pkgsrc-2014Q2:1.1.0.20
	pkgsrc-2014Q2-base:1.1
	pkgsrc-2014Q1:1.1.0.18
	pkgsrc-2014Q1-base:1.1
	pkgsrc-2013Q4:1.1.0.16
	pkgsrc-2013Q4-base:1.1
	pkgsrc-2013Q3:1.1.0.14
	pkgsrc-2013Q3-base:1.1
	pkgsrc-2013Q2:1.1.0.12
	pkgsrc-2013Q2-base:1.1
	pkgsrc-2013Q1:1.1.0.10
	pkgsrc-2013Q1-base:1.1
	pkgsrc-2012Q4:1.1.0.8
	pkgsrc-2012Q4-base:1.1
	pkgsrc-2012Q3:1.1.0.6
	pkgsrc-2012Q3-base:1.1
	pkgsrc-2012Q2:1.1.0.4
	pkgsrc-2012Q2-base:1.1
	pkgsrc-2012Q1:1.1.0.2
	pkgsrc-2012Q1-base:1.1;
locks; strict;
comment	@// @;


1.3
date	2019.12.02.09.38.10;	author markd;	state dead;
branches;
next	1.2;
commitid	e9PZ3A3StDXv97NB;

1.2
date	2014.11.15.03.35.26;	author markd;	state Exp;
branches;
next	1.1;
commitid	qTJggaetZ7TPneYx;

1.1
date	2012.03.22.06.39.01;	author markd;	state Exp;
branches;
next	;


desc
@@


1.3
log
@k3b: update to 19.08.3    qt5/kf5 version
@
text
@$NetBSD: patch-libk3bdevice_k3bdevice.cpp,v 1.2 2014/11/15 03:35:26 markd Exp $

--- libk3bdevice/k3bdevice.cpp.orig	2014-11-04 18:37:31.000000000 +0000
+++ libk3bdevice/k3bdevice.cpp
@@@@ -35,7 +35,7 @@@@
 #include <Solid/OpticalDrive>
 #include <Solid/Block>
 #include <Solid/StorageAccess>
-#ifdef __NETBSD__
+#ifdef Q_OS_NETBSD
 #include <Solid/GenericInterface>
 #endif
 
@@@@ -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;
-#ifndef __NETBSD__
+#ifndef Q_OS_NETBSD
     d->blockDevice = dev.as<Solid::Block>()->device();
 #else
     if (gi->propertyExists("block.netbsd.raw_device"))
@


1.2
log
@Update k3b to 2.0.3a

Bugfixes:
 * Missing "Extract Digital Audio with K3b" in device notifier for Audio
   CD medium
 * Clearing up track info in audio project when CDDB query failed
 * Improper track number in CDDB track edit window title
 * Crash on detecting writing speeds
 * Incorrect capacity returned by HL-DT-ST BH10LS30. Patch by Stephane
   Berthelot, thanks!
 * Compilation fails with new FFMPEG
@
text
@d1 1
a1 1
$NetBSD$
@


1.1
log
@Update to 2.0.2

KDE4 version.
@
text
@d3 1
a3 1
--- libk3bdevice/k3bdevice.cpp.orig	2009-05-07 19:08:16.000000000 +1200
d5 1
a5 1
@@@@ -35,6 +35,7 @@@@
d9 4
a12 1
+#include <Solid/GenericInterface>
d14 1
a14 3
 #include <sys/types.h>
 #include <sys/ioctl.h>
@@@@ -242,9 +243,14 @@@@ K3b::Device::Device::Handle K3b::Device:
d18 3
d22 1
a22 1
+
d25 5
a29 8
-    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;
@