From b6ec54a252b108a6484c25de1a56e6112e28175b Mon Sep 17 00:00:00 2001 From: Tilman Keskinoz Date: Wed, 6 Apr 2005 15:08:46 +0000 Subject: - Update to 0.11.23 - only /dev/cd* devices will be recognized as cd drives. PR: 79258 Submitted by: Heiner Eichmann --- sysutils/k3b-kde4/Makefile | 3 +-- sysutils/k3b-kde4/distinfo | 4 ++-- sysutils/k3b-kde4/files/patch-src-Makefile.in | 6 +++--- .../files/patch-src-audiodecoding-flac-k3bflacdecoder.cpp | 11 ----------- sysutils/k3b-kde4/files/patch-src-device-k3bdevice.cpp | 8 ++++---- sysutils/k3b-kde4/files/patch-src-device-k3bdevicemanager.cpp | 6 +++--- sysutils/k3b-kde4/pkg-plist | 4 ++++ sysutils/k3b/Makefile | 3 +-- sysutils/k3b/distinfo | 4 ++-- sysutils/k3b/files/patch-src-Makefile.in | 6 +++--- .../k3b/files/patch-src-audiodecoding-flac-k3bflacdecoder.cpp | 11 ----------- sysutils/k3b/files/patch-src-device-k3bdevice.cpp | 8 ++++---- sysutils/k3b/files/patch-src-device-k3bdevicemanager.cpp | 6 +++--- sysutils/k3b/pkg-plist | 4 ++++ 14 files changed, 34 insertions(+), 50 deletions(-) delete mode 100644 sysutils/k3b-kde4/files/patch-src-audiodecoding-flac-k3bflacdecoder.cpp delete mode 100644 sysutils/k3b/files/patch-src-audiodecoding-flac-k3bflacdecoder.cpp (limited to 'sysutils') diff --git a/sysutils/k3b-kde4/Makefile b/sysutils/k3b-kde4/Makefile index d212208dfed1..8ae0298cd218 100644 --- a/sysutils/k3b-kde4/Makefile +++ b/sysutils/k3b-kde4/Makefile @@ -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 --git a/sysutils/k3b-kde4/distinfo b/sysutils/k3b-kde4/distinfo index e40ce46ac861..7b6adb69fa05 100644 --- a/sysutils/k3b-kde4/distinfo +++ b/sysutils/k3b-kde4/distinfo @@ -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 --git a/sysutils/k3b-kde4/files/patch-src-Makefile.in b/sysutils/k3b-kde4/files/patch-src-Makefile.in index c3077fada020..8d4fb7e34271 100644 --- a/sysutils/k3b-kde4/files/patch-src-Makefile.in +++ b/sysutils/k3b-kde4/files/patch-src-Makefile.in @@ -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 --git a/sysutils/k3b-kde4/files/patch-src-audiodecoding-flac-k3bflacdecoder.cpp b/sysutils/k3b-kde4/files/patch-src-audiodecoding-flac-k3bflacdecoder.cpp deleted file mode 100644 index 575df24fb610..000000000000 --- a/sysutils/k3b-kde4/files/patch-src-audiodecoding-flac-k3bflacdecoder.cpp +++ /dev/null @@ -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 --git a/sysutils/k3b-kde4/files/patch-src-device-k3bdevice.cpp b/sysutils/k3b-kde4/files/patch-src-device-k3bdevice.cpp index b4af3c1a7620..3d8440b83cc0 100644 --- a/sysutils/k3b-kde4/files/patch-src-device-k3bdevice.cpp +++ b/sysutils/k3b-kde4/files/patch-src-device-k3bdevice.cpp @@ -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 --git a/sysutils/k3b-kde4/files/patch-src-device-k3bdevicemanager.cpp b/sysutils/k3b-kde4/files/patch-src-device-k3bdevicemanager.cpp index f99aa0b15d55..60cf19176b49 100644 --- a/sysutils/k3b-kde4/files/patch-src-device-k3bdevicemanager.cpp +++ b/sysutils/k3b-kde4/files/patch-src-device-k3bdevicemanager.cpp @@ -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 #include @@ -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 --git a/sysutils/k3b-kde4/pkg-plist b/sysutils/k3b-kde4/pkg-plist index 8619a4eec1ed..47535eae7391 100644 --- a/sysutils/k3b-kde4/pkg-plist +++ b/sysutils/k3b-kde4/pkg-plist @@ -207,6 +207,10 @@ share/icons/crystalsvg/16x16/apps/k3b.png 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 diff --git a/sysutils/k3b/Makefile b/sysutils/k3b/Makefile index d212208dfed1..8ae0298cd218 100644 --- a/sysutils/k3b/Makefile +++ b/sysutils/k3b/Makefile @@ -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 --git a/sysutils/k3b/distinfo b/sysutils/k3b/distinfo index e40ce46ac861..7b6adb69fa05 100644 --- a/sysutils/k3b/distinfo +++ b/sysutils/k3b/distinfo @@ -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 --git a/sysutils/k3b/files/patch-src-Makefile.in b/sysutils/k3b/files/patch-src-Makefile.in index c3077fada020..8d4fb7e34271 100644 --- a/sysutils/k3b/files/patch-src-Makefile.in +++ b/sysutils/k3b/files/patch-src-Makefile.in @@ -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 --git a/sysutils/k3b/files/patch-src-audiodecoding-flac-k3bflacdecoder.cpp b/sysutils/k3b/files/patch-src-audiodecoding-flac-k3bflacdecoder.cpp deleted file mode 100644 index 575df24fb610..000000000000 --- a/sysutils/k3b/files/patch-src-audiodecoding-flac-k3bflacdecoder.cpp +++ /dev/null @@ -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 --git a/sysutils/k3b/files/patch-src-device-k3bdevice.cpp b/sysutils/k3b/files/patch-src-device-k3bdevice.cpp index b4af3c1a7620..3d8440b83cc0 100644 --- a/sysutils/k3b/files/patch-src-device-k3bdevice.cpp +++ b/sysutils/k3b/files/patch-src-device-k3bdevice.cpp @@ -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 --git a/sysutils/k3b/files/patch-src-device-k3bdevicemanager.cpp b/sysutils/k3b/files/patch-src-device-k3bdevicemanager.cpp index f99aa0b15d55..60cf19176b49 100644 --- a/sysutils/k3b/files/patch-src-device-k3bdevicemanager.cpp +++ b/sysutils/k3b/files/patch-src-device-k3bdevicemanager.cpp @@ -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 #include @@ -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 --git a/sysutils/k3b/pkg-plist b/sysutils/k3b/pkg-plist index 8619a4eec1ed..47535eae7391 100644 --- a/sysutils/k3b/pkg-plist +++ b/sysutils/k3b/pkg-plist @@ -207,6 +207,10 @@ share/icons/crystalsvg/16x16/apps/k3b.png 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 -- cgit v1.2.3