Package: smplayer Version: 14.9.0~ds0-1.1 Severity: normal Tags: patch Dear Maintainer,
as updates should only come through package management there is no need for updates nor calling home direcly after installation. The attached patch fixes this behaviour Greetz Alf -- System Information: Debian Release: jessie/sid APT prefers unstable APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.17-3.towo-siduction-amd64 (SMP w/4 CPU cores; PREEMPT) Locale: LANG=de_DE.utf8, LC_CTYPE=de_DE.utf8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Versions of packages smplayer depends on: ii libc6 2.19-13 ii libgcc1 1:4.9.2-2 ii libqt4-dbus 4:4.8.6+git64-g5dc8b2b+dfsg-2+b1 ii libqt4-network 4:4.8.6+git64-g5dc8b2b+dfsg-2+b1 ii libqt4-script 4:4.8.6+git64-g5dc8b2b+dfsg-2+b1 ii libqt4-xml 4:4.8.6+git64-g5dc8b2b+dfsg-2+b1 ii libqtcore4 4:4.8.6+git64-g5dc8b2b+dfsg-2+b1 ii libqtgui4 4:4.8.6+git64-g5dc8b2b+dfsg-2+b1 ii libstdc++6 4.9.2-2 ii mplayer2 [mplayer] 2.0-728-g2c378c7-4+b1 ii zlib1g 1:1.2.8.dfsg-2 Versions of packages smplayer recommends: ii smplayer-l10n 14.9.0~ds0-1.1 ii smplayer-themes 1:14.9.0-1 smplayer suggests no packages. -- no debconf information
Description: completely disable the looking for updates as it is not sufficient to just disable the define. Author: Alf Gaida <[email protected]> --- Last-Update: <2014-11-20> --- smplayer-14.9.0~ds0.orig/src/basegui.cpp +++ smplayer-14.9.0~ds0/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
