commit:     fed7473d5f94e91e609dec75b726f8d6e6ee02f8
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  6 23:03:49 2024 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Aug  6 23:03:49 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fed7473d

media-video/kaffeine: Add backports patchset, fix update scan data

Patchset content:

Andreas Sturmlechner (1):
      Port away from API deprecated in >KF-5.62

Friedrich W. H. Kossebau (4):
      FindVLC.cmake: use <pkg>_VERSION over old <pkg>_VERSION_STRING pattern
      Port away from deprecated KMessageBox::sorry
      Port away from deprecated KMessageBox Yes/No API
      Add explicit moc includes to sources for moc-covered headers

Jonathan Riddell (1):
      update homepage

Mauro Carvalho Chehab (19):
      mediawidget.h: mark override virtual functions as such
      src: mark several functions as override
      dvb: avoid warning when EAGAIN == EWOULDBLOCK
      dvb: add a descriptor parser for registration descriptor
      dvbsi: improve stream type detection logic
      dvb: re-write bcdToTime function
      dvb: epg: add a warning if event lasts more than 24 hours
      mediawidget: don't keep screen saver suspended on exit
      get rid of deprecated qrand() function
      dvbconfigdialog: increase max download size for scandata
      qt: replace QList::swap() by QList::swapItemsAt()
      Replace std::endl by Qt::endl
      Replace Qt sort and search APIs
      Fix some warnings for random generator
      mediawidget: use angleDelta() instead of delta()
      dvb: fix QFlags() initialization
      vlc: use Qt::SkipEmptyParts
      Use QProcess::setProgram()
      CMake: Various fixes, translation handling

Nicolas Fella (3):
      Fix activating existing window
      Add desktop file name to solid actions
      Don't invoke XScreenSaverSuspend on Wayland

Pino Toscano (1):
      i18n: reduce the string puzzles

Yuri Chornoivan (2):
      Update homepage address
      Fix minor EBN issues

Closes: https://bugs.gentoo.org/937158
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-video/kaffeine/Manifest                      |  2 +
 .../kaffeine-2.0.18-cmake-no-dupl-po-targets.patch | 11 ++++
 media-video/kaffeine/kaffeine-2.0.18-r3.ebuild     | 74 ++++++++++++++++++++++
 3 files changed, 87 insertions(+)

diff --git a/media-video/kaffeine/Manifest b/media-video/kaffeine/Manifest
index 5a15bb12779a..2a7daee2655a 100644
--- a/media-video/kaffeine/Manifest
+++ b/media-video/kaffeine/Manifest
@@ -1,2 +1,4 @@
+DIST kaffeine-2.0.18-patchset.tar.xz 29600 BLAKE2B 
b7e4fa7c367ded01ddbdc258d2b6cac904fefe44b34668e64f7c4d9d2933abe42aeaee64c4889cee050d131ac6aac8bb58b6685523d0e6bdb019430fdd2a269d
 SHA512 
66d9a2f1820fd284b601245c6b7d5eac927e8e1c22e86ef2d84177c0e3f23f2bf6dacfe51f6512dfcaed3d7c59aad522ee9e3555ec2940179fe6b2b3a4fb7f98
+DIST kaffeine-2.0.18-r3-scantable.dvb 1980400 BLAKE2B 
dcc43fcd04cc155ae99e35a32de15f9823007f68041a4b3fc6fce143d2b66e3c209d945a24e9aea968b195b782d8ffb5d21533cba21fb48ffedb77d82f28d5f2
 SHA512 
de93c5dbecdb7549b03a1809891a33ee216a1592a140fcce81649e4355ac9e51898ca6a2d7b0d302e3e92191800fbd50033902a06fc6672ca3590eb4d7be2f98
 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-cmake-no-dupl-po-targets.patch 
b/media-video/kaffeine/files/kaffeine-2.0.18-cmake-no-dupl-po-targets.patch
new file mode 100644
index 000000000000..79482164bc2c
--- /dev/null
+++ b/media-video/kaffeine/files/kaffeine-2.0.18-cmake-no-dupl-po-targets.patch
@@ -0,0 +1,11 @@
+--- a/CMakeLists.txt   2019-05-14 15:04:58.000000000 +0200
++++ b/CMakeLists.txt   2024-08-04 22:36:49.346618444 +0200
+@@ -112,8 +112,3 @@
+ if(BUILD_TOOLS)
+   add_subdirectory(tools)
+ endif(BUILD_TOOLS)
+-
+-  find_package(KF5DocTools CONFIG)
+-  if(KF5DocTools_FOUND)
+-    kdoctools_install(po)
+-  endif()

diff --git a/media-video/kaffeine/kaffeine-2.0.18-r3.ebuild 
b/media-video/kaffeine/kaffeine-2.0.18-r3.ebuild
new file mode 100644
index 000000000000..bb6e662ce6a2
--- /dev/null
+++ b/media-video/kaffeine/kaffeine-2.0.18-r3.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ECM_HANDBOOK="optional"
+PATCHSET="${P}-patchset"
+SCANTABLE="${P}-r3-scantable.dvb"
+KFMIN=5.106.0
+QTMIN=5.15.9
+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 -> 
${SCANTABLE}"
+       SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz";
+       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=(
+       "${WORKDIR}/${PATCHSET}"
+       "${FILESDIR}/${P}-cmake-no-dupl-po-targets.patch")
+
+src_prepare() {
+       ecm_src_prepare
+       cp -av "${DISTDIR}"/${SCANTABLE} 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
+}

Reply via email to