Update to version 0.12.3

PR:		ports/85322
Submitted by:	Heiner Eichmann <h.eichmann@gmx.de> (maintainer)

6 files changed, 3 insertions, 85 deletions

diff --git a/sysutils/k3b/Makefile b/sysutils/k3b/Makefile
index fc3d71c253b5..d2d80868005b 100644
--- a/sysutils/k3b/Makefile
+++ b/sysutils/k3b/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	k3b
-PORTVERSION=	0.12.2
+PORTVERSION=	0.12.3
 CATEGORIES=	sysutils multimedia kde
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
diff --git a/sysutils/k3b/distinfo b/sysutils/k3b/distinfo
index 4ec1d47448fa..f46a17ad731d 100644
--- a/sysutils/k3b/distinfo
+++ b/sysutils/k3b/distinfo
@@ -1,2 +1,2 @@
-MD5 (k3b-0.12.2.tar.bz2) = 52dac62c8f22330784f82703385482ee
-SIZE (k3b-0.12.2.tar.bz2) = 3771371
+MD5 (k3b-0.12.3.tar.bz2) = 5a8515ad15d124104a79e63dab12366d
+SIZE (k3b-0.12.3.tar.bz2) = 3778337
diff --git a/sysutils/k3b/files/patch-libk3b-projects-datacd-k3bdatajob.cpp b/sysutils/k3b/files/patch-libk3b-projects-datacd-k3bdatajob.cpp
deleted file mode 100644
index 49d0c02af493..000000000000
--- a/sysutils/k3b/files/patch-libk3b-projects-datacd-k3bdatajob.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
---- libk3b/projects/datacd/k3bdatajob.cpp.orig	Tue Jul 12 14:56:13 2005
-+++ libk3b/projects/datacd/k3bdatajob.cpp	Tue Jul 12 14:56:35 2005
-@@ -98,8 +98,8 @@
- 
- K3bDataJob::~K3bDataJob()
- {
--  delete d;
-   delete d->tocFile;
-+  delete d;
- }
- 
- 
diff --git a/sysutils/k3b/files/patch-libk3bdevice-k3bscsicommand_bsd.cpp b/sysutils/k3b/files/patch-libk3bdevice-k3bscsicommand_bsd.cpp
deleted file mode 100644
index eca2d20ae58a..000000000000
--- a/sysutils/k3b/files/patch-libk3bdevice-k3bscsicommand_bsd.cpp
+++ /dev/null
@@ -1,48 +0,0 @@
---- libk3bdevice/k3bscsicommand_bsd.cpp.orig	Fri Jul  1 15:30:50 2005
-+++ libk3bdevice/k3bscsicommand_bsd.cpp	Sun Jul 17 15:07:58 2005
-@@ -51,10 +51,6 @@
- void K3bDevice::ScsiCommand::clear()
- {
-   memset (&d->ccb,0,sizeof(ccb));
--  if (!m_device || !m_device->handle()) return;
--  d->ccb.ccb_h.path_id    = m_device->handle()->path_id;
--  d->ccb.ccb_h.target_id  = m_device->handle()->target_id;
--  d->ccb.ccb_h.target_lun = m_device->handle()->target_lun;
- }
- 
- 
-@@ -76,8 +72,11 @@
-     needToClose = true;
-   }
- 
--  if( !m_device->open( dir == TR_DIR_WRITE ) )
-+  if( !m_device->open( true ) )
-     return -1;
-+  d->ccb.ccb_h.path_id    = m_device->handle()->path_id;
-+  d->ccb.ccb_h.target_id  = m_device->handle()->target_id;
-+  d->ccb.ccb_h.target_lun = m_device->handle()->target_lun;
- 
-   kdDebug() << "(K3bDevice::ScsiCommand) transport command " << QString::number((int)d->ccb.csio.cdb_io.cdb_bytes[0], 16) << ", length: " << (int)d->ccb.csio.cdb_len << endl;
-   int ret=0;
-@@ -86,7 +85,7 @@
-     direction |= CAM_DIR_NONE;
-   else
-     direction |= (dir & TR_DIR_READ)?CAM_DIR_IN : CAM_DIR_OUT;
--  cam_fill_csio (&(d->ccb.csio), 1, 0 /* NULL */, direction | CAM_DEV_QFRZDIS, MSG_SIMPLE_Q_TAG, (u_int8_t *)data, len, sizeof(d->ccb.csio.sense_data), d->ccb.csio.cdb_len, 30*1000);
-+  cam_fill_csio (&(d->ccb.csio), 1, 0 /* NULL */, direction, MSG_SIMPLE_Q_TAG, (u_int8_t *)data, len, sizeof(d->ccb.csio.sense_data), d->ccb.csio.cdb_len, 30*1000);
-   unsigned char * sense = (unsigned char *)&d->ccb.csio.sense_data;
-   if ((ret = cam_send_ccb(m_device->handle(), &d->ccb)) < 0)
-     {
-@@ -101,10 +100,11 @@
-       if( needToClose )
- 	m_device->close();
- 
--      return( ((senset->error_code & SSD_ERRCODE)<<24) & 0xF000 |
-+      int result = (((senset->error_code & SSD_ERRCODE)<<24) & 0xF000 |
- 	      ((senset->flags & SSD_KEY)<<16)          & 0x0F00 |
- 	      (senset->add_sense_code<<8)              & 0x00F0 |
- 	      (senset->add_sense_code_qual)            & 0x000F );
-+      return result?result:ret;
-     }
-   if ((d->ccb.ccb_h.status & CAM_STATUS_MASK) == CAM_REQ_CMP) {
-     if( needToClose )
diff --git a/sysutils/k3b/files/patch-src-rip-k3baudioprojectconvertingthread.cpp b/sysutils/k3b/files/patch-src-rip-k3baudioprojectconvertingthread.cpp
deleted file mode 100644
index 78f068697d3c..000000000000
--- a/sysutils/k3b/files/patch-src-rip-k3baudioprojectconvertingthread.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/rip/k3baudioprojectconvertingthread.cpp.orig	Sun Jul 10 00:18:23 2005
-+++ src/rip/k3baudioprojectconvertingthread.cpp	Sun Jul 10 00:18:50 2005
-@@ -373,7 +373,7 @@
- 
-   // we always use a relative filename here
-   QString imageFile = m_tracks[0].second.section( '/', -1 );
--  cueWriter.setImage( imageFile, ( d->fileType.isEmpty() ? "WAVE" : d->fileType ) );
-+  cueWriter.setImage( imageFile, ( d->fileType.isEmpty() ? QString("WAVE") : d->fileType ) );
- 
-   // use the same base name as the image file
-   QString cueFile = m_tracks[0].second;
diff --git a/sysutils/k3b/files/patch-src-rip-k3baudioripthread.cpp b/sysutils/k3b/files/patch-src-rip-k3baudioripthread.cpp
deleted file mode 100644
index badd900011cd..000000000000
--- a/sysutils/k3b/files/patch-src-rip-k3baudioripthread.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/rip/k3baudioripthread.cpp.orig	Sun Jul 10 00:14:21 2005
-+++ src/rip/k3baudioripthread.cpp	Sun Jul 10 00:15:00 2005
-@@ -536,7 +536,7 @@
- 
-   // we always use a relative filename here
-   QString imageFile = m_tracks[0].second.section( '/', -1 );
--  cueWriter.setImage( imageFile, ( d->fileType.isEmpty() ? "WAVE" : d->fileType ) );
-+  cueWriter.setImage( imageFile, ( d->fileType.isEmpty() ? QString("WAVE") : d->fileType ) );
- 
-   // use the same base name as the image file
-   QString cueFile = m_tracks[0].second;