pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/sysutils/k3b k3b: update to 19.08.3 qt5/kf5 version
details: https://anonhg.NetBSD.org/pkgsrc/rev/f7fdf1c979bf
branches: trunk
changeset: 405585:f7fdf1c979bf
user: markd <markd%pkgsrc.org@localhost>
date: Mon Dec 02 09:38:09 2019 +0000
description:
k3b: update to 19.08.3 qt5/kf5 version
diffstat:
sysutils/k3b/Makefile | 71 +-
sysutils/k3b/PLIST | 659 ++++-----
sysutils/k3b/distinfo | 15 +-
sysutils/k3b/patches/patch-CMakeLists.txt | 14 -
sysutils/k3b/patches/patch-libk3b_jobs_k3bdatatrackreader.cpp | 13 -
sysutils/k3b/patches/patch-libk3b_tools_k3bcdparanoialib.cpp | 40 -
sysutils/k3b/patches/patch-libk3bdevice_k3bdevice.cpp | 29 -
sysutils/k3b/patches/patch-libk3bdevice_k3bdevicemanager.cpp | 26 -
8 files changed, 335 insertions(+), 532 deletions(-)
diffs (truncated from 1176 to 300 lines):
diff -r 5aff60b636df -r f7fdf1c979bf sysutils/k3b/Makefile
--- a/sysutils/k3b/Makefile Mon Dec 02 09:32:30 2019 +0000
+++ b/sysutils/k3b/Makefile Mon Dec 02 09:38:09 2019 +0000
@@ -1,26 +1,24 @@
-# $NetBSD: Makefile,v 1.102 2019/11/04 21:28:47 rillig Exp $
+# $NetBSD: Makefile,v 1.103 2019/12/02 09:38:09 markd Exp $
+
+DISTNAME= k3b-${KAPPSVER}
+CATEGORIES= sysutils
-DISTNAME= k3b-2.0.3a
-PKGREVISION= 24
-CATEGORIES= sysutils
-MASTER_SITES= ${MASTER_SITE_KDE:=k3b/}
-EXTRACT_SUFX= .tar.xz
+HOMEPAGE= https://userbase.kde.org/K3b
+COMMENT= DVD and CD authoring program
+LICENSE= gnu-gpl-v2 AND gnu-fdl-v1.2
-MAINTAINER= markd%NetBSD.org@localhost
-HOMEPAGE= http://www.k3b.org/
-COMMENT= DVD and CD authoring program
+.include "../../meta-pkgs/kde/applications.mk"
-BUILD_DEPENDS+= automoc4>=0.9.87:../../devel/automoc4
-DEPENDS+= cdrdao-[0-9]*:../../sysutils/cdrdao
-DEPENDS+= {cdrtools,cdrtools-ossdvd}-[0-9]*:../../sysutils/cdrtools
+BUILD_DEPENDS+= kdoctools>=5.64.0:../../devel/kdoctools
+DEPENDS+= cdrdao-[0-9]*:../../sysutils/cdrdao
+DEPENDS+= {cdrtools,cdrtools-ossdvd}-[0-9]*:../../sysutils/cdrtools
-USE_TOOLS+= perl pkg-config gmake msgfmt
-USE_LANGUAGES= c c++
+USE_TOOLS+= msgmerge pkg-config perl
-CMAKE_ARGS+= -DK3B_BUILD_MUSE_DECODER_PLUGIN=OFF
+CMAKE_ARGS+= -DK3B_BUILD_MUSE_DECODER_PLUGIN=OFF
+CMAKE_ARGS+= -DKAUTH_DBUS_DIR=${PREFIX}/share/examples/k3b
-CONF_FILES= ${PREFIX}/share/examples/kde4-dbus/org.kde.kcontrol.k3bsetup.conf \
- ${PKG_SYSCONFBASE}/dbus-1/system.d/org.kde.kcontrol.k3bsetup.conf
+INSTALLATION_DIRS+= share/examples/k3b
ONLY_FOR_PLATFORM= FreeBSD-*-* Linux-*-* NetBSD-*-* DragonFly-*-*
@@ -30,29 +28,44 @@
SUBST_FILES.pathfix= libk3b/core/k3bexternalbinmanager.cpp
SUBST_SED.pathfix= -e 's:"/usr/bin/":"${LOCALBASE}/bin", "/usr/bin/":g'
-WRKSRC= ${WRKDIR}/k3b-2.0.3
+SUBST_CLASSES+= fix-moc
+SUBST_STAGE.fix-moc= post-configure
+SUBST_MESSAGE.fix-moc= Cleaning up MOC includes
+SUBST_FILES.fix-moc= _KDE_build/plugins/*/*/CMakeFiles/*_autogen.dir/AutogenInfo.cmake
+SUBST_SED.fix-moc= -e 's,;${PREFIX}/include;,;,g'
-pre-configure:
- # buildlink loses this symlink
- ln -s ${BUILDLINK_PREFIX.qt4-libs}/qt4/mkspecs/default ${BUILDLINK_DIR}/qt4/mkspecs/default
+SUBST_CLASSES+= xdg
+SUBST_STAGE.xdg= pre-configure
+SUBST_MESSAGE.xdg= Install via examples dir.
+SUBST_FILES.xdg= src/CMakeLists.txt
+SUBST_SED.xdg= -e 's:{KDE_INSTALL_CONFDIR}:{KDE_INSTALL_XDG_EX_DIR}:'
+
+MAKE_DIRS+= ${PKG_SYSCONFDIR}/xdg
+CONF_FILES+= ${PREFIX}/share/examples/kde-xdg/k3btheme.knsrc \
+ ${PKG_SYSCONFDIR}/xdg/k3btheme.knsrc
+CONF_FILES+= ${PREFIX}/share/examples/k3b/org.kde.k3b.conf \
+ ${PKG_SYSCONFBASE}/dbus-1/system.d/org.kde.k3b.conf
.include "../../mk/dlopen.buildlink3.mk"
-BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:M*}
+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/libsamplerate/buildlink3.mk"
+.include "../../audio/libsndfile/buildlink3.mk"
#.include "../../audio/musepack/buildlink3.mk"
-.include "../../audio/libsndfile/buildlink3.mk"
.include "../../audio/musicbrainz/buildlink3.mk"
-.include "../../audio/libsamplerate/buildlink3.mk"
.include "../../audio/taglib/buildlink3.mk"
+.include "../../devel/kcmutils/buildlink3.mk"
+.include "../../devel/knotifyconfig/buildlink3.mk"
+.include "../../net/knewstuff/buildlink3.mk"
.include "../../graphics/hicolor-icon-theme/buildlink3.mk"
-.include "../../multimedia/ffmpeg2/buildlink3.mk"
+.include "../../multimedia/ffmpeg4/buildlink3.mk"
.include "../../multimedia/libdvdread/buildlink3.mk"
-.include "../../multimedia/libkcddb/buildlink3.mk"
-.include "../../security/polkit-qt/buildlink3.mk"
-.include "../../x11/kdelibs4/buildlink3.mk"
+.include "../../wip/libkcddb/buildlink3.mk"
+.include "../../sysutils/kfilemetadata5/buildlink3.mk"
.include "../../sysutils/desktop-file-utils/desktopdb.mk"
+.include "../../x11/qt5-qtbase/buildlink3.mk"
+.include "../../x11/qt5-qtwebkit/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff -r 5aff60b636df -r f7fdf1c979bf sysutils/k3b/PLIST
--- a/sysutils/k3b/PLIST Mon Dec 02 09:32:30 2019 +0000
+++ b/sysutils/k3b/PLIST Mon Dec 02 09:38:09 2019 +0000
@@ -1,21 +1,25 @@
-@comment $NetBSD: PLIST,v 1.12 2018/01/17 19:03:25 markd Exp $
+@comment $NetBSD: PLIST,v 1.13 2019/12/02 09:38:09 markd Exp $
bin/k3b
-bin/k3bsetup
include/k3b_export.h
include/k3bactivepipe.h
include/k3baudiocdtrackdrag.h
+include/k3baudiocdtrackreader.h
include/k3baudiocdtracksource.h
include/k3baudiocuefilewritingjob.h
include/k3baudiodatasource.h
include/k3baudiodatasourceiterator.h
include/k3baudiodecoder.h
include/k3baudiodoc.h
+include/k3baudiodocreader.h
include/k3baudioencoder.h
include/k3baudiofile.h
include/k3baudiofileanalyzerjob.h
+include/k3baudiofilereader.h
include/k3baudiojob.h
include/k3baudiotrack.h
+include/k3baudiotrackreader.h
include/k3baudiozerodata.h
+include/k3baudiozerodatareader.h
include/k3bbinimagewritingjob.h
include/k3bblankingjob.h
include/k3bbootitem.h
@@ -25,6 +29,7 @@
include/k3bcdparanoialib.h
include/k3bcdrdaowriter.h
include/k3bcdrecordwriter.h
+include/k3bcdrskinwriter.h
include/k3bcdtext.h
include/k3bcdtextvalidator.h
include/k3bchecksumpipe.h
@@ -67,8 +72,6 @@
include/k3bisooptions.h
include/k3bjob.h
include/k3bjobhandler.h
-include/k3blistview.h
-include/k3blistviewitemanimator.h
include/k3bmd5job.h
include/k3bmediacache.h
include/k3bmedium.h
@@ -85,15 +88,12 @@
include/k3bpluginconfigwidget.h
include/k3bpluginmanager.h
include/k3bprocess.h
-include/k3bprogressdialog.h
include/k3bprojectplugin.h
-include/k3bpushbutton.h
+include/k3brawaudiodatareader.h
include/k3brawaudiodatasource.h
-include/k3brichtextlabel.h
include/k3bsignalwaiter.h
include/k3bsimplejobhandler.h
include/k3bstdguiitems.h
-include/k3bstringutils.h
include/k3bthreadjob.h
include/k3bthreadwidget.h
include/k3bthroughputestimator.h
@@ -118,566 +118,483 @@
include/k3bvideodvdtitletranscodingjob.h
include/k3bvideodvdvideostream.h
include/k3bwavefilewriter.h
-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/libk3bdevice.so.7
+lib/libk3bdevice.so.7.0.0
lib/libk3blib.so
-lib/libk3blib.so.6
-lib/libk3blib.so.6.0.0
-share/polkit-1/actions/org.kde.kcontrol.k3bsetup.policy
-share/applications/kde4/k3b.desktop
-share/dbus-1/system-services/org.kde.kcontrol.k3bsetup.service
-share/doc/kde/HTML/ca/k3b/K3bAddButton.png
-share/doc/kde/HTML/ca/k3b/K3bAdvancedSettings.png
-share/doc/kde/HTML/ca/k3b/K3bDiskChoice.png
-share/doc/kde/HTML/ca/k3b/K3bMoreActions.png
-share/doc/kde/HTML/ca/k3b/K3bSetVerify.png
-share/doc/kde/HTML/ca/k3b/K3bsetup.png
-share/doc/kde/HTML/ca/k3b/common
-share/doc/kde/HTML/ca/k3b/index.cache.bz2
-share/doc/kde/HTML/ca/k3b/index.docbook
-share/doc/kde/HTML/de/k3b/common
-share/doc/kde/HTML/de/k3b/index.cache.bz2
-share/doc/kde/HTML/de/k3b/index.docbook
-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/index.cache.bz2
-share/doc/kde/HTML/en/k3b/index.docbook
-share/doc/kde/HTML/es/k3b/common
-share/doc/kde/HTML/es/k3b/index.cache.bz2
-share/doc/kde/HTML/es/k3b/index.docbook
-share/doc/kde/HTML/et/k3b/common
-share/doc/kde/HTML/et/k3b/index.cache.bz2
-share/doc/kde/HTML/et/k3b/index.docbook
-share/doc/kde/HTML/fr/k3b/K3bAddButton.png
-share/doc/kde/HTML/fr/k3b/K3bAdvancedSettings.png
-share/doc/kde/HTML/fr/k3b/K3bDiskChoice.png
-share/doc/kde/HTML/fr/k3b/K3bMoreActions.png
-share/doc/kde/HTML/fr/k3b/K3bsetup.png
-share/doc/kde/HTML/fr/k3b/common
-share/doc/kde/HTML/fr/k3b/index.cache.bz2
-share/doc/kde/HTML/fr/k3b/index.docbook
-share/doc/kde/HTML/fr/k3b/k3bSetVerify.png
-share/doc/kde/HTML/it/k3b/common
-share/doc/kde/HTML/it/k3b/index.cache.bz2
-share/doc/kde/HTML/it/k3b/index.docbook
-share/doc/kde/HTML/nl/k3b/common
-share/doc/kde/HTML/nl/k3b/index.cache.bz2
-share/doc/kde/HTML/nl/k3b/index.docbook
-share/doc/kde/HTML/pt/k3b/common
-share/doc/kde/HTML/pt/k3b/index.cache.bz2
-share/doc/kde/HTML/pt/k3b/index.docbook
-share/doc/kde/HTML/pt_BR/k3b/common
-share/doc/kde/HTML/pt_BR/k3b/index.cache.bz2
-share/doc/kde/HTML/pt_BR/k3b/index.docbook
-share/doc/kde/HTML/uk/k3b/K3bAddButton.png
-share/doc/kde/HTML/uk/k3b/K3bAdvancedSettings.png
-share/doc/kde/HTML/uk/k3b/K3bDiskChoice.png
-share/doc/kde/HTML/uk/k3b/K3bMoreActions.png
-share/doc/kde/HTML/uk/k3b/K3bSetVerify.png
-share/doc/kde/HTML/uk/k3b/K3bsetup.png
-share/doc/kde/HTML/uk/k3b/common
-share/doc/kde/HTML/uk/k3b/index.cache.bz2
-share/doc/kde/HTML/uk/k3b/index.docbook
-share/examples/kde4-dbus/org.kde.kcontrol.k3bsetup.conf
+lib/libk3blib.so.7
+lib/libk3blib.so.7.0.0
+libexec/k3bhelper
+qt5/plugins/k3baudiometainforenamerplugin.so
+qt5/plugins/k3baudioprojectcddbplugin.so
+qt5/plugins/k3bexternalencoder.so
+qt5/plugins/k3bflacdecoder.so
+qt5/plugins/k3blameencoder.so
+qt5/plugins/k3blibsndfiledecoder.so
+qt5/plugins/k3bmaddecoder.so
+qt5/plugins/k3boggvorbisdecoder.so
+qt5/plugins/k3boggvorbisencoder.so
+qt5/plugins/k3bsoxencoder.so
+qt5/plugins/k3bwavedecoder.so
+qt5/plugins/kcm_k3bexternalencoder.so
+qt5/plugins/kcm_k3blameencoder.so
+qt5/plugins/kcm_k3boggvorbisencoder.so
+qt5/plugins/kcm_k3bsoxencoder.so
+qt5/plugins/kf5/kio/videodvd.so
+share/applications/org.kde.k3b.desktop
+share/dbus-1/system-services/org.kde.k3b.service
+share/doc/HTML/ca/k3b/K3bAdvancedSettings.png
+share/doc/HTML/ca/k3b/K3bDiskChoice.png
+share/doc/HTML/ca/k3b/K3bSetVerify.png
+share/doc/HTML/ca/k3b/K3bsetup.png
+share/doc/HTML/ca/k3b/index.cache.bz2
+share/doc/HTML/ca/k3b/index.docbook
+share/doc/HTML/de/k3b/index.cache.bz2
+share/doc/HTML/de/k3b/index.docbook
+share/doc/HTML/en/k3b/K3bAddButton.png
+share/doc/HTML/en/k3b/K3bAdvancedSettings.png
+share/doc/HTML/en/k3b/K3bDiskChoice.png
+share/doc/HTML/en/k3b/K3bMoreActions.png
+share/doc/HTML/en/k3b/K3bSetVerify.png
+share/doc/HTML/en/k3b/K3bsetup.png
+share/doc/HTML/en/k3b/index.cache.bz2
+share/doc/HTML/en/k3b/index.docbook
+share/doc/HTML/es/k3b/burndialog_audio.png
+share/doc/HTML/es/k3b/burndialog_progress.png
+share/doc/HTML/es/k3b/cdcloning_dialog.png
+share/doc/HTML/es/k3b/cdcloning_reading.png
Home |
Main Index |
Thread Index |
Old Index