[gentoo-commits] proj/kde:master commit in: kde-apps/k3b/
commit: 34d0b454fcdc83d5a4aa83b67ce9f898fbc8c30b Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Apr 21 20:42:22 2024 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Apr 21 20:52:41 2024 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=34d0b454 kde-apps/k3b: Drop unused dependency Upstream commit 9dd7e2a9ea0c0e2ff971faff3d634ae6db59103b Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/k3b/k3b-.ebuild | 1 - 1 file changed, 1 deletion(-) diff --git a/kde-apps/k3b/k3b-.ebuild b/kde-apps/k3b/k3b-.ebuild index ef729ac4e7..6fe1a0e8b8 100644 --- a/kde-apps/k3b/k3b-.ebuild +++ b/kde-apps/k3b/k3b-.ebuild @@ -22,7 +22,6 @@ REQUIRED_USE="flac? ( taglib ) lame? ( taglib ) sox? ( taglib )" DEPEND=" >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml] - >=dev-qt/qt5compat-${QTMIN}:6 >=kde-apps/libkcddb-${PVCUT}:6 >=kde-frameworks/karchive-${KFMIN}:6 >=kde-frameworks/kbookmarks-${KFMIN}:6
[gentoo-commits] proj/kde:master commit in: kde-apps/k3b/
commit: 3b0e7bb8fb816d4d36b57a45d3aab1a2b92967ea Author: Sam James gentoo org> AuthorDate: Sun Feb 25 20:10:27 2024 + Commit: Sam James gentoo org> CommitDate: Sun Feb 25 20:10:27 2024 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=3b0e7bb8 kde-apps/k3b: fix webengine option Signed-off-by: Sam James gentoo.org> kde-apps/k3b/k3b-.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kde-apps/k3b/k3b-.ebuild b/kde-apps/k3b/k3b-.ebuild index 692cc343e4..61aef5b5ec 100644 --- a/kde-apps/k3b/k3b-.ebuild +++ b/kde-apps/k3b/k3b-.ebuild @@ -88,7 +88,7 @@ src_configure() { -DK3B_ENABLE_TAGLIB=$(usex taglib) -DK3B_BUILD_OGGVORBIS_DECODER_PLUGIN=$(usex vorbis) -DK3B_BUILD_OGGVORBIS_ENCODER_PLUGIN=$(usex vorbis) - $(cmake_use_find_package webengine Qt6WebEngine) + $(cmake_use_find_package webengine Qt6WebEngineWidgets) ) ecm_src_configure
[gentoo-commits] proj/kde:master commit in: kde-apps/k3b/
commit: 339b4c171d6a4cab2d74492279e0bf1f9a04a4b1 Author: Sam James gentoo org> AuthorDate: Sun Feb 25 19:34:06 2024 + Commit: Sam James gentoo org> CommitDate: Sun Feb 25 19:35:14 2024 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=339b4c17 kde-apps/k3b: refresh deps * Set explicit minimum ffmpeg version (upstream commit b5134345d51a6215e8328288b61f611ceed7c803) * Add qt5compat (upstream commit 6d7416b20fc26fdfadce7a3affa41a8646c43a1b) Signed-off-by: Sam James gentoo.org> kde-apps/k3b/k3b-.ebuild | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/kde-apps/k3b/k3b-.ebuild b/kde-apps/k3b/k3b-.ebuild index a68600c80c..692cc343e4 100644 --- a/kde-apps/k3b/k3b-.ebuild +++ b/kde-apps/k3b/k3b-.ebuild @@ -22,6 +22,7 @@ REQUIRED_USE="flac? ( taglib ) lame? ( taglib ) sox? ( taglib )" DEPEND=" >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml] + >=dev-qt/qt5compat-${QTMIN}:6 >=kde-apps/libkcddb-${PVCUT}:6 >=kde-frameworks/karchive-${KFMIN}:6 >=kde-frameworks/kbookmarks-${KFMIN}:6 @@ -43,7 +44,7 @@ DEPEND=" >=kde-frameworks/solid-${KFMIN}:6 media-libs/libsamplerate dvd? ( media-libs/libdvdread:= ) - ffmpeg? ( media-video/ffmpeg:0= ) + ffmpeg? ( >=media-video/ffmpeg-4.4.0:0= ) flac? ( >=media-libs/flac-1.2:=[cxx] ) lame? ( media-sound/lame ) mad? ( media-libs/libmad )
[gentoo-commits] proj/kde:master commit in: kde-apps/k3b/
commit: e82cb63f248e8afa171fe46953606d48e637b732 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jan 7 13:04:32 2024 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jan 7 13:24:39 2024 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=e82cb63f kde-apps/k3b: Port to KF6 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/k3b/k3b-.ebuild | 54 1 file changed, 25 insertions(+), 29 deletions(-) diff --git a/kde-apps/k3b/k3b-.ebuild b/kde-apps/k3b/k3b-.ebuild index c2a72f2e8f..ba2cda4400 100644 --- a/kde-apps/k3b/k3b-.ebuild +++ b/kde-apps/k3b/k3b-.ebuild @@ -6,45 +6,41 @@ EAPI=8 ECM_HANDBOOK="forceoptional" ECM_TEST="true" PVCUT=$(ver_cut 1-3) -KFMIN=5.106.0 -QTMIN=5.15.9 +KFMIN=5.245.0 +QTMIN=6.6.0 inherit ecm gear.kde.org DESCRIPTION="Full-featured burning and ripping application based on KDE Frameworks" HOMEPAGE="https://apps.kde.org/k3b/ https://userbase.kde.org/K3b; LICENSE="GPL-2 FDL-1.2" -SLOT="5" +SLOT="6" KEYWORDS="" IUSE="dvd ffmpeg flac lame mad musepack sndfile sox taglib vcd vorbis webengine" REQUIRED_USE="flac? ( taglib ) lame? ( taglib ) sox? ( taglib )" DEPEND=" - >=dev-qt/qtdbus-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=dev-qt/qtxml-${QTMIN}:5 - >=kde-apps/libkcddb-23.08.4:5 - >=kde-frameworks/karchive-${KFMIN}:5 - >=kde-frameworks/kbookmarks-${KFMIN}:5 - >=kde-frameworks/kcmutils-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/kfilemetadata-${KFMIN}:5[taglib?] - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kiconthemes-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/kjobwidgets-${KFMIN}:5 - >=kde-frameworks/knewstuff-${KFMIN}:5 - >=kde-frameworks/knotifications-${KFMIN}:5 - >=kde-frameworks/knotifyconfig-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/solid-${KFMIN}:5 + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,widgets,xml] + >=kde-apps/libkcddb-${PVCUT}:6 + >=kde-frameworks/karchive-${KFMIN}:6 + >=kde-frameworks/kbookmarks-${KFMIN}:6 + >=kde-frameworks/kcmutils-${KFMIN}:6 + >=kde-frameworks/kcompletion-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kfilemetadata-${KFMIN}:6[taglib?] + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kiconthemes-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kjobwidgets-${KFMIN}:6 + >=kde-frameworks/knewstuff-${KFMIN}:6 + >=kde-frameworks/knotifications-${KFMIN}:6 + >=kde-frameworks/knotifyconfig-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kxmlgui-${KFMIN}:6 + >=kde-frameworks/solid-${KFMIN}:6 media-libs/libsamplerate dvd? ( media-libs/libdvdread:= ) ffmpeg? ( media-video/ffmpeg:0= ) @@ -58,7 +54,7 @@ DEPEND=" media-libs/libogg media-libs/libvorbis ) - webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] ) + webengine? ( >=dev-qt/qtwebengine-${QTMIN}:6 ) " RDEPEND="${DEPEND} app-cdr/cdrdao @@ -91,7 +87,7 @@ src_configure() { -DK3B_ENABLE_TAGLIB=$(usex taglib) -DK3B_BUILD_OGGVORBIS_DECODER_PLUGIN=$(usex vorbis) -DK3B_BUILD_OGGVORBIS_ENCODER_PLUGIN=$(usex vorbis) - $(cmake_use_find_package webengine Qt5WebEngineWidgets) + $(cmake_use_find_package webengine Qt6WebEngine) ) ecm_src_configure
[gentoo-commits] proj/kde:master commit in: kde-apps/k3b/
commit: bac13bd5b64951533050bbb0b47b617620e2d575 Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Sep 1 18:35:02 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Sep 1 18:35:02 2023 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=bac13bd5 kde-apps/k3b: Drop upstreamed patch Upstream commit c65e9cfb04926c93cc5e112ec2e720dcc8161f5c Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/k3b/k3b-.ebuild | 2 -- 1 file changed, 2 deletions(-) diff --git a/kde-apps/k3b/k3b-.ebuild b/kde-apps/k3b/k3b-.ebuild index 580c1061e7..4699e587e3 100644 --- a/kde-apps/k3b/k3b-.ebuild +++ b/kde-apps/k3b/k3b-.ebuild @@ -72,8 +72,6 @@ RDEPEND="${DEPEND} DOCS+=( ChangeLog {FAQ,PERMISSIONS,README}.txt ) -PATCHES=( "${FILESDIR}/${PN}-23.04.2-disable-transcode.patch" ) # bugs 891585, 906526 - src_configure() { local mycmakeargs=( -DK3B_BUILD_API_DOCS=OFF
[gentoo-commits] proj/kde:master commit in: kde-apps/k3b/
commit: 041c79dcfe19b362c22d644e666cd79a81c1f2da Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Aug 27 16:21:11 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Aug 27 16:21:11 2023 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=041c79dc kde-apps/k3b: Drop unused dependency Upstream commit 9982f85c3e37e12b2c4c413cfd4d9872d9333a60 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/k3b/k3b-.ebuild | 1 - 1 file changed, 1 deletion(-) diff --git a/kde-apps/k3b/k3b-.ebuild b/kde-apps/k3b/k3b-.ebuild index 3399df4656..580c1061e7 100644 --- a/kde-apps/k3b/k3b-.ebuild +++ b/kde-apps/k3b/k3b-.ebuild @@ -42,7 +42,6 @@ DEPEND=" >=kde-frameworks/knewstuff-${KFMIN}:5 >=kde-frameworks/knotifications-${KFMIN}:5 >=kde-frameworks/knotifyconfig-${KFMIN}:5 - >=kde-frameworks/kservice-${KFMIN}:5 >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 >=kde-frameworks/kxmlgui-${KFMIN}:5 >=kde-frameworks/solid-${KFMIN}:5
[gentoo-commits] proj/kde:master commit in: kde-apps/k3b/
commit: 5572e484ae7fdcf6f90fb2fca9578bc6be1406ef Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Aug 25 07:51:04 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Aug 25 07:51:04 2023 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=5572e484 kde-apps/k3b: Fix IUSE=webengine to be actually optional Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/k3b/k3b-23.08.0.ebuild | 2 +- kde-apps/k3b/k3b-23.08.49..ebuild | 2 +- kde-apps/k3b/k3b-.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kde-apps/k3b/k3b-23.08.0.ebuild b/kde-apps/k3b/k3b-23.08.0.ebuild index 32272155a2..47a02d8741 100644 --- a/kde-apps/k3b/k3b-23.08.0.ebuild +++ b/kde-apps/k3b/k3b-23.08.0.ebuild @@ -59,7 +59,7 @@ DEPEND=" media-libs/libogg media-libs/libvorbis ) - >=dev-qt/qtwebengine-${QTMIN}:5[widgets] + webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] ) " RDEPEND="${DEPEND} app-cdr/cdrdao diff --git a/kde-apps/k3b/k3b-23.08.49..ebuild b/kde-apps/k3b/k3b-23.08.49..ebuild index 6ccd35f338..3399df4656 100644 --- a/kde-apps/k3b/k3b-23.08.49..ebuild +++ b/kde-apps/k3b/k3b-23.08.49..ebuild @@ -59,7 +59,7 @@ DEPEND=" media-libs/libogg media-libs/libvorbis ) - >=dev-qt/qtwebengine-${QTMIN}:5[widgets] + webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] ) " RDEPEND="${DEPEND} app-cdr/cdrdao diff --git a/kde-apps/k3b/k3b-.ebuild b/kde-apps/k3b/k3b-.ebuild index 6ccd35f338..3399df4656 100644 --- a/kde-apps/k3b/k3b-.ebuild +++ b/kde-apps/k3b/k3b-.ebuild @@ -59,7 +59,7 @@ DEPEND=" media-libs/libogg media-libs/libvorbis ) - >=dev-qt/qtwebengine-${QTMIN}:5[widgets] + webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5[widgets] ) " RDEPEND="${DEPEND} app-cdr/cdrdao
[gentoo-commits] proj/kde:master commit in: kde-apps/k3b/files/, kde-apps/k3b/
commit: a108fdfe12ad87b18b63991d86009ac01b41bf2d Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Jul 6 11:56:10 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Jul 6 11:57:40 2023 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=a108fdfe kde-apps/k3b: Re-enable external encoder plugin Hard-disable transcode in code by reverting upstream commit f7d385a40cc062fa4db46c165f82f437dea82c58. Bug: https://bugs.gentoo.org/891585 Bug: https://bugs.gentoo.org/906526 Signed-off-by: Andreas Sturmlechner gentoo.org> .../k3b/files/k3b-23.04.2-disable-transcode.patch | 38 ++ kde-apps/k3b/k3b-23.04.49..ebuild | 4 ++- kde-apps/k3b/k3b-.ebuild | 4 ++- 3 files changed, 44 insertions(+), 2 deletions(-) diff --git a/kde-apps/k3b/files/k3b-23.04.2-disable-transcode.patch b/kde-apps/k3b/files/k3b-23.04.2-disable-transcode.patch new file mode 100644 index 00..209c13cd45 --- /dev/null +++ b/kde-apps/k3b/files/k3b-23.04.2-disable-transcode.patch @@ -0,0 +1,38 @@ +From cc1e0b76f080ed95c1f6e6d66ad806427f373909 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Thu, 6 Jul 2023 13:52:04 +0200 +Subject: [PATCH] Revert "Keep transcode until a replacement is implemented." + +Make sure users are not presented with a completely broken option. + +This reverts commit f7d385a40cc062fa4db46c165f82f437dea82c58. + +Signed-off-by: Andreas Sturmlechner +--- + libk3b/core/k3bdefaultexternalprograms.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/libk3b/core/k3bdefaultexternalprograms.cpp b/libk3b/core/k3bdefaultexternalprograms.cpp +index e659fc1f8..2ebf88367 100644 +--- a/libk3b/core/k3bdefaultexternalprograms.cpp b/libk3b/core/k3bdefaultexternalprograms.cpp +@@ -37,6 +37,8 @@ void K3b::addDefaultPrograms( K3b::ExternalBinManager* m ) + // https://bugs.kde.org/show_bug.cgi?id=381131 + void K3b::addTranscodePrograms(K3b::ExternalBinManager* m) + { ++Q_UNUSED(m); ++/* Deprecated transcode + static const char* const transcodeTools[] = {"transcode", + 0, // K3b 1.0 only uses the transcode binary + "tcprobe", +@@ -48,6 +50,7 @@ void K3b::addTranscodePrograms(K3b::ExternalBinManager* m) + + for (int i = 0; transcodeTools[i]; ++i) + m->addProgram(new K3b::TranscodeProgram(transcodeTools[i])); ++*/ + } + + +-- +2.41.0 + diff --git a/kde-apps/k3b/k3b-23.04.49..ebuild b/kde-apps/k3b/k3b-23.04.49..ebuild index f51f2af3a3..15d27d3eba 100644 --- a/kde-apps/k3b/k3b-23.04.49..ebuild +++ b/kde-apps/k3b/k3b-23.04.49..ebuild @@ -72,10 +72,12 @@ RDEPEND="${DEPEND} DOCS+=( ChangeLog {FAQ,PERMISSIONS,README}.txt ) +PATCHES=( "${FILESDIR}/${PN}-23.04.2-disable-transcode.patch" ) # bugs 891585, 906526 + src_configure() { local mycmakeargs=( -DK3B_BUILD_API_DOCS=OFF - -DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=OFF + -DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=ON -DK3B_BUILD_WAVE_DECODER_PLUGIN=ON -DK3B_ENABLE_HAL_SUPPORT=OFF -DK3B_ENABLE_MUSICBRAINZ=OFF diff --git a/kde-apps/k3b/k3b-.ebuild b/kde-apps/k3b/k3b-.ebuild index f51f2af3a3..15d27d3eba 100644 --- a/kde-apps/k3b/k3b-.ebuild +++ b/kde-apps/k3b/k3b-.ebuild @@ -72,10 +72,12 @@ RDEPEND="${DEPEND} DOCS+=( ChangeLog {FAQ,PERMISSIONS,README}.txt ) +PATCHES=( "${FILESDIR}/${PN}-23.04.2-disable-transcode.patch" ) # bugs 891585, 906526 + src_configure() { local mycmakeargs=( -DK3B_BUILD_API_DOCS=OFF - -DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=OFF + -DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=ON -DK3B_BUILD_WAVE_DECODER_PLUGIN=ON -DK3B_ENABLE_HAL_SUPPORT=OFF -DK3B_ENABLE_MUSICBRAINZ=OFF
[gentoo-commits] proj/kde:master commit in: kde-apps/k3b/
commit: 2f7a58d83e917cfabb8a3217013f992b2abe8d91 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Apr 23 11:42:34 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Apr 23 11:42:34 2023 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=2f7a58d8 kde-apps/k3b: Improve use flag sorting Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/k3b/k3b-23.04.49..ebuild | 2 +- kde-apps/k3b/k3b-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kde-apps/k3b/k3b-23.04.49..ebuild b/kde-apps/k3b/k3b-23.04.49..ebuild index bef68a474d..7ea543acf4 100644 --- a/kde-apps/k3b/k3b-23.04.49..ebuild +++ b/kde-apps/k3b/k3b-23.04.49..ebuild @@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/k3b/ https://userbase.kde.org/K3b; LICENSE="GPL-2 FDL-1.2" SLOT="5" KEYWORDS="" -IUSE="dvd ffmpeg flac mad lame musepack sndfile sox taglib vcd vorbis" +IUSE="dvd ffmpeg flac lame mad musepack sndfile sox taglib vcd vorbis" REQUIRED_USE="flac? ( taglib ) lame? ( taglib ) sox? ( taglib )" diff --git a/kde-apps/k3b/k3b-.ebuild b/kde-apps/k3b/k3b-.ebuild index bef68a474d..7ea543acf4 100644 --- a/kde-apps/k3b/k3b-.ebuild +++ b/kde-apps/k3b/k3b-.ebuild @@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/k3b/ https://userbase.kde.org/K3b; LICENSE="GPL-2 FDL-1.2" SLOT="5" KEYWORDS="" -IUSE="dvd ffmpeg flac mad lame musepack sndfile sox taglib vcd vorbis" +IUSE="dvd ffmpeg flac lame mad musepack sndfile sox taglib vcd vorbis" REQUIRED_USE="flac? ( taglib ) lame? ( taglib ) sox? ( taglib )"
[gentoo-commits] proj/kde:master commit in: kde-apps/k3b/
commit: f8686c82fa21fd3f89c9d655748a57f4bf9029cc Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Apr 23 11:12:22 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Apr 23 11:38:02 2023 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=f8686c82 kde-apps/k3b: Re-add IUSE (rename mp3 => lame), sox Remaining *_ENCODER_PLUGIN flags appear to still work fine without external encoder, just like ogg which had not been dropped. This partially reverts commit 922fbdd8be012b4d8c9c936a0fdcfa8cd48058b8. Bug: https://bugs.gentoo.org/904010 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/k3b/k3b-23.04.49..ebuild | 10 ++ kde-apps/k3b/k3b-.ebuild | 10 ++ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/kde-apps/k3b/k3b-23.04.49..ebuild b/kde-apps/k3b/k3b-23.04.49..ebuild index d110f86551..bef68a474d 100644 --- a/kde-apps/k3b/k3b-23.04.49..ebuild +++ b/kde-apps/k3b/k3b-23.04.49..ebuild @@ -16,9 +16,9 @@ HOMEPAGE="https://apps.kde.org/k3b/ https://userbase.kde.org/K3b; LICENSE="GPL-2 FDL-1.2" SLOT="5" KEYWORDS="" -IUSE="dvd ffmpeg flac mad musepack sndfile taglib vcd vorbis" +IUSE="dvd ffmpeg flac mad lame musepack sndfile sox taglib vcd vorbis" -REQUIRED_USE="flac? ( taglib )" +REQUIRED_USE="flac? ( taglib ) lame? ( taglib ) sox? ( taglib )" DEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 @@ -50,6 +50,7 @@ DEPEND=" dvd? ( media-libs/libdvdread:= ) ffmpeg? ( media-video/ffmpeg:0= ) flac? ( >=media-libs/flac-1.2:=[cxx] ) + lame? ( media-sound/lame ) mad? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) sndfile? ( media-libs/libsndfile ) @@ -65,6 +66,7 @@ RDEPEND="${DEPEND} dev-libs/libburn media-sound/cdparanoia dvd? ( >=app-cdr/dvd+rw-tools-7 ) + sox? ( media-sound/sox ) vcd? ( media-video/vcdimager ) " @@ -74,8 +76,6 @@ src_configure() { local mycmakeargs=( -DK3B_BUILD_API_DOCS=OFF -DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=OFF - -DK3B_BUILD_LAME_ENCODER_PLUGIN=OFF - -DK3B_BUILD_SOX_ENCODER_PLUGIN=OFF -DK3B_BUILD_WAVE_DECODER_PLUGIN=ON -DK3B_ENABLE_HAL_SUPPORT=OFF -DK3B_ENABLE_MUSICBRAINZ=OFF @@ -84,9 +84,11 @@ src_configure() { -DK3B_ENABLE_DVD_RIPPING=$(usex dvd) -DK3B_BUILD_FFMPEG_DECODER_PLUGIN=$(usex ffmpeg) -DK3B_BUILD_FLAC_DECODER_PLUGIN=$(usex flac) + -DK3B_BUILD_LAME_ENCODER_PLUGIN=$(usex lame) -DK3B_BUILD_MAD_DECODER_PLUGIN=$(usex mad) -DK3B_BUILD_MUSE_DECODER_PLUGIN=$(usex musepack) -DK3B_BUILD_SNDFILE_DECODER_PLUGIN=$(usex sndfile) + -DK3B_BUILD_SOX_ENCODER_PLUGIN=$(usex sox) -DK3B_ENABLE_TAGLIB=$(usex taglib) -DK3B_BUILD_OGGVORBIS_DECODER_PLUGIN=$(usex vorbis) -DK3B_BUILD_OGGVORBIS_ENCODER_PLUGIN=$(usex vorbis) diff --git a/kde-apps/k3b/k3b-.ebuild b/kde-apps/k3b/k3b-.ebuild index d110f86551..bef68a474d 100644 --- a/kde-apps/k3b/k3b-.ebuild +++ b/kde-apps/k3b/k3b-.ebuild @@ -16,9 +16,9 @@ HOMEPAGE="https://apps.kde.org/k3b/ https://userbase.kde.org/K3b; LICENSE="GPL-2 FDL-1.2" SLOT="5" KEYWORDS="" -IUSE="dvd ffmpeg flac mad musepack sndfile taglib vcd vorbis" +IUSE="dvd ffmpeg flac mad lame musepack sndfile sox taglib vcd vorbis" -REQUIRED_USE="flac? ( taglib )" +REQUIRED_USE="flac? ( taglib ) lame? ( taglib ) sox? ( taglib )" DEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 @@ -50,6 +50,7 @@ DEPEND=" dvd? ( media-libs/libdvdread:= ) ffmpeg? ( media-video/ffmpeg:0= ) flac? ( >=media-libs/flac-1.2:=[cxx] ) + lame? ( media-sound/lame ) mad? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) sndfile? ( media-libs/libsndfile ) @@ -65,6 +66,7 @@ RDEPEND="${DEPEND} dev-libs/libburn media-sound/cdparanoia dvd? ( >=app-cdr/dvd+rw-tools-7 ) + sox? ( media-sound/sox ) vcd? ( media-video/vcdimager ) " @@ -74,8 +76,6 @@ src_configure() { local mycmakeargs=( -DK3B_BUILD_API_DOCS=OFF -DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=OFF - -DK3B_BUILD_LAME_ENCODER_PLUGIN=OFF - -DK3B_BUILD_SOX_ENCODER_PLUGIN=OFF -DK3B_BUILD_WAVE_DECODER_PLUGIN=ON -DK3B_ENABLE_HAL_SUPPORT=OFF -DK3B_ENABLE_MUSICBRAINZ=OFF @@ -84,9 +84,11 @@ src_configure() { -DK3B_ENABLE_DVD_RIPPING=$(usex dvd) -DK3B_BUILD_FFMPEG_DECODER_PLUGIN=$(usex ffmpeg) -DK3B_BUILD_FLAC_DECODER_PLUGIN=$(usex flac) + -DK3B_BUILD_LAME_ENCODER_PLUGIN=$(usex lame) -DK3B_BUILD_MAD_DECODER_PLUGIN=$(usex mad)
[gentoo-commits] proj/kde:master commit in: kde-apps/k3b/
commit: 874b32c81812fca380c00b5726d28a0efd8c417f Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Jan 30 21:04:05 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Jan 30 21:11:24 2023 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=874b32c8 kde-apps/k3b: Re-add IUSE ffmpeg This reverts commits bf5d8421329b1533e0365dffa6b570355f435938 and 6a1427f974d5a62b4c398b698632912e1bd2d395. Upstream commits: 7341cec22caca61c0b048537c47ba529b4653a64 b5134345d51a6215e8328288b61f611ceed7c803 88dfdd9b8f71c5e5d092c6d6ebab6d3e73e744da Bug: https://bugs.gentoo.org/831621 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/k3b/k3b-22.12.49..ebuild | 4 +++- kde-apps/k3b/k3b-.ebuild | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/kde-apps/k3b/k3b-22.12.49..ebuild b/kde-apps/k3b/k3b-22.12.49..ebuild index a8a70674de..46bca58022 100644 --- a/kde-apps/k3b/k3b-22.12.49..ebuild +++ b/kde-apps/k3b/k3b-22.12.49..ebuild @@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/k3b/ https://userbase.kde.org/K3b; LICENSE="GPL-2 FDL-1.2" SLOT="5" KEYWORDS="" -IUSE="dvd flac mad musepack sndfile taglib vcd vorbis" +IUSE="dvd ffmpeg flac mad musepack sndfile taglib vcd vorbis" REQUIRED_USE="flac? ( taglib )" @@ -48,6 +48,7 @@ DEPEND=" >=kde-frameworks/solid-${KFMIN}:5 media-libs/libsamplerate dvd? ( media-libs/libdvdread:= ) + ffmpeg? ( media-video/ffmpeg:0= ) flac? ( >=media-libs/flac-1.2:=[cxx] ) mad? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) @@ -81,6 +82,7 @@ src_configure() { -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=ON -DK3B_DEBUG=$(usex debug) -DK3B_ENABLE_DVD_RIPPING=$(usex dvd) + -DK3B_BUILD_FFMPEG_DECODER_PLUGIN=$(usex ffmpeg) -DK3B_BUILD_FLAC_DECODER_PLUGIN=$(usex flac) -DK3B_BUILD_MAD_DECODER_PLUGIN=$(usex mad) -DK3B_BUILD_MUSE_DECODER_PLUGIN=$(usex musepack) diff --git a/kde-apps/k3b/k3b-.ebuild b/kde-apps/k3b/k3b-.ebuild index a8a70674de..46bca58022 100644 --- a/kde-apps/k3b/k3b-.ebuild +++ b/kde-apps/k3b/k3b-.ebuild @@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/k3b/ https://userbase.kde.org/K3b; LICENSE="GPL-2 FDL-1.2" SLOT="5" KEYWORDS="" -IUSE="dvd flac mad musepack sndfile taglib vcd vorbis" +IUSE="dvd ffmpeg flac mad musepack sndfile taglib vcd vorbis" REQUIRED_USE="flac? ( taglib )" @@ -48,6 +48,7 @@ DEPEND=" >=kde-frameworks/solid-${KFMIN}:5 media-libs/libsamplerate dvd? ( media-libs/libdvdread:= ) + ffmpeg? ( media-video/ffmpeg:0= ) flac? ( >=media-libs/flac-1.2:=[cxx] ) mad? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) @@ -81,6 +82,7 @@ src_configure() { -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=ON -DK3B_DEBUG=$(usex debug) -DK3B_ENABLE_DVD_RIPPING=$(usex dvd) + -DK3B_BUILD_FFMPEG_DECODER_PLUGIN=$(usex ffmpeg) -DK3B_BUILD_FLAC_DECODER_PLUGIN=$(usex flac) -DK3B_BUILD_MAD_DECODER_PLUGIN=$(usex mad) -DK3B_BUILD_MUSE_DECODER_PLUGIN=$(usex musepack)
[gentoo-commits] proj/kde:master commit in: kde-apps/k3b/
commit: 922fbdd8be012b4d8c9c936a0fdcfa8cd48058b8 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Jan 30 20:59:06 2023 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Jan 30 20:59:06 2023 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=922fbdd8 kde-apps/k3b: Drop IUSE transcode, mp3, sox Bug: https://bugs.gentoo.org/891585 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/k3b/k3b-22.12.49..ebuild | 21 ++--- kde-apps/k3b/k3b-.ebuild | 21 ++--- 2 files changed, 12 insertions(+), 30 deletions(-) diff --git a/kde-apps/k3b/k3b-22.12.49..ebuild b/kde-apps/k3b/k3b-22.12.49..ebuild index 17e5d0f24e..a8a70674de 100644 --- a/kde-apps/k3b/k3b-22.12.49..ebuild +++ b/kde-apps/k3b/k3b-22.12.49..ebuild @@ -16,13 +16,9 @@ HOMEPAGE="https://apps.kde.org/k3b/ https://userbase.kde.org/K3b; LICENSE="GPL-2 FDL-1.2" SLOT="5" KEYWORDS="" -IUSE="dvd encode flac mad mp3 musepack sndfile sox taglib vcd vorbis" +IUSE="dvd flac mad musepack sndfile taglib vcd vorbis" -REQUIRED_USE=" - flac? ( taglib ) - mp3? ( encode taglib ) - sox? ( encode taglib ) -" +REQUIRED_USE="flac? ( taglib )" DEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 @@ -53,7 +49,6 @@ DEPEND=" media-libs/libsamplerate dvd? ( media-libs/libdvdread:= ) flac? ( >=media-libs/flac-1.2:=[cxx] ) - mp3? ( media-sound/lame ) mad? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) sndfile? ( media-libs/libsndfile ) @@ -68,11 +63,7 @@ RDEPEND="${DEPEND} app-cdr/cdrtools dev-libs/libburn media-sound/cdparanoia - dvd? ( - >=app-cdr/dvd+rw-tools-7 - encode? ( media-video/transcode[dvd] ) - ) - sox? ( media-sound/sox ) + dvd? ( >=app-cdr/dvd+rw-tools-7 ) vcd? ( media-video/vcdimager ) " @@ -81,19 +72,19 @@ DOCS+=( ChangeLog {FAQ,PERMISSIONS,README}.txt ) src_configure() { local mycmakeargs=( -DK3B_BUILD_API_DOCS=OFF + -DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=OFF + -DK3B_BUILD_LAME_ENCODER_PLUGIN=OFF + -DK3B_BUILD_SOX_ENCODER_PLUGIN=OFF -DK3B_BUILD_WAVE_DECODER_PLUGIN=ON -DK3B_ENABLE_HAL_SUPPORT=OFF -DK3B_ENABLE_MUSICBRAINZ=OFF -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=ON -DK3B_DEBUG=$(usex debug) -DK3B_ENABLE_DVD_RIPPING=$(usex dvd) - -DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=$(usex encode) -DK3B_BUILD_FLAC_DECODER_PLUGIN=$(usex flac) - -DK3B_BUILD_LAME_ENCODER_PLUGIN=$(usex mp3) -DK3B_BUILD_MAD_DECODER_PLUGIN=$(usex mad) -DK3B_BUILD_MUSE_DECODER_PLUGIN=$(usex musepack) -DK3B_BUILD_SNDFILE_DECODER_PLUGIN=$(usex sndfile) - -DK3B_BUILD_SOX_ENCODER_PLUGIN=$(usex sox) -DK3B_ENABLE_TAGLIB=$(usex taglib) -DK3B_BUILD_OGGVORBIS_DECODER_PLUGIN=$(usex vorbis) -DK3B_BUILD_OGGVORBIS_ENCODER_PLUGIN=$(usex vorbis) diff --git a/kde-apps/k3b/k3b-.ebuild b/kde-apps/k3b/k3b-.ebuild index 17e5d0f24e..a8a70674de 100644 --- a/kde-apps/k3b/k3b-.ebuild +++ b/kde-apps/k3b/k3b-.ebuild @@ -16,13 +16,9 @@ HOMEPAGE="https://apps.kde.org/k3b/ https://userbase.kde.org/K3b; LICENSE="GPL-2 FDL-1.2" SLOT="5" KEYWORDS="" -IUSE="dvd encode flac mad mp3 musepack sndfile sox taglib vcd vorbis" +IUSE="dvd flac mad musepack sndfile taglib vcd vorbis" -REQUIRED_USE=" - flac? ( taglib ) - mp3? ( encode taglib ) - sox? ( encode taglib ) -" +REQUIRED_USE="flac? ( taglib )" DEPEND=" >=dev-qt/qtdbus-${QTMIN}:5 @@ -53,7 +49,6 @@ DEPEND=" media-libs/libsamplerate dvd? ( media-libs/libdvdread:= ) flac? ( >=media-libs/flac-1.2:=[cxx] ) - mp3? ( media-sound/lame ) mad? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) sndfile? ( media-libs/libsndfile ) @@ -68,11 +63,7 @@ RDEPEND="${DEPEND} app-cdr/cdrtools dev-libs/libburn media-sound/cdparanoia - dvd? ( - >=app-cdr/dvd+rw-tools-7 - encode? ( media-video/transcode[dvd] ) - ) - sox? ( media-sound/sox ) + dvd? ( >=app-cdr/dvd+rw-tools-7 ) vcd? ( media-video/vcdimager ) " @@ -81,19 +72,19 @@ DOCS+=( ChangeLog {FAQ,PERMISSIONS,README}.txt ) src_configure() { local mycmakeargs=( -DK3B_BUILD_API_DOCS=OFF + -DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=OFF + -DK3B_BUILD_LAME_ENCODER_PLUGIN=OFF + -DK3B_BUILD_SOX_ENCODER_PLUGIN=OFF -DK3B_BUILD_WAVE_DECODER_PLUGIN=ON -DK3B_ENABLE_HAL_SUPPORT=OFF -DK3B_ENABLE_MUSICBRAINZ=OFF
[gentoo-commits] proj/kde:master commit in: kde-apps/k3b/
commit: fbb39767e1b2543aacfc42c19cad3506e95a2acb Author: Sam James gentoo org> AuthorDate: Sat Sep 10 08:50:17 2022 + Commit: Sam James gentoo org> CommitDate: Sat Sep 10 08:50:17 2022 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=fbb39767 kde-apps/k3b: add media-libs/flac subslot dep media-libs/flac-1.4.0 breaks ABI. Signed-off-by: Sam James gentoo.org> kde-apps/k3b/k3b-22.08.49..ebuild | 2 +- kde-apps/k3b/k3b-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kde-apps/k3b/k3b-22.08.49..ebuild b/kde-apps/k3b/k3b-22.08.49..ebuild index b3efb99ad0..b1060feca5 100644 --- a/kde-apps/k3b/k3b-22.08.49..ebuild +++ b/kde-apps/k3b/k3b-22.08.49..ebuild @@ -52,7 +52,7 @@ DEPEND=" >=kde-frameworks/solid-${KFMIN}:5 media-libs/libsamplerate dvd? ( media-libs/libdvdread:= ) - flac? ( >=media-libs/flac-1.2[cxx] ) + flac? ( >=media-libs/flac-1.2:=[cxx] ) mp3? ( media-sound/lame ) mad? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 ) diff --git a/kde-apps/k3b/k3b-.ebuild b/kde-apps/k3b/k3b-.ebuild index b3efb99ad0..b1060feca5 100644 --- a/kde-apps/k3b/k3b-.ebuild +++ b/kde-apps/k3b/k3b-.ebuild @@ -52,7 +52,7 @@ DEPEND=" >=kde-frameworks/solid-${KFMIN}:5 media-libs/libsamplerate dvd? ( media-libs/libdvdread:= ) - flac? ( >=media-libs/flac-1.2[cxx] ) + flac? ( >=media-libs/flac-1.2:=[cxx] ) mp3? ( media-sound/lame ) mad? ( media-libs/libmad ) musepack? ( >=media-sound/musepack-tools-444 )
[gentoo-commits] proj/kde:master commit in: kde-apps/k3b/
commit: 6a1427f974d5a62b4c398b698632912e1bd2d395 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Mar 24 14:48:24 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Mar 24 14:53:11 2022 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=6a1427f9 kde-apps/k3b: Drop obsolete cmake var K3B_BUILD_FFMPEG_DECODER_PLUGIN now gone upstream. Upstream commit d20c6fb5f71231da359d07fe778bf5607191dbf3 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/k3b/k3b-.ebuild | 1 - 1 file changed, 1 deletion(-) diff --git a/kde-apps/k3b/k3b-.ebuild b/kde-apps/k3b/k3b-.ebuild index 60660b76b8..81bd2dd1a7 100644 --- a/kde-apps/k3b/k3b-.ebuild +++ b/kde-apps/k3b/k3b-.ebuild @@ -81,7 +81,6 @@ DOCS+=( ChangeLog {FAQ,PERMISSIONS,README}.txt ) src_configure() { local mycmakeargs=( -DK3B_BUILD_API_DOCS=OFF - -DK3B_BUILD_FFMPEG_DECODER_PLUGIN=OFF -DK3B_BUILD_WAVE_DECODER_PLUGIN=ON -DK3B_ENABLE_HAL_SUPPORT=OFF -DK3B_ENABLE_MUSICBRAINZ=OFF
[gentoo-commits] proj/kde:master commit in: kde-apps/k3b/
commit: bf5d8421329b1533e0365dffa6b570355f435938 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Feb 21 17:13:14 2022 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Feb 21 17:13:26 2022 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=bf5d8421 kde-apps/k3b: Drop IUSE ffmpeg Build broken by ffmpeg-5, but functionality already broken before. See also: https://invent.kde.org/multimedia/k3b/-/merge_requests/23 Bug: https://bugs.gentoo.org/831621 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/k3b/k3b-21.12.49..ebuild | 10 +++--- kde-apps/k3b/k3b-.ebuild | 10 +++--- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/kde-apps/k3b/k3b-21.12.49..ebuild b/kde-apps/k3b/k3b-21.12.49..ebuild index 111910a8bc..c8dbe4cd34 100644 --- a/kde-apps/k3b/k3b-21.12.49..ebuild +++ b/kde-apps/k3b/k3b-21.12.49..ebuild @@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/k3b/ https://userbase.kde.org/K3b; LICENSE="GPL-2 FDL-1.2" SLOT="5" KEYWORDS="" -IUSE="dvd encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis" +IUSE="dvd encode flac mad mp3 musepack sndfile sox taglib vcd vorbis" REQUIRED_USE=" flac? ( taglib ) @@ -52,7 +52,6 @@ DEPEND=" >=kde-frameworks/solid-${KFMIN}:5 media-libs/libsamplerate dvd? ( media-libs/libdvdread:= ) - ffmpeg? ( media-video/ffmpeg:0= ) flac? ( >=media-libs/flac-1.2[cxx] ) mp3? ( media-sound/lame ) mad? ( media-libs/libmad ) @@ -82,6 +81,7 @@ DOCS+=( ChangeLog {FAQ,PERMISSIONS,README}.txt ) src_configure() { local mycmakeargs=( -DK3B_BUILD_API_DOCS=OFF + -DK3B_BUILD_FFMPEG_DECODER_PLUGIN=OFF -DK3B_BUILD_WAVE_DECODER_PLUGIN=ON -DK3B_ENABLE_HAL_SUPPORT=OFF -DK3B_ENABLE_MUSICBRAINZ=OFF @@ -89,7 +89,6 @@ src_configure() { -DK3B_DEBUG=$(usex debug) -DK3B_ENABLE_DVD_RIPPING=$(usex dvd) -DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=$(usex encode) - -DK3B_BUILD_FFMPEG_DECODER_PLUGIN=$(usex ffmpeg) -DK3B_BUILD_FLAC_DECODER_PLUGIN=$(usex flac) -DK3B_BUILD_LAME_ENCODER_PLUGIN=$(usex mp3) -DK3B_BUILD_MAD_DECODER_PLUGIN=$(usex mad) @@ -107,14 +106,11 @@ src_configure() { pkg_postinst() { ecm_pkg_postinst - echo elog "If you get warnings on start-up, uncheck the \"Check system" elog "configuration\" option in the \"Misc\" settings window." - echo - + elog local group=cdrom use kernel_linux || group=operator elog "Make sure you have proper read/write permissions on optical device(s)." elog "Usually, it is sufficient to be in the ${group} group." - echo } diff --git a/kde-apps/k3b/k3b-.ebuild b/kde-apps/k3b/k3b-.ebuild index 111910a8bc..c8dbe4cd34 100644 --- a/kde-apps/k3b/k3b-.ebuild +++ b/kde-apps/k3b/k3b-.ebuild @@ -16,7 +16,7 @@ HOMEPAGE="https://apps.kde.org/k3b/ https://userbase.kde.org/K3b; LICENSE="GPL-2 FDL-1.2" SLOT="5" KEYWORDS="" -IUSE="dvd encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis" +IUSE="dvd encode flac mad mp3 musepack sndfile sox taglib vcd vorbis" REQUIRED_USE=" flac? ( taglib ) @@ -52,7 +52,6 @@ DEPEND=" >=kde-frameworks/solid-${KFMIN}:5 media-libs/libsamplerate dvd? ( media-libs/libdvdread:= ) - ffmpeg? ( media-video/ffmpeg:0= ) flac? ( >=media-libs/flac-1.2[cxx] ) mp3? ( media-sound/lame ) mad? ( media-libs/libmad ) @@ -82,6 +81,7 @@ DOCS+=( ChangeLog {FAQ,PERMISSIONS,README}.txt ) src_configure() { local mycmakeargs=( -DK3B_BUILD_API_DOCS=OFF + -DK3B_BUILD_FFMPEG_DECODER_PLUGIN=OFF -DK3B_BUILD_WAVE_DECODER_PLUGIN=ON -DK3B_ENABLE_HAL_SUPPORT=OFF -DK3B_ENABLE_MUSICBRAINZ=OFF @@ -89,7 +89,6 @@ src_configure() { -DK3B_DEBUG=$(usex debug) -DK3B_ENABLE_DVD_RIPPING=$(usex dvd) -DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=$(usex encode) - -DK3B_BUILD_FFMPEG_DECODER_PLUGIN=$(usex ffmpeg) -DK3B_BUILD_FLAC_DECODER_PLUGIN=$(usex flac) -DK3B_BUILD_LAME_ENCODER_PLUGIN=$(usex mp3) -DK3B_BUILD_MAD_DECODER_PLUGIN=$(usex mad) @@ -107,14 +106,11 @@ src_configure() { pkg_postinst() { ecm_pkg_postinst - echo elog "If you get warnings on start-up, uncheck the \"Check system" elog "configuration\" option in the \"Misc\" settings window." - echo - + elog local group=cdrom use kernel_linux || group=operator elog "Make sure you have proper read/write permissions on optical device(s)." elog "Usually, it is sufficient to be in the
[gentoo-commits] proj/kde:master commit in: kde-apps/k3b/
commit: 0695a1eb3d415f2a584a49537d4d0c62c90ae88d Author: Michał Górny gentoo org> AuthorDate: Fri Dec 18 08:57:28 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Dec 18 11:50:34 2020 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=0695a1eb kde-apps/k3b: Inline virtual/cdrtools Signed-off-by: Michał Górny gentoo.org> Signed-off-by: Andreas Sturmlechner gentoo.org> (cherry picked from commit 89d259771b2df024f1134c666de802dd87e8affd) kde-apps/k3b/k3b-20.12.49..ebuild | 2 +- kde-apps/k3b/k3b-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kde-apps/k3b/k3b-20.12.49..ebuild b/kde-apps/k3b/k3b-20.12.49..ebuild index 8733f20541..5287735cef 100644 --- a/kde-apps/k3b/k3b-20.12.49..ebuild +++ b/kde-apps/k3b/k3b-20.12.49..ebuild @@ -66,9 +66,9 @@ DEPEND=" " RDEPEND="${DEPEND} app-cdr/cdrdao + app-cdr/cdrtools dev-libs/libburn media-sound/cdparanoia - virtual/cdrtools dvd? ( >=app-cdr/dvd+rw-tools-7 encode? ( media-video/transcode[dvd] ) diff --git a/kde-apps/k3b/k3b-.ebuild b/kde-apps/k3b/k3b-.ebuild index 8733f20541..5287735cef 100644 --- a/kde-apps/k3b/k3b-.ebuild +++ b/kde-apps/k3b/k3b-.ebuild @@ -66,9 +66,9 @@ DEPEND=" " RDEPEND="${DEPEND} app-cdr/cdrdao + app-cdr/cdrtools dev-libs/libburn media-sound/cdparanoia - virtual/cdrtools dvd? ( >=app-cdr/dvd+rw-tools-7 encode? ( media-video/transcode[dvd] )
[gentoo-commits] proj/kde:master commit in: kde-apps/k3b/
commit: 379d1096fd7f9f87964da6e1f55efef009c8f2f4 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Sep 17 17:26:21 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Sep 17 17:43:40 2020 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=379d1096 kde-apps/k3b: Drop IUSE=webkit Completely avoidable and only sacrificing "prettier" k3bdiskinfoview. Package-Manager: Portage-3.0.7, Repoman-3.0.1 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/k3b/k3b-20.08.49..ebuild | 5 ++--- kde-apps/k3b/k3b-.ebuild | 5 ++--- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/kde-apps/k3b/k3b-20.08.49..ebuild b/kde-apps/k3b/k3b-20.08.49..ebuild index 031e96d8fe..40bc86c11d 100644 --- a/kde-apps/k3b/k3b-20.08.49..ebuild +++ b/kde-apps/k3b/k3b-20.08.49..ebuild @@ -17,7 +17,7 @@ https://userbase.kde.org/K3b; LICENSE="GPL-2 FDL-1.2" SLOT="5" KEYWORDS="" -IUSE="dvd encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis webkit" +IUSE="dvd encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis" REQUIRED_USE=" flac? ( taglib ) @@ -64,7 +64,6 @@ DEPEND=" media-libs/libogg media-libs/libvorbis ) - webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) " RDEPEND="${DEPEND} app-cdr/cdrdao @@ -87,6 +86,7 @@ src_configure() { -DK3B_BUILD_WAVE_DECODER_PLUGIN=ON -DK3B_ENABLE_HAL_SUPPORT=OFF -DK3B_ENABLE_MUSICBRAINZ=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=ON -DK3B_DEBUG=$(usex debug) -DK3B_ENABLE_DVD_RIPPING=$(usex dvd) -DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=$(usex encode) @@ -100,7 +100,6 @@ src_configure() { -DK3B_ENABLE_TAGLIB=$(usex taglib) -DK3B_BUILD_OGGVORBIS_DECODER_PLUGIN=$(usex vorbis) -DK3B_BUILD_OGGVORBIS_ENCODER_PLUGIN=$(usex vorbis) - $(cmake_use_find_package webkit Qt5WebKitWidgets) ) ecm_src_configure diff --git a/kde-apps/k3b/k3b-.ebuild b/kde-apps/k3b/k3b-.ebuild index 7072c49bea..fb70317dc1 100644 --- a/kde-apps/k3b/k3b-.ebuild +++ b/kde-apps/k3b/k3b-.ebuild @@ -17,7 +17,7 @@ https://userbase.kde.org/K3b; LICENSE="GPL-2 FDL-1.2" SLOT="5" KEYWORDS="" -IUSE="dvd encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis webkit" +IUSE="dvd encode ffmpeg flac mad mp3 musepack sndfile sox taglib vcd vorbis" REQUIRED_USE=" flac? ( taglib ) @@ -64,7 +64,6 @@ DEPEND=" media-libs/libogg media-libs/libvorbis ) - webkit? ( >=dev-qt/qtwebkit-5.212.0_pre20180120:5 ) " RDEPEND="${DEPEND} app-cdr/cdrdao @@ -87,6 +86,7 @@ src_configure() { -DK3B_BUILD_WAVE_DECODER_PLUGIN=ON -DK3B_ENABLE_HAL_SUPPORT=OFF -DK3B_ENABLE_MUSICBRAINZ=OFF + -DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebKitWidgets=ON -DK3B_DEBUG=$(usex debug) -DK3B_ENABLE_DVD_RIPPING=$(usex dvd) -DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=$(usex encode) @@ -100,7 +100,6 @@ src_configure() { -DK3B_ENABLE_TAGLIB=$(usex taglib) -DK3B_BUILD_OGGVORBIS_DECODER_PLUGIN=$(usex vorbis) -DK3B_BUILD_OGGVORBIS_ENCODER_PLUGIN=$(usex vorbis) - $(cmake_use_find_package webkit Qt5WebKitWidgets) ) ecm_src_configure
[gentoo-commits] proj/kde:master commit in: kde-apps/k3b/
commit: 1994ff6d463e2f95d8995b61405de4323f615bec Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Jan 9 17:36:03 2020 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Jan 9 18:24:05 2020 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=1994ff6d kde-apps/k3b: Drop USE emovix Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/k3b/k3b-19.12.49..ebuild | 3 +-- kde-apps/k3b/k3b-.ebuild | 3 +-- kde-apps/k3b/metadata.xml | 3 --- 3 files changed, 2 insertions(+), 7 deletions(-) diff --git a/kde-apps/k3b/k3b-19.12.49..ebuild b/kde-apps/k3b/k3b-19.12.49..ebuild index bb56104977..27b76ecfdd 100644 --- a/kde-apps/k3b/k3b-19.12.49..ebuild +++ b/kde-apps/k3b/k3b-19.12.49..ebuild @@ -17,7 +17,7 @@ https://userbase.kde.org/K3b; LICENSE="GPL-2 FDL-1.2" SLOT="5" KEYWORDS="" -IUSE="dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis webkit" +IUSE="dvd encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis webkit" REQUIRED_USE=" flac? ( taglib ) @@ -78,7 +78,6 @@ RDEPEND="${DEPEND} >=app-cdr/dvd+rw-tools-7 encode? ( media-video/transcode[dvd] ) ) - emovix? ( media-video/emovix ) sox? ( media-sound/sox ) vcd? ( media-video/vcdimager ) " diff --git a/kde-apps/k3b/k3b-.ebuild b/kde-apps/k3b/k3b-.ebuild index 3524faaf99..39df59e980 100644 --- a/kde-apps/k3b/k3b-.ebuild +++ b/kde-apps/k3b/k3b-.ebuild @@ -17,7 +17,7 @@ https://userbase.kde.org/K3b; LICENSE="GPL-2 FDL-1.2" SLOT="5" KEYWORDS="" -IUSE="dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis webkit" +IUSE="dvd encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis webkit" REQUIRED_USE=" flac? ( taglib ) @@ -78,7 +78,6 @@ RDEPEND="${DEPEND} >=app-cdr/dvd+rw-tools-7 encode? ( media-video/transcode[dvd] ) ) - emovix? ( media-video/emovix ) sox? ( media-sound/sox ) vcd? ( media-video/vcdimager ) " diff --git a/kde-apps/k3b/metadata.xml b/kde-apps/k3b/metadata.xml index cc7344ef5c..2fdbf33d96 100644 --- a/kde-apps/k3b/metadata.xml +++ b/kde-apps/k3b/metadata.xml @@ -5,7 +5,4 @@ k...@gentoo.org Gentoo KDE Project - - Enable burning support for eMoviX images -
[gentoo-commits] proj/kde:master commit in: kde-apps/k3b/
commit: a05d2bd6af7ace9ed625aaf9acefb72ae1eed527 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Sep 12 20:52:41 2019 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Sep 12 20:52:41 2019 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=a05d2bd6 kde-apps/k3b: Add slot operator to media-libs/libdvdread Bug: https://bugs.gentoo.org/694116 Package-Manager: Portage-2.3.76, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner gentoo.org> kde-apps/k3b/k3b-19.08.49..ebuild | 2 +- kde-apps/k3b/k3b-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kde-apps/k3b/k3b-19.08.49..ebuild b/kde-apps/k3b/k3b-19.08.49..ebuild index 8914e9add6..23457fc271 100644 --- a/kde-apps/k3b/k3b-19.08.49..ebuild +++ b/kde-apps/k3b/k3b-19.08.49..ebuild @@ -47,7 +47,7 @@ DEPEND=" $(add_qt_dep qtwidgets) $(add_qt_dep qtxml) media-libs/libsamplerate - dvd? ( media-libs/libdvdread ) + dvd? ( media-libs/libdvdread:= ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= ) diff --git a/kde-apps/k3b/k3b-.ebuild b/kde-apps/k3b/k3b-.ebuild index 8914e9add6..23457fc271 100644 --- a/kde-apps/k3b/k3b-.ebuild +++ b/kde-apps/k3b/k3b-.ebuild @@ -47,7 +47,7 @@ DEPEND=" $(add_qt_dep qtwidgets) $(add_qt_dep qtxml) media-libs/libsamplerate - dvd? ( media-libs/libdvdread ) + dvd? ( media-libs/libdvdread:= ) ffmpeg? ( libav? ( media-video/libav:= ) !libav? ( media-video/ffmpeg:0= )
[gentoo-commits] proj/kde:master commit in: kde-apps/k3b/
commit: 8c38562fcf9021452f6a499a9f63c289975f68ec Author: Michael Palimaka gentoo org> AuthorDate: Mon Dec 25 10:28:04 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Mon Dec 25 10:30:26 2017 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=8c38562f kde-apps/k3b: add missing dependency Package-Manager: Portage-2.3.14, Repoman-2.3.6 kde-apps/k3b/k3b-17.12.49..ebuild | 5 - kde-apps/k3b/k3b-.ebuild | 5 - 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/kde-apps/k3b/k3b-17.12.49..ebuild b/kde-apps/k3b/k3b-17.12.49..ebuild index 4c2bcb30de..4792c1a2c0 100644 --- a/kde-apps/k3b/k3b-17.12.49..ebuild +++ b/kde-apps/k3b/k3b-17.12.49..ebuild @@ -52,7 +52,10 @@ DEPEND=" musepack? ( >=media-sound/musepack-tools-444 ) sndfile? ( media-libs/libsndfile ) taglib? ( >=media-libs/taglib-1.5 ) - vorbis? ( media-libs/libvorbis ) + vorbis? ( + media-libs/libogg + media-libs/libvorbis + ) webkit? ( $(add_qt_dep qtwebkit) ) " RDEPEND="${DEPEND} diff --git a/kde-apps/k3b/k3b-.ebuild b/kde-apps/k3b/k3b-.ebuild index 4c2bcb30de..4792c1a2c0 100644 --- a/kde-apps/k3b/k3b-.ebuild +++ b/kde-apps/k3b/k3b-.ebuild @@ -52,7 +52,10 @@ DEPEND=" musepack? ( >=media-sound/musepack-tools-444 ) sndfile? ( media-libs/libsndfile ) taglib? ( >=media-libs/taglib-1.5 ) - vorbis? ( media-libs/libvorbis ) + vorbis? ( + media-libs/libogg + media-libs/libvorbis + ) webkit? ( $(add_qt_dep qtwebkit) ) " RDEPEND="${DEPEND}
[gentoo-commits] proj/kde:master commit in: kde-apps/k3b/
commit: eda3a99b101fae1fd8e0bb08046104f5a702 Author: Michael Palimaka gentoo org> AuthorDate: Sat Aug 26 12:43:35 2017 + Commit: Michael Palimaka gentoo org> CommitDate: Sat Aug 26 13:04:27 2017 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=eda3a99b kde-apps/k3b: update HOMEPAGE Package-Manager: Portage-2.3.6, Repoman-2.3.3 kde-apps/k3b/k3b-17.08.49..ebuild | 2 +- kde-apps/k3b/k3b-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kde-apps/k3b/k3b-17.08.49..ebuild b/kde-apps/k3b/k3b-17.08.49..ebuild index 6e1046bf8d..d3951b53a5 100644 --- a/kde-apps/k3b/k3b-17.08.49..ebuild +++ b/kde-apps/k3b/k3b-17.08.49..ebuild @@ -8,7 +8,7 @@ KDE_TEST="true" inherit kde5 DESCRIPTION="Full-featured burning and ripping application based on KDE Frameworks" -HOMEPAGE="http://www.k3b.org/; +HOMEPAGE="https://userbase.kde.org/K3b; LICENSE="GPL-2 FDL-1.2" KEYWORDS="" diff --git a/kde-apps/k3b/k3b-.ebuild b/kde-apps/k3b/k3b-.ebuild index c5366a7575..4c2bcb30de 100644 --- a/kde-apps/k3b/k3b-.ebuild +++ b/kde-apps/k3b/k3b-.ebuild @@ -8,7 +8,7 @@ KDE_TEST="true" inherit kde5 DESCRIPTION="Full-featured burning and ripping application based on KDE Frameworks" -HOMEPAGE="http://www.k3b.org/; +HOMEPAGE="https://userbase.kde.org/K3b; LICENSE="GPL-2 FDL-1.2" KEYWORDS=""
[gentoo-commits] proj/kde:master commit in: kde-apps/k3b/files/, kde-apps/k3b/
commit: ea71cd8b2e75b469241f06749fe6f4161f2c1c4d Author: Andreas Sturmlechner gentoo org> AuthorDate: Fri Aug 18 20:54:38 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Fri Aug 18 20:54:38 2017 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=ea71cd8b kde-apps/k3b: Disable broken test Gentoo-bug: 628166 Package-Manager: Portage-2.3.8, Repoman-2.3.3 kde-apps/k3b/files/k3b-17.04.3-out-of-bounds.patch | 75 -- kde-apps/k3b/k3b-17.08.49..ebuild | 11 +++- 2 files changed, 9 insertions(+), 77 deletions(-) diff --git a/kde-apps/k3b/files/k3b-17.04.3-out-of-bounds.patch b/kde-apps/k3b/files/k3b-17.04.3-out-of-bounds.patch deleted file mode 100644 index 83034e7481..00 --- a/kde-apps/k3b/files/k3b-17.04.3-out-of-bounds.patch +++ /dev/null @@ -1,75 +0,0 @@ -From 7f0be6a33b8260f7789c6aeed58be8d1c844229a Mon Sep 17 00:00:00 2001 -From: Leslie Zhai-Date: Tue, 1 Aug 2017 14:13:05 +0800 -Subject: Fix K3b::Device::from2Byte out-of-bounds issue. - -A great bug report by Mark! - -BUG: 382941 - libk3bdevice/k3bdeviceglobals.cpp | 24 - tests/k3bdeviceglobalstest.cpp| 4 +++- - 2 files changed, 15 insertions(+), 13 deletions(-) - -diff --git a/libk3bdevice/k3bdeviceglobals.cpp b/libk3bdevice/k3bdeviceglobals.cpp -index 090ed29..c016f59 100644 a/libk3bdevice/k3bdeviceglobals.cpp -+++ b/libk3bdevice/k3bdeviceglobals.cpp -@@ -212,27 +212,27 @@ void K3b::Device::debugBitfield( unsigned char* data, long len ) - } - - --quint16 K3b::Device::from2Byte( const unsigned char* d ) -+quint16 K3b::Device::from2Byte(const unsigned char* d) - { --if (d == NULL) { --qWarning() << "Invalid nullptr!"; -+if (d == NULL || strlen((const char *) d) < 2) { -+qWarning() << "Invalid Byte!"; - return 0; - } --return ( (d[0] << 8 & 0xFF00) | -- (d[1] & 0xFF) ); -+return ((d[0] << 8 & 0xFF00) | -+(d[1] & 0xFF)); - } - - --quint32 K3b::Device::from4Byte( const unsigned char* d ) -+quint32 K3b::Device::from4Byte(const unsigned char* d) - { --if (d == NULL) { --qWarning() << "Invalid nullptr!"; -+if (d == NULL || strlen((const char *) d) < 4) { -+qWarning() << "Invalid Byte!"; - return 0; - } --return ( (d[0] << 24 & 0xFF00) | -- (d[1] << 16 & 0xFF) | -- (d[2] << 8 & 0xFF00) | -- (d[3] & 0xFF) ); -+return ((d[0] << 24 & 0xFF00) | -+(d[1] << 16 & 0xFF) | -+(d[2] << 8 & 0xFF00) | -+(d[3] & 0xFF)); - } - - -diff --git a/tests/k3bdeviceglobalstest.cpp b/tests/k3bdeviceglobalstest.cpp -index 307b772..635ee39 100644 a/tests/k3bdeviceglobalstest.cpp -+++ b/tests/k3bdeviceglobalstest.cpp -@@ -23,8 +23,10 @@ DeviceGlobalsTest::DeviceGlobalsTest() - - void DeviceGlobalsTest::testFrom2Byte() - { --const unsigned char* d = NULL; -+unsigned char* d = NULL; - QCOMPARE(K3b::Device::from2Byte(d), (quint16)0); -+unsigned char buf[1] = { '\0' }; -+QCOMPARE(K3b::Device::from2Byte(buf), (quint16)0); - } - - void DeviceGlobalsTest::testFrom4Byte() --- -cgit v0.11.2 diff --git a/kde-apps/k3b/k3b-17.08.49..ebuild b/kde-apps/k3b/k3b-17.08.49..ebuild index 70aec75bf0..6e1046bf8d 100644 --- a/kde-apps/k3b/k3b-17.08.49..ebuild +++ b/kde-apps/k3b/k3b-17.08.49..ebuild @@ -77,8 +77,6 @@ REQUIRED_USE=" DOCS+=( ChangeLog {FAQ,PERMISSIONS,README}.txt ) -PATCHES=( "${FILESDIR}/${PN}-17.04.3-out-of-bounds.patch" ) - src_configure() { local mycmakeargs=( -DK3B_BUILD_API_DOCS=OFF @@ -104,6 +102,15 @@ src_configure() { kde5_src_configure } +src_test() { + # 628166 + local myctestargs=( + -E "(k3bdeviceglobalstest)" + ) + + kde5_src_test +} + pkg_postinst() { kde5_pkg_postinst
[gentoo-commits] proj/kde:master commit in: kde-apps/k3b/, kde-apps/k3b/files/
commit: 1dad375a54557f44c6cb404433cd7915f9c8a2eb Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Aug 3 00:39:44 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Aug 3 00:39:44 2017 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=1dad375a kde-apps/k3b: Fix K3b::Device::from2Byte out-of-bounds issue See also: https://bugs.kde.org/show_bug.cgi?id=382941 Gentoo-bug: 616880 Package-Manager: Portage-2.3.6, Repoman-2.3.1 kde-apps/k3b/files/k3b-17.04.3-out-of-bounds.patch | 75 ++ kde-apps/k3b/k3b-17.08.49..ebuild | 2 + 2 files changed, 77 insertions(+) diff --git a/kde-apps/k3b/files/k3b-17.04.3-out-of-bounds.patch b/kde-apps/k3b/files/k3b-17.04.3-out-of-bounds.patch new file mode 100644 index 00..83034e7481 --- /dev/null +++ b/kde-apps/k3b/files/k3b-17.04.3-out-of-bounds.patch @@ -0,0 +1,75 @@ +From 7f0be6a33b8260f7789c6aeed58be8d1c844229a Mon Sep 17 00:00:00 2001 +From: Leslie Zhai+Date: Tue, 1 Aug 2017 14:13:05 +0800 +Subject: Fix K3b::Device::from2Byte out-of-bounds issue. + +A great bug report by Mark! + +BUG: 382941 +--- + libk3bdevice/k3bdeviceglobals.cpp | 24 + tests/k3bdeviceglobalstest.cpp| 4 +++- + 2 files changed, 15 insertions(+), 13 deletions(-) + +diff --git a/libk3bdevice/k3bdeviceglobals.cpp b/libk3bdevice/k3bdeviceglobals.cpp +index 090ed29..c016f59 100644 +--- a/libk3bdevice/k3bdeviceglobals.cpp b/libk3bdevice/k3bdeviceglobals.cpp +@@ -212,27 +212,27 @@ void K3b::Device::debugBitfield( unsigned char* data, long len ) + } + + +-quint16 K3b::Device::from2Byte( const unsigned char* d ) ++quint16 K3b::Device::from2Byte(const unsigned char* d) + { +-if (d == NULL) { +-qWarning() << "Invalid nullptr!"; ++if (d == NULL || strlen((const char *) d) < 2) { ++qWarning() << "Invalid Byte!"; + return 0; + } +-return ( (d[0] << 8 & 0xFF00) | +- (d[1] & 0xFF) ); ++return ((d[0] << 8 & 0xFF00) | ++(d[1] & 0xFF)); + } + + +-quint32 K3b::Device::from4Byte( const unsigned char* d ) ++quint32 K3b::Device::from4Byte(const unsigned char* d) + { +-if (d == NULL) { +-qWarning() << "Invalid nullptr!"; ++if (d == NULL || strlen((const char *) d) < 4) { ++qWarning() << "Invalid Byte!"; + return 0; + } +-return ( (d[0] << 24 & 0xFF00) | +- (d[1] << 16 & 0xFF) | +- (d[2] << 8 & 0xFF00) | +- (d[3] & 0xFF) ); ++return ((d[0] << 24 & 0xFF00) | ++(d[1] << 16 & 0xFF) | ++(d[2] << 8 & 0xFF00) | ++(d[3] & 0xFF)); + } + + +diff --git a/tests/k3bdeviceglobalstest.cpp b/tests/k3bdeviceglobalstest.cpp +index 307b772..635ee39 100644 +--- a/tests/k3bdeviceglobalstest.cpp b/tests/k3bdeviceglobalstest.cpp +@@ -23,8 +23,10 @@ DeviceGlobalsTest::DeviceGlobalsTest() + + void DeviceGlobalsTest::testFrom2Byte() + { +-const unsigned char* d = NULL; ++unsigned char* d = NULL; + QCOMPARE(K3b::Device::from2Byte(d), (quint16)0); ++unsigned char buf[1] = { '\0' }; ++QCOMPARE(K3b::Device::from2Byte(buf), (quint16)0); + } + + void DeviceGlobalsTest::testFrom4Byte() +-- +cgit v0.11.2 diff --git a/kde-apps/k3b/k3b-17.08.49..ebuild b/kde-apps/k3b/k3b-17.08.49..ebuild index c5366a7575..70aec75bf0 100644 --- a/kde-apps/k3b/k3b-17.08.49..ebuild +++ b/kde-apps/k3b/k3b-17.08.49..ebuild @@ -77,6 +77,8 @@ REQUIRED_USE=" DOCS+=( ChangeLog {FAQ,PERMISSIONS,README}.txt ) +PATCHES=( "${FILESDIR}/${PN}-17.04.3-out-of-bounds.patch" ) + src_configure() { local mycmakeargs=( -DK3B_BUILD_API_DOCS=OFF
[gentoo-commits] proj/kde:master commit in: kde-apps/k3b/
commit: 393b6367aafea4b40d55035e268515271bf7dbe6 Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Aug 2 21:38:42 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Wed Aug 2 21:38:42 2017 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=393b6367 kde-apps/k3b: Fix USE-deps and REQUIRED_USE If taglib is not enabled, projects adding mp3 and flac files will hang. Package-Manager: Portage-2.3.6, Repoman-2.3.1 kde-apps/k3b/k3b-17.08.49..ebuild | 8 +--- kde-apps/k3b/k3b-.ebuild | 8 +--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/kde-apps/k3b/k3b-17.08.49..ebuild b/kde-apps/k3b/k3b-17.08.49..ebuild index 229940f507..c5366a7575 100644 --- a/kde-apps/k3b/k3b-17.08.49..ebuild +++ b/kde-apps/k3b/k3b-17.08.49..ebuild @@ -9,6 +9,7 @@ inherit kde5 DESCRIPTION="Full-featured burning and ripping application based on KDE Frameworks" HOMEPAGE="http://www.k3b.org/; + LICENSE="GPL-2 FDL-1.2" KEYWORDS="" IUSE="dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis webkit" @@ -21,7 +22,7 @@ DEPEND=" $(add_frameworks_dep kconfig) $(add_frameworks_dep kconfigwidgets) $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kfilemetadata) + $(add_frameworks_dep kfilemetadata 'taglib?') $(add_frameworks_dep ki18n) $(add_frameworks_dep kiconthemes) $(add_frameworks_dep kio) @@ -69,8 +70,9 @@ RDEPEND="${DEPEND} " REQUIRED_USE=" - mp3? ( encode ) - sox? ( encode ) + flac? ( taglib ) + mp3? ( encode taglib ) + sox? ( encode taglib ) " DOCS+=( ChangeLog {FAQ,PERMISSIONS,README}.txt ) diff --git a/kde-apps/k3b/k3b-.ebuild b/kde-apps/k3b/k3b-.ebuild index 229940f507..c5366a7575 100644 --- a/kde-apps/k3b/k3b-.ebuild +++ b/kde-apps/k3b/k3b-.ebuild @@ -9,6 +9,7 @@ inherit kde5 DESCRIPTION="Full-featured burning and ripping application based on KDE Frameworks" HOMEPAGE="http://www.k3b.org/; + LICENSE="GPL-2 FDL-1.2" KEYWORDS="" IUSE="dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis webkit" @@ -21,7 +22,7 @@ DEPEND=" $(add_frameworks_dep kconfig) $(add_frameworks_dep kconfigwidgets) $(add_frameworks_dep kcoreaddons) - $(add_frameworks_dep kfilemetadata) + $(add_frameworks_dep kfilemetadata 'taglib?') $(add_frameworks_dep ki18n) $(add_frameworks_dep kiconthemes) $(add_frameworks_dep kio) @@ -69,8 +70,9 @@ RDEPEND="${DEPEND} " REQUIRED_USE=" - mp3? ( encode ) - sox? ( encode ) + flac? ( taglib ) + mp3? ( encode taglib ) + sox? ( encode taglib ) " DOCS+=( ChangeLog {FAQ,PERMISSIONS,README}.txt )
[gentoo-commits] proj/kde:master commit in: kde-apps/k3b/
commit: 9b9805843bb59dc89ec103ce0d6926bf77700d0e Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jul 9 18:28:53 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jul 9 18:28:53 2017 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=9b980584 kde-apps/k3b: Add missing dev-libs/libburn RDEPEND Gentoo-bug: 611556 Package-Manager: Portage-2.3.6, Repoman-2.3.1 kde-apps/k3b/k3b-17.04.49..ebuild | 1 + kde-apps/k3b/k3b-.ebuild | 1 + 2 files changed, 2 insertions(+) diff --git a/kde-apps/k3b/k3b-17.04.49..ebuild b/kde-apps/k3b/k3b-17.04.49..ebuild index b5a1913f95..229940f507 100644 --- a/kde-apps/k3b/k3b-17.04.49..ebuild +++ b/kde-apps/k3b/k3b-17.04.49..ebuild @@ -56,6 +56,7 @@ DEPEND=" " RDEPEND="${DEPEND} app-cdr/cdrdao + dev-libs/libburn media-sound/cdparanoia virtual/cdrtools dvd? ( diff --git a/kde-apps/k3b/k3b-.ebuild b/kde-apps/k3b/k3b-.ebuild index b5a1913f95..229940f507 100644 --- a/kde-apps/k3b/k3b-.ebuild +++ b/kde-apps/k3b/k3b-.ebuild @@ -56,6 +56,7 @@ DEPEND=" " RDEPEND="${DEPEND} app-cdr/cdrdao + dev-libs/libburn media-sound/cdparanoia virtual/cdrtools dvd? (
[gentoo-commits] proj/kde:master commit in: kde-apps/k3b/
commit: 3e8b61c018dc301012d8db14e76123d0aea6c050 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun May 7 22:23:34 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun May 7 22:23:34 2017 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=3e8b61c0 kde-apps/k3b: Set KDE_TEST to true Fixes configure warning. Reported-by: Arfrever Package-Manager: Portage-2.3.5, Repoman-2.3.1 kde-apps/k3b/k3b-17.04.49..ebuild | 2 +- kde-apps/k3b/k3b-.ebuild | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/kde-apps/k3b/k3b-17.04.49..ebuild b/kde-apps/k3b/k3b-17.04.49..ebuild index 8d27812308..b5a1913f95 100644 --- a/kde-apps/k3b/k3b-17.04.49..ebuild +++ b/kde-apps/k3b/k3b-17.04.49..ebuild @@ -4,7 +4,7 @@ EAPI=6 KDE_HANDBOOK="forceoptional" -KDE_TEST="optional" +KDE_TEST="true" inherit kde5 DESCRIPTION="Full-featured burning and ripping application based on KDE Frameworks" diff --git a/kde-apps/k3b/k3b-.ebuild b/kde-apps/k3b/k3b-.ebuild index 8d27812308..b5a1913f95 100644 --- a/kde-apps/k3b/k3b-.ebuild +++ b/kde-apps/k3b/k3b-.ebuild @@ -4,7 +4,7 @@ EAPI=6 KDE_HANDBOOK="forceoptional" -KDE_TEST="optional" +KDE_TEST="true" inherit kde5 DESCRIPTION="Full-featured burning and ripping application based on KDE Frameworks"
[gentoo-commits] proj/kde:master commit in: kde-apps/k3b/
commit: 572ebeb31b739d651c3c7b8a53cf4f1c67906f36 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Mar 19 17:03:16 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Mar 20 07:10:55 2017 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=572ebeb3 kde-apps/k3b: Add USE=webkit It has been made optional. Package-Manager: Portage-2.3.3, Repoman-2.3.1 kde-apps/k3b/k3b-17.04.49..ebuild | 5 +++-- kde-apps/k3b/k3b-.ebuild | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/kde-apps/k3b/k3b-17.04.49..ebuild b/kde-apps/k3b/k3b-17.04.49..ebuild index 3712821ac3..8d27812308 100644 --- a/kde-apps/k3b/k3b-17.04.49..ebuild +++ b/kde-apps/k3b/k3b-17.04.49..ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Full-featured burning and ripping application based on KDE Framewor HOMEPAGE="http://www.k3b.org/; LICENSE="GPL-2 FDL-1.2" KEYWORDS="" -IUSE="dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis" +IUSE="dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis webkit" DEPEND=" $(add_frameworks_dep karchive) @@ -37,7 +37,6 @@ DEPEND=" $(add_qt_dep qtdbus) $(add_qt_dep qtgui) $(add_qt_dep qtnetwork) - $(add_qt_dep qtwebkit) $(add_qt_dep qtwidgets) $(add_qt_dep qtxml) media-libs/libsamplerate @@ -53,6 +52,7 @@ DEPEND=" sndfile? ( media-libs/libsndfile ) taglib? ( >=media-libs/taglib-1.5 ) vorbis? ( media-libs/libvorbis ) + webkit? ( $(add_qt_dep qtwebkit) ) " RDEPEND="${DEPEND} app-cdr/cdrdao @@ -93,6 +93,7 @@ src_configure() { -DK3B_ENABLE_TAGLIB=$(usex taglib) -DK3B_BUILD_OGGVORBIS_DECODER_PLUGIN=$(usex vorbis) -DK3B_BUILD_OGGVORBIS_ENCODER_PLUGIN=$(usex vorbis) + $(cmake-utils_use_find_package webkit Qt5WebKitWidgets) ) kde5_src_configure diff --git a/kde-apps/k3b/k3b-.ebuild b/kde-apps/k3b/k3b-.ebuild index 3712821ac3..8d27812308 100644 --- a/kde-apps/k3b/k3b-.ebuild +++ b/kde-apps/k3b/k3b-.ebuild @@ -11,7 +11,7 @@ DESCRIPTION="Full-featured burning and ripping application based on KDE Framewor HOMEPAGE="http://www.k3b.org/; LICENSE="GPL-2 FDL-1.2" KEYWORDS="" -IUSE="dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis" +IUSE="dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis webkit" DEPEND=" $(add_frameworks_dep karchive) @@ -37,7 +37,6 @@ DEPEND=" $(add_qt_dep qtdbus) $(add_qt_dep qtgui) $(add_qt_dep qtnetwork) - $(add_qt_dep qtwebkit) $(add_qt_dep qtwidgets) $(add_qt_dep qtxml) media-libs/libsamplerate @@ -53,6 +52,7 @@ DEPEND=" sndfile? ( media-libs/libsndfile ) taglib? ( >=media-libs/taglib-1.5 ) vorbis? ( media-libs/libvorbis ) + webkit? ( $(add_qt_dep qtwebkit) ) " RDEPEND="${DEPEND} app-cdr/cdrdao @@ -93,6 +93,7 @@ src_configure() { -DK3B_ENABLE_TAGLIB=$(usex taglib) -DK3B_BUILD_OGGVORBIS_DECODER_PLUGIN=$(usex vorbis) -DK3B_BUILD_OGGVORBIS_ENCODER_PLUGIN=$(usex vorbis) + $(cmake-utils_use_find_package webkit Qt5WebKitWidgets) ) kde5_src_configure
[gentoo-commits] proj/kde:master commit in: kde-apps/k3b/
commit: df02c589b6adf7a5862358de0bdce11701b4011b Author: Johannes Huber gentoo org> AuthorDate: Thu Mar 9 17:24:34 2017 + Commit: Johannes Huber gentoo org> CommitDate: Thu Mar 9 17:24:34 2017 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=df02c589 kde-apps/k3b: Drop obsolete blocker Package was moved in tree to kde-apps as well and this is handled by kde5 eclass anyway. Package-Manager: Portage-2.3.4, Repoman-2.3.2 kde-apps/k3b/k3b-.ebuild | 1 - 1 file changed, 1 deletion(-) diff --git a/kde-apps/k3b/k3b-.ebuild b/kde-apps/k3b/k3b-.ebuild index 5fafb7b730..3712821ac3 100644 --- a/kde-apps/k3b/k3b-.ebuild +++ b/kde-apps/k3b/k3b-.ebuild @@ -65,7 +65,6 @@ RDEPEND="${DEPEND} emovix? ( media-video/emovix ) sox? ( media-sound/sox ) vcd? ( media-video/vcdimager ) - !app-cdr/k3b:4 " REQUIRED_USE="
[gentoo-commits] proj/kde:master commit in: kde-apps/k3b/, profiles/updates/, app-cdr/k3b/
commit: 52a73de75a70e3986318a05a933bfb274a5071e3 Author: Johannes Huber gentoo org> AuthorDate: Thu Mar 9 17:09:22 2017 + Commit: Johannes Huber gentoo org> CommitDate: Thu Mar 9 17:09:22 2017 + URL:https://gitweb.gentoo.org/proj/kde.git/commit/?id=52a73de7 app-cdr/k3b -> kde-apps/k3b {app-cdr => kde-apps}/k3b/k3b-.ebuild | 4 +--- {app-cdr => kde-apps}/k3b/metadata.xml| 0 profiles/updates/1Q-2017 | 1 + 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/app-cdr/k3b/k3b-.ebuild b/kde-apps/k3b/k3b-.ebuild similarity index 95% rename from app-cdr/k3b/k3b-.ebuild rename to kde-apps/k3b/k3b-.ebuild index f888af6f13..5fafb7b730 100644 --- a/app-cdr/k3b/k3b-.ebuild +++ b/kde-apps/k3b/k3b-.ebuild @@ -9,10 +9,8 @@ inherit kde5 DESCRIPTION="Full-featured burning and ripping application based on KDE Frameworks" HOMEPAGE="http://www.k3b.org/; -[[ ${KDE_BUILD_TYPE} = release ]] && SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz" - LICENSE="GPL-2 FDL-1.2" -[[ ${KDE_BUILD_TYPE} = release ]] && KEYWORDS="~amd64 ~x86" +KEYWORDS="" IUSE="dvd emovix encode ffmpeg flac libav mad mp3 musepack sndfile sox taglib vcd vorbis" DEPEND=" diff --git a/app-cdr/k3b/metadata.xml b/kde-apps/k3b/metadata.xml similarity index 100% rename from app-cdr/k3b/metadata.xml rename to kde-apps/k3b/metadata.xml diff --git a/profiles/updates/1Q-2017 b/profiles/updates/1Q-2017 index d04617015b..4625936668 100644 --- a/profiles/updates/1Q-2017 +++ b/profiles/updates/1Q-2017 @@ -1,3 +1,4 @@ slotmove dev-libs/kirigami 5 1 move net-libs/libkgapi kde-apps/libkgapi move kde-misc/plasma-vault kde-plasma/plasma-vault +move app-cdr/k3b kde-apps/k3b