[SCM] smplayer/master: Refresh all patches

mati75-guest at users.alioth.debian.org mati75-guest at users.alioth.debian.org
Sun Apr 26 20:13:39 UTC 2015


The following commit has been merged in the master branch:
commit 8b273360a554e59e2f58401d30dae76b51b3b952
Author: Mateusz Łukasik <mati75 at linuxmint.pl>
Date:   Sun Apr 26 22:12:35 2015 +0200

    Refresh all patches

diff --git a/debian/patches/03-completely_disable_check_updates.patch b/debian/patches/03-completely_disable_check_updates.patch
index 81727a8..1956bf3 100644
--- a/debian/patches/03-completely_disable_check_updates.patch
+++ b/debian/patches/03-completely_disable_check_updates.patch
@@ -5,16 +5,6 @@ Bug-Debian: http://bugs.debian.org/770357
 
 --- a/src/basegui.cpp
 +++ b/src/basegui.cpp
-@@ -106,7 +106,9 @@
- #include <QSysInfo>
- #endif
- 
-+#ifdef CHECK_UPDATE
- #include "updatechecker.h"
-+#endif
- 
- #ifdef YOUTUBE_SUPPORT
-   #ifdef YT_USE_SCRIPT
 @@ -840,9 +842,11 @@ void BaseGui::createActions() {
  	connect( showCLOptionsAct, SIGNAL(triggered()),
               this, SLOT(helpCLOptions()) );
@@ -48,21 +38,6 @@ Bug-Debian: http://bugs.debian.org/770357
  #if defined(YOUTUBE_SUPPORT) && defined(YT_USE_SCRIPT)
  	helpMenu->addAction(updateYTAct);
  #endif
-@@ -4125,11 +4134,13 @@ void BaseGui::helpCLOptions() {
- 	clhelp_window->show();
- }
- 
-+#ifdef CHECK_UPDATES
- void BaseGui::helpCheckUpdates() {
- 	QString url = "http://smplayer.sourceforge.net/changes.php";
- 	/* if (!pref->language.isEmpty()) url += QString("?tr_lang=%1").arg(pref->language); */
- 	QDesktopServices::openUrl( QUrl(url) );
- }
-+#endif
- 
- void BaseGui::helpShowConfig() {
- 	QDesktopServices::openUrl(QUrl::fromLocalFile(Paths::configPath()));
-
 --- a/src/basegui.h
 +++ b/src/basegui.h
 @@ -111,7 +111,10 @@ public slots:
@@ -166,15 +141,14 @@ Bug-Debian: http://bugs.debian.org/770357
 
 --- a/src/smplayer.pro
 +++ b/src/smplayer.pro
-@@ -21,8 +21,8 @@ DEFINES += LOG_MPLAYER
- DEFINES += LOG_SMPLAYER
+@@ -22,8 +22,8 @@ DEFINES += LOG_SMPLAYER
  DEFINES += MPCGUI
  DEFINES += SKINS
+ DEFINES += MPRIS2
 -DEFINES += UPDATE_CHECKER
 -DEFINES += CHECK_UPGRADED
 +#DEFINES += UPDATE_CHECKER
 +#DEFINES += CHECK_UPGRADED
  DEFINES += REMINDER_ACTIONS
+ DEFINES += SHAREWIDGET
  #DEFINES += USE_FONTCONFIG_OPTIONS
- DEFINES += AUTO_SHUTDOWN_PC
-
diff --git a/debian/patches/04-not_define_reminder_actions.patch b/debian/patches/04-not_define_reminder_actions.patch
index 134af20..6082eb7 100644
--- a/debian/patches/04-not_define_reminder_actions.patch
+++ b/debian/patches/04-not_define_reminder_actions.patch
@@ -3,17 +3,17 @@ as there are enough calls for donations on the project website.
 Tehre is no need to have anything like that in the application
 help menu
 Author: Alf Gaida <agaida at siduction.org>
-Last-Update: <2014-11-20>
+Last-Update: <2015-04-26>
 Bug-Debian: http://bugs.debian.org/770359
-
+ 
 --- a/src/smplayer.pro
 +++ b/src/smplayer.pro
-@@ -23,7 +23,7 @@ DEFINES += MPCGUI
- DEFINES += SKINS
+@@ -24,7 +24,7 @@ DEFINES += SKINS
+ DEFINES += MPRIS2
  #DEFINES += UPDATE_CHECKER
  #DEFINES += CHECK_UPGRADED
 -DEFINES += REMINDER_ACTIONS
 +#DEFINES += REMINDER_ACTIONS
+ DEFINES += SHAREWIDGET
  #DEFINES += USE_FONTCONFIG_OPTIONS
  DEFINES += AUTO_SHUTDOWN_PC
- 

-- 
smplayer packaging



More information about the pkg-multimedia-commits mailing list