[SCM] smplayer/master: remove 03-completely_disable_check_updates.patch similiar patch is add upstrem
mati75-guest at users.alioth.debian.org
mati75-guest at users.alioth.debian.org
Mon Apr 27 13:57:12 UTC 2015
The following commit has been merged in the master branch:
commit 03d30678adc7064918b2d1d3edf1e391d7cae8c5
Author: Mateusz Łukasik <mati75 at linuxmint.pl>
Date: Mon Apr 27 15:56:03 2015 +0200
remove 03-completely_disable_check_updates.patch similiar patch is add upstrem
diff --git a/debian/changelog b/debian/changelog
index 4f41dd3..0c50abd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,12 @@
smplayer (14.9.0.6887~ds0-1) UNRELEASED; urgency=medium
[ Mateusz Łukasik ]
- * New upstream release. (LP: #1390937)
+ * New upstream release. (CLoses: #770357, LP: #1390937)
* 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)
- - Add 04-not_define_reminder_actions.patch to do not define reminder
+ - Add 03-not_define_reminder_actions.patch to do not define reminder
actions (Closes: #770359)
- - Add 05_add_unity_launcher_quicklist.patch for add Unity Launcher
+ - Add 04_add_unity_launcher_quicklist.patch for add Unity Launcher
Quicklist. (LP: #938015)
- Refresh 02-disable_updates.patch.
* debian/rules:
diff --git a/debian/patches/03-completely_disable_check_updates.patch b/debian/patches/03-completely_disable_check_updates.patch
deleted file mode 100644
index 1956bf3..0000000
--- a/debian/patches/03-completely_disable_check_updates.patch
+++ /dev/null
@@ -1,154 +0,0 @@
-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
-@@ -840,9 +842,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" );
-@@ -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") );
-+
-+#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") );
-@@ -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
---- a/src/basegui.h
-+++ b/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
---- a/src/preferencesdialog.cpp
-+++ b/src/preferencesdialog.cpp
-@@ -29,7 +29,11 @@
- #include "prefadvanced.h"
- #include "prefplaylist.h"
- #include "preftv.h"
-+
-+#ifdef CHECK_UPDATES
- #include "prefupdates.h"
-+#endif
-+
- #include "prefnetwork.h"
-
- #if USE_ASSOCIATIONS
-@@ -96,9 +100,10 @@ PreferencesDialog::PreferencesDialog(QWi
- addSection(page_associations);
- #endif
-
-+#if CHECK_UPDATES
- page_updates = new PrefUpdates;
- addSection( page_updates );
--
-+#endif
- page_network = new PrefNetwork;
- addSection( page_network );
-
-@@ -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
-@@ -201,7 +208,9 @@ void PreferencesDialog::getData(Preferen
- page_advanced->getData(pref);
- page_playlist->getData(pref);
- page_tv->getData(pref);
-+#ifdef CHECK_UPDATES
- page_updates->getData(pref);
-+#endif
- page_network->getData(pref);
-
- #if USE_ASSOCIATIONS
-@@ -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;
---- 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;
-
-@@ -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_updates() { return page_updates; };
-+#endif
- PrefNetwork * mod_network() { return page_network; };
-
- 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;
-
---- a/src/smplayer.pro
-+++ b/src/smplayer.pro
-@@ -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
diff --git a/debian/patches/04-not_define_reminder_actions.patch b/debian/patches/03-not_define_reminder_actions.patch
similarity index 90%
rename from debian/patches/04-not_define_reminder_actions.patch
rename to debian/patches/03-not_define_reminder_actions.patch
index 6082eb7..0c0a7ba 100644
--- a/debian/patches/04-not_define_reminder_actions.patch
+++ b/debian/patches/03-not_define_reminder_actions.patch
@@ -10,8 +10,8 @@ Bug-Debian: http://bugs.debian.org/770359
+++ b/src/smplayer.pro
@@ -24,7 +24,7 @@ DEFINES += SKINS
DEFINES += MPRIS2
- #DEFINES += UPDATE_CHECKER
- #DEFINES += CHECK_UPGRADED
+ DEFINES += UPDATE_CHECKER
+ DEFINES += CHECK_UPGRADED
-DEFINES += REMINDER_ACTIONS
+#DEFINES += REMINDER_ACTIONS
DEFINES += SHAREWIDGET
diff --git a/debian/patches/05_add_unity_launcher_quicklist.patch b/debian/patches/04_add_unity_launcher_quicklist.patch
similarity index 100%
rename from debian/patches/05_add_unity_launcher_quicklist.patch
rename to debian/patches/04_add_unity_launcher_quicklist.patch
diff --git a/debian/patches/series b/debian/patches/series
index 752ef42..2e675c3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
01-add-mplayer2-detection.patch
02-disable_updates.patch
-03-completely_disable_check_updates.patch
-04-not_define_reminder_actions.patch
-05_add_unity_launcher_quicklist.patch
+03-not_define_reminder_actions.patch
+04_add_unity_launcher_quicklist.patch
--
smplayer packaging
More information about the pkg-multimedia-commits
mailing list