From: "Johannes Huber" <johu@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] proj/kde:master commit in: media-video/kaffeine/files/
Date: Fri, 3 Jun 2016 20:33:35 +0000 (UTC) [thread overview]
Message-ID: <1464985987.d4d5dbdbfd272e5aaf9c6c264bebf45ea2c1dfb1.johu@gentoo> (raw)
commit: d4d5dbdbfd272e5aaf9c6c264bebf45ea2c1dfb1
Author: Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 3 20:33:07 2016 +0000
Commit: Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Fri Jun 3 20:33:07 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=d4d5dbdb
media-video/kaffeine: Drop upstreamed patch
Package-Manager: portage-2.3.0_rc1
.../files/kaffeine-2.0.1-desktop-file.patch | 25 ----------------------
1 file changed, 25 deletions(-)
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
deleted file mode 100644
index 1558aef..0000000
--- a/media-video/kaffeine/files/kaffeine-2.0.1-desktop-file.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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
-
reply other threads:[~2016-06-03 20:33 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1464985987.d4d5dbdbfd272e5aaf9c6c264bebf45ea2c1dfb1.johu@gentoo \
--to=johu@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox