pool/kaffeine
SHA256
2
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 87224 from KDE:Distro:Factory

Browse Source 
- Remove patch fix_plasma_startup_error.diff as this causes kaffeine
  not beeing displayed as an action for audio-cds (bnc#722284)

Unfortuanetly I could not find what was the actual cause for that patch. If you think I should only have removed the part for the audio-cd which should 
not do any harm, as the one for amarok has the same entry, I will this. (forwarded request 87038 from christiantrippe)

OBS-URL: https://build.opensuse.org/request/show/87224
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/kaffeine?expand=0&rev=42
This commit is contained in:
Lars Vogdt 2011-10-11 14:55:24 +00:00 committed by Git OBS Bridge
parent 3527529326
commit b93f751bf6
3 changed files with 6 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
fix_plasma_startup_error.diff
View File

@ -1,33 +0,0 @@
--- deviceactions/kaffeine_play_audiocd.desktop
+++ deviceactions/kaffeine_play_audiocd.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Service
Actions=PlayAudioCd;
-X-KDE-Solid-Predicate=OpticalDisc.availableContent & 'Audio'
+X-KDE-Solid-Predicate=[ StorageVolume.ignored == false AND OpticalDisc.availableContent & 'Audio' ]
[Desktop Action PlayAudioCd]
Name=Play Audio CD with Kaffeine
--- deviceactions/kaffeine_play_dvd.desktop
+++ deviceactions/kaffeine_play_dvd.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Service
Actions=PlayDVD;
-X-KDE-Solid-Predicate=OpticalDisc.availableContent & 'VideoDvd'
+X-KDE-Solid-Predicate=[ StorageVolume.ignored == false AND OpticalDisc.availableContent & 'VideoDvd' ]
[Desktop Action PlayDVD]
Name=Play DVD with Kaffeine
--- deviceactions/kaffeine_play_videocd.desktop
+++ deviceactions/kaffeine_play_videocd.desktop
@@ -1,7 +1,7 @@
[Desktop Entry]
Type=Service
Actions=PlayVideoCd;
-X-KDE-Solid-Predicate=[OpticalDisc.availableContent & 'VideoCd' OR OpticalDisc.availableContent & 'SuperVideoCd']
+X-KDE-Solid-Predicate=[ StorageVolume.ignored == false AND OpticalDisc.availableContent & 'VideoCd|SuperVideoCd' ]
[Desktop Action PlayVideoCd]
Name=Play Video CD with Kaffeine

6
kaffeine.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Fri Oct 7 10:34:42 UTC 2011 - ctrippe@opensuse.org
- Remove patch fix_plasma_startup_error.diff as this causes kaffeine
not beeing displayed as an action for audio-cds (bnc#722284)
-------------------------------------------------------------------
Wed Apr 27 20:23:37 UTC 2011 - asterios.dramis@gmail.com

3
kaffeine.spec
View File

@ -31,8 +31,6 @@ Source0: %{name}-%{version}.tar.bz2
Source1: %{name}-icons.tar.bz2
# PATCH-FEATURE-OPENSUSE kaffeine-fixsplitter.patch -- GUI improvement (allow more flexibly set splitters)
Patch0: kaffeine-fixsplitter.patch
# PATCH-FIX-OPENSUSE fix_plasma_startup_error.diff -- Fix plasma solid actions
Patch1: fix_plasma_startup_error.diff
# PATCH-FEATURE-OPENSUSE ksuseinstall.diff llunak@novell.com -- Support for on-demand codecs install using ksuseinstall
Patch2: ksuseinstall.diff
# PATCH-FIX-OPENSUSE initial-preference.diff cmorve69@yahoo.es -- Add InitialPreference to set it as the default video player
@ -62,7 +60,6 @@ and Ogg Vorbis. It also handles Video CDs, DVDs, and DVB cards.
%prep
%setup -q -b 1
%patch0
%patch1
%if 0%{?suse_version} > 1120 || !0%{?kde_updatedapps}
%patch2
%endif