[SCM] QtWebKit packaging branch, master, updated. debian/2.1.0-2011week03-1-4-g550b1c1

[Fathi Boudra]

The following commit has been merged in the master branch:
commit b7bbc670cae1304f9c03aa827b5b539e11f9470d
Author: Fathi Boudra <fabo at debian.org>
Date:   Wed Mar 9 12:03:07 2011 +0200

    Add webcore_qtplatformplugin_createfullscreenvideohandler_ftbfs.patch to
    work around the build failure.
---
 debian/changelog                                   |    2 +
 debian/patches/series                              |    1 +
 ...plugin_createfullscreenvideohandler_ftbfs.patch |   22 ++++++++++++++++++++
 3 files changed, 25 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d8c19c1..be68597 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 qtwebkit (2.1.0~2011week09-1) unstable; urgency=low
 
   * New upstream release - upload to Sid.
+  * Add webcore_qtplatformplugin_createfullscreenvideohandler_ftbfs.patch to
+    work around the build failure.
 
  -- Fathi Boudra <fabo at debian.org>  Sun, 06 Mar 2011 10:05:46 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index a461737..6e82e53 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@
 07_s390_stabs_format_debugging_information.diff
 08_powerpc_s390_no_gc_sections.diff
 09_hurd.diff
+webcore_qtplatformplugin_createfullscreenvideohandler_ftbfs.patch
diff --git a/debian/patches/webcore_qtplatformplugin_createfullscreenvideohandler_ftbfs.patch b/debian/patches/webcore_qtplatformplugin_createfullscreenvideohandler_ftbfs.patch
new file mode 100644
index 0000000..158e015
--- /dev/null
+++ b/debian/patches/webcore_qtplatformplugin_createfullscreenvideohandler_ftbfs.patch
@@ -0,0 +1,22 @@
+Description: ftbfs work around WebCore::QtPlatformPlugin has no member named
+             createFullScreenVideoHandler
+Author: Fathi Boudra <fabo at debian.org>
+--- a/WebCore/WebCore.pro
++++ b/WebCore/WebCore.pro
+@@ -2572,13 +2572,11 @@ contains(DEFINES, ENABLE_VIDEO=1) {
+         bindings/js/JSAudioConstructor.cpp
+ 
+         !lessThan(QT_MINOR_VERSION, 6):contains(MOBILITY_CONFIG, multimedia) {
+-            HEADERS += \ 
+-                platform/graphics/qt/MediaPlayerPrivateQt.h \
+-                $$PWD/../WebKit/qt/WebCoreSupport/FullScreenVideoQt.h
++            HEADERS += \
++                platform/graphics/qt/MediaPlayerPrivateQt.h
+ 
+             SOURCES += \
+-                platform/graphics/qt/MediaPlayerPrivateQt.cpp \
+-                $$PWD/../WebKit/qt/WebCoreSupport/FullScreenVideoQt.cpp
++                platform/graphics/qt/MediaPlayerPrivateQt.cpp
+ 
+             CONFIG *= mobility
+             MOBILITY += multimedia

-- 
QtWebKit packaging