[Pkg-kde-commits] rev 1428 - in trunk/packages/qt-x11-free/debian: . patches

[Adeodato Simó]

Author: adeodato
Date: 2005-08-11 12:38:02 +0000 (Thu, 11 Aug 2005)
New Revision: 1428

Modified:
   trunk/packages/qt-x11-free/debian/changelog
   trunk/packages/qt-x11-free/debian/patches/08_arm_gcc4.dpatch
Log:
Sigh. But yay Isaac. (Fix new FTBFS in arm.)


Modified: trunk/packages/qt-x11-free/debian/changelog
===================================================================
--- trunk/packages/qt-x11-free/debian/changelog	2005-08-11 11:38:50 UTC (rev 1427)
+++ trunk/packages/qt-x11-free/debian/changelog	2005-08-11 12:38:02 UTC (rev 1428)
@@ -1,3 +1,14 @@
+qt-x11-free (3:3.3.4-6) unstable; urgency=low
+
+  * The "If debussy had been up..." release.
+
+  +++ Changes by Adeodato Simó:
+
+  * Include in 08_arm_gcc4.dpatch an appropriate cast so that GCC 4.0 does not
+    barf. Patch stolen from SuSE, kudos to Isaac Clerencia for finding it.
+
+ -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 11 Aug 2005 14:29:47 +0200
+
 qt-x11-free (3:3.3.4-5) unstable; urgency=low
 
   +++ Changes by Adeodato Simó:

Modified: trunk/packages/qt-x11-free/debian/patches/08_arm_gcc4.dpatch
===================================================================
--- trunk/packages/qt-x11-free/debian/patches/08_arm_gcc4.dpatch	2005-08-11 11:38:50 UTC (rev 1427)
+++ trunk/packages/qt-x11-free/debian/patches/08_arm_gcc4.dpatch	2005-08-11 12:38:02 UTC (rev 1428)
@@ -30,3 +30,14 @@
  #      define Q_NO_PACKED_REFERENCE
  #    endif
  #  endif
+--- qt/include/qstring.h
++++ qt/include/qstring.h
+@@ -194,7 +194,7 @@
+     char latin1() const { return ucs > 0xff ? 0 : (char) ucs; }
+     ushort unicode() const { return ucs; }
+ #ifdef Q_NO_PACKED_REFERENCE
+-    ushort &unicode() { return *(&ucs); }
++    ushort &unicode() { return *((ushort*)&ucs); }
+ #else
+     ushort &unicode() { return ucs; }
+ #endif