[oe-commits] org.oe.dev networkmanager: add patch to build against dbus 1.0

[koen commit]

networkmanager: add patch to build against dbus 1.0

Author: koen at openembedded.org
Branch: org.openembedded.dev
Revision: 0aadd762e26905515015bfe5e0e827a34240e6e2
ViewMTN: http://monotone.openembedded.org/revision.psp?id=0aadd762e26905515015bfe5e0e827a34240e6e2
Files:
1
packages/networkmanager/files/dbus-1.0-fix.patch
packages/networkmanager/networkmanager_0.6.4.bb
Diffs:

#
# mt diff -r7dd9a5f52078d7e0c8e5cd723acd79f281b4989c -r0aadd762e26905515015bfe5e0e827a34240e6e2
#
# 
# 
# add_file "packages/networkmanager/files/dbus-1.0-fix.patch"
#  content [466cf4a5c4e3d70ecd5578567f6174cf5d39eb6a]
# 
# patch "packages/networkmanager/networkmanager_0.6.4.bb"
#  from [6550635d269c35f293bdee60eede7853bc418bb4]
#    to [f892d72f55c5fff4b240cff8174310d59b5e5133]
# 
============================================================
--- packages/networkmanager/files/dbus-1.0-fix.patch	466cf4a5c4e3d70ecd5578567f6174cf5d39eb6a
+++ packages/networkmanager/files/dbus-1.0-fix.patch	466cf4a5c4e3d70ecd5578567f6174cf5d39eb6a
@@ -0,0 +1,11 @@
+--- /tmp/NetworkManagerDbus.c	2006-11-21 11:07:35.000000000 +0100
++++ NetworkManager-0.6.4/src/NetworkManagerDbus.c	2006-11-21 11:08:35.748554000 +0100
+@@ -833,7 +833,7 @@
+ 	}
+ 
+ 	dbus_error_init (&error);
+-#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60)
++#if (DBUS_VERSION_MAJOR == 0) && (DBUS_VERSION_MINOR >= 60) || DBUS_VERSION_MAJOR > 0
+ 	flags = DBUS_NAME_FLAG_DO_NOT_QUEUE;	/* Prohibit replacement is now the default */
+ #else
+ 	flags = DBUS_NAME_FLAG_PROHIBIT_REPLACEMENT;
============================================================
--- packages/networkmanager/networkmanager_0.6.4.bb	6550635d269c35f293bdee60eede7853bc418bb4
+++ packages/networkmanager/networkmanager_0.6.4.bb	f892d72f55c5fff4b240cff8174310d59b5e5133
@@ -6,11 +6,12 @@ RDEPENDS = "wpa-supplicant iproute2 dhcd
 DEPENDS = "libnl dbus dbus-glib libhal-nm libgpewidget gnome-keyring gconf-dbus wireless-tools libglade"
 RDEPENDS = "wpa-supplicant iproute2 dhcdbd gnome-keyring hicolor-icon-theme"
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI="http://www.handhelds.org/~mmp/files/NetworkManager-${PV}-gpe.tar.gz \
 	file://dbus-api-fix.patch;patch=1 \
-	file://99_networkmanager \
+	file://dbus-1.0-fix.patch;patch=1 \
+        file://99_networkmanager \
 	file://NetworkManager \
 	file://nm-applet.desktop"