[SCM] smplayer/master: refresh patches

mati75-guest at users.alioth.debian.org mati75-guest at users.alioth.debian.org
Tue Oct 6 13:24:47 UTC 2015


The following commit has been merged in the master branch:
commit dcf7d3b06c19b94c9a2f69bc9fd21642d6486a5c
Author: Mateusz Łukasik <mati75 at linuxmint.pl>
Date:   Tue Oct 6 15:22:31 2015 +0200

    refresh patches

diff --git a/debian/patches/02-disable_updates.patch b/debian/patches/02-disable_updates.patch
index e76161c..d55d106 100644
--- a/debian/patches/02-disable_updates.patch
+++ b/debian/patches/02-disable_updates.patch
@@ -4,13 +4,13 @@ Forwarded: not-needed
 
 --- a/src/updatechecker.cpp
 +++ b/src/updatechecker.cpp
-@@ -36,35 +36,7 @@ UpdateChecker::UpdateChecker(QWidget * p
+@@ -39,35 +39,7 @@ UpdateChecker::UpdateChecker(QWidget * p
  	, net_manager(0)
  	, d(0)
  {
 -	d = data;
 -
--	check_url = "http://updates.smplayer.info/version_info";
+-	check_url = URL_VERSION_INFO;
 -	user_agent = "SMPlayer";
 -
 -	connect(this, SIGNAL(newVersionFound(const QString &)),
diff --git a/debian/patches/05-add-debian-hardening-flags.patch b/debian/patches/05-add-debian-hardening-flags.patch
index 7f0b83a..d5e0124 100644
--- a/debian/patches/05-add-debian-hardening-flags.patch
+++ b/debian/patches/05-add-debian-hardening-flags.patch
@@ -3,7 +3,7 @@ Author: Mateusz Łukasik <mati75 at linuxmint.pl>
 
 --- a/src/smplayer.pro
 +++ b/src/smplayer.pro
-@@ -29,6 +29,11 @@ DEFINES += SHAREWIDGET
+@@ -28,6 +28,11 @@ DEFINES += SHAREWIDGET
  #DEFINES += USE_FONTCONFIG_OPTIONS
  DEFINES += AUTO_SHUTDOWN_PC
  
@@ -12,6 +12,6 @@ Author: Mateusz Łukasik <mati75 at linuxmint.pl>
 +QMAKE_CXXFLAGS *= $(shell dpkg-buildflags --get CXXFLAGS)
 +QMAKE_LFLAGS   *= $(shell dpkg-buildflags --get LDFLAGS)
 +
- isEqual(QT_MAJOR_VERSION, 5) {
- 	QT += widgets gui
- 	#DEFINES += QT_DISABLE_DEPRECATED_BEFORE=0x040000
+ DEFINES += MPV_SUPPORT
+ DEFINES += MPLAYER_SUPPORT
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 1bb20de..957e56a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,5 @@
 01-add-mplayer2-detection.patch
-02-disable_updates.patch
+#02-disable_updates.patch
 03-not_define_reminder_actions.patch
 04_update_desktop_launcher.patch
-05-add-debian-hardening-flags.patch
+#05-add-debian-hardening-flags.patch

-- 
smplayer packaging



More information about the pkg-multimedia-commits mailing list