gentoo auto-resync : 16:09:2023 - 04:59:22

3 files changed, 72 insertions, 5 deletions

diff --git a/kde-apps/ffmpegthumbs/Manifest b/kde-apps/ffmpegthumbs/Manifest
index e1fdaf606e7f..18a20bc48817 100644
--- a/kde-apps/ffmpegthumbs/Manifest
+++ b/kde-apps/ffmpegthumbs/Manifest
@@ -1,5 +1,6 @@
+AUX ffmpegthumbs-23.08.1-cmake.patch 2056 BLAKE2B d6aac13598260bc6a78644a5fd553d5acf055c00361b3d2f9e313bdf55b389b6ded0540c575e5db7b2ec48ec63c45e1cd3063d96112037eeb86b680612200779 SHA512 91fe6ea196fdd93bb9949be6162870f02a97c1b2a525a718b32dd8b5f0ea8809a22a704f1b7af5bac922e75bca1679a1e9c6c2ca62e067fc4fc5927e4a30ef72
 DIST ffmpegthumbs-23.04.3.tar.xz 32632 BLAKE2B 377ca6227dc39ce19a5a86436c343d10d398a36444450447504d778fc2b82d7611afa5af4fc0f7ff92ea9b4457a84413d94a3632e7eb3a9d004ade38cb2702cd SHA512 9b1d78c1ae8f8338abcb0afdfad3b25419a8c39ee4722251bd12db022c681b5bacdbdedc351fb4405e518177f15f9497182b6de1cc9f4f80793d6bfc3991c08f
-DIST ffmpegthumbs-23.08.0.tar.xz 32996 BLAKE2B 62d993421d3a24ecdf395c2e3e78683acb65e7de104e048e146163192eda4a8bd650abfd86715da990e4cb1ffb1ef2644c146f2c34aa1799d24131e7f07de7d2 SHA512 3577e507a49d773b25357fc3a24771c1439eb7c151750258b6ae67b89609cd526a1fe34d15f5fb1c3f5fc56fb59384f2423daefc25eb5ccd375af4d3f32d9c86
+DIST ffmpegthumbs-23.08.1.tar.xz 33004 BLAKE2B a751360c470b46be7c8c3b3d5170b5eddc05bf69e5f6f1a228f8725451822dc60f496ad40b6201aac97a40eaeec328d41b508a27f4cd054a89c177af56765bac SHA512 ee0591067649cf4b9f585b0f75ff91081088994e1cd0206aaac1a4119d8649fadbaea590d806c426544002a7ef507d4fa101f8c8e15334d269b819f591919e57
 EBUILD ffmpegthumbs-23.04.3.ebuild 558 BLAKE2B 3f16975433deb505cc3fa25146a542de5a715110810af528cd93eff2ee67d50b9763866f60251408892012104b268067cbe97c65cccb315cec4c11c4b5566fee SHA512 17b126869befd3ebe63515d6f75345dc0d35e322be56b7a7c0a2491b99c1e2d44dfffdfad87b8590d46e125786a0f0e83000312edd70581fa6217aa4b233c166
-EBUILD ffmpegthumbs-23.08.0.ebuild 561 BLAKE2B cf6c69c010b5d25aaf4d60c9a6b7d45c816deb4fa60dfc57ede9879a739ef34ae9a1356fba4fe08437db3ccda1823667d0a5913b6d3706bd29f052bf02785144 SHA512 f05ffe0d5fa25425beb548492d08873959f7ce4240f3d781d205a46f284a289e1094e76ef1d0c12fe24abfd551ab8e9bcba3e94046454959c720be2f9962af53
+EBUILD ffmpegthumbs-23.08.1.ebuild 583 BLAKE2B f1097835828fcc6a2bbb77d3f9ec4d1304a743641188fda2be9c9c19a7e0f9596b05eb68758512ab3957fbddcc1d1b2117b4189a00a2fb38b466a031b092d87f SHA512 336e9408e2a76cb2dbcd4d30de73aca6be4005202d78b6ff738beb41b6c217414d3cb7944bc2b7039e8ed3bb288c86b0b2ab3805168220972581d0e8fb4654e6
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-23.08.0.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-23.08.1.ebuild
index 863f426bc38b..8e03e31e09e2 100644
--- a/kde-apps/ffmpegthumbs/ffmpegthumbs-23.08.0.ebuild
+++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-23.08.1.ebuild
@@ -16,11 +16,14 @@ IUSE=""
 
 DEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/kio-${KFMIN}:5
 	media-video/ffmpeg:0=
 "
 RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
+BDEPEND="
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}/${P}-cmake.patch" )
diff --git a/kde-apps/ffmpegthumbs/files/ffmpegthumbs-23.08.1-cmake.patch b/kde-apps/ffmpegthumbs/files/ffmpegthumbs-23.08.1-cmake.patch
new file mode 100644
index 000000000000..584925393275
--- /dev/null
+++ b/kde-apps/ffmpegthumbs/files/ffmpegthumbs-23.08.1-cmake.patch
@@ -0,0 +1,63 @@
+From 741f5285ee7dedd86d5e6142d4f6a411c65667ad Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Thu, 14 Sep 2023 20:47:24 +0200
+Subject: [PATCH] Drop unused KI18n header/dependency
+
+Does not actually have translations.
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+(cherry picked from commit 62c8a809800576d0898da0e7f5941a4070637c58)
+---
+ CMakeLists.txt        | 3 +--
+ ffmpegthumbnailer.cpp | 1 -
+ tests/CMakeLists.txt  | 1 -
+ 3 files changed, 1 insertion(+), 4 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 806b703..46b9e13 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -24,7 +24,7 @@ include(FeatureSummary)
+ include(ECMDeprecationSettings)
+ 
+ find_package(Qt${QT_MAJOR_VERSION} ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS Core Gui)
+-find_package(KF${QT_MAJOR_VERSION} ${KF_MIN_VERSION} REQUIRED COMPONENTS KIO I18n Config)
++find_package(KF${QT_MAJOR_VERSION} ${KF_MIN_VERSION} REQUIRED COMPONENTS KIO Config)
+ find_package(FFmpeg COMPONENTS AVCODEC AVFORMAT SWSCALE)
+ 
+ include_directories(
+@@ -71,7 +71,6 @@ target_link_libraries(ffmpegthumbs
+     Qt::Gui
+     KF${QT_MAJOR_VERSION}::KIOWidgets
+     KF${QT_MAJOR_VERSION}::KIOCore
+-    KF${QT_MAJOR_VERSION}::I18n
+     KF${QT_MAJOR_VERSION}::ConfigCore
+     KF${QT_MAJOR_VERSION}::ConfigGui
+     ${AVUTIL_LIBRARIES}
+diff --git a/ffmpegthumbnailer.cpp b/ffmpegthumbnailer.cpp
+index 5bee237..40bf1be 100644
+--- a/ffmpegthumbnailer.cpp
++++ b/ffmpegthumbnailer.cpp
+@@ -11,7 +11,6 @@
+ 
+ #include <limits>
+ 
+-#include <KLocalizedString>
+ #include <KPluginFactory>
+ #include <QCheckBox>
+ #include <QFormLayout>
+diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
+index 7f4c7e3..ec7e964 100644
+--- a/tests/CMakeLists.txt
++++ b/tests/CMakeLists.txt
+@@ -26,7 +26,6 @@ target_link_libraries(ffmpegthumbtest
+     Qt::Gui
+     KF${QT_MAJOR_VERSION}::KIOWidgets
+     KF${QT_MAJOR_VERSION}::KIOCore
+-    KF${QT_MAJOR_VERSION}::I18n
+     KF${QT_MAJOR_VERSION}::ConfigCore
+     KF${QT_MAJOR_VERSION}::ConfigGui
+     ${AVUTIL_LIBRARIES}
+-- 
+2.42.0
+