[SCM] vlc/natty: Refresh backport-fullscreen-fix.patch
bdrung at users.alioth.debian.org
bdrung at users.alioth.debian.org
Tue Jun 14 00:31:26 UTC 2011
The following commit has been merged in the natty branch:
commit b38468c95f0b3efbe90e392dd45068b9ca288a0a
Author: Benjamin Drung <bdrung at debian.org>
Date: Tue Jun 14 02:31:22 2011 +0200
Refresh backport-fullscreen-fix.patch
diff --git a/debian/patches/backport-fullscreen-fix.patch b/debian/patches/backport-fullscreen-fix.patch
index d812dc2..46d4fc6 100644
--- a/debian/patches/backport-fullscreen-fix.patch
+++ b/debian/patches/backport-fullscreen-fix.patch
@@ -12,16 +12,14 @@ Applied-Upstream: 1.1.10
Origin: upstream, http://git.videolan.org/?p=vlc%2Fvlc-1.1.git;h=d119e5414b7519894f336180bebfd1f160a9c378
Bug-Ubuntu: https://bugs.launchpad.net/bugs/774581
-diff --git a/modules/gui/qt4/components/controller.cpp b/modules/gui/qt4/components/controller.cpp
-index 28ba75d..0f887ef 100644
--- a/modules/gui/qt4/components/controller.cpp
+++ b/modules/gui/qt4/components/controller.cpp
-@@ -649,12 +649,7 @@ FullscreenControllerWidget::FullscreenControllerWidget( intf_thread_t *_p_i, QWi
+@@ -649,12 +649,7 @@
vout.clear();
-#ifdef Q_WS_X11
-- setWindowFlags( Qt::Window | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint );
+- setWindowFlags( Qt::Window | Qt::FramelessWindowHint );
- setWindowModality( Qt::ApplicationModal );
-#else
setWindowFlags( Qt::ToolTip );
--
VLC media player packaging
More information about the pkg-multimedia-commits
mailing list