[Pkg-utopia-commits] r426 - in packages/experimental/dbus/debian: . patches

[Sjoerd Simons]

Author: sjoerd
Date: 2006-01-05 11:34:14 +0000 (Thu, 05 Jan 2006)
New Revision: 426

Added:
   packages/experimental/dbus/debian/patches/dbus-qdbusmarshall-amd64.patch
Modified:
   packages/experimental/dbus/debian/changelog
Log:
Fix build on amd64

Modified: packages/experimental/dbus/debian/changelog
===================================================================
--- packages/experimental/dbus/debian/changelog	2005-12-22 19:02:44 UTC (rev 425)
+++ packages/experimental/dbus/debian/changelog	2006-01-05 11:34:14 UTC (rev 426)
@@ -1,8 +1,10 @@
 dbus (0.60-3) experimental; urgency=low
 
+  * debian/patches/dbus-qdbusmarshall-amd64.patch
+    + Fix build failure on amd64 (Closes: #343746)
   * Ignore the exit code of run-parts in the init script.
 
- -- Sjoerd Simons <sjoerd at debian.org>  Thu, 22 Dec 2005 13:12:23 +0100
+ -- Sjoerd Simons <sjoerd at debian.org>  Thu,  5 Jan 2006 12:30:26 +0100
 
 dbus (0.60-2) experimental; urgency=low
 

Added: packages/experimental/dbus/debian/patches/dbus-qdbusmarshall-amd64.patch
===================================================================
--- packages/experimental/dbus/debian/patches/dbus-qdbusmarshall-amd64.patch	2005-12-22 19:02:44 UTC (rev 425)
+++ packages/experimental/dbus/debian/patches/dbus-qdbusmarshall-amd64.patch	2006-01-05 11:34:14 UTC (rev 426)
@@ -0,0 +1,19 @@
+Index: qdbusmarshall.cpp
+===================================================================
+RCS file: /cvs/dbus/dbus/qt/qdbusmarshall.cpp,v
+retrieving revision 1.1
+diff -u -3 -p -r1.1 qdbusmarshall.cpp
+--- qdbusmarshall.cpp	23 Sep 2005 13:08:26 -0000	1.1
++++ qdbusmarshall.cpp	19 Dec 2005 21:40:02 -0000
+@@ -69,9 +69,9 @@ static QVariant qFetchParameter(DBusMess
+     case DBUS_TYPE_BOOLEAN:
+         return qIterGet<dbus_bool_t>(it);
+     case DBUS_TYPE_INT64:
+-        return qIterGet<dbus_int64_t>(it);
++        return QVariant((qlonglong)qIterGet<dbus_int64_t>(it));
+     case DBUS_TYPE_UINT64:
+-        return qIterGet<dbus_uint64_t>(it);
++        return QVariant((qulonglong)qIterGet<dbus_uint64_t>(it));
+     case DBUS_TYPE_STRING:
+     case DBUS_TYPE_OBJECT_PATH:
+     case DBUS_TYPE_SIGNATURE: