gentoo auto-resync : 15:09:2022 - 23:13:44

4 files changed, 107 insertions, 0 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index 4992643a0586..f9468ffeffbb 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/kaffeine/Manifest b/media-video/kaffeine/Manifest
index 30e140919c62..94fea211e937 100644
--- a/media-video/kaffeine/Manifest
+++ b/media-video/kaffeine/Manifest
@@ -1,4 +1,7 @@
 AUX kaffeine-2.0.18-kwindowsystem-5.82.patch 885 BLAKE2B 4ea110e8ddf8fc1555953a9de61002ef3a0c2395eb0f5d1ce5516cf256ae0d4a1a92571c797ff1c48801c555073e3fda424aa180e73f4f1d4888023b6b491376 SHA512 0270e812a61669c6fe78061d2045319668d6d05f0181fb028318ad397dd230d4e21756fd304bcb0b46be4c342a1abed4c8cf046ab0b06bd4babb67c282d1ed89
+AUX kaffeine-2.0.18-wayland-window-activation.patch 1098 BLAKE2B a129d194ef354f046b6d8b2c6649e0c92bc04d835f89c4d84066d544ea5950f8812c525afd338f97b82788ad4a62564ab7ba5998dd313660ae420d375ec59252 SHA512 d85e749df73be82506dac1fd06784323e944a7091a39d0a25118f9624a3d1a59cb080be1b0d77629e4fca0dfc8e31e9b1d7849ba88a29dd9e0809c7c30142606
+DIST kaffeine-2.0.18-scantable.dvb 1880456 BLAKE2B e435309f0a11cb6ecb9671c0948c6afdf4c946bc0914c0809945002e353383bb539e1c5594a0a52f2968393623c56914b360b37e5b24a0c17a8f3a60b100ad6a SHA512 2d00987eb261e6f52df490dd44b43567f7d4e3bdcfd0eb2f62e064604d91661e9754cf9e5462b491009fcb35bdca681f4be2a9f06b6b6d47a5b44f5819dbf4fe
 DIST kaffeine-2.0.18.tar.xz 6033112 BLAKE2B c9a0fbd58f7ee4ed8ad44cbed59d95cde7df8ba9c2f5f341df74e6a771293756434e38adb7706baf224a684b56453601099fcac9bf27fd7ec935073a0c30ec19 SHA512 60854251f25e7de94928686f647e6e0f07ca40188e8dfd8140985f1dfbb53bb4d92ff42c29e216431500839d7eb83b81f386bac3a8a86dd8c986a611ec0db3a4
 EBUILD kaffeine-2.0.18-r1.ebuild 1523 BLAKE2B 34353431c4762fb778b341bb7431e325aee9bb3c296427129953bcfef256823ffe2cdeae828f82830accbaff6b34fdb485fa261d1513f8180b4e0c15299a35cb SHA512 5c8843a715286fc1e3f34518ec629fc2276aba15d559810f25c74c0ceba5049c15681030e53d1d11f6431d307abfbf992365168ce66136c41f67037a4414a013
+EBUILD kaffeine-2.0.18-r2.ebuild 1748 BLAKE2B 02ebab05eab4ea8fdba5d86712874ca635afef7c718b59ca32219ab3fc158a1b07a7bf550606201c0816bb7bc3acbb48ded67c4a9207cb6214e7bd45c4744e5d SHA512 b67195640a73e7ad735ce32ea4709248c362f072e3208c8ff250ff3971bcfc4c3b5a07136c3e36d1f48646188382377c6c2206e983b8b8ee278870e82dbfffcc
 MISC metadata.xml 438 BLAKE2B b11cde969ef9af83c7e70ac17615703c8f0b4296113a8ff552a669c3b7bf7b5291106dd1c4ece993fd8195f5af3bcd1b05697b583bd85f4a155fa10351cbbadd SHA512 d32994646bdbfb90e5fde722a905ebf5fa59903de7c36fd8228ce257057ac8523d7219656d1f1a1bdcc3f0eec1ad9f34535d4090078c9e3a6890d58b8e1e3b71
diff --git a/media-video/kaffeine/files/kaffeine-2.0.18-wayland-window-activation.patch b/media-video/kaffeine/files/kaffeine-2.0.18-wayland-window-activation.patch
new file mode 100644
index 000000000000..2c4cc7a6f862
--- /dev/null
+++ b/media-video/kaffeine/files/kaffeine-2.0.18-wayland-window-activation.patch
@@ -0,0 +1,35 @@
+From 389c812c3afffc5184492039a80bee24a8104815 Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Sun, 15 May 2022 18:38:07 +0200
+Subject: [PATCH] Fix activating existing window
+
+Also raise window when no arguments were passed
+
+Use KWindowSystem API that also works on Wayland
+---
+ src/main.cpp | 11 +++++++----
+ 1 file changed, 7 insertions(+), 4 deletions(-)
+
+diff --git a/src/main.cpp b/src/main.cpp
+index 68677fd..b5a07dc 100644
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -178,12 +178,11 @@ KaffeineApplication::KaffeineApplication(int &argc, char **argv) : QApplication(
+ void KaffeineApplication::activateRequested(const QStringList &arguments,
+ 					    const QString &workingDirectory)
+ {
+-	if (arguments.isEmpty())
+-		return;
+-
+ 	parser.parse(arguments);
++
++	KWindowSystem::updateStartupId(mainWindow->windowHandle());
++	KWindowSystem::activateWindow(mainWindow->windowHandle());
+-	KStartupInfo::setNewStartupId(mainWindow, KStartupInfo::startupId());
+ 	KWindowSystem::forceActiveWindow(mainWindow->winId());
+ 	mainWindow->parseArgs(workingDirectory);
+ }
+ 
+-- 
+GitLab
+
diff --git a/media-video/kaffeine/kaffeine-2.0.18-r2.ebuild b/media-video/kaffeine/kaffeine-2.0.18-r2.ebuild
new file mode 100644
index 000000000000..f95af9a8b83a
--- /dev/null
+++ b/media-video/kaffeine/kaffeine-2.0.18-r2.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+KFMIN=5.92.0
+QTMIN=5.15.5
+inherit ecm kde.org
+
+if [[ ${KDE_BUILD_TYPE} == release ]]; then
+	SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz
+	https://linuxtv.org/downloads/dtv-scan-tables/${PN}/scantable.dvb -> ${P}-scantable.dvb"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Media player with digital TV support by KDE"
+HOMEPAGE="https://apps.kde.org/kaffeine/ 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}-wayland-window-activation.patch" )
+
+src_prepare() {
+	ecm_src_prepare
+	cp -av "${DISTDIR}"/kaffeine-2.0.18-scantable.dvb src/scantable.dvb || die
+}
+
+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
+}