commit: 9cb2804875a6a3d32a4248c331289f46826906a2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Thu Sep 15 19:37:14 2022 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Thu Sep 15 19:41:36 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9cb28048
media-video/kaffeine: EAPI-8 bump, update scantable.dvb, wayland fix Fix activating existing window backporting upstream commit 389c812c3afffc5184492039a80bee24a8104815. Fix HOMEPAGE. Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-video/kaffeine/Manifest | 1 + ...kaffeine-2.0.18-wayland-window-activation.patch | 35 +++++++++++ media-video/kaffeine/kaffeine-2.0.18-r2.ebuild | 69 ++++++++++++++++++++++ 3 files changed, 105 insertions(+) diff --git a/media-video/kaffeine/Manifest b/media-video/kaffeine/Manifest index 730b942b88a1..5a15bb12779a 100644 --- a/media-video/kaffeine/Manifest +++ b/media-video/kaffeine/Manifest @@ -1 +1,2 @@ +DIST kaffeine-2.0.18-scantable.dvb 1880456 BLAKE2B e435309f0a11cb6ecb9671c0948c6afdf4c946bc0914c0809945002e353383bb539e1c5594a0a52f2968393623c56914b360b37e5b24a0c17a8f3a60b100ad6a SHA512 2d00987eb261e6f52df490dd44b43567f7d4e3bdcfd0eb2f62e064604d91661e9754cf9e5462b491009fcb35bdca681f4be2a9f06b6b6d47a5b44f5819dbf4fe DIST kaffeine-2.0.18.tar.xz 6033112 BLAKE2B c9a0fbd58f7ee4ed8ad44cbed59d95cde7df8ba9c2f5f341df74e6a771293756434e38adb7706baf224a684b56453601099fcac9bf27fd7ec935073a0c30ec19 SHA512 60854251f25e7de94928686f647e6e0f07ca40188e8dfd8140985f1dfbb53bb4d92ff42c29e216431500839d7eb83b81f386bac3a8a86dd8c986a611ec0db3a4 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 <[email protected]> +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 +}
