gentoo resync : 11.05.2021

3 files changed, 93 insertions, 0 deletions

diff --git a/media-video/kaffeine/Manifest b/media-video/kaffeine/Manifest
index ee6e2d0a4776..626f8219757c 100644
--- a/media-video/kaffeine/Manifest
+++ b/media-video/kaffeine/Manifest
@@ -1,3 +1,5 @@
+AUX kaffeine-2.0.18-kwindowsystem-5.82.patch 885 BLAKE2B 4ea110e8ddf8fc1555953a9de61002ef3a0c2395eb0f5d1ce5516cf256ae0d4a1a92571c797ff1c48801c555073e3fda424aa180e73f4f1d4888023b6b491376 SHA512 0270e812a61669c6fe78061d2045319668d6d05f0181fb028318ad397dd230d4e21756fd304bcb0b46be4c342a1abed4c8cf046ab0b06bd4babb67c282d1ed89
 DIST kaffeine-2.0.18.tar.xz 6033112 BLAKE2B c9a0fbd58f7ee4ed8ad44cbed59d95cde7df8ba9c2f5f341df74e6a771293756434e38adb7706baf224a684b56453601099fcac9bf27fd7ec935073a0c30ec19 SHA512 60854251f25e7de94928686f647e6e0f07ca40188e8dfd8140985f1dfbb53bb4d92ff42c29e216431500839d7eb83b81f386bac3a8a86dd8c986a611ec0db3a4
+EBUILD kaffeine-2.0.18-r1.ebuild 1525 BLAKE2B 4b41f4b6114dab705871477d840fcf581f55a55af78e01ca0073ebacebe07f7db465d32d09d7c0ff24b1973d24dc5df44aa979b802f4acc1b1b3803e9545adc5 SHA512 c8a888e964a4e1e9e63b03bec4ed74bd146a040e707f3b1dc8b25190b166e4a697f4a95877478c844e1490c70fd56ce469104032b348da7d9132a1066137d834
 EBUILD kaffeine-2.0.18.ebuild 1444 BLAKE2B ea8a713fc0aaa108c6e28db08a760a0271222318f615a67d006b7295f9f20ac04a14606540cd959773213ed3be28a27f69c9e01224b88542af0fa87a3e097d16 SHA512 34dfcd7123d8d19d3d8079242b89e88f416e7e374ba97751099adca93346ce8c0bbe02b739c3d2ffb6437dbbdf496d555114f50b8b2fced45d6af7122a171832
 MISC metadata.xml 369 BLAKE2B 2ba0f7bed05089f04c57eaeae806308ef4fe560461e5f44b32e05ffcb2cd2ee064d81a07589e1d9ad067acb56f9dd43d0acda9a87cdaf42187aae8cb67306a54 SHA512 f58a7acad05449a5cfc6ee4bc9d52677b06b9d994bb109a279d04e71ff7368cd697b286767b463e4f5d42a1194b268789fb373b17a19e581927c25d64d46a083
diff --git a/media-video/kaffeine/files/kaffeine-2.0.18-kwindowsystem-5.82.patch b/media-video/kaffeine/files/kaffeine-2.0.18-kwindowsystem-5.82.patch
new file mode 100644
index 000000000000..97d8ecdec057
--- /dev/null
+++ b/media-video/kaffeine/files/kaffeine-2.0.18-kwindowsystem-5.82.patch
@@ -0,0 +1,28 @@
+From 4280d21a96c4ffd162eca52815aa84ddb679f60b Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sat, 8 May 2021 23:45:53 +0200
+Subject: [PATCH] Port away from API deprecated in >KF-5.62
+
+BUG: 436798
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ src/main.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/main.cpp b/src/main.cpp
+index 01e3b80..cee5102 100644
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -180,7 +180,7 @@ void KaffeineApplication::activateRequested(const QStringList &arguments,
+ 		return;
+ 
+ 	parser.parse(arguments);
+-	KStartupInfo::setNewStartupId(mainWindow, KStartupInfo::startupId());
++	KStartupInfo::setNewStartupId(mainWindow->window()->windowHandle(), KStartupInfo::startupId());
+ 	KWindowSystem::forceActiveWindow(mainWindow->winId());
+ 	mainWindow->parseArgs(workingDirectory);
+ }
+-- 
+2.31.1
+
diff --git a/media-video/kaffeine/kaffeine-2.0.18-r1.ebuild b/media-video/kaffeine/kaffeine-2.0.18-r1.ebuild
new file mode 100644
index 000000000000..48b9edc935b3
--- /dev/null
+++ b/media-video/kaffeine/kaffeine-2.0.18-r1.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+KFMIN=5.82.0
+QTMIN=5.15.2
+inherit ecm kde.org
+
+if [[ ${KDE_BUILD_TYPE} = release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Media player with digital TV support by KDE"
+HOMEPAGE="https://userbase.kde.org/Kaffeine"
+
+LICENSE="GPL-2+ handbook? ( FDL-1.3 )"
+SLOT="5"
+IUSE="dvb"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtsql-${QTMIN}:5[sqlite]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtx11extras-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	media-video/vlc[X]
+	x11-libs/libXScrnSaver
+	dvb? ( media-libs/libv4l[dvb] )
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+
+DOCS=( Changelog NOTES README.md )
+
+PATCHES=( "${FILESDIR}/${P}-kwindowsystem-5.82.patch" ) # KDE-bug 436798
+
+src_configure() {
+	# tools working on $HOME directory for a local git checkout
+	local mycmakeargs=(
+		-DBUILD_TOOLS=OFF
+		$(cmake_use_find_package dvb Libdvbv5)
+	)
+
+	ecm_src_configure
+}