[gentoo-commits] repo/gentoo:master commit in: media-video/kaffeine/files/, media-video/kaffeine/
commit: fed7473d5f94e91e609dec75b726f8d6e6ee02f8 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Aug 6 23:03:49 2024 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Aug 6 23:03:49 2024 + 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 _VERSION over old _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 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 ..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.0 +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 ..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_
[gentoo-commits] repo/gentoo:master commit in: media-video/kaffeine/files/, media-video/kaffeine/
commit: a1cf2cea618f7cc48102add51140d4e1c19d95ab Author: Johannes Huber gentoo org> AuthorDate: Tue Mar 7 18:06:49 2017 + Commit: Johannes Huber gentoo org> CommitDate: Tue Mar 7 18:07:00 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a1cf2cea media-video/kaffeine: Version bump 2.0.8 Package-Manager: Portage-2.3.4, Repoman-2.3.2 media-video/kaffeine/Manifest | 1 + .../kaffeine/files/kaffeine-2.0.8-build.patch | 38 media-video/kaffeine/kaffeine-2.0.8.ebuild | 68 ++ 3 files changed, 107 insertions(+) diff --git a/media-video/kaffeine/Manifest b/media-video/kaffeine/Manifest index 84d894772e1..385d5a88dc1 100644 --- a/media-video/kaffeine/Manifest +++ b/media-video/kaffeine/Manifest @@ -1,2 +1,3 @@ DIST kaffeine-2.0.5.tar.xz 2284712 SHA256 e1610931e9475e8b86f9c75331f51fbeea22fab0c5fc6a1085325ab2ef055a8c SHA512 2e0562debba616a1b5e3c8c635735e27473cea4ac9b21ab56b8babe5cfffd6f43bce82ecbdcb1d01c08722c08622110fd1b0d00aae779e9007ea82c5068680c2 WHIRLPOOL df3d8bc26077bbd15199a426d77ca0725342c22c0c0c29915479a74f41c37b95579d202cd718e271b2ef7bc0fb6dfc1c921f14395f56040a6727d4830421f840 DIST kaffeine-2.0.6.tar.xz 2295280 SHA256 70cd8423a23717edc7c8f127bd41e5e98aa93cc5866615ed25a8da3e148464e6 SHA512 ca2f036b629e750703536054dd6e28bc9b8191c3851a745f07548b756799243b3739cba9c7ec031be6eab64c18aa5f2eb96d37bcd0b11456e65eb67b016d1bc2 WHIRLPOOL 0d67538dc45f50cced9ab2c0b1adf1bf2367d823270118bf268ed2126c7bb1a65b09fabb51e2b60400fcf073de6fe917a4887d54edc3c13204433538d146 +DIST kaffeine-2.0.8.tar.xz 4400524 SHA256 0277e5d3f55e4ac002788fc6954d4ab5c6aa994f63d7c6b9136d3227818facbd SHA512 9ee7b156d5195caef61cdbdf12deaa2493c6acc31724e839e1773dc5d7ee06f0d87cd7f21df74cf67dcb32fa5a347b72f5953f4568eb8476cb337a59121c609f WHIRLPOOL 4ae48e7e2f615428730f02d0b6b08406f6b3e805518da3fad9cb041ec5f1f9623541f521b3c065e94ed75f3f076d6651d5acc9d2fd306bc545527b05d550c01e diff --git a/media-video/kaffeine/files/kaffeine-2.0.8-build.patch b/media-video/kaffeine/files/kaffeine-2.0.8-build.patch new file mode 100644 index 000..1507f46da21 --- /dev/null +++ b/media-video/kaffeine/files/kaffeine-2.0.8-build.patch @@ -0,0 +1,38 @@ +commit 2dbc752d60f963bad172cf3ec83dc681ec7f +Author: Mauro Carvalho Chehab +Date: Tue Mar 7 06:54:39 2017 -0300 + +CMakeLists.txt: fix it to allow building from tarball + +Kaffeine has a script at tools/update_l10n.sh that allows one to +download and test all translations locally, with is useful during +Kaffeine development. Such script creates a file at po/CMakeLists.txt. + +However, normal users will use the Kaffeine tarball, downloaded from +kde.org. + +The translations at the po/ directory on the tarballs don't +have a CMakeLists.txt, as this file is created only if the +tools/update_l10n.sh is called. + +So, change the main CMakeLists.txt to cope with both ways. + +Signed-off-by: Mauro Carvalho Chehab + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3215e94..d24e848 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -93,7 +93,11 @@ add_subdirectory(icons) + add_subdirectory(profiles) + add_subdirectory(src) + if (IS_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/po") +- add_subdirectory(po) ++ if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/po/CMakeLists.txt" ) ++add_subdirectory(po) ++ else() ++ki18n_install(po) ++ endif() + endif() + + if(KF5DocTools_VERSION) diff --git a/media-video/kaffeine/kaffeine-2.0.8.ebuild b/media-video/kaffeine/kaffeine-2.0.8.ebuild new file mode 100644 index 000..202f5a50eca --- /dev/null +++ b/media-video/kaffeine/kaffeine-2.0.8.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +KDE_HANDBOOK="optional" +inherit kde5 + +DESCRIPTION="Media player with digital TV support by KDE" +HOMEPAGE="https://kaffeine.kde.org/"; +SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz" + +LICENSE="GPL-2+ handbook? ( FDL-1.3 )" +KEYWORDS="~amd64 ~x86" +IUSE="" + +CDEPEND=" + $(add_frameworks_dep kconfig) + $(add_frameworks_dep kconfigwidgets) + $(add_frameworks_dep kcoreaddons) + $(add_frameworks_dep kdbusaddons) + $(add_frameworks_dep ki18n) + $(add_frameworks_dep kio) + $(add_frameworks_dep kwidgetsaddons) + $(add_frameworks_dep kxmlgui) + $(add_frameworks_dep solid) + $(add_qt_dep qtdbus) + $(add_qt_dep qtgui) + $(add_qt_dep qtnetwork) + $(add_qt_dep qtsql 'sqlite') + $(add_qt_dep qtwidgets) + $(add_qt_dep qtx11extras) + $(add_qt_dep qtxml) + media-libs/libv4l + media-video/vlc[X] + x11-libs/libXScrnSaver +" +DEPEND="${CDEPEND} + sys-devel/gettext + virtual/pkgconfig +" +RDEPEND="${CDEPEND} + !media-video/kaffeine:4 +" + +DOCS=( Changelog NOTES README.md )
[gentoo-commits] repo/gentoo:master commit in: media-video/kaffeine/files/, media-video/kaffeine/
commit: d3f06d1312feae858ad63293e326ab3de74f14a3 Author: Johannes Huber gentoo org> AuthorDate: Thu Jul 21 18:31:22 2016 + Commit: Johannes Huber gentoo org> CommitDate: Thu Jul 21 18:31:36 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3f06d13 media-video/kaffeine: Remove slot 4 Package-Manager: portage-2.3.0 media-video/kaffeine/Manifest | 2 -- .../kaffeine/files/kaffeine-1.2.2-gcc4.7.patch | 32 - .../kaffeine/files/kaffeine-1.3.1-cmake34.patch| 26 -- media-video/kaffeine/kaffeine-1.2.2-r1.ebuild | 42 -- media-video/kaffeine/kaffeine-1.3.1.ebuild | 40 - 5 files changed, 142 deletions(-) diff --git a/media-video/kaffeine/Manifest b/media-video/kaffeine/Manifest index 4331821..90fd699 100644 --- a/media-video/kaffeine/Manifest +++ b/media-video/kaffeine/Manifest @@ -1,4 +1,2 @@ -DIST kaffeine-1.2.2.tar.gz 489727 SHA256 b6476a93ddbf84142d4fe29f0757de871e11ce6ca32590affe863a75a231c8cb SHA512 31db518943c223e635822369548949a0c2162cdbbe59edbadb77f4820acf697293d67681553d5552b9435471240fee551786c8c652f1ae5ab9cfe9b8a9cf4459 WHIRLPOOL 232f4875398c4ce889cbf1f3d0aeadefce09d5c6ed64aaf82df9fb57472b7fc814f20fb0fec54db715b45965ff79ae2ae064bb008c4c5fcf96d5b4dd3c860157 -DIST kaffeine-1.3.1.tar.gz 1011607 SHA256 af3abe58e038478a0e50449d414c4885ff3e7a898724cf4216054a0360838aa6 SHA512 c0674153147dea231f8b1cd1d6de245d4af13893904937856371d9e1f2bd1b8df4d4389b324a02b34630cebb134ae47e9c405bcfa909b7fa680e2ff034db4471 WHIRLPOOL 49e5f528223b651e9f46fc44f0a94f69d15e743af31e53192473b95bb338b03bfcc93861343496ca29a55d8356ddf58789c75ed493beee42b22b47a69c083fea DIST kaffeine-2.0.3.tar.xz 1770836 SHA256 dd993e14a109676e56ad30bd7254e0b59cb39db3a75189e4169bc9bde0ac278f SHA512 dc0b4538e672afbc82ad8aa67561a909d7c88d5049e1c9ab7796a5c1365275010c3b7a24929021c9fd959bc3c1d2a4dfa86082afcd506626e841e28d574ff21c WHIRLPOOL c509cca114e3afcbc45964e11020882fad19642fbe3635d3c507dab5308d94e5ae138586d44bece7e086be17929564ff686e159f1a8461bf85378cbb32a47bf1 DIST kaffeine-2.0.4.tar.xz 1993776 SHA256 b9b22a1e8503a49bcf70feaa5443a30c3c99a9da6e3d5b7fe82c1d98602c0166 SHA512 bb27f967d8106425d8b9f60f157a6bc8372b1fb0d0b28319d447f4ff8b81ed821569f9554940aaf2d35457ae195a7b783b25012ac5839b4213209dcc82ff93e0 WHIRLPOOL 5f7f4e52254054674269a71205153a66faefaae6e8bebce17c12d357d79c7731d7a271827f3fb608134f11b0d0f2695d0d13b999c7d2c086b1f9a386c67d6647 diff --git a/media-video/kaffeine/files/kaffeine-1.2.2-gcc4.7.patch b/media-video/kaffeine/files/kaffeine-1.2.2-gcc4.7.patch deleted file mode 100644 index e74563e..000 --- a/media-video/kaffeine/files/kaffeine-1.2.2-gcc4.7.patch +++ /dev/null @@ -1,32 +0,0 @@ -commit 2da9df1e67004c3cfa879578c351300a99f23da1 -Author: Christoph Pfister -Date: Wed Apr 4 21:22:09 2012 +0200 - -fix build for gcc 4.7 - -diff --git a/src/dvb/dvbepg.cpp b/src/dvb/dvbepg.cpp -index 7fc8f68..e70d8b8 100644 a/src/dvb/dvbepg.cpp -+++ b/src/dvb/dvbepg.cpp -@@ -690,15 +690,15 @@ void AtscEpgFilter::processEitSection(const char *data, int size) - // 1980-01-06T00 minus 15 secs (= UTC - GPS in 2011) - QDateTime baseDateTime = QDateTime(QDate(1980, 1, 5), QTime(23, 59, 45), Qt::UTC); - -- for (AtscEitSectionEntry entry = eitSection.entries(); (entryCount > 0) && entry.isValid(); -- --entryCount, entry.advance()) { -+ for (AtscEitSectionEntry eitEntry = eitSection.entries(); -+ (entryCount > 0) && eitEntry.isValid(); --entryCount, eitEntry.advance()) { - DvbEpgEntry epgEntry; - epgEntry.channel = channel; -- epgEntry.begin = baseDateTime.addSecs(entry.startTime()); -- epgEntry.duration = QTime().addSecs(entry.duration()); -- epgEntry.title = entry.title(); -+ epgEntry.begin = baseDateTime.addSecs(eitEntry.startTime()); -+ epgEntry.duration = QTime().addSecs(eitEntry.duration()); -+ epgEntry.title = eitEntry.title(); - -- quint32 id = ((quint32(fakeChannel.networkId) << 16) | quint32(entry.eventId())); -+ quint32 id = ((quint32(fakeChannel.networkId) << 16) | quint32(eitEntry.eventId())); - DvbSharedEpgEntry entry = epgEntries.value(id); - - if (entry.isValid() && (entry->channel == epgEntry.channel) && diff --git a/media-video/kaffeine/files/kaffeine-1.3.1-cmake34.patch b/media-video/kaffeine/files/kaffeine-1.3.1-cmake34.patch deleted file mode 100644 index a8c31f1..000 --- a/media-video/kaffeine/files/kaffeine-1.3.1-cmake34.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 4a1a90ee1b2b4d13302046f043adf1c2a1de758d Mon Sep 17 00:00:00 2001 -From: Raphael Kubo da Costa -Date: Thu, 26 Nov 2015 15:36:26 +0100 -Subject: [PATCH] Explicitly include CheckIncludeFiles. - -This fixes the build with CMake 3.4.0. We were calling check_include_files() -and implicitl
[gentoo-commits] repo/gentoo:master commit in: media-video/kaffeine/files/, media-video/kaffeine/
commit: ff3e817e7ebf75172d1468d7c244210a77a32763 Author: Johannes Huber gentoo org> AuthorDate: Sun Jun 12 07:51:55 2016 + Commit: Johannes Huber gentoo org> CommitDate: Sun Jun 12 07:52:09 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff3e817e media-video/kaffeine: Remove 2.0.2 Package-Manager: portage-2.3.0_rc1 media-video/kaffeine/Manifest | 1 - .../files/kaffeine-2.0.2-bogus-dependency.patch| 51 --- media-video/kaffeine/kaffeine-2.0.2.ebuild | 58 -- 3 files changed, 110 deletions(-) diff --git a/media-video/kaffeine/Manifest b/media-video/kaffeine/Manifest index caf6618..7524e7b 100644 --- a/media-video/kaffeine/Manifest +++ b/media-video/kaffeine/Manifest @@ -1,4 +1,3 @@ DIST kaffeine-1.2.2.tar.gz 489727 SHA256 b6476a93ddbf84142d4fe29f0757de871e11ce6ca32590affe863a75a231c8cb SHA512 31db518943c223e635822369548949a0c2162cdbbe59edbadb77f4820acf697293d67681553d5552b9435471240fee551786c8c652f1ae5ab9cfe9b8a9cf4459 WHIRLPOOL 232f4875398c4ce889cbf1f3d0aeadefce09d5c6ed64aaf82df9fb57472b7fc814f20fb0fec54db715b45965ff79ae2ae064bb008c4c5fcf96d5b4dd3c860157 DIST kaffeine-1.3.1.tar.gz 1011607 SHA256 af3abe58e038478a0e50449d414c4885ff3e7a898724cf4216054a0360838aa6 SHA512 c0674153147dea231f8b1cd1d6de245d4af13893904937856371d9e1f2bd1b8df4d4389b324a02b34630cebb134ae47e9c405bcfa909b7fa680e2ff034db4471 WHIRLPOOL 49e5f528223b651e9f46fc44f0a94f69d15e743af31e53192473b95bb338b03bfcc93861343496ca29a55d8356ddf58789c75ed493beee42b22b47a69c083fea -DIST kaffeine-2.0.2.tar.xz 1766100 SHA256 47e1ea39e5ee8bee0d8af2f7ef15ef7a6c6edffc55e4881bc74b06f38448ed2c SHA512 98cd33db8f00a284fa7ac4484e0f10d133c8d96c477459e76c2bcc78713aa10f3a0afdc81a1518a16059f1debc5e6063c1212dba0687d8002db24616c3b7 WHIRLPOOL 186c3714250d60a1657e37e5b84329adca6d7e44506a81b1400d8280fc5cde5ee2d8c35c96c2f659e4193d13b6cbe9cc2773ff4dc0cb80487528e139b17c2b9f DIST kaffeine-2.0.3.tar.xz 1770836 SHA256 dd993e14a109676e56ad30bd7254e0b59cb39db3a75189e4169bc9bde0ac278f SHA512 dc0b4538e672afbc82ad8aa67561a909d7c88d5049e1c9ab7796a5c1365275010c3b7a24929021c9fd959bc3c1d2a4dfa86082afcd506626e841e28d574ff21c WHIRLPOOL c509cca114e3afcbc45964e11020882fad19642fbe3635d3c507dab5308d94e5ae138586d44bece7e086be17929564ff686e159f1a8461bf85378cbb32a47bf1 diff --git a/media-video/kaffeine/files/kaffeine-2.0.2-bogus-dependency.patch b/media-video/kaffeine/files/kaffeine-2.0.2-bogus-dependency.patch deleted file mode 100644 index 1416898..000 --- a/media-video/kaffeine/files/kaffeine-2.0.2-bogus-dependency.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 83d870fea86d1f12e4760ac0f29b0a4db7cb0cfe Mon Sep 17 00:00:00 2001 -From: Johannes Huber -Date: Wed, 8 Jun 2016 13:04:25 +0200 -Subject: [PATCH] Remove unused dependency KIdleTime - - CMakeLists.txt | 1 - - src/CMakeLists.txt | 2 +- - src/dvb/dvbrecording.cpp | 1 - - 3 files changed, 1 insertion(+), 3 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3b4a7f5..30642a0 100644 a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -58,7 +58,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS - KIO # KFileWidget - Solid - Notifications -- IdleTime - DBusAddons - ) - find_package(KF5DocTools ${KF5_MIN_VERSION} QUIET) -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 9ae14a0..634c78c 100644 a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -44,7 +44,7 @@ configure_file(config-kaffeine.h.cmake ${CMAKE_BINARY_DIR}/config-kaffeine.h) - - add_executable(kaffeine ${kaffeinedvb_SRCS} ${kaffeine_SRCS}) - target_link_libraries(kaffeine Qt5::Sql Qt5::X11Extras KF5::KIOWidgets KF5::XmlGui KF5::I18n KF5::Solid --KF5::KIOCore KF5::KIOFileWidgets KF5::Notifications KF5::IdleTime -+KF5::KIOCore KF5::KIOFileWidgets KF5::Notifications - KF5::DBusAddons ${X11_Xscreensaver_LIB} ${VLC_LIBRARY}) - - if(HAVE_DVB) -diff --git a/src/dvb/dvbrecording.cpp b/src/dvb/dvbrecording.cpp -index e30fa82..d18adaa 100644 a/src/dvb/dvbrecording.cpp -+++ b/src/dvb/dvbrecording.cpp -@@ -23,7 +23,6 @@ - # define qInfo qDebug - #endif - --#include - #include - #include - #include --- -2.8.4 - diff --git a/media-video/kaffeine/kaffeine-2.0.2.ebuild b/media-video/kaffeine/kaffeine-2.0.2.ebuild deleted file mode 100644 index dbb6fa7..000 --- a/media-video/kaffeine/kaffeine-2.0.2.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2016 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI=6 - -inherit kde5 - -DESCRIPTION="Media player with digital TV support by KDE" -HOMEPAGE="https://kaffeine.kde.org/"; -SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz" - -LICENSE="GPL-2 FDL-1.2" -KEYWORDS="~amd64 ~x86" -IUSE="" - -CDEPEND=" - $(add_frameworks_dep kconfig) - $(add_frameworks_dep kconfigwidgets)
[gentoo-commits] repo/gentoo:master commit in: media-video/kaffeine/files/, media-video/kaffeine/
commit: db84d66e0a2cb1e4155c4635791e1a8b05046e02 Author: Johannes Huber gentoo org> AuthorDate: Wed Jun 8 11:00:36 2016 + Commit: Johannes Huber gentoo org> CommitDate: Wed Jun 8 11:11:10 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db84d66e media-video/kaffeine: Version bump 2.0.2 Add patch to remove bogus dependency on kde-frameworks/kidletime. Gentoo-bug: 585158 Package-Manager: portage-2.3.0_rc1 media-video/kaffeine/Manifest | 1 + .../files/kaffeine-2.0.2-bogus-dependency.patch| 51 +++ media-video/kaffeine/kaffeine-2.0.2.ebuild | 58 ++ 3 files changed, 110 insertions(+) diff --git a/media-video/kaffeine/Manifest b/media-video/kaffeine/Manifest index 485617f..849eee2 100644 --- a/media-video/kaffeine/Manifest +++ b/media-video/kaffeine/Manifest @@ -1,3 +1,4 @@ DIST kaffeine-1.2.2.tar.gz 489727 SHA256 b6476a93ddbf84142d4fe29f0757de871e11ce6ca32590affe863a75a231c8cb SHA512 31db518943c223e635822369548949a0c2162cdbbe59edbadb77f4820acf697293d67681553d5552b9435471240fee551786c8c652f1ae5ab9cfe9b8a9cf4459 WHIRLPOOL 232f4875398c4ce889cbf1f3d0aeadefce09d5c6ed64aaf82df9fb57472b7fc814f20fb0fec54db715b45965ff79ae2ae064bb008c4c5fcf96d5b4dd3c860157 DIST kaffeine-1.3.1.tar.gz 1011607 SHA256 af3abe58e038478a0e50449d414c4885ff3e7a898724cf4216054a0360838aa6 SHA512 c0674153147dea231f8b1cd1d6de245d4af13893904937856371d9e1f2bd1b8df4d4389b324a02b34630cebb134ae47e9c405bcfa909b7fa680e2ff034db4471 WHIRLPOOL 49e5f528223b651e9f46fc44f0a94f69d15e743af31e53192473b95bb338b03bfcc93861343496ca29a55d8356ddf58789c75ed493beee42b22b47a69c083fea DIST kaffeine-2.0.1.tar.bz2 278474 SHA256 0400aa7e5acb3b19694e4568e77a7e267c2110b24d3855152263604e91324ba7 SHA512 9c7c8d7879cb071d3d3291f218faa662183783717398818e48143718a219c6139423e5347a33a4d0e8ffe854754f58afea005a1b771c55ba29c6df00e44492d5 WHIRLPOOL b51b476c1df97970446ddb41599b2e0447a67ac6a6661bc114513ac6480411688ef332e5e7147eed8b86d798e764a84d26bd65e5bd12f50fe01ec8f03d965403 +DIST kaffeine-2.0.2.tar.xz 1766100 SHA256 47e1ea39e5ee8bee0d8af2f7ef15ef7a6c6edffc55e4881bc74b06f38448ed2c SHA512 98cd33db8f00a284fa7ac4484e0f10d133c8d96c477459e76c2bcc78713aa10f3a0afdc81a1518a16059f1debc5e6063c1212dba0687d8002db24616c3b7 WHIRLPOOL 186c3714250d60a1657e37e5b84329adca6d7e44506a81b1400d8280fc5cde5ee2d8c35c96c2f659e4193d13b6cbe9cc2773ff4dc0cb80487528e139b17c2b9f diff --git a/media-video/kaffeine/files/kaffeine-2.0.2-bogus-dependency.patch b/media-video/kaffeine/files/kaffeine-2.0.2-bogus-dependency.patch new file mode 100644 index 000..1416898 --- /dev/null +++ b/media-video/kaffeine/files/kaffeine-2.0.2-bogus-dependency.patch @@ -0,0 +1,51 @@ +From 83d870fea86d1f12e4760ac0f29b0a4db7cb0cfe Mon Sep 17 00:00:00 2001 +From: Johannes Huber +Date: Wed, 8 Jun 2016 13:04:25 +0200 +Subject: [PATCH] Remove unused dependency KIdleTime + +--- + CMakeLists.txt | 1 - + src/CMakeLists.txt | 2 +- + src/dvb/dvbrecording.cpp | 1 - + 3 files changed, 1 insertion(+), 3 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 3b4a7f5..30642a0 100644 +--- a/CMakeLists.txt b/CMakeLists.txt +@@ -58,7 +58,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS + KIO # KFileWidget + Solid + Notifications +- IdleTime + DBusAddons + ) + find_package(KF5DocTools ${KF5_MIN_VERSION} QUIET) +diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt +index 9ae14a0..634c78c 100644 +--- a/src/CMakeLists.txt b/src/CMakeLists.txt +@@ -44,7 +44,7 @@ configure_file(config-kaffeine.h.cmake ${CMAKE_BINARY_DIR}/config-kaffeine.h) + + add_executable(kaffeine ${kaffeinedvb_SRCS} ${kaffeine_SRCS}) + target_link_libraries(kaffeine Qt5::Sql Qt5::X11Extras KF5::KIOWidgets KF5::XmlGui KF5::I18n KF5::Solid +-KF5::KIOCore KF5::KIOFileWidgets KF5::Notifications KF5::IdleTime ++KF5::KIOCore KF5::KIOFileWidgets KF5::Notifications + KF5::DBusAddons ${X11_Xscreensaver_LIB} ${VLC_LIBRARY}) + + if(HAVE_DVB) +diff --git a/src/dvb/dvbrecording.cpp b/src/dvb/dvbrecording.cpp +index e30fa82..d18adaa 100644 +--- a/src/dvb/dvbrecording.cpp b/src/dvb/dvbrecording.cpp +@@ -23,7 +23,6 @@ + # define qInfo qDebug + #endif + +-#include + #include + #include + #include +-- +2.8.4 + diff --git a/media-video/kaffeine/kaffeine-2.0.2.ebuild b/media-video/kaffeine/kaffeine-2.0.2.ebuild new file mode 100644 index 000..dbb6fa7 --- /dev/null +++ b/media-video/kaffeine/kaffeine-2.0.2.ebuild @@ -0,0 +1,58 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit kde5 + +DESCRIPTION="Media player with digital TV support by KDE" +HOMEPAGE="https://kaffeine.kde.org/"; +SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.xz" + +LICENSE="GPL-2 FDL-1.2" +KEYWORDS="~amd64 ~x86" +IUSE="" + +CDEPEN