[pkg-kde-commits] rev 2770 - in trunk/packages/qt4-x11/debian: . patches

[Brian Nelson]

Author: pyro
Date: 2006-01-07 18:53:56 +0000 (Sat, 07 Jan 2006)
New Revision: 2770

Added:
   trunk/packages/qt4-x11/debian/patches/13_arm_ftbfs_fixes.dpatch
Removed:
   trunk/packages/qt4-x11/debian/patches/13_arm_gcc4.dpatch
Modified:
   trunk/packages/qt4-x11/debian/changelog
Log:
  * debian/patches/13_arm_ftbfs_fixes.dpatch: renamed, added a fix for the
    new build failure due to a poorly defined qreal

Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2006-01-07 18:32:24 UTC (rev 2769)
+++ trunk/packages/qt4-x11/debian/changelog	2006-01-07 18:53:56 UTC (rev 2770)
@@ -5,8 +5,11 @@
     q_atomic_test_and_set_release_int, that were added in this release.
     This should again fix the build failures on mips.
 
- -- Brian Nelson <pyro at debian.org>  Sat,  7 Jan 2006 10:52:36 -0500
+  * debian/patches/13_arm_ftbfs_fixes.dpatch: renamed, added a fix for the
+    new build failure due to a poorly defined qreal
 
+ -- Brian Nelson <pyro at debian.org>  Sat,  7 Jan 2006 13:53:43 -0500
+
 qt4-x11 (4.1.0-1) unstable; urgency=low
 
   * New upstream release

Copied: trunk/packages/qt4-x11/debian/patches/13_arm_ftbfs_fixes.dpatch (from rev 2757, trunk/packages/qt4-x11/debian/patches/13_arm_gcc4.dpatch)
===================================================================
--- trunk/packages/qt4-x11/debian/patches/13_arm_gcc4.dpatch	2006-01-06 16:12:17 UTC (rev 2757)
+++ trunk/packages/qt4-x11/debian/patches/13_arm_ftbfs_fixes.dpatch	2006-01-07 18:53:56 UTC (rev 2770)
@@ -0,0 +1,35 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 13_arm_ftbfs_fixes.dpatch by Brian Nelson <pyro at debian.org> by way of
+## Jeremy Laine <jeremy.laine at m4x.org>.
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fixes FTBFS on arm
+
+ at DPATCH@
+diff -urNad qt4-x11-4.1.0~/src/corelib/global/qglobal.h qt4-x11-4.1.0/src/corelib/global/qglobal.h
+--- qt4-x11-4.1.0~/src/corelib/global/qglobal.h	2005-12-16 06:51:59.000000000 -0500
++++ qt4-x11-4.1.0/src/corelib/global/qglobal.h	2006-01-07 13:46:59.000000000 -0500
+@@ -715,8 +715,9 @@
+ 
+ #if defined(QT_COORD_TYPE)
+ typedef QT_COORD_TYPE qreal;
+-#elif defined(__arm__)
+-typedef float qreal;
++// BN: Defining qreal as float on arm breaks compilation!
++//#elif defined(__arm__)
++//typedef float qreal;
+ #else
+ typedef double qreal;
+ #endif
+diff -urNad qt4-x11-4.1.0~/src/corelib/tools/qchar.h qt4-x11-4.1.0/src/corelib/tools/qchar.h
+--- qt4-x11-4.1.0~/src/corelib/tools/qchar.h	2005-12-16 06:52:00.000000000 -0500
++++ qt4-x11-4.1.0/src/corelib/tools/qchar.h	2006-01-07 13:45:48.000000000 -0500
+@@ -219,7 +219,7 @@
+     inline const char toLatin1() const;
+     inline const ushort unicode() const { return ucs; }
+ #ifdef Q_NO_PACKED_REFERENCE
+-    inline ushort &unicode() { return *(&ucs); }
++    inline ushort &unicode() { return *((ushort*)&ucs); }
+ #else
+     inline ushort &unicode() { return ucs; }
+ #endif

Deleted: trunk/packages/qt4-x11/debian/patches/13_arm_gcc4.dpatch