ports/85322: Port upgrade: sysutils/k3b to 0.12.3
Heiner
h.eichmann at gmx.de
Fri Aug 26 18:00:33 UTC 2005
>Number: 85322
>Category: ports
>Synopsis: Port upgrade: sysutils/k3b to 0.12.3
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Fri Aug 26 18:00:29 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Heiner Eichmann <h.eichmann at gmx.de>
>Release: FreeBSD 5.4-RELEASE
>Organization:
Sirius Cybernetics Corp.
>Environment:
# $FreeBSD: ports/sysutils/k3b/Makefile,v 1.24 2005/05/27 14:42:51 arved Exp $
>Description:
Upgrade to 0.12.3
After applying the patch, the files directory should be empty!
>How-To-Repeat:
>Fix:
--Boundary-00=_ef1DDd7v/s/YnDZ
Content-Type: text/x-diff;
charset="iso-8859-1";
name="k3b.diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="k3b.diff"
diff -urN ../../sysutils/k3b/Makefile ./Makefile
--- ../../sysutils/k3b/Makefile Sun Aug 14 10:55:16 2005
+++ ./Makefile Sun Aug 14 17:46:51 2005
@@ -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 -urN ../../sysutils/k3b/distinfo ./distinfo
--- ../../sysutils/k3b/distinfo Sun Aug 14 10:55:16 2005
+++ ./distinfo Sun Aug 14 17:48:33 2005
@@ -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 -urN ../../sysutils/k3b/files/patch-libk3b-projects-datacd-k3bdatajob.cpp ./files/patch-libk3b-projects-datacd-k3bdatajob.cpp
--- ../../sysutils/k3b/files/patch-libk3b-projects-datacd-k3bdatajob.cpp Wed Jul 20 11:22:25 2005
+++ ./files/patch-libk3b-projects-datacd-k3bdatajob.cpp Thu Jan 1 01:00:00 1970
@@ -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 -urN ../../sysutils/k3b/files/patch-libk3bdevice-k3bscsicommand_bsd.cpp ./files/patch-libk3bdevice-k3bscsicommand_bsd.cpp
--- ../../sysutils/k3b/files/patch-libk3bdevice-k3bscsicommand_bsd.cpp Wed Jul 20 11:22:25 2005
+++ ./files/patch-libk3bdevice-k3bscsicommand_bsd.cpp Thu Jan 1 01:00:00 1970
@@ -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 -urN ../../sysutils/k3b/files/patch-src-rip-k3baudioprojectconvertingthread.cpp ./files/patch-src-rip-k3baudioprojectconvertingthread.cpp
--- ../../sysutils/k3b/files/patch-src-rip-k3baudioprojectconvertingthread.cpp Wed Jul 20 11:22:25 2005
+++ ./files/patch-src-rip-k3baudioprojectconvertingthread.cpp Thu Jan 1 01:00:00 1970
@@ -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 -urN ../../sysutils/k3b/files/patch-src-rip-k3baudioripthread.cpp ./files/patch-src-rip-k3baudioripthread.cpp
--- ../../sysutils/k3b/files/patch-src-rip-k3baudioripthread.cpp Wed Jul 20 11:22:25 2005
+++ ./files/patch-src-rip-k3baudioripthread.cpp Thu Jan 1 01:00:00 1970
@@ -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;
--Boundary-00=_ef1DDd7v/s/YnDZ--
>Release-Note:
>Audit-Trail:
>Unformatted:
--Boundary-00=_ef1DDd7v/s/YnDZ
Content-Type: text/plain;
charset="iso-8859-1"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
X-send-pr-version: send-pr 3.113
X-GNATS-Notify:
More information about the freebsd-ports-bugs
mailing list