[SCM] smplayer/master: Refresh all patches and drop 03-not_define_reminder_actions.patch.

Fri Apr 8 08:54:09 UTC 2016

The following commit has been merged in the master branch:
commit 125a4050d94a278d12321f8591b595841478501a
Author: Mateusz Łukasik <mati75 at linuxmint.pl>
Date:   Fri Apr 8 10:54:45 2016 +0200

    Refresh all patches and drop 03-not_define_reminder_actions.patch.

diff --git a/debian/changelog b/debian/changelog
index d460e49..541dc9c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 smplayer (16.4.0~ds0-1) UNRELEASED; urgency=medium
 
   * New upstream release. (Closes: #809667)
-    - Refresh 05-add-debian-hardening-flags.patch.
+    - Refresh all patches and drop 03-not_define_reminder_actions.patch.
   * debian/control:
     - Bump standards version to 3.9.8. (no changes needed)
     - Update package description. (Closes: #819656)
diff --git a/debian/patches/01-add-mplayer2-detection.patch b/debian/patches/01-add-mplayer2-detection.patch
index b630d99..765f5db 100644
--- a/debian/patches/01-add-mplayer2-detection.patch
+++ b/debian/patches/01-add-mplayer2-detection.patch
@@ -18,13 +18,13 @@ dpkg-specific, but light-weight check.
  
  #include "mplayerwindow.h"
  #include "desktopinfo.h"
-@@ -1597,9 +1598,10 @@ void Core::startMplayer( QString file, d
- 		mplayer_bin = fi.absoluteFilePath();
+@@ -1585,9 +1586,10 @@ void Core::startMplayer( QString file, d
  	}
  
+ #ifdef MPLAYER2_SUPPORT
 -	if (fi.baseName().toLower() == "mplayer2") {
 +	// debian/ubuntu specific check if we are using mplayer2
-+	if ((fi.baseName().toLower() == "mplayer2") || !access("/usr/share/doc/mplayer2/copyright", F_OK)) {
++	if (fi.baseName().toLower() == "mplayer2") { || !access("/usr/share/doc/mplayer2/copyright", F_OK)) {
 +		qDebug("Core::startMplayer: this seems mplayer2");
  		if (!pref->mplayer_is_mplayer2) {
 -			qDebug("Core::startMplayer: this seems mplayer2");
diff --git a/debian/patches/02-disable_updates.patch b/debian/patches/02-disable_updates.patch
index d55d106..a52c229 100644
--- a/debian/patches/02-disable_updates.patch
+++ b/debian/patches/02-disable_updates.patch
@@ -2,42 +2,14 @@ Description: Disable updates checking mechanism.
 Author: Alessio Treglia <alessio at debian.org>
 Forwarded: not-needed
 
---- a/src/updatechecker.cpp
-+++ b/src/updatechecker.cpp
-@@ -39,35 +39,7 @@ UpdateChecker::UpdateChecker(QWidget * p
- 	, net_manager(0)
- 	, d(0)
- {
--	d = data;
--
--	check_url = URL_VERSION_INFO;
--	user_agent = "SMPlayer";
--
--	connect(this, SIGNAL(newVersionFound(const QString &)),
--            this, SLOT(reportNewVersionAvailable(const QString &)));
--
--	connect(this, SIGNAL(noNewVersionFound(const QString &)),
--            this, SLOT(reportNoNewVersionFound(const QString &)));
--
--	connect(this, SIGNAL(errorOcurred(int, QString)), this, SLOT(reportError(int, QString)));
--
--	net_manager = new QNetworkAccessManager(this);
--
--	QDate now = QDate::currentDate();
--	//now = now.addDays(27);
--	int days = QDateTime(d->last_checked).daysTo(QDateTime(now));
--
--	qDebug("UpdateChecker::UpdateChecker: enabled: %d", d->enabled);
--	qDebug("UpdateChecker::UpdateChecker: days_to_check: %d", d->days_to_check);
--	qDebug("UpdateChecker::UpdateChecker: days since last check: %d", days);
--
--	if ((!d->enabled) || (days < d->days_to_check)) return;
--
--	QNetworkRequest req(check_url);
--	req.setRawHeader("User-Agent", user_agent);
--	QNetworkReply *reply = net_manager->get(req);
--	connect(reply, SIGNAL(finished()), this, SLOT(gotReply()));
-+	return;
- }
- 
- UpdateChecker::~UpdateChecker() {
+--- a/src/smplayer.pro
++++ b/src/smplayer.pro
+@@ -23,7 +23,7 @@ DEFINES += MINIGUI
+ DEFINES += MPCGUI
+ DEFINES += SKINS
+ DEFINES += MPRIS2
+-DEFINES += UPDATE_CHECKER
++#DEFINES += UPDATE_CHECKER
+ DEFINES += CHECK_UPGRADED
+ DEFINES += AUTO_SHUTDOWN_PC
+ DEFINES += CAPTURE_STREAM
diff --git a/debian/patches/03-not_define_reminder_actions.patch b/debian/patches/03-not_define_reminder_actions.patch
deleted file mode 100644
index 0c0a7ba..0000000
--- a/debian/patches/03-not_define_reminder_actions.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Description: not define reminder actions in the project file
-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: <2015-04-26>
-Bug-Debian: http://bugs.debian.org/770359
- 
---- a/src/smplayer.pro
-+++ b/src/smplayer.pro
-@@ -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
diff --git a/debian/patches/05-add-debian-hardening-flags.patch b/debian/patches/05-add-debian-hardening-flags.patch
index eb671aa..37b8617 100644
--- a/debian/patches/05-add-debian-hardening-flags.patch
+++ b/debian/patches/05-add-debian-hardening-flags.patch
@@ -1,12 +1,11 @@
 Description: Add Debian hardening flags to qmake.
 Author: Mateusz Łukasik <mati75 at linuxmint.pl>
 
-
 --- a/src/smplayer.pro
 +++ b/src/smplayer.pro
-@@ -30,6 +30,11 @@ DEFINES += AUTO_SHUTDOWN_PC
- DEFINES += CAPTURE_STREAM
+@@ -30,6 +30,11 @@ DEFINES += CAPTURE_STREAM
  DEFINES += BOOKMARKS
+ DEFINES += MOUSE_GESTURES
  
 +QMAKE_CPPFLAGS *= $(shell dpkg-buildflags --get CPPFLAGS)
 +QMAKE_CFLAGS   *= $(shell dpkg-buildflags --get CFLAGS)
diff --git a/debian/patches/series b/debian/patches/series
index c077aab..21254f2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 01-add-mplayer2-detection.patch
 02-disable_updates.patch
-03-not_define_reminder_actions.patch
 04_update_desktop_launcher.patch
 05-add-debian-hardening-flags.patch
 06-tryfixplaylist.patch

-- 
smplayer packaging

