commit: cbc46196bbd18a68f1a09282e8ab1cbf4dc6335f Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Wed Feb 18 20:13:30 2026 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Wed Feb 18 22:08:30 2026 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbc46196
media-video/kaffeine: add 2.1.0_pre20260210, pin to =VLC-3* Build is broken w/ VLC-4. Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-video/kaffeine/Manifest | 1 + .../files/kaffeine-2.1.0_pre20260210-cmake.patch | 49 ++++++++++++++++++ ...ne-2.1.0_pre20260210-fix-epgdata.dvb-read.patch | 13 +++++ .../kaffeine/kaffeine-2.1.0_pre20260210.ebuild | 59 ++++++++++++++++++++++ 4 files changed, 122 insertions(+) diff --git a/media-video/kaffeine/Manifest b/media-video/kaffeine/Manifest index 5e0f13ca66d7..866750c33e54 100644 --- a/media-video/kaffeine/Manifest +++ b/media-video/kaffeine/Manifest @@ -1 +1,2 @@ DIST kaffeine-2.1.0_pre20241125-45fd3627.tar.gz 6573858 BLAKE2B 6ccc18725ad16e5b3f7c37233fcf3a040a4dcf3b9a88ed867ea9d0dbd44225e9b0cbc5f2491943b73cd3e6d6dc557aa5a69ffa8db0fe42d32da504375c88184d SHA512 d4c109a727d69fce7ddfede90f03d82bf2003ec4cac6f7f685745c1e880cdb92e69f93693315d03d5a2088cdba70f67141b2581f935a11937816cfc8d3369b05 +DIST kaffeine-2.1.0_pre20260210-22c6a2c0.tar.gz 6623290 BLAKE2B 8427dcd3db5e91afe7119a2bd1d2facc7358c9a400d8ad5ef0dcae80d4bcd2201fe0956ecf090a4ccb63594459e3ec7260ddfae4065a12b10aeb139b8b3a17d2 SHA512 b8b5df8403f3aa1e27b899ef9a67096f00db2d1d8b44725cc8a1f19ec4b941401b78c8656ede3620baef0930f0c0df87e993f635eec86df33ef6612b0ea41b25 diff --git a/media-video/kaffeine/files/kaffeine-2.1.0_pre20260210-cmake.patch b/media-video/kaffeine/files/kaffeine-2.1.0_pre20260210-cmake.patch new file mode 100644 index 000000000000..23e4c4de9648 --- /dev/null +++ b/media-video/kaffeine/files/kaffeine-2.1.0_pre20260210-cmake.patch @@ -0,0 +1,49 @@ +From df9203657ec140ee193a6356437f3660cfc28b5e Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <[email protected]> +Date: Wed, 18 Feb 2026 21:22:23 +0100 +Subject: [PATCH] Fix CMake warnings caused by Qt6Core before ECM, align ECM w/ + KF6_MIN_VERSION + +Fixes: + +> CMake Warning at /usr/share/ECM/kde-modules/KDEInstallDirsCommon.cmake:169 (message): +> KDE_INSTALL_BINDIR got its value from CMAKE_INSTALL_BINDIR. In most cases +> this is unintended, check if you included GNUInstallDirs before +> KDEInstallDirs. Some third party modules include GNUInstallDirs too so eg. +> find_package(Qt6 ...) is equivalent to include(GNUInstallDirs). If you set +> CMAKE_INSTALL_BINDIR deliberately before including KDEInstallDirs its +> recommended to use KDE_INSTALL_BINDIR instead to suppress this message. +> Call Stack (most recent call first): +> /usr/share/ECM/kde-modules/KDEInstallDirsCommon.cmake:255 (_define_relative) +> /usr/share/ECM/kde-modules/KDEInstallDirs6.cmake:201 (include) +> /usr/share/ECM/kde-modules/KDEInstallDirs.cmake:17 (include) +> CMakeLists.txt:24 (include) + +(7 times) + +Signed-off-by: Andreas Sturmlechner <[email protected]> +--- + CMakeLists.txt | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 054c250..8c26437 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -17,10 +17,11 @@ option(BUILD_TOOLS "Build the helper tools" OFF) + set(QT_MIN_VERSION "6.6.0") + set(KF6_MIN_VERSION "6.0.0") + +-find_package(Qt6Core) +-find_package(ECM 1.0 REQUIRED NO_MODULE) ++find_package(ECM ${KF6_MIN_VERSION} REQUIRED NO_MODULE) + set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules") + ++set(KDE_COMPILERSETTINGS_LEVEL 5.84.0) ++ + include(KDEInstallDirs) + include(KDECMakeSettings) + include(KDECompilerSettings) +-- +2.53.0 + diff --git a/media-video/kaffeine/files/kaffeine-2.1.0_pre20260210-fix-epgdata.dvb-read.patch b/media-video/kaffeine/files/kaffeine-2.1.0_pre20260210-fix-epgdata.dvb-read.patch new file mode 100644 index 000000000000..abf3bc14330b --- /dev/null +++ b/media-video/kaffeine/files/kaffeine-2.1.0_pre20260210-fix-epgdata.dvb-read.patch @@ -0,0 +1,13 @@ +diff --git a/src/dvb/dvbepg.cpp b/src/dvb/dvbepg.cpp +index 575bc3f..456655b 100644 +--- a/src/dvb/dvbepg.cpp ++++ b/src/dvb/dvbepg.cpp +@@ -110,7 +110,7 @@ DvbEpgModel::DvbEpgModel(DvbManager *manager_, QObject *parent) : QObject(parent + stream >> entry.duration; + + if (hasMultilang) { +- int i, count; ++ qsizetype i, count; + + stream >> count; + \ No newline at end of file diff --git a/media-video/kaffeine/kaffeine-2.1.0_pre20260210.ebuild b/media-video/kaffeine/kaffeine-2.1.0_pre20260210.ebuild new file mode 100644 index 000000000000..f2854d8f95f8 --- /dev/null +++ b/media-video/kaffeine/kaffeine-2.1.0_pre20260210.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2026 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_HANDBOOK="optional" +KDE_ORG_COMMIT=22c6a2c0508a880db796465734996a8a6d6fbaeb +KFMIN=6.16.0 +QTMIN=6.7.2 +inherit ecm kde.org xdg + +DESCRIPTION="Media player with digital TV support by KDE" +HOMEPAGE="https://apps.kde.org/kaffeine/ https://userbase.kde.org/Kaffeine"; +SRC_URI="https://dev.gentoo.org/~asturm/distfiles/kde/${KDE_ORG_NAME}-${PV}-${KDE_ORG_COMMIT:0:8}.tar.gz"; + +LICENSE="GPL-2+ handbook? ( FDL-1.3 )" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="dvb" + +DEPEND=" + >=dev-qt/qtbase-${QTMIN}:6[dbus,gui,network,sql,widgets,xml] + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/kdbusaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kwindowsystem-${KFMIN}:6[X] + >=kde-frameworks/kxmlgui-${KFMIN}:6 + >=kde-frameworks/solid-${KFMIN}:6 + =media-video/vlc-3*[X] + dvb? ( media-libs/libv4l[dvb] ) +" +RDEPEND="${DEPEND} + !${CATEGORY}/${PN}:5 +" +BDEPEND=" + sys-devel/gettext + virtual/pkgconfig +" + +DOCS=( Changelog NOTES README.md ) + +PATCHES=( + "${FILESDIR}/${P}-cmake.patch" # Pending upstream + "${FILESDIR}/${P}-fix-epgdata.dvb-read.patch" # KDE-bug 497475 +) + +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 +}
