summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2023-07-06 13:56:10 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2023-07-06 14:12:51 +0200
commitc65bd23152d13d499b085a6854efac9ad3eb4cc2 (patch)
tree646e4946a534ff16f05800fb29313f1e486152b0 /kde-apps/k3b
parentkde-apps/kmail: Pin to kde-apps/kpimtextedit[speech=] (diff)
downloadgentoo-c65bd23152d13d499b085a6854efac9ad3eb4cc2.tar.gz
gentoo-c65bd23152d13d499b085a6854efac9ad3eb4cc2.tar.bz2
gentoo-c65bd23152d13d499b085a6854efac9ad3eb4cc2.zip
kde-apps/k3b: Re-enable external encoder plugin
Hard-disable transcode in code by reverting upstream commit f7d385a40cc062fa4db46c165f82f437dea82c58. Bug: https://bugs.gentoo.org/891585 Closes: https://bugs.gentoo.org/906526 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-apps/k3b')
-rw-r--r--kde-apps/k3b/files/k3b-23.04.2-disable-transcode.patch38
-rw-r--r--kde-apps/k3b/k3b-23.04.2-r1.ebuild (renamed from kde-apps/k3b/k3b-23.04.2.ebuild)4
2 files changed, 41 insertions, 1 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 000000000000..209c13cd4546
--- /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 <asturm@gentoo.org>
+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 <asturm@gentoo.org>
+---
+ 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.2.ebuild b/kde-apps/k3b/k3b-23.04.2-r1.ebuild
index d072c2b7d0bb..12bcb8cce68c 100644
--- a/kde-apps/k3b/k3b-23.04.2.ebuild
+++ b/kde-apps/k3b/k3b-23.04.2-r1.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