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

[Brian Nelson]

Author: pyro
Date: 2005-12-13 13:39:02 +0000 (Tue, 13 Dec 2005)
New Revision: 2629

Added:
   trunk/packages/qt4-x11/debian/patches/13_arm_gcc4.dpatch
Modified:
   trunk/packages/qt4-x11/debian/changelog
   trunk/packages/qt4-x11/debian/patches/00list
Log:
  * debian/patches/13_arm_gcc4.dpatch: new patch from Jeremy Laine to fix
    FTBFS on arm (Closes: #343176)

Modified: trunk/packages/qt4-x11/debian/changelog
===================================================================
--- trunk/packages/qt4-x11/debian/changelog	2005-12-12 17:55:21 UTC (rev 2628)
+++ trunk/packages/qt4-x11/debian/changelog	2005-12-13 13:39:02 UTC (rev 2629)
@@ -1,3 +1,10 @@
+qt4-x11 (4.0.1-7) UNRELEASED; urgency=low
+
+  * debian/patches/13_arm_gcc4.dpatch: new patch from Jeremy Laine to fix
+    FTBFS on arm (Closes: #343176)
+
+ -- Brian Nelson <pyro at debian.org>  Tue, 13 Dec 2005 15:37:40 +0200
+
 qt4-x11 (4.0.1-6) unstable; urgency=low
 
   * Added a target to automatically install lintian overrides, stolen from

Modified: trunk/packages/qt4-x11/debian/patches/00list
===================================================================
--- trunk/packages/qt4-x11/debian/patches/00list	2005-12-12 17:55:21 UTC (rev 2628)
+++ trunk/packages/qt4-x11/debian/patches/00list	2005-12-13 13:39:02 UTC (rev 2629)
@@ -1,3 +1,4 @@
 10_qmake_use_qt4_tools
 11_launch_assistant-qt4
 12_mips_atomic_ops
+13_arm_gcc4

Added: trunk/packages/qt4-x11/debian/patches/13_arm_gcc4.dpatch
===================================================================
--- trunk/packages/qt4-x11/debian/patches/13_arm_gcc4.dpatch	2005-12-12 17:55:21 UTC (rev 2628)
+++ trunk/packages/qt4-x11/debian/patches/13_arm_gcc4.dpatch	2005-12-13 13:39:02 UTC (rev 2629)
@@ -0,0 +1,20 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 13_arm_gcc4.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.0.1~/src/corelib/tools/qchar.h qt4-x11-4.0.1/src/corelib/tools/qchar.h
+--- qt4-x11-4.0.1~/src/corelib/tools/qchar.h	2005-08-16 11:41:08.000000000 +0300
++++ qt4-x11-4.0.1/src/corelib/tools/qchar.h	2005-12-13 15:32:45.000000000 +0200
+@@ -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


Property changes on: trunk/packages/qt4-x11/debian/patches/13_arm_gcc4.dpatch
___________________________________________________________________
Name: svn:executable
   + *