rev 8147 - in trunk/packages/qt4-x11/debian: . patches

[Fathi Boudra]

Author: fabo
Date: 2007-12-07 08:42:00 +0000 (Fri, 07 Dec 2007)
New Revision: 8147

Added:
   trunk/packages/qt4-x11/debian/patches/21_assume_no_fpu_for_embedded_devices.diff
Removed:
   trunk/packages/qt4-x11/debian/patches/21_mis-assumes_non-irix_mips_systems_have_no_fpu.diff
Modified:
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/patches/series
Log:
* Update patch to fix #451046.


Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2007-12-07 00:19:02 UTC (rev 8146)
+++ trunk/packages/qt4-x11/debian/changelog	2007-12-07 08:42:00 UTC (rev 8147)
@@ -12,8 +12,8 @@
   * 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.

Added: trunk/packages/qt4-x11/debian/patches/21_assume_no_fpu_for_embedded_devices.diff
===================================================================
--- trunk/packages/qt4-x11/debian/patches/21_assume_no_fpu_for_embedded_devices.diff	                        (rev 0)
+++ trunk/packages/qt4-x11/debian/patches/21_assume_no_fpu_for_embedded_devices.diff	2007-12-07 08:42:00 UTC (rev 8147)
@@ -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;

Deleted: trunk/packages/qt4-x11/debian/patches/21_mis-assumes_non-irix_mips_systems_have_no_fpu.diff

Modified: trunk/packages/qt4-x11/debian/patches/series
===================================================================
--- trunk/packages/qt4-x11/debian/patches/series	2007-12-07 00:19:02 UTC (rev 8146)
+++ trunk/packages/qt4-x11/debian/patches/series	2007-12-07 08:42:00 UTC (rev 8147)
@@ -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