[SCM] Qt 4 packaging branch, experimental-snapshots, updated. debian/4.7.3-1-7-g0470728

[Fathi Boudra]

The following commit has been merged in the experimental-snapshots branch:
commit 04707289b2230eb8945c9d6dd8903ab054a67a36
Author: Fathi Boudra <fabo at debian.org>
Date:   Sat Jun 11 14:37:22 2011 +0300

    Add Fix_builds_with_compilers_without_--with-fpu_neon_as_default.patch
    (replace 95_neon_flags.patch)
    
    NEON_SOURCES would be (incorrectly) compiled without -mfpu=neon,
    resulting in build failure. This also moves -mfpu=neon after CXXFLAGS,
    as CXXFLAGS may contain -mfpu=vfpv3-d16
---
 debian/changelog                                   |    4 ++
 debian/patches/95_neon_flags.patch                 |   16 --------
 ...pilers_without_--with-fpu_neon_as_default.patch |   39 ++++++++++++++++++++
 debian/patches/series                              |    2 +-
 4 files changed, 44 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d7b785d..e2d5b7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ qt4-x11 (4:4.7.3-2) UNRELEASED; urgency=low
 
   * Add patch cherry-picked upstream:
     - Fixed_bug_in_X11_backend_when_creating_translucent_windows.patch
+    - Fix_builds_with_compilers_without_--with-fpu_neon_as_default.patch
+      NEON_SOURCES would be (incorrectly) compiled without -mfpu=neon,
+      resulting in build failure. This also moves -mfpu=neon after CXXFLAGS,
+      as CXXFLAGS may contain -mfpu=vfpv3-d16
   * Build Qt with GL ES 2 on armel and armhf architectures:
     - debian/control: add libgles2-mesa-dev | libgles2-dev build-dependencies.
     - debian/rules: pass -opengl es2 configure option.
diff --git a/debian/patches/95_neon_flags.patch b/debian/patches/95_neon_flags.patch
deleted file mode 100644
index 46982ac..0000000
--- a/debian/patches/95_neon_flags.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-## Description: add some description
-## Origin/Author: add some origin or author
-## Bug: bug URL
---- a/src/gui/gui.pro
-+++ b/src/gui/gui.pro
-@@ -65,9 +65,9 @@ symbian {
- neon:*-g++* {
-     DEFINES += QT_HAVE_NEON
-     HEADERS += $$NEON_HEADERS
--    SOURCES += $$NEON_SOURCES
- 
-     DRAWHELPER_NEON_ASM_FILES = $$NEON_ASM
-+    DRAWHELPER_NEON_ASM_FILES += $$NEON_SOURCES
- 
-     neon_compiler.commands = $$QMAKE_CXX -c -mfpu=neon
-     neon_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
diff --git a/debian/patches/Fix_builds_with_compilers_without_--with-fpu_neon_as_default.patch b/debian/patches/Fix_builds_with_compilers_without_--with-fpu_neon_as_default.patch
new file mode 100644
index 0000000..3f5682f
--- /dev/null
+++ b/debian/patches/Fix_builds_with_compilers_without_--with-fpu_neon_as_default.patch
@@ -0,0 +1,39 @@
+commit bc21d7604c78cf05780bb9974911ba81e787b6f9
+Author: Robin Burchell <robin.burchell at collabora.co.uk>
+Date:   Fri Feb 4 12:39:51 2011 +0100
+
+    Fix builds with compilers without --with-fpu=neon as a default.
+
+    The changes introduced in fac68dca46131d63f11c37210834073848f5a93d do not work
+    correctly on compilers without --with-fpu=neon as a default, NEON_SOURCES would
+    be (incorrectly) compiled without -mfpu=neon, resulting in build failure.
+
+    This also moves -mfpu=neon after CXXFLAGS, as CXXFLAGS may contain
+    -mfpu=vfpv3-d16.
+
+    Issue noted by Carsten Munk while building Qt for MeeGo ARM with NEON.
+
+    Merge-request: 1042
+    Reviewed-by: Samuel Rødal <samuel.rodal at nokia.com>
+
+--- a/src/gui/gui.pro
++++ b/src/gui/gui.pro
+@@ -65,15 +65,14 @@ symbian {
+ neon:*-g++* {
+     DEFINES += QT_HAVE_NEON
+     HEADERS += $$NEON_HEADERS
+-    SOURCES += $$NEON_SOURCES
+ 
+     DRAWHELPER_NEON_ASM_FILES = $$NEON_ASM
+ 
+-    neon_compiler.commands = $$QMAKE_CXX -c -mfpu=neon
+-    neon_compiler.commands += $(CXXFLAGS) $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
++    neon_compiler.commands = $$QMAKE_CXX -c
++    neon_compiler.commands += $(CXXFLAGS) -mfpu=neon $(INCPATH) ${QMAKE_FILE_IN} -o ${QMAKE_FILE_OUT}
+     neon_compiler.dependency_type = TYPE_C
+     neon_compiler.output = ${QMAKE_VAR_OBJECTS_DIR}${QMAKE_FILE_BASE}$${first(QMAKE_EXT_OBJ)}
+-    neon_compiler.input = DRAWHELPER_NEON_ASM_FILES
++    neon_compiler.input = DRAWHELPER_NEON_ASM_FILES NEON_SOURCES
+     neon_compiler.variable_out = OBJECTS
+     neon_compiler.name = compiling[neon] ${QMAKE_FILE_IN}
+     silent:neon_compiler.commands = @echo compiling[neon] ${QMAKE_FILE_IN} && $$neon_compiler.commands
diff --git a/debian/patches/series b/debian/patches/series
index f0f903a..8826850 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 # upstream patches
+Fix_builds_with_compilers_without_--with-fpu_neon_as_default.patch
 Fix_GL_problems_on_stock_1.4_SGX_drivers.patch
 Fixed_missing_text_when_using_static_text_items_in_GL_2_engine.patch
 Update_createwindow_in_qgl_x11egl.patch
@@ -42,7 +43,6 @@ buildable_appchooser_states_demos.patch
 92_armel_gcc43_valist_compat.diff
 x-0003-Use-GCC-intrinsics-for-armv6-atomic-operations.patch
 94_armv6_uname_entry.diff
-95_neon_flags.patch
 96_webkit_no_gc_sections.diff
 99_hppa_bug561203_decrease_failure_rate.diff
 powerpcspe.diff

-- 
Qt 4 packaging