[SCM] smplayer/master: add 03-completely_disable_check_updates.patch to completely disable checking updates. (Closes: #770357)
mati75-guest at users.alioth.debian.org
mati75-guest at users.alioth.debian.org
Thu Nov 20 19:08:11 UTC 2014
The following commit has been merged in the master branch:
commit 4958b5ea30da4ba14e6e82d98aad07ed1790efa0
Author: Mateusz Łukasik <mati75 at linuxmint.pl>
Date: Thu Nov 20 20:05:09 2014 +0100
add 03-completely_disable_check_updates.patch to completely disable checking updates. (Closes: #770357)
diff --git a/debian/changelog b/debian/changelog
index 863bdd1..43ad09b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
smplayer (14.9.0~ds0-2) UNRELEASED; urgency=medium
* Bump standards version to 3.9.6. (no changes needed)
+ * Patch working: (thanks Alf Gaida <agaida at siduction.org>)
+ - add 03-completely_disable_check_updates.patch to completely disable
+ checking updates. (Closes: #770357)
-- Mateusz Łukasik <mati75 at linuxmint.pl> Thu, 20 Nov 2014 19:59:08 +0100
diff --git a/debian/patches/03-completely_disable_check_updates.patch b/debian/patches/03-completely_disable_check_updates.patch
new file mode 100644
index 0000000..ac496ea
--- /dev/null
+++ b/debian/patches/03-completely_disable_check_updates.patch
@@ -0,0 +1,194 @@
+Description: completely disable the looking for updates as it is not sufficient to just disable the define.
+Author: Alf Gaida <agaida at siduction.org>
+Last-Update: <2014-11-20>
+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 YT_USE_SCRIPT
+ #include "codedownloader.h"
+@@ -806,9 +808,11 @@ void BaseGui::createActions() {
+ connect( showCLOptionsAct, SIGNAL(triggered()),
+ this, SLOT(helpCLOptions()) );
+
++#ifdef CHECK_UPDATES
+ showCheckUpdatesAct = new MyAction( this, "check_updates" );
+ connect( showCheckUpdatesAct, SIGNAL(triggered()),
+ this, SLOT(helpCheckUpdates()) );
++#endif
+
+ #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() {
+ 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") );
++
++#ifdef CHECK_UPDATES
+ showCheckUpdatesAct->change( Images::icon("check_updates"), tr("Check for &updates") );
++#endif
+
+ #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() {
+ 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() {
+ 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()));
+--- smplayer-14.9.0~ds0.orig/src/basegui.h
++++ smplayer-14.9.0~ds0/src/basegui.h
+@@ -111,7 +111,10 @@ public slots:
+ virtual void helpFirstSteps();
+ virtual void helpFAQ();
+ virtual void helpCLOptions();
++#ifdef CHECK_UPDATES
+ virtual void helpCheckUpdates();
++#endif
++
+ #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 @@
+ #include "prefadvanced.h"
+ #include "prefplaylist.h"
+ #include "preftv.h"
++
++#ifdef CHECK_UPDATES
+ #include "prefupdates.h"
++#endif
+
+ #if USE_ASSOCIATIONS
+ #include "prefassociations.h"
+@@ -94,9 +97,10 @@ PreferencesDialog::PreferencesDialog(QWi
+ addSection(page_associations);
+ #endif
+
++#if CHECK_UPDATES
+ page_updates = new PrefUpdates;
+ addSection( page_updates );
+-
++#endif
+ page_advanced = new PrefAdvanced;
+ addSection( page_advanced );
+
+@@ -178,7 +182,10 @@ void PreferencesDialog::setData(Preferen
+ page_advanced->setData(pref);
+ page_playlist->setData(pref);
+ page_tv->setData(pref);
++
++#ifdef CHECK_UPDATES
+ page_updates->setData(pref);
++#endif
+
+ #if USE_ASSOCIATIONS
+ page_associations->setData(pref);
+@@ -195,7 +202,10 @@ 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);
++#endif
+
+ #if USE_ASSOCIATIONS
+ page_associations->getData(pref);
+@@ -212,7 +222,10 @@ 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
+
+ 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;
+ class PrefAdvanced;
+ class PrefPlaylist;
+ class PrefTV;
++
++#ifdef CHECK_UPDATES
+ class PrefUpdates;
++#endif
++
+ class PrefAssociations;
+
+ class Preferences;
+@@ -62,8 +66,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; };
+-
++#endif
+ void addSection(PrefWidget *w);
+
+ // Pass data to the standard dialogs
+@@ -101,7 +106,9 @@ protected:
+ PrefInput * page_input;
+ PrefPlaylist * page_playlist;
+ PrefTV * page_tv;
++#ifdef CHECK_UPDATES
+ PrefUpdates * page_updates;
++#endif
+ PrefAdvanced * page_advanced;
+
+ #if USE_ASSOCIATIONS
+--- smplayer-14.9.0~ds0.orig/src/smplayer.pro
++++ smplayer-14.9.0~ds0/src/smplayer.pro
+@@ -21,8 +21,8 @@ DEFINES += LOG_MPLAYER
+ DEFINES += LOG_SMPLAYER
+ DEFINES += MPCGUI
+ DEFINES += SKINS
+-DEFINES += UPDATE_CHECKER
+-DEFINES += CHECK_UPGRADED
++#DEFINES += UPDATE_CHECKER
++#DEFINES += CHECK_UPGRADED
+ DEFINES += REMINDER_ACTIONS
+ #DEFINES += USE_FONTCONFIG_OPTIONS
+ DEFINES += AUTO_SHUTDOWN_PC
diff --git a/debian/patches/series b/debian/patches/series
index 529624a..12c39e9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
01-add-mplayer2-detection.patch
02-disable_updates.patch
+03-completely_disable_check_updates.patch
--
smplayer packaging
More information about the pkg-multimedia-commits
mailing list