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_k3bdevicemanager.cpp,v 1.2 2014/11/15 03:35:26 markd Exp $

--- libk3bdevice/k3bdevicemanager.cpp.orig	2014-11-04 18:37:31.000000000 +0000
+++ libk3bdevice/k3bdevicemanager.cpp
@@@@ -39,7 +39,7 @@@@
 #include <Solid/OpticalDrive>
 #include <Solid/Block>
 #include <Solid/Device>
-#ifdef __NETBSD__
+#ifdef Q_OS_NETBSD
 #include <Solid/GenericInterface>
 #endif
 
@@@@ -359,10 +359,10 @@@@ bool K3b::Device::DeviceManager::saveCon
 K3b::Device::Device* K3b::Device::DeviceManager::addDevice( const Solid::Device& solidDevice )
 {
     if( const Solid::Block* blockDevice = solidDevice.as<Solid::Block>() ) {
-#ifndef __NETBSD__
+#ifndef Q_OS_NETBSD
         if( !findDevice( blockDevice->device() ) )
 #else
-        if( !findDevice( solidDevice.as<Solid::GenericInterface>()->propertyExists("block.netbsd.raw_device") ? solidDevice.as<Solid::GenericInterface>()->property("block.netbsd.raw_device").toString() : blockDevice->device() ) );
+        if( !findDevice( solidDevice.as<Solid::GenericInterface>()->propertyExists("block.netbsd.raw_device") ? solidDevice.as<Solid::GenericInterface>()->property("block.netbsd.raw_device").toString() : blockDevice->device() ) )
 #endif
             return addDevice( new K3b::Device::Device( solidDevice ) );
         else
@


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/k3bdevicemanager.cpp.orig	2011-01-15 20:47:29.000000000 +0000
d5 1
a5 1
@@@@ -39,6 +39,7 @@@@
d9 4
a12 1
+#include <Solid/GenericInterface>
d14 1
a14 3
 #include <iostream>
 #include <limits.h>
@@@@ -356,7 +357,7 @@@@ bool K3b::Device::DeviceManager::saveCon
d18 5
a22 1
-        if( !findDevice( blockDevice->device() ) )
d24 1
a26 1
             kDebug() << "(K3b::Device::DeviceManager) dev " << blockDevice->device()  << " already found";
@