aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Huber <johu@gentoo.org>2016-06-08 13:22:01 +0200
committerJohannes Huber <johu@gentoo.org>2016-06-08 13:22:01 +0200
commitb411bece209c9afe0098a8fef9e249d0c8f4230d (patch)
treed19b7c8d96fd01b12c52e3eb414367a2c4c9cb47 /media-video/kaffeine
parentkde5.eclass: Fix find designer plugin condition (diff)
downloadkde-b411bece209c9afe0098a8fef9e249d0c8f4230d.tar.gz
kde-b411bece209c9afe0098a8fef9e249d0c8f4230d.tar.bz2
kde-b411bece209c9afe0098a8fef9e249d0c8f4230d.zip
media-video/kaffeine: Sync with tree
Package-Manager: portage-2.3.0_rc1
Diffstat (limited to 'media-video/kaffeine')
-rw-r--r--media-video/kaffeine/files/kaffeine-2.0.2-bogus-dependency.patch51
-rw-r--r--media-video/kaffeine/kaffeine-9999.ebuild4
2 files changed, 52 insertions, 3 deletions
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 0000000000..1416898084
--- /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 <johu@gentoo.org>
+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 <KIdleTime>
+ #include <QCoreApplication>
+ #include <QDataStream>
+ #include <QDir>
+--
+2.8.4
+
diff --git a/media-video/kaffeine/kaffeine-9999.ebuild b/media-video/kaffeine/kaffeine-9999.ebuild
index 0f3bafb04f..c66a1576f4 100644
--- a/media-video/kaffeine/kaffeine-9999.ebuild
+++ b/media-video/kaffeine/kaffeine-9999.ebuild
@@ -44,9 +44,7 @@ RDEPEND="${CDEPEND}
DOCS=( Changelog NOTES README )
-if [[ ${KDE_BUILD_TYPE} != live ]] ; then
- S="${WORKDIR}"
-fi
+PATCHES=( "${FILESDIR}/${PN}-2.0.2-bogus-dependency.patch" )
src_configure() {
# tools working on $HOME directory for a local git checkout