summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2021-05-09 01:09:41 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2021-05-09 14:09:53 +0200
commitd147393d622d88fede7f13c84468e78f3ffc5d37 (patch)
tree95011a91254507a1c7547055d77bd785e6176843 /media-video/kaffeine
parentmedia-gfx/digikam: Fix build with Qt-5.15.2-after-f8ad329f (diff)
downloadgentoo-d147393d622d88fede7f13c84468e78f3ffc5d37.tar.gz
gentoo-d147393d622d88fede7f13c84468e78f3ffc5d37.tar.bz2
gentoo-d147393d622d88fede7f13c84468e78f3ffc5d37.zip
media-video/kaffeine: Fix build w/ >=kde-frameworks/kwindowsystem-5.82
Upstream commit 4280d21a96c4ffd162eca52815aa84ddb679f60b Gentoo ebuild sets KWINDOWSYSTEM_NO_WIDGETS=ON which drops deprecated KF5WindowSystem API from <=5.62. See also: https://invent.kde.org/multimedia/kaffeine/-/merge_requests/2 KDE-bug: https://bugs.kde.org/show_bug.cgi?id=436798 Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'media-video/kaffeine')
-rw-r--r--media-video/kaffeine/files/kaffeine-2.0.18-kwindowsystem-5.82.patch28
-rw-r--r--media-video/kaffeine/kaffeine-2.0.18-r1.ebuild63
2 files changed, 91 insertions, 0 deletions
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..174bd34442cb
--- /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 )
+"
+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
+}