Author: sergiomb Update of /cvs/free/rpms/smplayer/devel In directory old02.ovh.rpmfusion.lan:/tmp/cvs-serv8189 Modified Files: .cvsignore smplayer.spec smplayer_enqueue_kde4.desktop sources Added Files: smplayer-14.9.0.6966-system-qtsingleapplication.patch smtube-15.5.10-system-qtsingleapplication.patch Removed Files: smplayer-0.8.5-system-qtsingleapplication.patch smtube-2.1-system-qtsingleapplication.patch Log Message: * Thu Aug 30 2007 George Machitidze <giomac(a)gmail.com&gt; - Rebuild for Fedora Core smplayer-14.9.0.6966-system-qtsingleapplication.patch: smplayer.pro | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) --- NEW FILE smplayer-14.9.0.6966-system-qtsingleapplication.patch --- --- ./src/smplayer.pro.orig 2015-04-18 03:11:32.000000000 +0100 +++ ./src/smplayer.pro 2015-06-06 19:37:48.769799609 +0100 @@ -3,6 +3,7 @@ LANGUAGE = C++ CONFIG += qt warn_on CONFIG += release +CONFIG += qtsingleapplication #CONFIG += debug QT += network xml @@ -283,14 +284,6 @@ FORMS = inputdvddirectory.ui logwindowba about.ui inputmplayerversion.ui errordialog.ui timedialog.ui stereo3ddialog.ui \ toolbareditor.ui multilineinputdialog.ui -# qtsingleapplication -contains( DEFINES, SINGLE_INSTANCE ) { - INCLUDEPATH += qtsingleapplication - DEPENDPATH += qtsingleapplication - - SOURCES += qtsingleapplication/qtsingleapplication.cpp qtsingleapplication/qtlocalpeer.cpp - HEADERS += qtsingleapplication/qtsingleapplication.h qtsingleapplication/qtlocalpeer.h -} # Find subtitles dialog contains( DEFINES, FIND_SUBTITLES ) { smtube-15.5.10-system-qtsingleapplication.patch: smtube.pro | 2 ++ 1 file changed, 2 insertions(+) --- NEW FILE smtube-15.5.10-system-qtsingleapplication.patch --- --- ./src/smtube.pro.orig 2015-06-06 19:41:57.132618395 +0100 +++ ./src/smtube.pro 2015-06-06 19:43:23.309596085 +0100 @@ -1,12 +1,14 @@ TEMPLATE = app QT += network +INCLUDEPATH += qtsingleapplication CONFIG += release #CONFIG += debug DEFINES += USE_PLAYERS DEFINES += YT_USE_SCRIPT +DEFINES += USE_SINGLE_APPLICATION isEqual(QT_MAJOR_VERSION, 5) { QT += webkitwidgets widgets gui Index: .cvsignore =================================================================== RCS file: /cvs/free/rpms/smplayer/devel/.cvsignore,v retrieving revision 1.24 retrieving revision 1.25 diff -u -r1.24 -r1.25 --- .cvsignore 25 Mar 2015 18:49:24 -0000 1.24 +++ .cvsignore 6 Jun 2015 21:26:41 -0000 1.25 @@ -1,2 +1,2 @@ -smplayer-14.9.0.6690.tar.bz2 -smtube-15.1.26.tar.bz2 +smplayer-14.9.0.6966.tar.bz2 +smtube-15.5.10.tar.bz2 Index: smplayer.spec =================================================================== RCS file: /cvs/free/rpms/smplayer/devel/smplayer.spec,v retrieving revision 1.38 retrieving revision 1.39 diff -u -r1.38 -r1.39 --- smplayer.spec 25 Mar 2015 18:50:54 -0000 1.38 +++ smplayer.spec 6 Jun 2015 21:26:41 -0000 1.39 @@ -1,13 +1,13 @@ -%global smtube_ver 15.1.26 +%global smtube_ver 15.5.10 Name: smplayer -Version: 14.9.0.6690 +Version: 14.9.0.6966 Release: 1%{?dist} Summary: A graphical frontend for mplayer Group: Applications/Multimedia License: GPLv2+ -URL: http://smplayer.sourceforge.net/linux/ +URL: http://smplayer.sourceforge.net/ Source0: http://downloads.sourceforge.net/smplayer/smplayer-%{version}.tar.bz2 # Add a servicemenu to enqeue files in smplayer's playlist. # see also: @@ -17,13 +17,14 @@ # Fix regression in Thunar (TODO: re-check in upcoming versions!) # https://bugzilla.rpmfusion.org/show_bug.cgi?id=1217 Patch0: smplayer-0.8.3-desktop-files.patch -Patch2: smplayer-0.8.5-system-qtsingleapplication.patch -Patch3: smtube-2.1-system-qtsingleapplication.patch +Patch2: smplayer-14.9.0.6966-system-qtsingleapplication.patch +Patch3: smtube-15.5.10-system-qtsingleapplication.patch BuildRequires: desktop-file-utils BuildRequires: qt4-devel BuildRequires: quazip-devel BuildRequires: qtsingleapplication-devel +BuildRequires: qtwebkit-devel # smplayer without mplayer is quite useless Requires: mplayer Requires: kde-filesystem @@ -39,11 +40,11 @@ %prep %setup -a3 -qn %{name}-%{version} -#remove some bundle sources +#remove some bundle sources rm -rf zlib rm -rf src/qtsingleapplication/ rm -rf smtube-%{smtube_ver}/src/qtsingleapplication/ -#TODO unbundle libmaia +#TODO unbundle libmaia #rm -rf src/findsubtitles/libmaia %patch0 -p0 -b .desktop-files @@ -132,6 +133,9 @@ %changelog * Wed Mar 25 2015 Sérgio Basto <sergio(a)serjux.com&gt; - 14.9.0.6690-1 - Update smplayer to smplayer-14.9.0.6690 and smtube to smtube-15.1.26 +- Fix warning "The desktop entry file "ServiceMenus/smplayer_enqueue.desktop" + has an empty mimetype! +- Rebase patches 2 and 3 . * Mon Sep 15 2014 Sérgio Basto <sergio(a)serjux.com&gt; - 14.9.0-1 - New upstream releases smplayer 14.9.0 and smtube 14.8.0 Index: smplayer_enqueue_kde4.desktop =================================================================== RCS file: /cvs/free/rpms/smplayer/devel/smplayer_enqueue_kde4.desktop,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- smplayer_enqueue_kde4.desktop 10 Jan 2013 03:09:18 -0000 1.2 +++ smplayer_enqueue_kde4.desktop 6 Jun 2015 21:26:41 -0000 1.3 @@ -1,11 +1,10 @@ -[Desktop Entry] -Actions=smplayer_enqueue; -Type=Service -Icon= -Name= -X-KDE-ServiceTypes=KonqPopupMenu/Plugin,audio/ac3,audio/mp4,audio/mpeg,audio/vnd.rn-realaudio,audio/vorbis,audio/x-adpcm,audio/x-matroska,audio/x-mp2,audio/x-mp3,audio/x-ms-wma,audio/x-vorbis,audio/x-wav,video/avi,video/mp4,video/mpeg,video/quicktime,video/vnd.rn-realvideo,video/x-matroska,video/x-ms-asf,video/x-msvideo,video/x-ms-wmv,video/x-ogm,video/x-theora,video/webm, -X-KDE-ExcludeServiceTypes=kdedevice/* -X-KDE-Protocol=!file +[Desktop Entry] +Actions=smplayer_enqueue; +Type=Service +X-KDE-ServiceTypes=KonqPopupMenu/Plugin +MimeType=audio/ac3;audio/mp4;audio/mpeg;audio/vnd.rn-realaudio;audio/vorbis;audio/x-adpcm;audio/x-matroska;audio/x-mp2;audio/x-mp3;audio/x-ms-wma;audio/x-vorbis;audio/x-wav;audio/mpegurl;audio/x-mpegurl;audio/x-pn-realaudio;audio/x-scpls;audio/aac;audio/flac;audio/ogg;video/avi;video/mp4;video/flv;video/mpeg;video/quicktime;video/vnd.rn-realvideo;video/x-matroska;video/x-ms-asf;video/x-msvideo;video/x-ms-wmv;video/x-ogm;video/x-theora;video/webm; +X-KDE-ExcludeServiceTypes=kdedevice/* +X-KDE-Protocol=!file [Desktop Action smplayer_enqueue] Exec=smplayer -add-to-playlist %F Index: sources =================================================================== RCS file: /cvs/free/rpms/smplayer/devel/sources,v retrieving revision 1.26 retrieving revision 1.27 diff -u -r1.26 -r1.27 --- sources 25 Mar 2015 18:49:25 -0000 1.26 +++ sources 6 Jun 2015 21:26:41 -0000 1.27 @@ -1,2 +1,2 @@ -75d8947682de96f7bf29c6f1a2f21391 smplayer-14.9.0.6690.tar.bz2 -88e63bbfa0a5fc6d90c88a72a802c3fb smtube-15.1.26.tar.bz2 +56eaf954077f34d2dd8e7208093351b3 smplayer-14.9.0.6966.tar.bz2 +ac05ed80bf724463512246832e57f253 smtube-15.5.10.tar.bz2 --- smplayer-0.8.5-system-qtsingleapplication.patch DELETED --- --- smtube-2.1-system-qtsingleapplication.patch DELETED ---