[SCM] Qt 4 packaging branch, experimental, updated. debian/4.7.4-1-38-gcbc6f1f

[Fathi Boudra]

The following commit has been merged in the experimental branch:
commit cbc6f1fd3a893c35bb7abdaca1d8da5e1400f17e
Author: Fathi Boudra <fabo at debian.org>
Date:   Wed Dec 28 11:40:34 2011 +0200

    Add fix_qvfb_build.patch - fix qvfb build on Qt 4.8.0
---
 debian/changelog                    |    8 ++++----
 debian/patches/fix_qvfb_build.patch |   18 ++++++++++++++++++
 debian/patches/series               |    3 ++-
 debian/qt4-dev-tools.install        |    2 +-
 4 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 89425f5..d5011d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,10 +24,10 @@ qt4-x11 (4:4.8.0-0multiarch1) UNRELEASED; urgency=low
   * Add patches:
     - qt-multiarch-plugin-path-compat.diff - include legacy pre-multiarch
       plugin path.
-    - fix_ftbfs_format-security.patch
-      due to debian/compat bump to 9, Qt is built with -Werror=format-security
-      and trigger an error: format not a string literal and no format
-      arguments.
+    - fix_ftbfs_format-security.patch - due to debian/compat bump to 9, Qt is
+      built with -Werror=format-security and trigger an error: format not a
+      string literal and no format arguments.
+    - fix_qvfb_build.patch - fix qvfb build on Qt 4.8.0
   * Update debian/compat: bump to 9 for multiarch.
   * Update debian/control:
     - mark Qt libraries as Multi-Arch.
diff --git a/debian/patches/fix_qvfb_build.patch b/debian/patches/fix_qvfb_build.patch
new file mode 100644
index 0000000..392f48e
--- /dev/null
+++ b/debian/patches/fix_qvfb_build.patch
@@ -0,0 +1,18 @@
+Description: Fix qvfb build failure on Qt 4.8.0
+Bug: https://bugreports.qt.nokia.com/browse/QTBUG-19804
+
+---
+ tools/qvfb/qvfb.pro |    2 --
+ 1 file changed, 2 deletions(-)
+
+--- a/tools/qvfb/qvfb.pro
++++ b/tools/qvfb/qvfb.pro
+@@ -38,8 +38,6 @@ SOURCES         = qvfb.cpp \
+ 
+ !embedded {
+     DEFINES         += QT_NO_QWS_SIGNALHANDLER
+-    HEADERS         += ../../src/gui/embedded/qlock_p.h
+-    SOURCES         += ../../src/gui/embedded/qlock.cpp
+ }
+ 
+ include(../shared/deviceskin/deviceskin.pri)
diff --git a/debian/patches/series b/debian/patches/series
index f5891dc..a3075e8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,7 +18,7 @@ buildable_appchooser_states_demos.patch
 15_fix_qmake_makefile_generation.diff
 16_hide_std_symbols_on_qtwebkit.diff
 18_enable_qt3support_qtwebkit_debug_info.diff
-# FIXME: 20_install_qvfb.diff
+20_install_qvfb.diff
 23_permit_plugins_built_with_future_qt.diff
 30_webkit_unaligned_access.diff
 40_alpha_ice.diff
@@ -38,3 +38,4 @@ kfreebsd_monotonic_clock.diff
 powerpc_designer_gstabs.diff
 qt-multiarch-plugin-path-compat.diff
 fix_ftbfs_format-security.patch
+fix_qvfb_build.patch
diff --git a/debian/qt4-dev-tools.install b/debian/qt4-dev-tools.install
index 39cefad..11a896f 100644
--- a/debian/qt4-dev-tools.install
+++ b/debian/qt4-dev-tools.install
@@ -1,4 +1,3 @@
-# FIXME usr/bin/qvfb
 usr/bin/assistant-qt4
 usr/bin/lconvert
 usr/bin/linguist-qt4
@@ -10,6 +9,7 @@ usr/bin/qhelpconverter
 usr/bin/qhelpgenerator
 usr/bin/qmlplugindump
 usr/bin/qttracereplay
+usr/bin/qvfb
 usr/bin/xmlpatterns
 usr/bin/xmlpatternsvalidator
 usr/share/qt4/phrasebooks/*

-- 
Qt 4 packaging