* [gentoo-commits] proj/kde:master commit in: media-video/kaffeine/, media-video/kaffeine/files/
@ 2016-06-03 12:14 Johannes Huber
0 siblings, 0 replies; 2+ messages in thread
From: Johannes Huber @ 2016-06-03 12:14 UTC (permalink / raw
To: gentoo-commits
commit: 734c14696a77d939076553320533cc4927865eac
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 3 12:03:03 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Jun 3 12:03:03 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=734c1469
media-video/kaffeine: Fix desktop file warning
Package-Manager: portage-2.3.0_rc1
.../files/kaffeine-2.0.1-desktop-file.patch | 25 ++++++++++++++++++++++
media-video/kaffeine/kaffeine-9999.ebuild | 3 ++-
2 files changed, 27 insertions(+), 1 deletion(-)
diff --git a/media-video/kaffeine/files/kaffeine-2.0.1-desktop-file.patch b/media-video/kaffeine/files/kaffeine-2.0.1-desktop-file.patch
new file mode 100644
index 0000000..1558aef
--- /dev/null
+++ b/media-video/kaffeine/files/kaffeine-2.0.1-desktop-file.patch
@@ -0,0 +1,25 @@
+From 534d90f280b7aea3fa3006d858729cc2d606cee6 Mon Sep 17 00:00:00 2001
+From: Johannes Huber <johu@gentoo.org>
+Date: Fri, 3 Jun 2016 13:59:11 +0200
+Subject: [PATCH] Fix desktop file
+
+---
+ src/kaffeine.desktop | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/kaffeine.desktop b/src/kaffeine.desktop
+index dee82c4..0095a07 100644
+--- a/src/kaffeine.desktop
++++ b/src/kaffeine.desktop
+@@ -127,7 +127,7 @@ GenericName[zh_CN]=媒体播放器
+ GenericName[zh_TW]=媒體播放器
+ Categories=Qt;KDE;AudioVideo;Player;
+ Icon=kaffeine
+-MimeType=application/ogg;application/ram;application/vnd.rn-realmedia;application/x-matroska;application/x-ogg;application/x-quicktime-media-link;application/x-shockwave-flash;application/x-shorten;application/xspf+xml;audio/ac3;audio/amr;audio/amr-wb;audio/basic;audio/flac;audio/mp4;audio/mpeg;audio/ogg;audio/vnd.rn-realaudio;audio/webm;audio/x-aiff;audio/x-flac;audio/x-it;audio/x-m4a;audio/x-m4b;audio/x-matroska;audio/x-mod;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-asx;audio/x-ms-wma;audio/x-musepack;audio/x-pn-realaudio;audio/x-pn-realaudio-plugin;audio/x-s3m;audio/x-scpls;audio/x-stm;audio/x-tta;audio/x-voc;audio/x-vorbis+ogg;audio/x-wav;audio/x-wavpack;audio/x-xm;image/vnd.rn-realpix;skip;video/dv;video/mp2t;video/mp4;video/mp4v-es;video/mpeg;video/msvideo;video/ogg;video/quicktime;video/vnd.rn-realvideo;video/webm;video/x-anim;video/x-avi;video/x-fli;video/x-flic;video/x-flv;video/x-matroska;video/x-mng;video/x-mpeg;video/x-ms-asf;video/x-ms-wmv;video/x-msvideo;vide
o/x-nsv;video/x-ogm+ogg;x-content/audio-cdda;x-content/audio-player;x-content/video-dvd;x-content/video-svcd;x-content/video-vcd;
++MimeType=application/ogg;application/ram;application/vnd.rn-realmedia;application/x-matroska;application/x-ogg;application/x-quicktime-media-link;application/x-shockwave-flash;application/x-shorten;application/xspf+xml;audio/ac3;audio/amr;audio/amr-wb;audio/basic;audio/flac;audio/mp4;audio/mpeg;audio/ogg;audio/vnd.rn-realaudio;audio/webm;audio/x-aiff;audio/x-flac;audio/x-it;audio/x-m4a;audio/x-m4b;audio/x-matroska;audio/x-mod;audio/x-mp3;audio/x-mpeg;audio/x-mpegurl;audio/x-ms-asx;audio/x-ms-wma;audio/x-musepack;audio/x-pn-realaudio;audio/x-pn-realaudio-plugin;audio/x-s3m;audio/x-scpls;audio/x-stm;audio/x-tta;audio/x-voc;audio/x-vorbis+ogg;audio/x-wav;audio/x-wavpack;audio/x-xm;image/vnd.rn-realpix;x-scheme-handler/skip;video/dv;video/mp2t;video/mp4;video/mp4v-es;video/mpeg;video/msvideo;video/ogg;video/quicktime;video/vnd.rn-realvideo;video/webm;video/x-anim;video/x-avi;video/x-fli;video/x-flic;video/x-flv;video/x-matroska;video/x-mng;video/x-mpeg;video/x-ms-asf;video/x-ms-wmv;vid
eo/x-msvideo;video/x-nsv;video/x-ogm+ogg;x-content/audio-cdda;x-content/audio-player;x-content/video-dvd;x-content/video-svcd;x-content/video-vcd;
+ Terminal=false
+ Type=Application
+ X-KDE-HasTempFileOption=true
+--
+2.8.3
+
diff --git a/media-video/kaffeine/kaffeine-9999.ebuild b/media-video/kaffeine/kaffeine-9999.ebuild
index 2e712c2..0736122 100644
--- a/media-video/kaffeine/kaffeine-9999.ebuild
+++ b/media-video/kaffeine/kaffeine-9999.ebuild
@@ -4,7 +4,6 @@
EAPI=6
-# TODO: desktop file has warnings
inherit kde5
DESCRIPTION="Media player with digital TV support by KDE"
@@ -40,6 +39,8 @@ RDEPEND="${DEPEND}
DOCS=( Changelog NOTES README )
+PATCHES=( "${FILESDIR}/${PN}-2.0.1-desktop-file.patch" )
+
src_configure() {
# tools working on $HOME directory for a local git checkout
local mycmakeargs=(
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/kde:master commit in: media-video/kaffeine/, media-video/kaffeine/files/
@ 2016-06-08 11:22 Johannes Huber
0 siblings, 0 replies; 2+ messages in thread
From: Johannes Huber @ 2016-06-08 11:22 UTC (permalink / raw
To: gentoo-commits
commit: b411bece209c9afe0098a8fef9e249d0c8f4230d
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Wed Jun 8 11:22:01 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Wed Jun 8 11:22:01 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=b411bece
media-video/kaffeine: Sync with tree
Package-Manager: portage-2.3.0_rc1
.../files/kaffeine-2.0.2-bogus-dependency.patch | 51 ++++++++++++++++++++++
media-video/kaffeine/kaffeine-9999.ebuild | 4 +-
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 0000000..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 <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 0f3bafb..c66a157 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
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2016-06-08 11:22 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-06-03 12:14 [gentoo-commits] proj/kde:master commit in: media-video/kaffeine/, media-video/kaffeine/files/ Johannes Huber
-- strict thread matches above, loose matches on Subject: below --
2016-06-08 11:22 Johannes Huber
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox