* Update patch to fix #451046.

4 files changed, 23 insertions, 14 deletions

diff --git a/debian/changelog b/debian/changelog
index e9a2ebc..93f5f74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,8 +12,8 @@ qt4-x11 (4.3.3-1) unstable; urgency=low
   * Bump Standards-Version to 3.7.3.
   * Merge Kubuntu load ssl patch. Thanks to Jonathan Riddell.
   * Add CDDL exception to debian/copyright.
-  * Add 21_mis-assumes_non-irix_mips_systems_have_no_fpu patch.
-    Thanks to Thiemo Seufer.
+  * Add 21_assume_no_fpu_for_embedded_devices patch.
+    Thanks to Thiemo Seufer and Bradley Hughes. (Closes: #451046)
   * Remove qt-copy patches:
     * 0163-fix-gcc43-support.
     * 0185-fix-format-strings.
diff --git a/debian/patches/21_assume_no_fpu_for_embedded_devices.diff b/debian/patches/21_assume_no_fpu_for_embedded_devices.diff
new file mode 100644
index 0000000..72e80b3
--- /dev/null
+++ b/debian/patches/21_assume_no_fpu_for_embedded_devices.diff
@@ -0,0 +1,20 @@
+status: fixed for Qt 4.4.0
+
+--- a/src/corelib/global/qglobal.h
++++ b/src/corelib/global/qglobal.h
+@@ -834,13 +834,13 @@
+ 
+ typedef int QNoImplicitBoolCast;
+ 
+-#if defined(QT_ARCH_ARM) || (defined(QT_ARCH_MIPS) && !defined(Q_OS_IRIX))
++#if defined(QT_ARCH_ARM) || (defined(QT_ARCH_MIPS) && (defined(Q_WS_QWS) || defined(Q_OS_WINCE)))
+ #define QT_NO_FPU
+ #endif
+ 
+ #if defined(QT_COORD_TYPE)
+ typedef QT_COORD_TYPE qreal;
+-#elif defined(QT_NO_FPU)
++#elif defined(QT_NO_FPU) || defined(QT_ARCH_ARM) || defined(QT_ARCH_WINDOWSCE)
+ typedef float qreal;
+ #else
+ typedef double qreal;
diff --git a/debian/patches/21_mis-assumes_non-irix_mips_systems_have_no_fpu.diff b/debian/patches/21_mis-assumes_non-irix_mips_systems_have_no_fpu.diff
deleted file mode 100644
index 83614d6..0000000
--- a/debian/patches/21_mis-assumes_non-irix_mips_systems_have_no_fpu.diff
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/corelib/global/qglobal.h
-+++ b/src/corelib/global/qglobal.h
-@@ -834,7 +834,7 @@
- 
- typedef int QNoImplicitBoolCast;
- 
--#if defined(QT_ARCH_ARM) || (defined(QT_ARCH_MIPS) && !defined(Q_OS_IRIX))
-+#if defined(QT_ARCH_ARM)
- #define QT_NO_FPU
- #endif
- 
diff --git a/debian/patches/series b/debian/patches/series
index a8b540a..7862bb8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -24,7 +24,7 @@
 07_trust_dpkg-arch_over_uname-m.diff
 08_load_ssl.diff
 20_mips_atomic_ops.diff
-21_mis-assumes_non-irix_mips_systems_have_no_fpu.diff
+21_assume_no_fpu_for_embedded_devices.diff
 30_arm_ftbfs_fixes.diff
 31_arm_eabi_fix.diff
 40_alpha_ice.diff