rev 6296 - in branches/kde4/packages/qt4-x11/debian: . patches

[Fathi Boudra]

Author: fboudra-guest
Date: 2007-05-20 14:27:55 +0000 (Sun, 20 May 2007)
New Revision: 6296

Added:
   branches/kde4/packages/qt4-x11/debian/patches/30_arm_ftbfs_fixes.dpatch
Modified:
   branches/kde4/packages/qt4-x11/debian/changelog
   branches/kde4/packages/qt4-x11/debian/patches/00list
Log:
* Redo 30_arm_ftbfs_fixes patch. Add arm target to configure script.


Modified: branches/kde4/packages/qt4-x11/debian/changelog
===================================================================
--- branches/kde4/packages/qt4-x11/debian/changelog	2007-05-20 12:10:27 UTC (rev 6295)
+++ branches/kde4/packages/qt4-x11/debian/changelog	2007-05-20 14:27:55 UTC (rev 6296)
@@ -3,15 +3,7 @@
   * New upstream release.
 
   [Sune Vuorela]
-  * Remove:
-    * 04_utf8_bug_fix: Merged upstream.
-    * 71_hppa_inotify_fix: Merged upstream.
-    * 30_arm_ftbfs_fixes: Fixed upstream. IT MUST BE TESTED.
-      Upstream claims it should compile in practically all platforms.
-      BTW, if we redefine qreal on ARM, we must update documentation:
-      Typedef for double on all platforms except for those using CPUs with ARM
-      architectures. On ARM-based platforms, qreal is a typedef for float for
-      performance reasons.
+  * Remove 04_utf8_bug_fix: Merged upstream.
   * Update libqt4-dev.install. Upstream installs pkgconfig files the right place.
   * Update libqt4-core.install. Add libQtScript.
   * Update rules:
@@ -22,6 +14,9 @@
       target.
 
   [Fathi Boudra]
+  * Redo 30_arm_ftbfs_fixes to fix another FTBFS. Add arm target to configure
+    script. Thanks to Sune Vuorela and Aurelien Jarno.
+  * Remove 71_hppa_inotify_fix: Merged upstream.
   * Update patches:
     * 02_launch_assistant-qt4
     * 03_launch_moc-qt4

Modified: branches/kde4/packages/qt4-x11/debian/patches/00list
===================================================================
--- branches/kde4/packages/qt4-x11/debian/patches/00list	2007-05-20 12:10:27 UTC (rev 6295)
+++ branches/kde4/packages/qt4-x11/debian/patches/00list	2007-05-20 14:27:55 UTC (rev 6296)
@@ -7,6 +7,7 @@
 02_launch_assistant-qt4
 03_launch_moc-qt4
 20_mips_atomic_ops
+30_arm_ftbfs_fixes
 31_arm_eabi_fix
 40_alpha_ice
 41_disable_opengl_visibility

Added: branches/kde4/packages/qt4-x11/debian/patches/30_arm_ftbfs_fixes.dpatch
===================================================================
--- branches/kde4/packages/qt4-x11/debian/patches/30_arm_ftbfs_fixes.dpatch	                        (rev 0)
+++ branches/kde4/packages/qt4-x11/debian/patches/30_arm_ftbfs_fixes.dpatch	2007-05-20 14:27:55 UTC (rev 6296)
@@ -0,0 +1,35 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 30_arm_ftbfs_fixes.dpatch by Fathi Boudra <fboudra at free.fr>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix arm FTBFS. Add arm target to configure script.
+
+ at DPATCH@
+diff -urNad qt4-x11-4.3.0~rc1~/configure qt4-x11-4.3.0~rc1/configure
+--- qt4-x11-4.3.0~rc1~/configure	2007-05-06 17:54:53.000000000 +0200
++++ qt4-x11-4.3.0~rc1/configure	2007-05-20 16:10:15.000000000 +0200
+@@ -2204,6 +2204,12 @@
+     	fi
+     	ARCH=s390
+     	;;
++    *:*:arm*)
++        if [ "$OPT_VERBOSE" = "yes" ]; then
++            echo "    ARM (arm)"
++        fi
++        ARCH=arm
++        ;;
+     *:*:*)
+         if [ "$OPT_VERBOSE" = "yes" ]; then
+             echo "    Trying '$UNAME_MACHINE'..."
+diff -urNad qt4-x11-4.3.0~rc1~/tools/qtestlib/src/qtestcase.h qt4-x11-4.3.0~rc1/tools/qtestlib/src/qtestcase.h
+--- qt4-x11-4.3.0~rc1~/tools/qtestlib/src/qtestcase.h	2007-05-06 17:54:35.000000000 +0200
++++ qt4-x11-4.3.0~rc1/tools/qtestlib/src/qtestcase.h	2007-05-20 16:11:07.000000000 +0200
+@@ -195,7 +195,7 @@
+     template <typename T1, typename T2>
+     bool qCompare(T1 const &, T2 const &, const char *, const char *, const char *, int);
+ 
+-#if defined(QT_COORD_TYPE) || defined(__arm__)
++#if defined(QT_COORD_TYPE) || defined(QT_ARCH_ARM)
+     template <>
+     inline bool qCompare<qreal, double>(qreal const &t1, double const &t2, const char *actual,
+                                  const char *expected, const char *file, int line)


Property changes on: branches/kde4/packages/qt4-x11/debian/patches/30_arm_ftbfs_fixes.dpatch
___________________________________________________________________
Name: svn:executable
   + *