ports/79258: Port upgrade: sysutils/k3b to 0.11.23
Heiner
h.eichmann at gmx.de
Sat Mar 26 17:50:04 UTC 2005
>Number: 79258
>Category: ports
>Synopsis: Port upgrade: sysutils/k3b to 0.11.23
>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: Sat Mar 26 17:50:02 GMT 2005
>Closed-Date:
>Last-Modified:
>Originator: Heiner Eichmann <h.eichmann at gmx.de>
>Release: FreeBSD 5.3-RELEASE
>Organization:
Sirius Cybernetics Corp.
>Environment:
FreeBSD 7of9.unimatrix-zero.borg 5.3-RELEASE FreeBSD 5.3-RELEASE #0: Fri Dec
31 16:57:09 CET 2004
he at 7of9.unimatrix-zero.borg:/usr/obj/usr/src/sys/MYKERNEL i386
>Description:
Upgrade to 0.11.23
Please remove patch-src-audiodecoding-flac-k3bflacdecoder.cpp!
Important change: only /dev/cd* devices will be recognized as cd drives.
>How-To-Repeat:
>Fix:
See attached diff
--Boundary-00=_r8ZRC6egjC4ZWn6
Content-Type: text/x-diff;
charset="iso-8859-1";
name="diff"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename="diff"
diff -urN ../../sysutils/k3b/Makefile ./Makefile
--- ../../sysutils/k3b/Makefile Mon Mar 21 18:39:57 2005
+++ ./Makefile Sat Mar 26 17:50:41 2005
@@ -6,8 +6,7 @@
#
PORTNAME= k3b
-PORTVERSION= 0.11.20
-PORTREVISION= 1
+PORTVERSION= 0.11.23
CATEGORIES= sysutils multimedia kde
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE}
MASTER_SITE_SUBDIR= ${PORTNAME}
diff -urN ../../sysutils/k3b/distinfo ./distinfo
--- ../../sysutils/k3b/distinfo Sun Feb 13 10:57:24 2005
+++ ./distinfo Sat Mar 26 17:52:25 2005
@@ -1,2 +1,2 @@
-MD5 (k3b-0.11.20.tar.bz2) = 6c4844319ccb5e9be3ec69aec80c8d5f
-SIZE (k3b-0.11.20.tar.bz2) = 3190897
+MD5 (k3b-0.11.23.tar.bz2) = eaff485fb4c431aae715b0ef95c43fcf
+SIZE (k3b-0.11.23.tar.bz2) = 3195224
diff -urN ../../sysutils/k3b/files/patch-src-Makefile.in ./files/patch-src-Makefile.in
--- ../../sysutils/k3b/files/patch-src-Makefile.in Sun Jan 30 17:27:40 2005
+++ ./files/patch-src-Makefile.in Wed Mar 23 20:05:15 2005
@@ -1,6 +1,6 @@
---- src/Makefile.in.orig Sat Dec 11 17:46:26 2004
-+++ src/Makefile.in Sun Jan 2 09:30:08 2005
-@@ -297,7 +297,7 @@
+--- src/Makefile.in.orig Wed Mar 16 10:43:55 2005
++++ src/Makefile.in Wed Mar 23 19:44:55 2005
+@@ -299,7 +299,7 @@
#>+ 1
k3b_SOURCES=k3bwelcomewidget.cpp k3bapplication.cpp k3bdiroperator.cpp kdndfileview.cpp k3bfiletreeview.cpp k3bcddbmultientriesdialog.cpp k3baudioplayer.cpp k3bprojecttabbar.cpp k3bprojecttabwidget.cpp k3bsplash.cpp k3bblankingdialog.cpp k3bfileview.cpp k3bdirview.cpp k3btoolbox.cpp k3b.cpp main.cpp k3bstatusbarmanager.cpp k3bfiletreecombobox.cpp k3breadcdreader.cpp k3binterface.cpp k3bprojectinterface.cpp k3bsystemproblemdialog.cpp k3bcdcontentsview.cpp k3bwriterspeedverificationdialog.cpp k3bdatatrackreader.cpp k3binterface_skel.cpp k3bprojectinterface_skel.cpp
diff -urN ../../sysutils/k3b/files/patch-src-audiodecoding-flac-k3bflacdecoder.cpp ./files/patch-src-audiodecoding-flac-k3bflacdecoder.cpp
--- ../../sysutils/k3b/files/patch-src-audiodecoding-flac-k3bflacdecoder.cpp Wed Mar 23 00:04:47 2005
+++ ./files/patch-src-audiodecoding-flac-k3bflacdecoder.cpp Thu Jan 1 01:00:00 1970
@@ -1,11 +0,0 @@
---- src/audiodecoding/flac/k3bflacdecoder.cpp.orig Tue Feb 24 16:07:27 2004
-+++ src/audiodecoding/flac/k3bflacdecoder.cpp Tue Mar 22 22:08:07 2005
-@@ -308,7 +308,7 @@
- {
- if( d->comments != 0 ) {
- if( info == i18n("Vendor") )
-- return QString::fromUtf8(d->comments->get_vendor_string().get_field());
-+ return QString::fromUtf8((char*)d->comments->get_vendor_string());
- else if( info == i18n("Channels") )
- return QString::number(d->channels);
- else if( info == i18n("Sampling Rate") )
diff -urN ../../sysutils/k3b/files/patch-src-device-k3bdevice.cpp ./files/patch-src-device-k3bdevice.cpp
--- ../../sysutils/k3b/files/patch-src-device-k3bdevice.cpp Sun Jan 30 17:27:40 2005
+++ ./files/patch-src-device-k3bdevice.cpp Wed Mar 23 20:05:15 2005
@@ -1,5 +1,5 @@
---- src/device/k3bdevice.cpp.orig Sun Nov 28 01:22:29 2004
-+++ src/device/k3bdevice.cpp Sun Jan 2 09:30:08 2005
+--- src/device/k3bdevice.cpp.orig Thu Feb 24 09:15:57 2005
++++ src/device/k3bdevice.cpp Wed Mar 23 19:44:55 2005
@@ -57,6 +57,13 @@
#endif // Q_OS_LINUX
@@ -58,7 +58,7 @@
else if( vendor().startsWith("MATSHITA") ) {
if( description().startsWith("CD-R CW-7501") ) {
m_writeModes = TAO|SAO;
-@@ -2663,10 +2691,12 @@
+@@ -2673,10 +2701,12 @@
{
// if the device is already opened we do not close it
// to allow fast multible method calls in a row
@@ -71,7 +71,7 @@
// header size is 8
unsigned char* buffer = 0;
-@@ -2752,13 +2782,16 @@
+@@ -2762,13 +2792,16 @@
delete [] buffer;
}
diff -urN ../../sysutils/k3b/files/patch-src-device-k3bdevice.h ./files/patch-src-device-k3bdevice.h
--- ../../sysutils/k3b/files/patch-src-device-k3bdevice.h Sun Jan 30 17:27:40 2005
+++ ./files/patch-src-device-k3bdevice.h Wed Mar 23 20:05:15 2005
@@ -1,5 +1,5 @@
--- src/device/k3bdevice.h.orig Sun Nov 28 13:27:24 2004
-+++ src/device/k3bdevice.h Sun Jan 2 09:30:08 2005
++++ src/device/k3bdevice.h Wed Mar 23 19:44:55 2005
@@ -690,6 +690,10 @@
class Private;
diff -urN ../../sysutils/k3b/files/patch-src-device-k3bdevicemanager.cpp ./files/patch-src-device-k3bdevicemanager.cpp
--- ../../sysutils/k3b/files/patch-src-device-k3bdevicemanager.cpp Sun Jan 30 17:27:40 2005
+++ ./files/patch-src-device-k3bdevicemanager.cpp Wed Mar 23 20:05:15 2005
@@ -1,5 +1,5 @@
--- src/device/k3bdevicemanager.cpp.orig Sun Nov 28 13:27:24 2004
-+++ src/device/k3bdevicemanager.cpp Sun Jan 2 09:44:09 2005
++++ src/device/k3bdevicemanager.cpp Wed Mar 23 19:45:36 2005
@@ -49,6 +49,12 @@
#include <sys/stat.h>
#include <sys/ioctl.h>
@@ -205,7 +205,7 @@
+#if __FreeBSD_version < 500100
+ dev += "c";
+#endif
-+ if (dev1 != "" && dev2 != "")
++ if (dev1 != "" && dev2 != "" && dev.startsWith("/dev/cd"))
+ {
+ K3bDevice* device = new K3bDevice(dev.latin1());
+ device->m_bus = bus;
@@ -259,7 +259,7 @@
+#if __FreeBSD_version < 500100
+ dev += "c";
+#endif
-+ if (dev1 != "" && dev2 != "")
++ if (dev1 != "" && dev2 != "" && dev.startsWith("/dev/cd"))
+ {
+ K3bDevice* device = new K3bDevice(dev.latin1());
+ device->m_bus = bus;
diff -urN ../../sysutils/k3b/files/patch-src-device-k3bdevicemanager.h ./files/patch-src-device-k3bdevicemanager.h
--- ../../sysutils/k3b/files/patch-src-device-k3bdevicemanager.h Sun Jan 30 17:27:40 2005
+++ ./files/patch-src-device-k3bdevicemanager.h Wed Mar 23 20:05:15 2005
@@ -1,5 +1,5 @@
--- src/device/k3bdevicemanager.h.orig Wed Jan 21 11:20:11 2004
-+++ src/device/k3bdevicemanager.h Sun Jan 2 09:30:08 2005
++++ src/device/k3bdevicemanager.h Wed Mar 23 19:44:55 2005
@@ -112,6 +112,10 @@
class Private;
diff -urN ../../sysutils/k3b/files/patch-src-device-k3bscsicommand.cpp ./files/patch-src-device-k3bscsicommand.cpp
--- ../../sysutils/k3b/files/patch-src-device-k3bscsicommand.cpp Sun Jan 30 17:27:40 2005
+++ ./files/patch-src-device-k3bscsicommand.cpp Wed Mar 23 20:05:15 2005
@@ -1,5 +1,5 @@
--- src/device/k3bscsicommand.cpp.orig Sun Aug 15 11:58:23 2004
-+++ src/device/k3bscsicommand.cpp Sun Jan 2 09:30:08 2005
++++ src/device/k3bscsicommand.cpp Wed Mar 23 19:44:55 2005
@@ -58,13 +58,14 @@
diff -urN ../../sysutils/k3b/files/patch-src-device-k3bscsicommand.h ./files/patch-src-device-k3bscsicommand.h
--- ../../sysutils/k3b/files/patch-src-device-k3bscsicommand.h Sun Jan 30 17:27:40 2005
+++ ./files/patch-src-device-k3bscsicommand.h Wed Mar 23 20:05:15 2005
@@ -1,5 +1,5 @@
--- src/device/k3bscsicommand.h.orig Wed Jan 21 11:20:11 2004
-+++ src/device/k3bscsicommand.h Sun Jan 2 09:30:08 2005
++++ src/device/k3bscsicommand.h Wed Mar 23 19:44:55 2005
@@ -17,9 +17,27 @@
#define _K3B_SCSI_COMMAND_H_
diff -urN ../../sysutils/k3b/files/patch-src-rip-k3bdvdrippingprocess.cpp ./files/patch-src-rip-k3bdvdrippingprocess.cpp
--- ../../sysutils/k3b/files/patch-src-rip-k3bdvdrippingprocess.cpp Sun Jan 30 17:27:40 2005
+++ ./files/patch-src-rip-k3bdvdrippingprocess.cpp Wed Mar 23 20:05:15 2005
@@ -1,5 +1,5 @@
--- src/rip/k3bdvdrippingprocess.cpp.orig Wed Jun 2 11:31:41 2004
-+++ src/rip/k3bdvdrippingprocess.cpp Sun Jan 2 09:30:08 2005
++++ src/rip/k3bdvdrippingprocess.cpp Wed Mar 23 19:44:55 2005
@@ -285,10 +285,13 @@
void K3bDvdRippingProcess::slotPreProcessingDvd() {
QString video;
diff -urN ../../sysutils/k3b/files/patch-src-rip-k3bmovieview.cpp ./files/patch-src-rip-k3bmovieview.cpp
--- ../../sysutils/k3b/files/patch-src-rip-k3bmovieview.cpp Sun Jan 30 17:27:40 2005
+++ ./files/patch-src-rip-k3bmovieview.cpp Wed Mar 23 20:05:15 2005
@@ -1,5 +1,5 @@
--- src/rip/k3bmovieview.cpp.orig Fri Feb 6 12:08:51 2004
-+++ src/rip/k3bmovieview.cpp Sun Jan 2 09:30:08 2005
++++ src/rip/k3bmovieview.cpp Wed Mar 23 19:44:55 2005
@@ -223,8 +223,11 @@
}
diff -urN ../../sysutils/k3b/files/patch-src-rip-k3btcwrapper.cpp ./files/patch-src-rip-k3btcwrapper.cpp
--- ../../sysutils/k3b/files/patch-src-rip-k3btcwrapper.cpp Sun Jan 30 17:27:40 2005
+++ ./files/patch-src-rip-k3btcwrapper.cpp Wed Mar 23 20:05:15 2005
@@ -1,5 +1,5 @@
--- src/rip/k3btcwrapper.cpp.orig Wed Jan 21 11:20:20 2004
-+++ src/rip/k3btcwrapper.cpp Sun Jan 2 09:30:08 2005
++++ src/rip/k3btcwrapper.cpp Wed Mar 23 19:44:55 2005
@@ -65,7 +65,12 @@
//K3bProcess *p = new K3bProcess();
emit tcprobeTitleParsed( m_currentTitle );
diff -urN ../../sysutils/k3b/files/patch-src-rip-k3bvideocdrip.cpp ./files/patch-src-rip-k3bvideocdrip.cpp
--- ../../sysutils/k3b/files/patch-src-rip-k3bvideocdrip.cpp Sun Jan 30 17:27:40 2005
+++ ./files/patch-src-rip-k3bvideocdrip.cpp Wed Mar 23 20:05:15 2005
@@ -1,5 +1,5 @@
--- src/rip/k3bvideocdrip.cpp.orig Wed Jan 21 11:20:20 2004
-+++ src/rip/k3bvideocdrip.cpp Sun Jan 2 09:30:08 2005
++++ src/rip/k3bvideocdrip.cpp Wed Mar 23 19:44:55 2005
@@ -41,7 +41,8 @@
m_ripsourceType( 0 ),
m_videooptions( options ),
diff -urN ../../sysutils/k3b/pkg-plist ./pkg-plist
--- ../../sysutils/k3b/pkg-plist Fri May 28 07:51:59 2004
+++ ./pkg-plist Sat Mar 26 18:18:13 2005
@@ -207,6 +207,10 @@
share/icons/crystalsvg/32x32/apps/k3b.png
share/icons/crystalsvg/48x48/apps/k3b.png
share/icons/crystalsvg/64x64/apps/k3b.png
+share/icons/hicolor/16x16/apps/k3b.png
+share/icons/hicolor/32x32/apps/k3b.png
+share/icons/hicolor/48x48/apps/k3b.png
+share/icons/hicolor/64x64/apps/k3b.png
share/mimelnk/application/x-k3b.desktop
share/sounds/k3b_error1.wav
share/sounds/k3b_success1.wav
--Boundary-00=_r8ZRC6egjC4ZWn6--
>Release-Note:
>Audit-Trail:
>Unformatted:
--Boundary-00=_r8ZRC6egjC4ZWn6
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