[SCM] vlc/natty: Qt: undo the FSC/KDE workaround

[bdrung at users.alioth.debian.org]

The following commit has been merged in the natty branch:
commit 40326641ec9a5e70d3a27ad0bc7dedba435391b2
Author: Benjamin Drung <bdrung at debian.org>
Date:   Tue Jun 14 02:22:38 2011 +0200

    Qt: undo the FSC/KDE workaround
    
    LP: #774581

diff --git a/debian/patches/backport-fullscreen-fix.patch b/debian/patches/backport-fullscreen-fix.patch
new file mode 100644
index 0000000..d812dc2
--- /dev/null
+++ b/debian/patches/backport-fullscreen-fix.patch
@@ -0,0 +1,31 @@
+From: Ludovic Fauvet <etix at l0cal.com>
+Subject: Qt: undo the FSC/KDE workaround
+ This is a partial revert of the "fix" introduced in
+ ffe7367b1672ec72705ec4cb440758ec0c869230.
+ .
+ If you encounter a visual bug in the fullscreen controller and you are
+ using KDE, please upgrade to version 4.6.2 or don't use the Oxygen
+ theme.
+ .
+ Ref: https://bugs.kde.org/show_bug.cgi?id=254473
+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
+ 
+     vout.clear();
+ 
+-#ifdef Q_WS_X11
+-    setWindowFlags( Qt::Window | Qt::FramelessWindowHint | Qt::WindowStaysOnTopHint );
+-    setWindowModality( Qt::ApplicationModal );
+-#else
+     setWindowFlags( Qt::ToolTip );
+-#endif
+     setMinimumWidth( 600 );
+ 
+     setFrameShape( QFrame::StyledPanel );
diff --git a/debian/patches/series b/debian/patches/series
index 626182b..a372441 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ xulrunner-1.9.1.patch
 fix-xspf-integer-overflow.patch
 backport-pulse-rewrite.patch
 backport-fix-NULL-derefence.patch
+backport-fullscreen-fix.patch

-- 
VLC media player packaging