diff options
-rw-r--r-- | sysutils/k3b/Makefile | 41 | ||||
-rw-r--r-- | sysutils/k3b/PLIST | 570 | ||||
-rw-r--r-- | sysutils/k3b/distinfo | 16 | ||||
-rw-r--r-- | sysutils/k3b/patches/patch-ab | 22 | ||||
-rw-r--r-- | sysutils/k3b/patches/patch-ac | 13 | ||||
-rw-r--r-- | sysutils/k3b/patches/patch-ad | 38 | ||||
-rw-r--r-- | sysutils/k3b/patches/patch-ae | 16 | ||||
-rw-r--r-- | sysutils/k3b/patches/patch-libk3b_jobs_k3bdatatrackreader.cpp | 16 | ||||
-rw-r--r-- | sysutils/k3b/patches/patch-libk3bdevice_k3bdevice.cpp | 28 | ||||
-rw-r--r-- | sysutils/k3b/patches/patch-libk3bdevice_k3bdevicemanager.cpp | 21 | ||||
-rw-r--r-- | sysutils/k3b/patches/patch-libk3bdevice_k3bscsicommand_netbsd.cpp | 13 |
11 files changed, 520 insertions, 274 deletions
diff --git a/sysutils/k3b/Makefile b/sysutils/k3b/Makefile index 8355ba442d9..e4e15ba728b 100644 --- a/sysutils/k3b/Makefile +++ b/sysutils/k3b/Makefile @@ -1,8 +1,7 @@ -# $NetBSD: Makefile,v 1.41 2012/03/03 00:13:57 wiz Exp $ +# $NetBSD: Makefile,v 1.42 2012/03/22 06:39:00 markd Exp $ # -DISTNAME= k3b-1.0.5 -PKGREVISION= 14 +DISTNAME= k3b-2.0.2 CATEGORIES= sysutils MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=k3b/} EXTRACT_SUFX= .tar.bz2 @@ -13,24 +12,46 @@ COMMENT= DVD and CD authoring program PKG_DESTDIR_SUPPORT= user-destdir +BUILD_DEPENDS+= automoc4>=0.9.87:../../devel/automoc4 DEPENDS+= cdrdao-[0-9]*:../../sysutils/cdrdao DEPENDS+= {cdrtools,cdrtools-ossdvd}-[0-9]*:../../sysutils/cdrtools -GNU_CONFIGURE= yes -SET_LIBDIR= yes -USE_TOOLS+= gmake perl pkg-config +USE_TOOLS+= perl pkg-config gmake msgfmt USE_LANGUAGES= c c++ -USE_LIBTOOL= yes + +CMAKE_ARGS+= -DK3B_BUILD_MUSE_DECODER_PLUGIN=OFF + +CONF_FILES= ${PREFIX}/share/examples/kde4-dbus/org.kde.kcontrol.k3bsetup.conf \ + ${PKG_SYSCONFBASE}/dbus-1/system.d/org.kde.kcontrol.k3bsetup.conf ONLY_FOR_PLATFORM= FreeBSD-*-* Linux-*-* NetBSD-*-* DragonFly-*-* -.include "../../meta-pkgs/kde3/kde3.mk" +SUBST_CLASSES+= pathfix +SUBST_STAGE.pathfix= post-patch +SUBST_MESSAGE.pathfix= Add cdrtools path. +SUBST_FILES.pathfix= libk3b/core/k3bexternalbinmanager.cpp +SUBST_SED.pathfix= -e 's:"/usr/bin/":"${LOCALBASE}/bin", "/usr/bin/":g' + +pre-configure: + # buildlink loses this symlink + ln -s ${BUILDLINK_PREFIX.qt4-libs}/qt4/mkspecs/default ${BUILDLINK_DIR}/qt4/mkspecs/default + +.include "../../mk/dlopen.buildlink3.mk" +BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:M*} + +.include "../../meta-pkgs/kde4/kde4.mk" .include "../../audio/flac/buildlink3.mk" .include "../../audio/lame/buildlink3.mk" +.include "../../audio/libmad/buildlink3.mk" +#.include "../../audio/libmpcdec/buildlink3.mk" .include "../../audio/libsndfile/buildlink3.mk" .include "../../audio/musicbrainz/buildlink3.mk" +.include "../../audio/libsamplerate/buildlink3.mk" .include "../../audio/taglib/buildlink3.mk" .include "../../graphics/hicolor-icon-theme/buildlink3.mk" -.include "../../x11/kdebase3/buildlink3.mk" -.include "../../x11/kdelibs3/buildlink3.mk" +.include "../../multimedia/ffmpeg/buildlink3.mk" +.include "../../multimedia/kdemultimedia4/buildlink3.mk" +.include "../../multimedia/libdvdread/buildlink3.mk" +.include "../../security/polkit-qt/buildlink3.mk" +.include "../../x11/kdelibs4/buildlink3.mk" .include "../../mk/bsd.pkg.mk" diff --git a/sysutils/k3b/PLIST b/sysutils/k3b/PLIST index 12594368cb2..a2d81ec6a68 100644 --- a/sysutils/k3b/PLIST +++ b/sysutils/k3b/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2009/06/14 18:16:08 joerg Exp $ +@comment $NetBSD: PLIST,v 1.10 2012/03/22 06:39:00 markd Exp $ bin/k3b bin/k3bsetup include/k3b_export.h @@ -12,8 +12,8 @@ include/k3baudiodecoder.h include/k3baudiodoc.h include/k3baudioencoder.h include/k3baudiofile.h +include/k3baudiofileanalyzerjob.h include/k3baudiojob.h -include/k3baudiooutputplugin.h include/k3baudiotrack.h include/k3baudiozerodata.h include/k3bbinimagewritingjob.h @@ -22,7 +22,6 @@ include/k3bbootitem.h include/k3bbusywidget.h include/k3bcdcopyjob.h include/k3bcddb.h -include/k3bcddbresult.h include/k3bcdparanoialib.h include/k3bcdrdaowriter.h include/k3bcdrecordwriter.h @@ -32,11 +31,9 @@ include/k3bchecksumpipe.h include/k3bclonejob.h include/k3bcore.h include/k3bcuefileparser.h -include/k3bcutcombobox.h include/k3bdatadoc.h include/k3bdataitem.h include/k3bdatajob.h -include/k3bdebug.h include/k3bdefaultexternalprograms.h include/k3bdevice.h include/k3bdevice_export.h @@ -51,9 +48,7 @@ include/k3bdirsizejob.h include/k3bdiskinfo.h include/k3bdoc.h include/k3bdvdcopyjob.h -include/k3bdvddoc.h include/k3bdvdformattingjob.h -include/k3bdvdjob.h include/k3bexceptions.h include/k3bexternalbinmanager.h include/k3bfileitem.h @@ -75,40 +70,35 @@ include/k3bjobhandler.h include/k3blistview.h include/k3blistviewitemanimator.h include/k3bmd5job.h +include/k3bmediacache.h +include/k3bmedium.h +include/k3bmetawriter.h include/k3bmixeddoc.h include/k3bmixedjob.h include/k3bmovixdoc.h -include/k3bmovixdvddoc.h -include/k3bmovixdvdjob.h include/k3bmovixfileitem.h include/k3bmovixjob.h include/k3bmsf.h include/k3bmsfedit.h include/k3bmultichoicedialog.h -include/k3bpipe.h include/k3bplugin.h include/k3bpluginconfigwidget.h -include/k3bpluginfactory.h include/k3bpluginmanager.h include/k3bprocess.h include/k3bprogressdialog.h include/k3bprojectplugin.h include/k3bpushbutton.h -include/k3bradioaction.h +include/k3brawaudiodatasource.h include/k3brichtextlabel.h include/k3bsignalwaiter.h include/k3bsimplejobhandler.h include/k3bstdguiitems.h include/k3bstringutils.h -include/k3btempfile.h -include/k3bthread.h include/k3bthreadjob.h include/k3bthreadwidget.h include/k3bthroughputestimator.h include/k3btoc.h include/k3btocfilewriter.h -include/k3btoolbox.h -include/k3btoolbutton.h include/k3btrack.h include/k3bvalidators.h include/k3bvcddoc.h @@ -116,149 +106,139 @@ include/k3bvcdjob.h include/k3bvcdoptions.h include/k3bverificationjob.h include/k3bversion.h +include/k3bvideodvd.h +include/k3bvideodvdaudiostream.h include/k3bvideodvddoc.h include/k3bvideodvdjob.h +include/k3bvideodvdptt.h +include/k3bvideodvdsubpicturestream.h +include/k3bvideodvdtime.h +include/k3bvideodvdtitle.h +include/k3bvideodvdtitledetectclippingjob.h +include/k3bvideodvdtitletranscodingjob.h +include/k3bvideodvdvideostream.h include/k3bwavefilewriter.h -include/kcutlabel.h -lib/kde3/kcm_k3bsetup2.la -lib/kde3/kfile_k3b.la -lib/kde3/kio_videodvd.la -lib/kde3/libk3bartsoutputplugin.la -lib/kde3/libk3baudiometainforenamerplugin.la -lib/kde3/libk3baudioprojectcddbplugin.la -lib/kde3/libk3bexternalencoder.la -lib/kde3/libk3bflacdecoder.la -lib/kde3/libk3blameencoder.la -lib/kde3/libk3blibsndfiledecoder.la -lib/kde3/libk3bmaddecoder.la -lib/kde3/libk3boggvorbisdecoder.la -lib/kde3/libk3boggvorbisencoder.la -lib/kde3/libk3bsoxencoder.la -lib/kde3/libk3bwavedecoder.la -lib/libk3b.la -lib/libk3bdevice.la -share/applications/kde/k3b.desktop -share/doc/kde/HTML/en/k3b/audiocd-howto.docbook -share/doc/kde/HTML/en/k3b/burndialog_audio.png -share/doc/kde/HTML/en/k3b/burndialog_progress.png -share/doc/kde/HTML/en/k3b/cdcloning_dialog.png -share/doc/kde/HTML/en/k3b/cdcloning_reading.png -share/doc/kde/HTML/en/k3b/cdcopy-howto.docbook -share/doc/kde/HTML/en/k3b/cdcopy_done.png -share/doc/kde/HTML/en/k3b/cdcopy_reading.png -share/doc/kde/HTML/en/k3b/cdcopy_settings.png -share/doc/kde/HTML/en/k3b/cdcopy_writing.png -share/doc/kde/HTML/en/k3b/commands.docbook +lib/kde4/k3baudiometainforenamerplugin.so +lib/kde4/k3baudioprojectcddbplugin.so +lib/kde4/k3bexternalencoder.so +lib/kde4/k3bffmpegdecoder.so +lib/kde4/k3bflacdecoder.so +lib/kde4/k3blameencoder.so +lib/kde4/k3blibsndfiledecoder.so +lib/kde4/k3bmaddecoder.so +lib/kde4/k3boggvorbisdecoder.so +lib/kde4/k3boggvorbisencoder.so +lib/kde4/k3bsoxencoder.so +lib/kde4/k3bwavedecoder.so +lib/kde4/kcm_k3bexternalencoder.so +lib/kde4/kcm_k3blameencoder.so +lib/kde4/kcm_k3boggvorbisencoder.so +lib/kde4/kcm_k3bsetup.so +lib/kde4/kcm_k3bsoxencoder.so +lib/kde4/kio_videodvd.so +lib/kde4/libexec/k3bsetuphelper +lib/libk3bdevice.so +lib/libk3bdevice.so.6 +lib/libk3bdevice.so.6.0.0 +lib/libk3blib.so +lib/libk3blib.so.6 +lib/libk3blib.so.6.0.0 +share/PolicyKit/policy/org.kde.kcontrol.k3bsetup.policy +share/applications/kde4/k3b.desktop +share/dbus-1/system-services/org.kde.kcontrol.k3bsetup.service +share/doc/kde/HTML/en/k3b/K3bAddButton.png +share/doc/kde/HTML/en/k3b/K3bAdvancedSettings.png +share/doc/kde/HTML/en/k3b/K3bDiskChoice.png +share/doc/kde/HTML/en/k3b/K3bMoreActions.png +share/doc/kde/HTML/en/k3b/K3bSetVerify.png +share/doc/kde/HTML/en/k3b/K3bsetup.png share/doc/kde/HTML/en/k3b/common -share/doc/kde/HTML/en/k3b/dcop.docbook share/doc/kde/HTML/en/k3b/index.cache.bz2 share/doc/kde/HTML/en/k3b/index.docbook -share/doc/kde/HTML/en/k3b/select_audiofiles.png -share/doc/kde/HTML/en/k3b/select_project.png +share/examples/kde4-dbus/org.kde.kcontrol.k3bsetup.conf share/icons/hicolor/128x128/apps/k3b.png share/icons/hicolor/16x16/apps/k3b.png share/icons/hicolor/22x22/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/kde/applnk/.hidden/k3b-cue.desktop -share/kde/applnk/.hidden/k3b-iso.desktop -share/kde/applnk/Settings/System/k3bsetup2.desktop +share/icons/hicolor/scalable/apps/k3b.svgz share/kde/apps/k3b/cdi/cdi_imag.rtf share/kde/apps/k3b/cdi/cdi_text.fnt share/kde/apps/k3b/cdi/cdi_vcd.app share/kde/apps/k3b/cdi/cdi_vcd.cfg share/kde/apps/k3b/cdi/icdia.htm share/kde/apps/k3b/cdi/vcd_on_cdi_41.pdf -share/kde/apps/k3b/eventsrc share/kde/apps/k3b/extra/k3bphotosvcd.mpg share/kde/apps/k3b/extra/k3bphotovcd.mpg -share/kde/apps/k3b/icons/crystalsvg/16x16/actions/greenled.png -share/kde/apps/k3b/icons/crystalsvg/16x16/actions/redled.png -share/kde/apps/k3b/icons/crystalsvg/16x16/actions/yellowinfo.png -share/kde/apps/k3b/icons/crystalsvg/16x16/actions/yellowled.png -share/kde/apps/k3b/icons/hicolor/16x16/actions/audiocd.png -share/kde/apps/k3b/icons/hicolor/16x16/actions/burn_cdimage.png -share/kde/apps/k3b/icons/hicolor/16x16/actions/burn_dvdimage.png -share/kde/apps/k3b/icons/hicolor/16x16/actions/cdburn.png -share/kde/apps/k3b/icons/hicolor/16x16/actions/cdcopy.png -share/kde/apps/k3b/icons/hicolor/16x16/actions/cddarip.png -share/kde/apps/k3b/icons/hicolor/16x16/actions/datacd.png -share/kde/apps/k3b/icons/hicolor/16x16/actions/datadvd.png -share/kde/apps/k3b/icons/hicolor/16x16/actions/dvdcopy.png -share/kde/apps/k3b/icons/hicolor/16x16/actions/emovix.png -share/kde/apps/k3b/icons/hicolor/16x16/actions/erasecd.png -share/kde/apps/k3b/icons/hicolor/16x16/actions/formatdvd.png -share/kde/apps/k3b/icons/hicolor/16x16/actions/mixedcd.png -share/kde/apps/k3b/icons/hicolor/16x16/actions/mp3cd.png share/kde/apps/k3b/icons/hicolor/16x16/actions/musicbrainz.png -share/kde/apps/k3b/icons/hicolor/16x16/actions/videocd.png -share/kde/apps/k3b/icons/hicolor/16x16/actions/videodvd.png -share/kde/apps/k3b/icons/hicolor/22x22/actions/audiocd.png -share/kde/apps/k3b/icons/hicolor/22x22/actions/burn_cdimage.png -share/kde/apps/k3b/icons/hicolor/22x22/actions/burn_dvdimage.png -share/kde/apps/k3b/icons/hicolor/22x22/actions/cdburn.png -share/kde/apps/k3b/icons/hicolor/22x22/actions/cdcopy.png -share/kde/apps/k3b/icons/hicolor/22x22/actions/cddarip.png -share/kde/apps/k3b/icons/hicolor/22x22/actions/datacd.png -share/kde/apps/k3b/icons/hicolor/22x22/actions/datadvd.png -share/kde/apps/k3b/icons/hicolor/22x22/actions/dvdcopy.png -share/kde/apps/k3b/icons/hicolor/22x22/actions/emovix.png -share/kde/apps/k3b/icons/hicolor/22x22/actions/erasecd.png -share/kde/apps/k3b/icons/hicolor/22x22/actions/formatdvd.png -share/kde/apps/k3b/icons/hicolor/22x22/actions/mixedcd.png -share/kde/apps/k3b/icons/hicolor/22x22/actions/mp3cd.png -share/kde/apps/k3b/icons/hicolor/22x22/actions/videocd.png -share/kde/apps/k3b/icons/hicolor/22x22/actions/videodvd.png -share/kde/apps/k3b/icons/hicolor/32x32/actions/audiocd.png -share/kde/apps/k3b/icons/hicolor/32x32/actions/burn_cdimage.png -share/kde/apps/k3b/icons/hicolor/32x32/actions/burn_dvdimage.png -share/kde/apps/k3b/icons/hicolor/32x32/actions/cdburn.png -share/kde/apps/k3b/icons/hicolor/32x32/actions/cdcopy.png -share/kde/apps/k3b/icons/hicolor/32x32/actions/cddarip.png -share/kde/apps/k3b/icons/hicolor/32x32/actions/datacd.png -share/kde/apps/k3b/icons/hicolor/32x32/actions/datadvd.png -share/kde/apps/k3b/icons/hicolor/32x32/actions/dvdcopy.png -share/kde/apps/k3b/icons/hicolor/32x32/actions/emovix.png -share/kde/apps/k3b/icons/hicolor/32x32/actions/erasecd.png -share/kde/apps/k3b/icons/hicolor/32x32/actions/formatdvd.png -share/kde/apps/k3b/icons/hicolor/32x32/actions/mixedcd.png -share/kde/apps/k3b/icons/hicolor/32x32/actions/mp3cd.png -share/kde/apps/k3b/icons/hicolor/32x32/actions/videocd.png -share/kde/apps/k3b/icons/hicolor/32x32/actions/videodvd.png -share/kde/apps/k3b/icons/hicolor/48x48/actions/audiocd.png -share/kde/apps/k3b/icons/hicolor/48x48/actions/burn_cdimage.png -share/kde/apps/k3b/icons/hicolor/48x48/actions/burn_dvdimage.png -share/kde/apps/k3b/icons/hicolor/48x48/actions/cdburn.png -share/kde/apps/k3b/icons/hicolor/48x48/actions/cdcopy.png -share/kde/apps/k3b/icons/hicolor/48x48/actions/cddarip.png -share/kde/apps/k3b/icons/hicolor/48x48/actions/datacd.png -share/kde/apps/k3b/icons/hicolor/48x48/actions/datadvd.png -share/kde/apps/k3b/icons/hicolor/48x48/actions/dvdcopy.png -share/kde/apps/k3b/icons/hicolor/48x48/actions/emovix.png -share/kde/apps/k3b/icons/hicolor/48x48/actions/erasecd.png -share/kde/apps/k3b/icons/hicolor/48x48/actions/formatdvd.png -share/kde/apps/k3b/icons/hicolor/48x48/actions/mixedcd.png -share/kde/apps/k3b/icons/hicolor/48x48/actions/mp3cd.png -share/kde/apps/k3b/icons/hicolor/48x48/actions/videocd.png -share/kde/apps/k3b/icons/hicolor/48x48/actions/videodvd.png share/kde/apps/k3b/icons/hicolor/64x64/actions/musicbrainz.png -share/kde/apps/k3b/icons/hicolor/scalable/actions/audiocd.svgz -share/kde/apps/k3b/icons/hicolor/scalable/actions/burn_cdimage.svgz -share/kde/apps/k3b/icons/hicolor/scalable/actions/burn_dvdimage.svgz -share/kde/apps/k3b/icons/hicolor/scalable/actions/cdburn.svgz -share/kde/apps/k3b/icons/hicolor/scalable/actions/cdcopy.svgz -share/kde/apps/k3b/icons/hicolor/scalable/actions/cddarip.svgz -share/kde/apps/k3b/icons/hicolor/scalable/actions/datacd.svgz -share/kde/apps/k3b/icons/hicolor/scalable/actions/datadvd.svgz -share/kde/apps/k3b/icons/hicolor/scalable/actions/dvdcopy.svgz -share/kde/apps/k3b/icons/hicolor/scalable/actions/emovix.svgz -share/kde/apps/k3b/icons/hicolor/scalable/actions/erasecd.svgz -share/kde/apps/k3b/icons/hicolor/scalable/actions/formatdvd.svgz -share/kde/apps/k3b/icons/hicolor/scalable/actions/mixedcd.svgz -share/kde/apps/k3b/icons/hicolor/scalable/actions/mp3cd.svgz -share/kde/apps/k3b/icons/hicolor/scalable/actions/videocd.svgz -share/kde/apps/k3b/icons/hicolor/scalable/actions/videodvd.svgz +share/kde/apps/k3b/icons/oxygen/128x128/actions/tools-rip-audio-cd.png +share/kde/apps/k3b/icons/oxygen/128x128/actions/tools-rip-video-cd.png +share/kde/apps/k3b/icons/oxygen/128x128/actions/tools-rip-video-dvd.png +share/kde/apps/k3b/icons/oxygen/128x128/devices/media-optical-audio.png +share/kde/apps/k3b/icons/oxygen/128x128/devices/media-optical-cd-video.png +share/kde/apps/k3b/icons/oxygen/128x128/devices/media-optical-dvd-video.png +share/kde/apps/k3b/icons/oxygen/128x128/devices/media-optical-mixed-cd.png +share/kde/apps/k3b/icons/oxygen/128x128/devices/media-optical-video.png +share/kde/apps/k3b/icons/oxygen/128x128/mimetypes/application-x-k3b.png +share/kde/apps/k3b/icons/oxygen/16x16/actions/tools-rip-audio-cd.png +share/kde/apps/k3b/icons/oxygen/16x16/actions/tools-rip-video-cd.png +share/kde/apps/k3b/icons/oxygen/16x16/actions/tools-rip-video-dvd.png +share/kde/apps/k3b/icons/oxygen/16x16/devices/media-optical-audio.png +share/kde/apps/k3b/icons/oxygen/16x16/devices/media-optical-cd-video.png +share/kde/apps/k3b/icons/oxygen/16x16/devices/media-optical-data.png +share/kde/apps/k3b/icons/oxygen/16x16/devices/media-optical-mixed-cd.png +share/kde/apps/k3b/icons/oxygen/16x16/devices/media-optical-video.png +share/kde/apps/k3b/icons/oxygen/22x22/actions/tools-rip-audio-cd.png +share/kde/apps/k3b/icons/oxygen/22x22/actions/tools-rip-video-cd.png +share/kde/apps/k3b/icons/oxygen/22x22/actions/tools-rip-video-dvd.png +share/kde/apps/k3b/icons/oxygen/22x22/devices/media-optical-audio.png +share/kde/apps/k3b/icons/oxygen/22x22/devices/media-optical-cd-video.png +share/kde/apps/k3b/icons/oxygen/22x22/devices/media-optical-data.png +share/kde/apps/k3b/icons/oxygen/22x22/devices/media-optical-mixed-cd.png +share/kde/apps/k3b/icons/oxygen/22x22/devices/media-optical-video.png +share/kde/apps/k3b/icons/oxygen/32x32/actions/tools-rip-audio-cd.png +share/kde/apps/k3b/icons/oxygen/32x32/actions/tools-rip-video-cd.png +share/kde/apps/k3b/icons/oxygen/32x32/actions/tools-rip-video-dvd.png +share/kde/apps/k3b/icons/oxygen/32x32/devices/media-optical-audio.png +share/kde/apps/k3b/icons/oxygen/32x32/devices/media-optical-cd-video.png +share/kde/apps/k3b/icons/oxygen/32x32/devices/media-optical-data.png +share/kde/apps/k3b/icons/oxygen/32x32/devices/media-optical-dvd-video.png +share/kde/apps/k3b/icons/oxygen/32x32/devices/media-optical-mixed-cd.png +share/kde/apps/k3b/icons/oxygen/32x32/devices/media-optical-video.png +share/kde/apps/k3b/icons/oxygen/32x32/mimetypes/application-x-k3b.png +share/kde/apps/k3b/icons/oxygen/48x48/actions/tools-rip-audio-cd.png +share/kde/apps/k3b/icons/oxygen/48x48/actions/tools-rip-video-cd.png +share/kde/apps/k3b/icons/oxygen/48x48/actions/tools-rip-video-dvd.png +share/kde/apps/k3b/icons/oxygen/48x48/devices/media-optical-audio.png +share/kde/apps/k3b/icons/oxygen/48x48/devices/media-optical-cd-video.png +share/kde/apps/k3b/icons/oxygen/48x48/devices/media-optical-data.png +share/kde/apps/k3b/icons/oxygen/48x48/devices/media-optical-dvd-video.png +share/kde/apps/k3b/icons/oxygen/48x48/devices/media-optical-mixed-cd.png +share/kde/apps/k3b/icons/oxygen/48x48/devices/media-optical-video.png +share/kde/apps/k3b/icons/oxygen/48x48/mimetypes/application-x-k3b.png +share/kde/apps/k3b/icons/oxygen/64x64/actions/tools-rip-audio-cd.png +share/kde/apps/k3b/icons/oxygen/64x64/actions/tools-rip-video-cd.png +share/kde/apps/k3b/icons/oxygen/64x64/actions/tools-rip-video-dvd.png +share/kde/apps/k3b/icons/oxygen/64x64/devices/media-optical-audio.png +share/kde/apps/k3b/icons/oxygen/64x64/devices/media-optical-cd-video.png +share/kde/apps/k3b/icons/oxygen/64x64/devices/media-optical-dvd-video.png +share/kde/apps/k3b/icons/oxygen/64x64/devices/media-optical-mixed-cd.png +share/kde/apps/k3b/icons/oxygen/64x64/devices/media-optical-video.png +share/kde/apps/k3b/icons/oxygen/64x64/mimetypes/application-x-k3b.png +share/kde/apps/k3b/icons/oxygen/scalable/actions/tools-rip-audio-cd.svgz +share/kde/apps/k3b/icons/oxygen/scalable/actions/tools-rip-video-cd.svgz +share/kde/apps/k3b/icons/oxygen/scalable/actions/tools-rip-video-dvd.svgz +share/kde/apps/k3b/icons/oxygen/scalable/devices/media-optical-audio.svgz +share/kde/apps/k3b/icons/oxygen/scalable/devices/media-optical-cd-video.svgz +share/kde/apps/k3b/icons/oxygen/scalable/devices/media-optical-data.svgz +share/kde/apps/k3b/icons/oxygen/scalable/devices/media-optical-dvd-video.svgz +share/kde/apps/k3b/icons/oxygen/scalable/devices/media-optical-mixed-cd.svgz +share/kde/apps/k3b/icons/oxygen/scalable/devices/media-optical-video.svgz +share/kde/apps/k3b/icons/oxygen/scalable/mimetypes/application-x-k3b.svgz +share/kde/apps/k3b/k3b.notifyrc +share/kde/apps/k3b/k3bdeviceui.rc share/kde/apps/k3b/k3bui.rc share/kde/apps/k3b/pics/73lab/dialog_left.png share/kde/apps/k3b/pics/73lab/dialog_right.png @@ -334,35 +314,291 @@ share/kde/apps/k3b/pics/quant/project_left.png share/kde/apps/k3b/pics/quant/project_right.png share/kde/apps/k3b/pics/quant/splash.png share/kde/apps/k3b/pics/quant/welcome_bg.png -share/kde/apps/k3b/plugins/k3bartsoutputplugin.plugin -share/kde/apps/k3b/plugins/k3baudiometainforenamerplugin.plugin -share/kde/apps/k3b/plugins/k3baudioprojectcddbplugin.plugin -share/kde/apps/k3b/plugins/k3bexternalencoder.plugin -share/kde/apps/k3b/plugins/k3bflacdecoder.plugin -share/kde/apps/k3b/plugins/k3blameencoder.plugin -share/kde/apps/k3b/plugins/k3blibsndfiledecoder.plugin -share/kde/apps/k3b/plugins/k3bmaddecoder.plugin -share/kde/apps/k3b/plugins/k3boggvorbisdecoder.plugin -share/kde/apps/k3b/plugins/k3boggvorbisencoder.plugin -share/kde/apps/k3b/plugins/k3bsoxencoder.plugin -share/kde/apps/k3b/plugins/k3bwavedecoder.plugin -share/kde/apps/k3b/servicemenus/k3b_create_audio_cd.desktop -share/kde/apps/k3b/servicemenus/k3b_create_data_cd.desktop -share/kde/apps/k3b/servicemenus/k3b_create_data_dvd.desktop -share/kde/apps/k3b/servicemenus/k3b_create_video_cd.desktop -share/kde/apps/k3b/servicemenus/k3b_write_bin_image.desktop -share/kde/apps/k3b/servicemenus/k3b_write_iso_image.desktop share/kde/apps/k3b/tips share/kde/apps/konqsidebartng/virtual_folders/services/videodvd.desktop -share/kde/apps/konqueror/servicemenus/k3b_audiocd_rip.desktop -share/kde/apps/konqueror/servicemenus/k3b_cd_copy.desktop -share/kde/apps/konqueror/servicemenus/k3b_dvd_copy.desktop -share/kde/apps/konqueror/servicemenus/k3b_handle_empty_cd.desktop -share/kde/apps/konqueror/servicemenus/k3b_handle_empty_dvd.desktop -share/kde/apps/konqueror/servicemenus/k3b_videodvd_rip.desktop -share/kde/mimelnk/application/x-k3b.desktop -share/kde/services/kfile_k3b.desktop -share/kde/services/videodvd.protocol -share/kde/sounds/k3b_error1.wav -share/kde/sounds/k3b_success1.wav -share/kde/sounds/k3b_wait_media1.wav +share/kde/apps/solid/actions/k3b_audiocd_rip.desktop +share/kde/apps/solid/actions/k3b_copy_disc.desktop +share/kde/apps/solid/actions/k3b_create_audio_cd_from_blank_medium.desktop +share/kde/apps/solid/actions/k3b_create_data_project_from_blank_medium.desktop +share/kde/apps/solid/actions/k3b_videodvd_rip.desktop +share/kde4/services/ServiceMenus/k3b_create_audio_cd.desktop +share/kde4/services/ServiceMenus/k3b_create_data_project.desktop +share/kde4/services/ServiceMenus/k3b_create_video_cd.desktop +share/kde4/services/ServiceMenus/k3b_write_bin_image.desktop +share/kde4/services/ServiceMenus/k3b_write_iso_image.desktop +share/kde4/services/k3baudiometainforenamerplugin.desktop +share/kde4/services/k3baudioprojectcddbplugin.desktop +share/kde4/services/k3bexternalencoder.desktop +share/kde4/services/k3bffmpegdecoder.desktop +share/kde4/services/k3bflacdecoder.desktop +share/kde4/services/k3blameencoder.desktop +share/kde4/services/k3blibsndfiledecoder.desktop +share/kde4/services/k3bmaddecoder.desktop +share/kde4/services/k3boggvorbisdecoder.desktop +share/kde4/services/k3boggvorbisencoder.desktop +share/kde4/services/k3bsetup.desktop +share/kde4/services/k3bsoxencoder.desktop +share/kde4/services/k3bwavedecoder.desktop +share/kde4/services/kcm_k3bexternalencoder.desktop +share/kde4/services/kcm_k3blameencoder.desktop +share/kde4/services/kcm_k3boggvorbisencoder.desktop +share/kde4/services/kcm_k3bsoxencoder.desktop +share/kde4/services/videodvd.protocol +share/kde4/servicetypes/k3bplugin.desktop +share/locale/ast/LC_MESSAGES/k3b.mo +share/locale/ast/LC_MESSAGES/k3bsetup.mo +share/locale/ast/LC_MESSAGES/kio_videodvd.mo +share/locale/ast/LC_MESSAGES/libk3b.mo +share/locale/ast/LC_MESSAGES/libk3bdevice.mo +share/locale/be/LC_MESSAGES/k3b.mo +share/locale/be/LC_MESSAGES/k3bsetup.mo +share/locale/be/LC_MESSAGES/libk3b.mo +share/locale/be/LC_MESSAGES/libk3bdevice.mo +share/locale/bg/LC_MESSAGES/k3b.mo +share/locale/bg/LC_MESSAGES/k3bsetup.mo +share/locale/bg/LC_MESSAGES/libk3b.mo +share/locale/bg/LC_MESSAGES/libk3bdevice.mo +share/locale/ca/LC_MESSAGES/k3b.mo +share/locale/ca/LC_MESSAGES/k3bsetup.mo +share/locale/ca/LC_MESSAGES/kio_videodvd.mo +share/locale/ca/LC_MESSAGES/libk3b.mo +share/locale/ca/LC_MESSAGES/libk3bdevice.mo +share/locale/ca@valencia/LC_MESSAGES/k3b.mo +share/locale/ca@valencia/LC_MESSAGES/k3bsetup.mo +share/locale/ca@valencia/LC_MESSAGES/kio_videodvd.mo +share/locale/ca@valencia/LC_MESSAGES/libk3b.mo +share/locale/ca@valencia/LC_MESSAGES/libk3bdevice.mo +share/locale/cs/LC_MESSAGES/k3b.mo +share/locale/cs/LC_MESSAGES/k3bsetup.mo +share/locale/cs/LC_MESSAGES/kio_videodvd.mo +share/locale/cs/LC_MESSAGES/libk3b.mo +share/locale/cs/LC_MESSAGES/libk3bdevice.mo +share/locale/csb/LC_MESSAGES/k3b.mo +share/locale/csb/LC_MESSAGES/k3bsetup.mo +share/locale/da/LC_MESSAGES/k3b.mo +share/locale/da/LC_MESSAGES/k3bsetup.mo +share/locale/da/LC_MESSAGES/kio_videodvd.mo +share/locale/da/LC_MESSAGES/libk3b.mo +share/locale/da/LC_MESSAGES/libk3bdevice.mo +share/locale/de/LC_MESSAGES/k3b.mo +share/locale/de/LC_MESSAGES/k3bsetup.mo +share/locale/de/LC_MESSAGES/kio_videodvd.mo +share/locale/de/LC_MESSAGES/libk3b.mo +share/locale/de/LC_MESSAGES/libk3bdevice.mo +share/locale/el/LC_MESSAGES/k3b.mo +share/locale/el/LC_MESSAGES/k3bsetup.mo +share/locale/el/LC_MESSAGES/libk3b.mo +share/locale/el/LC_MESSAGES/libk3bdevice.mo +share/locale/en_GB/LC_MESSAGES/k3b.mo +share/locale/en_GB/LC_MESSAGES/k3bsetup.mo +share/locale/en_GB/LC_MESSAGES/kio_videodvd.mo +share/locale/en_GB/LC_MESSAGES/libk3b.mo +share/locale/en_GB/LC_MESSAGES/libk3bdevice.mo +share/locale/eo/LC_MESSAGES/k3b.mo +share/locale/eo/LC_MESSAGES/k3bsetup.mo +share/locale/eo/LC_MESSAGES/libk3b.mo +share/locale/eo/LC_MESSAGES/libk3bdevice.mo +share/locale/es/LC_MESSAGES/k3b.mo +share/locale/es/LC_MESSAGES/k3bsetup.mo +share/locale/es/LC_MESSAGES/kio_videodvd.mo +share/locale/es/LC_MESSAGES/libk3b.mo +share/locale/es/LC_MESSAGES/libk3bdevice.mo +share/locale/et/LC_MESSAGES/k3b.mo +share/locale/et/LC_MESSAGES/k3bsetup.mo +share/locale/et/LC_MESSAGES/kio_videodvd.mo +share/locale/et/LC_MESSAGES/libk3b.mo +share/locale/et/LC_MESSAGES/libk3bdevice.mo +share/locale/eu/LC_MESSAGES/k3b.mo +share/locale/eu/LC_MESSAGES/k3bsetup.mo +share/locale/eu/LC_MESSAGES/libk3b.mo +share/locale/eu/LC_MESSAGES/libk3bdevice.mo +share/locale/fi/LC_MESSAGES/k3b.mo +share/locale/fi/LC_MESSAGES/k3bsetup.mo +share/locale/fi/LC_MESSAGES/libk3b.mo +share/locale/fi/LC_MESSAGES/libk3bdevice.mo +share/locale/fr/LC_MESSAGES/k3b.mo +share/locale/fr/LC_MESSAGES/k3bsetup.mo +share/locale/fr/LC_MESSAGES/libk3b.mo +share/locale/fr/LC_MESSAGES/libk3bdevice.mo +share/locale/ga/LC_MESSAGES/k3b.mo +share/locale/ga/LC_MESSAGES/k3bsetup.mo +share/locale/ga/LC_MESSAGES/kio_videodvd.mo +share/locale/ga/LC_MESSAGES/libk3b.mo +share/locale/ga/LC_MESSAGES/libk3bdevice.mo +share/locale/gl/LC_MESSAGES/k3b.mo +share/locale/gl/LC_MESSAGES/k3bsetup.mo +share/locale/gl/LC_MESSAGES/libk3b.mo +share/locale/gl/LC_MESSAGES/libk3bdevice.mo +share/locale/he/LC_MESSAGES/k3b.mo +share/locale/he/LC_MESSAGES/k3bsetup.mo +share/locale/he/LC_MESSAGES/libk3b.mo +share/locale/he/LC_MESSAGES/libk3bdevice.mo +share/locale/hi/LC_MESSAGES/k3b.mo +share/locale/hi/LC_MESSAGES/k3bsetup.mo +share/locale/hi/LC_MESSAGES/libk3b.mo +share/locale/hi/LC_MESSAGES/libk3bdevice.mo +share/locale/hne/LC_MESSAGES/k3b.mo +share/locale/hne/LC_MESSAGES/k3bsetup.mo +share/locale/hne/LC_MESSAGES/libk3b.mo +share/locale/hne/LC_MESSAGES/libk3bdevice.mo +share/locale/hr/LC_MESSAGES/k3b.mo +share/locale/hr/LC_MESSAGES/k3bsetup.mo +share/locale/hr/LC_MESSAGES/kio_videodvd.mo +share/locale/hr/LC_MESSAGES/libk3b.mo +share/locale/hr/LC_MESSAGES/libk3bdevice.mo +share/locale/hu/LC_MESSAGES/k3b.mo +share/locale/hu/LC_MESSAGES/k3bsetup.mo +share/locale/hu/LC_MESSAGES/kio_videodvd.mo +share/locale/hu/LC_MESSAGES/libk3b.mo +share/locale/hu/LC_MESSAGES/libk3bdevice.mo +share/locale/is/LC_MESSAGES/k3b.mo +share/locale/is/LC_MESSAGES/k3bsetup.mo +share/locale/is/LC_MESSAGES/kio_videodvd.mo +share/locale/is/LC_MESSAGES/libk3b.mo +share/locale/is/LC_MESSAGES/libk3bdevice.mo +share/locale/it/LC_MESSAGES/k3b.mo +share/locale/it/LC_MESSAGES/k3bsetup.mo +share/locale/it/LC_MESSAGES/libk3b.mo +share/locale/it/LC_MESSAGES/libk3bdevice.mo +share/locale/ja/LC_MESSAGES/k3b.mo +share/locale/ja/LC_MESSAGES/k3bsetup.mo +share/locale/ja/LC_MESSAGES/kio_videodvd.mo +share/locale/ja/LC_MESSAGES/libk3b.mo +share/locale/ja/LC_MESSAGES/libk3bdevice.mo +share/locale/km/LC_MESSAGES/k3b.mo +share/locale/km/LC_MESSAGES/k3bsetup.mo +share/locale/km/LC_MESSAGES/libk3b.mo +share/locale/km/LC_MESSAGES/libk3bdevice.mo +share/locale/ko/LC_MESSAGES/k3b.mo +share/locale/ko/LC_MESSAGES/k3bsetup.mo +share/locale/ko/LC_MESSAGES/libk3b.mo +share/locale/ko/LC_MESSAGES/libk3bdevice.mo +share/locale/ku/LC_MESSAGES/k3b.mo +share/locale/lt/LC_MESSAGES/k3b.mo +share/locale/lt/LC_MESSAGES/k3bsetup.mo +share/locale/lt/LC_MESSAGES/kio_videodvd.mo +share/locale/lt/LC_MESSAGES/libk3b.mo +share/locale/lt/LC_MESSAGES/libk3bdevice.mo +share/locale/lv/LC_MESSAGES/k3bsetup.mo +share/locale/lv/LC_MESSAGES/libk3b.mo +share/locale/lv/LC_MESSAGES/libk3bdevice.mo +share/locale/mai/LC_MESSAGES/k3b.mo +share/locale/mai/LC_MESSAGES/libk3b.mo +share/locale/ms/LC_MESSAGES/k3b.mo +share/locale/ms/LC_MESSAGES/k3bsetup.mo +share/locale/ms/LC_MESSAGES/kio_videodvd.mo +share/locale/ms/LC_MESSAGES/libk3b.mo +share/locale/ms/LC_MESSAGES/libk3bdevice.mo +share/locale/nb/LC_MESSAGES/k3b.mo +share/locale/nb/LC_MESSAGES/k3bsetup.mo +share/locale/nb/LC_MESSAGES/kio_videodvd.mo +share/locale/nb/LC_MESSAGES/libk3b.mo +share/locale/nb/LC_MESSAGES/libk3bdevice.mo +share/locale/nds/LC_MESSAGES/k3b.mo +share/locale/nds/LC_MESSAGES/k3bsetup.mo +share/locale/nds/LC_MESSAGES/kio_videodvd.mo +share/locale/nds/LC_MESSAGES/libk3b.mo +share/locale/nds/LC_MESSAGES/libk3bdevice.mo +share/locale/nl/LC_MESSAGES/k3b.mo +share/locale/nl/LC_MESSAGES/k3bsetup.mo +share/locale/nl/LC_MESSAGES/kio_videodvd.mo +share/locale/nl/LC_MESSAGES/libk3b.mo +share/locale/nl/LC_MESSAGES/libk3bdevice.mo +share/locale/nn/LC_MESSAGES/k3b.mo +share/locale/nn/LC_MESSAGES/k3bsetup.mo +share/locale/nn/LC_MESSAGES/kio_videodvd.mo +share/locale/nn/LC_MESSAGES/libk3b.mo +share/locale/nn/LC_MESSAGES/libk3bdevice.mo +share/locale/oc/LC_MESSAGES/k3b.mo +share/locale/oc/LC_MESSAGES/k3bsetup.mo +share/locale/oc/LC_MESSAGES/libk3b.mo +share/locale/oc/LC_MESSAGES/libk3bdevice.mo +share/locale/pa/LC_MESSAGES/k3b.mo +share/locale/pa/LC_MESSAGES/k3bsetup.mo +share/locale/pa/LC_MESSAGES/libk3b.mo +share/locale/pa/LC_MESSAGES/libk3bdevice.mo +share/locale/pl/LC_MESSAGES/k3b.mo +share/locale/pl/LC_MESSAGES/k3bsetup.mo +share/locale/pl/LC_MESSAGES/libk3b.mo +share/locale/pl/LC_MESSAGES/libk3bdevice.mo +share/locale/pt/LC_MESSAGES/k3b.mo +share/locale/pt/LC_MESSAGES/k3bsetup.mo +share/locale/pt/LC_MESSAGES/kio_videodvd.mo +share/locale/pt/LC_MESSAGES/libk3b.mo +share/locale/pt/LC_MESSAGES/libk3bdevice.mo +share/locale/pt_BR/LC_MESSAGES/k3b.mo +share/locale/pt_BR/LC_MESSAGES/k3bsetup.mo +share/locale/pt_BR/LC_MESSAGES/kio_videodvd.mo +share/locale/pt_BR/LC_MESSAGES/libk3b.mo +share/locale/pt_BR/LC_MESSAGES/libk3bdevice.mo +share/locale/ro/LC_MESSAGES/k3b.mo +share/locale/ro/LC_MESSAGES/k3bsetup.mo +share/locale/ro/LC_MESSAGES/libk3b.mo +share/locale/ro/LC_MESSAGES/libk3bdevice.mo +share/locale/ru/LC_MESSAGES/k3b.mo +share/locale/ru/LC_MESSAGES/k3bsetup.mo +share/locale/ru/LC_MESSAGES/kio_videodvd.mo +share/locale/ru/LC_MESSAGES/libk3b.mo +share/locale/ru/LC_MESSAGES/libk3bdevice.mo +share/locale/se/LC_MESSAGES/k3b.mo +share/locale/se/LC_MESSAGES/k3bsetup.mo +share/locale/se/LC_MESSAGES/libk3b.mo +share/locale/se/LC_MESSAGES/libk3bdevice.mo +share/locale/sk/LC_MESSAGES/k3b.mo +share/locale/sk/LC_MESSAGES/k3bsetup.mo +share/locale/sk/LC_MESSAGES/kio_videodvd.mo +share/locale/sk/LC_MESSAGES/libk3b.mo +share/locale/sk/LC_MESSAGES/libk3bdevice.mo +share/locale/sl/LC_MESSAGES/k3b.mo +share/locale/sl/LC_MESSAGES/k3bsetup.mo +share/locale/sl/LC_MESSAGES/libk3b.mo +share/locale/sl/LC_MESSAGES/libk3bdevice.mo +share/locale/sr/LC_MESSAGES/k3b.mo +share/locale/sr/LC_MESSAGES/k3bsetup.mo +share/locale/sr/LC_MESSAGES/kio_videodvd.mo +share/locale/sr/LC_MESSAGES/libk3b.mo +share/locale/sr/LC_MESSAGES/libk3bdevice.mo +share/locale/sr@ijekavian/LC_MESSAGES/k3b.mo +share/locale/sr@ijekavian/LC_MESSAGES/k3bsetup.mo +share/locale/sr@ijekavian/LC_MESSAGES/kio_videodvd.mo +share/locale/sr@ijekavian/LC_MESSAGES/libk3b.mo +share/locale/sr@ijekavian/LC_MESSAGES/libk3bdevice.mo +share/locale/sr@ijekavianlatin/LC_MESSAGES/k3b.mo +share/locale/sr@ijekavianlatin/LC_MESSAGES/k3bsetup.mo +share/locale/sr@ijekavianlatin/LC_MESSAGES/kio_videodvd.mo +share/locale/sr@ijekavianlatin/LC_MESSAGES/libk3b.mo +share/locale/sr@ijekavianlatin/LC_MESSAGES/libk3bdevice.mo +share/locale/sr@latin/LC_MESSAGES/k3b.mo +share/locale/sr@latin/LC_MESSAGES/k3bsetup.mo +share/locale/sr@latin/LC_MESSAGES/kio_videodvd.mo +share/locale/sr@latin/LC_MESSAGES/libk3b.mo +share/locale/sr@latin/LC_MESSAGES/libk3bdevice.mo +share/locale/sv/LC_MESSAGES/k3b.mo +share/locale/sv/LC_MESSAGES/k3bsetup.mo +share/locale/sv/LC_MESSAGES/kio_videodvd.mo +share/locale/sv/LC_MESSAGES/libk3b.mo +share/locale/sv/LC_MESSAGES/libk3bdevice.mo +share/locale/th/LC_MESSAGES/k3b.mo +share/locale/th/LC_MESSAGES/k3bsetup.mo +share/locale/th/LC_MESSAGES/libk3b.mo +share/locale/th/LC_MESSAGES/libk3bdevice.mo +share/locale/tr/LC_MESSAGES/k3b.mo +share/locale/tr/LC_MESSAGES/k3bsetup.mo +share/locale/tr/LC_MESSAGES/kio_videodvd.mo +share/locale/tr/LC_MESSAGES/libk3b.mo +share/locale/tr/LC_MESSAGES/libk3bdevice.mo +share/locale/uk/LC_MESSAGES/k3b.mo +share/locale/uk/LC_MESSAGES/k3bsetup.mo +share/locale/uk/LC_MESSAGES/kio_videodvd.mo +share/locale/uk/LC_MESSAGES/libk3b.mo +share/locale/uk/LC_MESSAGES/libk3bdevice.mo +share/locale/zh_CN/LC_MESSAGES/k3b.mo +share/locale/zh_CN/LC_MESSAGES/k3bsetup.mo +share/locale/zh_CN/LC_MESSAGES/libk3b.mo +share/locale/zh_CN/LC_MESSAGES/libk3bdevice.mo +share/locale/zh_TW/LC_MESSAGES/k3b.mo +share/locale/zh_TW/LC_MESSAGES/k3bsetup.mo +share/locale/zh_TW/LC_MESSAGES/kio_videodvd.mo +share/locale/zh_TW/LC_MESSAGES/libk3b.mo +share/locale/zh_TW/LC_MESSAGES/libk3bdevice.mo +share/mime/packages/x-k3b.xml diff --git a/sysutils/k3b/distinfo b/sysutils/k3b/distinfo index b6222b3ba62..4ebdf5ce1e1 100644 --- a/sysutils/k3b/distinfo +++ b/sysutils/k3b/distinfo @@ -1,9 +1,9 @@ -$NetBSD: distinfo,v 1.17 2009/12/12 19:39:24 markd Exp $ +$NetBSD: distinfo,v 1.18 2012/03/22 06:39:00 markd Exp $ -SHA1 (k3b-1.0.5.tar.bz2) = c45d6f2a36b1bc7ea14101d444149c40fd4b700e -RMD160 (k3b-1.0.5.tar.bz2) = b562746015cc2e4226652402725b4e69eb846822 -Size (k3b-1.0.5.tar.bz2) = 5113060 bytes -SHA1 (patch-ab) = 4f382751e9a7ade09aad6f8d594e76f9e5bfa5d5 -SHA1 (patch-ac) = 38902921193ff0219c1769ffa3b793de6f3f4c0c -SHA1 (patch-ad) = 895ec31a9a05f0168daba78bcb3ff8969f98637b -SHA1 (patch-ae) = d5fb26c88710b9cdf14e19aa530f60e429b47941 +SHA1 (k3b-2.0.2.tar.bz2) = 8b30a4d07942e82559b01bc07dea6bcf2defd532 +RMD160 (k3b-2.0.2.tar.bz2) = a0289eb9ccec9607c2bdac3fc7c69102eec5ee40 +Size (k3b-2.0.2.tar.bz2) = 12833321 bytes +SHA1 (patch-libk3b_jobs_k3bdatatrackreader.cpp) = 124d5ba1a3384d012a8b471f55fd624ffe9df5d4 +SHA1 (patch-libk3bdevice_k3bdevice.cpp) = 8533f0c08551ef9b8429792f607a52675f79e419 +SHA1 (patch-libk3bdevice_k3bdevicemanager.cpp) = fe07915854808758ab9d989d11b61fdc3b4b95bd +SHA1 (patch-libk3bdevice_k3bscsicommand_netbsd.cpp) = f2326f21219178443535fc4a80b8bdd46479b1ad diff --git a/sysutils/k3b/patches/patch-ab b/sysutils/k3b/patches/patch-ab deleted file mode 100644 index d1964374bb9..00000000000 --- a/sysutils/k3b/patches/patch-ab +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-ab,v 1.6 2007/03/18 13:25:56 markd Exp $ - ---- src/projects/k3bencodingconverter.cpp.orig 2007-03-17 08:04:05.000000000 +1300 -+++ src/projects/k3bencodingconverter.cpp -@@ -62,7 +62,7 @@ bool K3bEncodingConverter::encodedLocall - { - #ifdef HAVE_ICONV_H - QCString utf8Encoded( s.length()*2 ); --#if defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD) -+#if (defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)) && !defined(__DragonFly__) - const char* in = s.data(); - #else - char* in = s.data(); -@@ -111,7 +111,7 @@ bool K3bEncodingConverter::convert( cons - iconv_t ic = ::iconv_open( to.local8Bit(), from.local8Bit() ); - - result.resize( s.length() * 2 ); --#if defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD) -+#if (defined(Q_OS_FREEBSD) || defined(Q_OS_NETBSD)) && !defined(__DragonFly__) - const char* in = s.data(); - #else - char* in = s.data(); diff --git a/sysutils/k3b/patches/patch-ac b/sysutils/k3b/patches/patch-ac deleted file mode 100644 index 863bfb11d26..00000000000 --- a/sysutils/k3b/patches/patch-ac +++ /dev/null @@ -1,13 +0,0 @@ -$NetBSD: patch-ac,v 1.3 2007/01/16 22:38:08 joerg Exp $ - ---- libk3b/core/k3bglobals.cpp.orig 2007-01-16 21:29:07.000000000 +0000 -+++ libk3b/core/k3bglobals.cpp -@@ -46,7 +46,7 @@ - #include <sys/utsname.h> - #include <sys/stat.h> - --#if defined(__FreeBSD__) || defined(__NetBSD__) -+#if defined(__FreeBSD__) || defined(__NetBSD__) || defined(__DragonFly__) - # include <sys/param.h> - # include <sys/mount.h> - # include <sys/endian.h> diff --git a/sysutils/k3b/patches/patch-ad b/sysutils/k3b/patches/patch-ad deleted file mode 100644 index e621adbcf2f..00000000000 --- a/sysutils/k3b/patches/patch-ad +++ /dev/null @@ -1,38 +0,0 @@ -$NetBSD: patch-ad,v 1.6 2009/12/12 19:39:24 markd Exp $ - ---- libk3bdevice/k3bdevicemanager.cpp.orig 2008-05-27 20:23:39.000000000 +1200 -+++ libk3bdevice/k3bdevicemanager.cpp -@@ -99,6 +99,7 @@ typedef unsigned char u8; - - #ifdef Q_OS_NETBSD - #include <sys/scsiio.h> -+#include <util.h> - #endif - - -@@ -324,13 +325,9 @@ void K3bDevice::DeviceManager::NetBSDDev - - int i; - -- // Whole disk mask (According to cd(4), the AMD64, i386 and BeBox ports use -- // 'd' as whole-disk partition, the rest uses 'c'.) -- --#if defined(__i386__) || defined (__amd64__) || defined (__bebox__) -- static const char slicename = 'd'; --#else -- static const char slicename = 'c'; -+ static char slicename = 'a'; -+#ifdef Q_OS_NETBSD -+ slicename += getrawpartition(); - #endif - - char devicename[11]; // /dev/rcdXd + trailing zero -@@ -831,7 +828,7 @@ bool K3bDevice::DeviceManager::determine - // XXX Re-map atapibus, so it doesn't conflict with "real" scsi - // busses - -- bus = 15; -+ bus = 31; - id = my_addr.addr.atapi.drive + 2 * my_addr.addr.atapi.atbus; - lun = 0; - } diff --git a/sysutils/k3b/patches/patch-ae b/sysutils/k3b/patches/patch-ae deleted file mode 100644 index 9703ddfe3ff..00000000000 --- a/sysutils/k3b/patches/patch-ae +++ /dev/null @@ -1,16 +0,0 @@ -$NetBSD: patch-ae,v 1.3 2007/07/25 02:33:03 markd Exp $ - ---- libk3b/jobs/k3bdatatrackreader.cpp.orig 2007-06-24 06:35:52.000000000 +1200 -+++ libk3b/jobs/k3bdatatrackreader.cpp -@@ -219,7 +219,11 @@ void K3bDataTrackReader::WorkThread::run - // - m_device->setSpeed( 0xffff, 0xffff ); - -+#ifdef __NetBSD__ -+ s_bufferSizeSectors = 31; -+#else - s_bufferSizeSectors = 128; -+#endif - unsigned char* buffer = new unsigned char[m_usedSectorSize*s_bufferSizeSectors]; - while( s_bufferSizeSectors > 0 && read( buffer, m_firstSector.lba(), s_bufferSizeSectors ) < 0 ) { - kdDebug() << "(K3bDataTrackReader) determine max read sectors: " diff --git a/sysutils/k3b/patches/patch-libk3b_jobs_k3bdatatrackreader.cpp b/sysutils/k3b/patches/patch-libk3b_jobs_k3bdatatrackreader.cpp new file mode 100644 index 00000000000..17f0af09202 --- /dev/null +++ b/sysutils/k3b/patches/patch-libk3b_jobs_k3bdatatrackreader.cpp @@ -0,0 +1,16 @@ +$NetBSD: patch-libk3b_jobs_k3bdatatrackreader.cpp,v 1.1 2012/03/22 06:39:01 markd Exp $ + +--- libk3b/jobs/k3bdatatrackreader.cpp.orig 2009-04-22 05:54:02.000000000 +1200 ++++ libk3b/jobs/k3bdatatrackreader.cpp +@@ -256,7 +256,11 @@ bool K3b::DataTrackReader::run() + // + d->device->setSpeed( 0xffff, 0xffff ); + ++#ifdef __NetBSD__ ++ s_bufferSizeSectors = 31; ++#else + s_bufferSizeSectors = 128; ++#endif + unsigned char* buffer = new unsigned char[d->usedSectorSize*s_bufferSizeSectors]; + while( s_bufferSizeSectors > 0 && read( buffer, d->firstSector.lba(), s_bufferSizeSectors ) < 0 ) { + kDebug() << "(K3b::DataTrackReader) determine max read sectors: " diff --git a/sysutils/k3b/patches/patch-libk3bdevice_k3bdevice.cpp b/sysutils/k3b/patches/patch-libk3bdevice_k3bdevice.cpp new file mode 100644 index 00000000000..2e01a65cf82 --- /dev/null +++ b/sysutils/k3b/patches/patch-libk3bdevice_k3bdevice.cpp @@ -0,0 +1,28 @@ +$NetBSD: patch-libk3bdevice_k3bdevice.cpp,v 1.1 2012/03/22 06:39:01 markd Exp $ + +--- libk3bdevice/k3bdevice.cpp.orig 2009-05-07 19:08:16.000000000 +1200 ++++ libk3bdevice/k3bdevice.cpp +@@ -35,6 +35,7 @@ + #include <Solid/OpticalDrive> + #include <Solid/Block> + #include <Solid/StorageAccess> ++#include <Solid/GenericInterface> + + #include <sys/types.h> + #include <sys/ioctl.h> +@@ -242,9 +243,14 @@ K3b::Device::Device::Handle K3b::Device: + + K3b::Device::Device::Device( const Solid::Device& dev ) + { ++ const Solid::GenericInterface *gi = dev.as<Solid::GenericInterface>(); ++ + d = new Private; + d->solidDevice = dev; +- d->blockDevice = dev.as<Solid::Block>()->device(); ++ if (gi->propertyExists("block.netbsd.raw_device")) ++ d->blockDevice = gi->property("block.netbsd.raw_device").toString(); ++ else ++ d->blockDevice = dev.as<Solid::Block>()->device(); + d->writeModes = 0; + d->maxWriteSpeed = 0; + d->maxReadSpeed = 0; diff --git a/sysutils/k3b/patches/patch-libk3bdevice_k3bdevicemanager.cpp b/sysutils/k3b/patches/patch-libk3bdevice_k3bdevicemanager.cpp new file mode 100644 index 00000000000..5a0c06b8821 --- /dev/null +++ b/sysutils/k3b/patches/patch-libk3bdevice_k3bdevicemanager.cpp @@ -0,0 +1,21 @@ +$NetBSD: patch-libk3bdevice_k3bdevicemanager.cpp,v 1.1 2012/03/22 06:39:01 markd Exp $ + +--- libk3bdevice/k3bdevicemanager.cpp.orig 2011-01-15 20:47:29.000000000 +0000 ++++ libk3bdevice/k3bdevicemanager.cpp +@@ -39,6 +39,7 @@ + #include <Solid/OpticalDrive> + #include <Solid/Block> + #include <Solid/Device> ++#include <Solid/GenericInterface> + + #include <iostream> + #include <limits.h> +@@ -356,7 +357,7 @@ 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>() ) { +- if( !findDevice( 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() ) ) + return addDevice( new K3b::Device::Device( solidDevice ) ); + else + kDebug() << "(K3b::Device::DeviceManager) dev " << blockDevice->device() << " already found"; diff --git a/sysutils/k3b/patches/patch-libk3bdevice_k3bscsicommand_netbsd.cpp b/sysutils/k3b/patches/patch-libk3bdevice_k3bscsicommand_netbsd.cpp new file mode 100644 index 00000000000..c2dc4c28f2c --- /dev/null +++ b/sysutils/k3b/patches/patch-libk3bdevice_k3bscsicommand_netbsd.cpp @@ -0,0 +1,13 @@ +$NetBSD: patch-libk3bdevice_k3bscsicommand_netbsd.cpp,v 1.1 2012/03/22 06:39:01 markd Exp $ + +--- libk3bdevice/k3bscsicommand_netbsd.cpp.orig 2009-04-04 04:27:24.000000000 +1300 ++++ libk3bdevice/k3bscsicommand_netbsd.cpp +@@ -53,7 +53,7 @@ int K3b::Device::ScsiCommand::transport( + size_t len ) + { + bool needToClose = false; +- int deviceHandler = -1; ++ int deviceHandle = -1; + if( m_device ) { + m_device->usageLock(); + if( !m_device->isOpen() ) { |