summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMateusz Łukasik <mati75@linuxmint.pl>2015-10-06 15:24:49 +0200
committerMateusz Łukasik <mati75@linuxmint.pl>2015-10-06 15:24:49 +0200
commitf8d2691e3599a6373c03f4db924c4c9af6797aa6 (patch)
tree0484b6a86aa69865ad2efa807aaf3a6a984f1057 /debian
parentdcf7d3b06c19b94c9a2f69bc9fd21642d6486a5c (diff)
Add 06-tryfixplaylist.patch to fix playlist that disappear after leaving full-screen with openbox. (Closes: #799385, #799984)
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog4
-rw-r--r--debian/patches/06-tryfixplaylist.patch23
-rw-r--r--debian/patches/series5
3 files changed, 29 insertions, 3 deletions
diff --git a/debian/changelog b/debian/changelog
index eaa7351..5fd1eac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
smplayer (15.9.0~ds0-1) UNRELEASED; urgency=medium
[ Mateusz Łukasik ]
- * New upstream release. (CLoses: #770357, #798961, #799040, #800533,
+ * New upstream release. (Closes: #770357, #798961, #799040, #800533,
LP: #1390937)
- Build with QT5.
* Bump standards version to 3.9.6. (no changes needed)
@@ -13,6 +13,8 @@ smplayer (15.9.0~ds0-1) UNRELEASED; urgency=medium
- Refresh 02-disable_updates.patch.
- Add 05-add-debian-hardening-flags.patch to using Debian hardening
flags.
+ - Add 06-tryfixplaylist.patch to fix playlist that disappear after
+ leaving full-screen with openbox. (Closes: #799385, #799984)
* debian/rules:
- Remove /usr/share/doc/smplayer/es/gpl.htm
* Update debian/copyright.
diff --git a/debian/patches/06-tryfixplaylist.patch b/debian/patches/06-tryfixplaylist.patch
new file mode 100644
index 0000000..eb70562
--- /dev/null
+++ b/debian/patches/06-tryfixplaylist.patch
@@ -0,0 +1,23 @@
+Description: try to fix playlist hide wuth a hack that always show the playlist if are activated
+Author: PICCORO Lenz McKAY <mckaygerhard@gmail.com>
+Bug-Debian: http://bugs.debian.org/799385
+Bug-Debian: http://bugs.debian.org/799984
+
+Origin: https://sourceforge.net/p/smplayer/patches/62/
+Bug: https://sourceforge.net/p/smplayer/bugs/482/
+Forwarded: not-needed
+
+--- a/src/baseguiplus.cpp
++++ b/src/baseguiplus.cpp
+@@ -427,10 +427,10 @@ void BaseGuiPlus::aboutToExitFullscreen(
+ #endif
+ );
+
++ playlistdock->setFloating( fullscreen_playlist_was_floating );
+ if (fullscreen_playlist_was_visible) {
+ playlistdock->show();
+ }
+- playlistdock->setFloating( fullscreen_playlist_was_floating );
+ ignore_playlist_events = false;
+ #endif
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 957e56a..c077aab 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
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
+06-tryfixplaylist.patch