[maemo-commits] [maemo-commits] r8288 - in projects/haf/trunk/dbus/debian: . patches

[From: www-data at stage.maemo.org]

Author: kihamala
Date: 2006-11-23 17:54:10 +0200 (Thu, 23 Nov 2006)
New Revision: 8288

Added:
   projects/haf/trunk/dbus/debian/patches/10-fix-match-rule-equal.patch
Modified:
   projects/haf/trunk/dbus/debian/changelog
   projects/haf/trunk/dbus/debian/rules
Log:
added fix for match_rule_equal() + support for thumb instructions


Modified: projects/haf/trunk/dbus/debian/changelog
===================================================================
--- projects/haf/trunk/dbus/debian/changelog	2006-11-23 15:17:33 UTC (rev 8287)
+++ projects/haf/trunk/dbus/debian/changelog	2006-11-23 15:54:10 UTC (rev 8288)
@@ -1,3 +1,11 @@
+dbus (1.0.0-osso3) experimental; urgency=low
+
+  * UNRELEASED
+  * Added support for building with thumb instructions.
+  * Fixed bug in match_rule_equal().
+
+ -- Kimmo Hämäläinen <kimmo.hamalainen at nokia.com>  Thu, 23 Nov 2006 17:57:57 +0200
+
 dbus (1.0.0-osso2) experimental; urgency=low
 
   * Removed unused build dependency to docbook-utils.

Added: projects/haf/trunk/dbus/debian/patches/10-fix-match-rule-equal.patch
===================================================================
--- projects/haf/trunk/dbus/debian/patches/10-fix-match-rule-equal.patch	2006-11-23 15:17:33 UTC (rev 8287)
+++ projects/haf/trunk/dbus/debian/patches/10-fix-match-rule-equal.patch	2006-11-23 15:54:10 UTC (rev 8288)
@@ -0,0 +1,13 @@
+diff -pur 0.61-osso23/bus/signals.c 0.61-osso23.new/bus/signals.c
+--- 0.61-osso23/bus/signals.c	2006-11-23 16:46:52.589602192 +0200
++++ 0.61-osso23.new/bus/signals.c	2006-11-23 16:49:28.873843376 +0200
+@@ -1067,6 +1067,9 @@ match_rule_equal (BusMatchRule *a,
+   if (a->flags != b->flags)
+     return FALSE;
+ 
++  if (a->matches_go_to != b->matches_go_to)
++    return FALSE;
++
+   if ((a->flags & BUS_MATCH_MESSAGE_TYPE) &&
+       a->message_type != b->message_type)
+     return FALSE;

Modified: projects/haf/trunk/dbus/debian/rules
===================================================================
--- projects/haf/trunk/dbus/debian/rules	2006-11-23 15:17:33 UTC (rev 8287)
+++ projects/haf/trunk/dbus/debian/rules	2006-11-23 15:54:10 UTC (rev 8288)
@@ -12,6 +12,11 @@
 DEB_TAR_SRCDIR := dbus-1.0.0
 include /usr/share/cdbs/1/rules/tarball.mk
 
+# Use soft-float and thumb mode if it is enabled.
+ifneq (,$(findstring thumb,$(DEB_BUILD_OPTIONS)))
+	CFLAGS += -mthumb
+endif
+
 # List any files which are not installed
 common-binary-post-install-arch:: list-missing