[Pkg-utopia-commits] r679 - in packages/unstable/dbus/debian: . patches

[Sjoerd Simons]

Author: sjoerd
Date: 2006-02-28 09:53:46 +0000 (Tue, 28 Feb 2006)
New Revision: 679

Modified:
   packages/unstable/dbus/debian/changelog
   packages/unstable/dbus/debian/patches/dbus-qt-endianness.patch
Log:
  + Added. Fix FTBS on big-endian architectures 

Modified: packages/unstable/dbus/debian/changelog
===================================================================
--- packages/unstable/dbus/debian/changelog	2006-02-27 23:58:44 UTC (rev 678)
+++ packages/unstable/dbus/debian/changelog	2006-02-28 09:53:46 UTC (rev 679)
@@ -1,8 +1,7 @@
 dbus (0.61-2) unstable; urgency=low
 
   * debian/patches/dbus-qt-endianness.patch
-    + Added. include <sys/param.h> for __BYTE_ORDER. Fixes compile errors on
-      big-endian
+    + Added. Fix FTBS on big-endian architectures 
 
  -- Sjoerd Simons <sjoerd at debian.org>  Tue, 28 Feb 2006 00:58:05 +0100
 

Modified: packages/unstable/dbus/debian/patches/dbus-qt-endianness.patch
===================================================================
--- packages/unstable/dbus/debian/patches/dbus-qt-endianness.patch	2006-02-27 23:58:44 UTC (rev 678)
+++ packages/unstable/dbus/debian/patches/dbus-qt-endianness.patch	2006-02-28 09:53:46 UTC (rev 679)
@@ -4,14 +4,33 @@
 retrieving revision 1.3
 diff -u -r1.3 qdbusintegrator.cpp
 --- qt/qdbusintegrator.cpp	20 Feb 2006 13:23:11 -0000	1.3
-+++ qt/qdbusintegrator.cpp	27 Feb 2006 23:57:57 -0000
-@@ -22,6 +22,9 @@
-  *
-  */
++++ qt/qdbusintegrator.cpp	28 Feb 2006 09:32:47 -0000
+@@ -39,6 +39,15 @@
  
-+/* For endianess definitions */
-+#include <sys/param.h>
+ int QDBusConnectionPrivate::messageMetaType = 0;
+ 
++#if __BYTE_ORDER != __LITTLE_ENDIAN
++    union integer
++    {
++        short s;
++        unsigned short us;
++        unsigned char uc;
++    };
++#endif
 +
- #include <qcoreapplication.h>
- #include <qcoreevent.h>
- #include <qdebug.h>
+ struct QDBusPendingCall
+ {
+     QPointer<QObject> receiver;
+@@ -622,12 +631,6 @@
+     params.reserve(metaTypes.count());
+ 
+ #if __BYTE_ORDER != __LITTLE_ENDIAN
+-    union integer
+-    {
+-        short s;
+-        unsigned short us;
+-        unsigned char uc;
+-    }
+     QVarLengthArray<integer, 4> auxParameters;
+ #endif
+     // let's create the parameter list