[SCM] smplayer/master: refresh patches
mati75-guest at users.alioth.debian.org
mati75-guest at users.alioth.debian.org
Sat Apr 25 18:26:21 UTC 2015
The following commit has been merged in the master branch:
commit 6e36d4c35a1239a1d66415ba2b52b3c31910b373
Author: Mateusz Łukasik <mati75 at linuxmint.pl>
Date: Sat Apr 25 20:27:10 2015 +0200
refresh patches
diff --git a/debian/patches/02-disable_updates.patch b/debian/patches/02-disable_updates.patch
index ca2d4b9..4a2212b 100644
--- a/debian/patches/02-disable_updates.patch
+++ b/debian/patches/02-disable_updates.patch
@@ -5,6 +5,8 @@ Forwarded: not-needed
src/updatechecker.cpp | 20 +-------------------
1 file changed, 1 insertion(+), 19 deletions(-)
+Index: smplayer/src/updatechecker.cpp
+===================================================================
--- smplayer.orig/src/updatechecker.cpp
+++ smplayer/src/updatechecker.cpp
@@ -47,25 +47,7 @@ void UpdateCheckerData::load(QSettings *
diff --git a/debian/patches/03-completely_disable_check_updates.patch b/debian/patches/03-completely_disable_check_updates.patch
index ac496ea..81727a8 100644
--- a/debian/patches/03-completely_disable_check_updates.patch
+++ b/debian/patches/03-completely_disable_check_updates.patch
@@ -13,9 +13,9 @@ Bug-Debian: http://bugs.debian.org/770357
#include "updatechecker.h"
+#endif
- #ifdef YT_USE_SCRIPT
- #include "codedownloader.h"
-@@ -806,9 +808,11 @@ void BaseGui::createActions() {
+ #ifdef YOUTUBE_SUPPORT
+ #ifdef YT_USE_SCRIPT
+@@ -840,9 +842,11 @@ void BaseGui::createActions() {
connect( showCLOptionsAct, SIGNAL(triggered()),
this, SLOT(helpCLOptions()) );
@@ -27,15 +27,7 @@ Bug-Debian: http://bugs.debian.org/770357
#if defined(YOUTUBE_SUPPORT) && defined(YT_USE_SCRIPT)
updateYTAct = new MyAction( this, "update_youtube" );
-@@ -1666,6 +1670,7 @@ void BaseGui::retranslateStrings() {
- #ifdef LOG_MPLAYER
- showLogMplayerAct->change( "MPlayer" );
- #endif
-+
- #ifdef LOG_SMPLAYER
- showLogSmplayerAct->change( "SMPlayer" );
- #endif
-@@ -1674,7 +1679,10 @@ void BaseGui::retranslateStrings() {
+@@ -1710,7 +1714,10 @@ void BaseGui::retranslateStrings() {
showFirstStepsAct->change( Images::icon("guide"), tr("First Steps &Guide") );
showFAQAct->change( Images::icon("faq"), tr("&FAQ") );
showCLOptionsAct->change( Images::icon("cl_help"), tr("&Command line options") );
@@ -46,19 +38,17 @@ Bug-Debian: http://bugs.debian.org/770357
#if defined(YOUTUBE_SUPPORT) && defined(YT_USE_SCRIPT)
updateYTAct->change( Images::icon("update_youtube"), tr("Update &Youtube code") );
-@@ -2678,7 +2686,11 @@ void BaseGui::createMenus() {
+@@ -2736,7 +2743,9 @@ void BaseGui::createMenus() {
helpMenu->addAction(showFAQAct);
helpMenu->addAction(showCLOptionsAct);
helpMenu->addSeparator();
-+
+#ifdef CHECK_UPDATES
helpMenu->addAction(showCheckUpdatesAct);
+#endif
-+
#if defined(YOUTUBE_SUPPORT) && defined(YT_USE_SCRIPT)
helpMenu->addAction(updateYTAct);
#endif
-@@ -4017,11 +4029,13 @@ void BaseGui::helpCLOptions() {
+@@ -4125,11 +4134,13 @@ void BaseGui::helpCLOptions() {
clhelp_window->show();
}
@@ -72,8 +62,9 @@ Bug-Debian: http://bugs.debian.org/770357
void BaseGui::helpShowConfig() {
QDesktopServices::openUrl(QUrl::fromLocalFile(Paths::configPath()));
---- smplayer-14.9.0~ds0.orig/src/basegui.h
-+++ smplayer-14.9.0~ds0/src/basegui.h
+
+--- a/src/basegui.h
++++ b/src/basegui.h
@@ -111,7 +111,10 @@ public slots:
virtual void helpFirstSteps();
virtual void helpFAQ();
@@ -85,9 +76,9 @@ Bug-Debian: http://bugs.debian.org/770357
#ifdef REMINDER_ACTIONS
virtual void helpDonate();
#endif
---- smplayer-14.9.0~ds0.orig/src/preferencesdialog.cpp
-+++ smplayer-14.9.0~ds0/src/preferencesdialog.cpp
-@@ -29,7 +29,10 @@
+--- a/src/preferencesdialog.cpp
++++ b/src/preferencesdialog.cpp
+@@ -29,7 +29,11 @@
#include "prefadvanced.h"
#include "prefplaylist.h"
#include "preftv.h"
@@ -95,10 +86,11 @@ Bug-Debian: http://bugs.debian.org/770357
+#ifdef CHECK_UPDATES
#include "prefupdates.h"
+#endif
++
+ #include "prefnetwork.h"
#if USE_ASSOCIATIONS
- #include "prefassociations.h"
-@@ -94,9 +97,10 @@ PreferencesDialog::PreferencesDialog(QWi
+@@ -96,9 +100,10 @@ PreferencesDialog::PreferencesDialog(QWi
addSection(page_associations);
#endif
@@ -107,80 +99,73 @@ Bug-Debian: http://bugs.debian.org/770357
addSection( page_updates );
-
+#endif
- page_advanced = new PrefAdvanced;
- addSection( page_advanced );
+ page_network = new PrefNetwork;
+ addSection( page_network );
-@@ -178,7 +182,10 @@ void PreferencesDialog::setData(Preferen
+@@ -183,7 +188,9 @@ void PreferencesDialog::setData(Preferen
page_advanced->setData(pref);
page_playlist->setData(pref);
page_tv->setData(pref);
-+
+#ifdef CHECK_UPDATES
page_updates->setData(pref);
+#endif
+ page_network->setData(pref);
#if USE_ASSOCIATIONS
- page_associations->setData(pref);
-@@ -195,7 +202,10 @@ void PreferencesDialog::getData(Preferen
+@@ -201,7 +208,9 @@ void PreferencesDialog::getData(Preferen
page_advanced->getData(pref);
page_playlist->getData(pref);
page_tv->getData(pref);
-- page_updates->getData(pref);
-+
+#ifdef CHECK_UPDATES
-+ page_updates->getData(pref);
+ page_updates->getData(pref);
+#endif
+ page_network->getData(pref);
#if USE_ASSOCIATIONS
- page_associations->getData(pref);
-@@ -212,7 +222,10 @@ bool PreferencesDialog::requiresRestart(
+@@ -219,7 +228,9 @@ bool PreferencesDialog::requiresRestart(
if (!need_restart) need_restart = page_advanced->requiresRestart();
if (!need_restart) need_restart = page_playlist->requiresRestart();
if (!need_restart) need_restart = page_tv->requiresRestart();
-+
+#ifdef CHECK_UPDATES
if (!need_restart) need_restart = page_updates->requiresRestart();
+#endif
+ if (!need_restart) need_restart = page_network->requiresRestart();
return need_restart;
- }
---- smplayer-14.9.0~ds0.orig/src/preferencesdialog.h
-+++ smplayer-14.9.0~ds0/src/preferencesdialog.h
-@@ -40,7 +40,11 @@ class PrefInput;
+--- a/src/preferencesdialog.h
++++ b/src/preferencesdialog.h
+@@ -40,7 +40,9 @@ class PrefInput;
class PrefAdvanced;
class PrefPlaylist;
class PrefTV;
-+
+#ifdef CHECK_UPDATES
class PrefUpdates;
+#endif
-+
+ class PrefNetwork;
class PrefAssociations;
- class Preferences;
-@@ -62,8 +66,9 @@ public:
+@@ -63,7 +65,9 @@ public:
PrefInput * mod_input() { return page_input; };
PrefAdvanced * mod_advanced() { return page_advanced; };
PrefPlaylist * mod_playlist() { return page_playlist; };
+#ifdef CHECK_UPDATES
- PrefUpdates * mod_updtes() { return page_updates; };
--
+ PrefUpdates * mod_updates() { return page_updates; };
+#endif
- void addSection(PrefWidget *w);
+ PrefNetwork * mod_network() { return page_network; };
- // Pass data to the standard dialogs
-@@ -101,7 +106,9 @@ protected:
+ void addSection(PrefWidget *w);
+@@ -103,7 +107,9 @@ protected:
PrefInput * page_input;
PrefPlaylist * page_playlist;
PrefTV * page_tv;
+#ifdef CHECK_UPDATES
PrefUpdates * page_updates;
+#endif
+ PrefNetwork * page_network;
PrefAdvanced * page_advanced;
-
- #if USE_ASSOCIATIONS
---- smplayer-14.9.0~ds0.orig/src/smplayer.pro
-+++ smplayer-14.9.0~ds0/src/smplayer.pro
+
+--- a/src/smplayer.pro
++++ b/src/smplayer.pro
@@ -21,8 +21,8 @@ DEFINES += LOG_MPLAYER
DEFINES += LOG_SMPLAYER
DEFINES += MPCGUI
@@ -192,3 +177,4 @@ Bug-Debian: http://bugs.debian.org/770357
DEFINES += REMINDER_ACTIONS
#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 43f71b7..134af20 100644
--- a/debian/patches/04-not_define_reminder_actions.patch
+++ b/debian/patches/04-not_define_reminder_actions.patch
@@ -10,8 +10,8 @@ Bug-Debian: http://bugs.debian.org/770359
+++ b/src/smplayer.pro
@@ -23,7 +23,7 @@ DEFINES += MPCGUI
DEFINES += SKINS
- DEFINES += UPDATE_CHECKER
- DEFINES += CHECK_UPGRADED
+ #DEFINES += UPDATE_CHECKER
+ #DEFINES += CHECK_UPGRADED
-DEFINES += REMINDER_ACTIONS
+#DEFINES += REMINDER_ACTIONS
#DEFINES += USE_FONTCONFIG_OPTIONS
diff --git a/debian/patches/series b/debian/patches/series
index c465c3d..b278c5b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
01-add-mplayer2-detection.patch
02-disable_updates.patch
-#03-completely_disable_check_updates.patch
+03-completely_disable_check_updates.patch
04-not_define_reminder_actions.patch
06_add_unity_launcher_quicklist.patch
--
smplayer packaging
More information about the pkg-multimedia-commits
mailing list