[oe-commits] org.oe.dev dbus 1.1.4 update to 1.1.20 (new default version)

[mickeyl commit]

dbus 1.1.4 update to 1.1.20 (new default version)

Author: mickeyl at openembedded.org
Branch: org.openembedded.dev
Revision: d954d523c897bdc03bc955807728abed35427069
ViewMTN: http://monotone.openembedded.org/revision/info/d954d523c897bdc03bc955807728abed35427069
Files:
1
packages/dbus/dbus-1.1.4
packages/dbus/dbus-1.1.20
packages/dbus/dbus-native_1.1.4.bb
packages/dbus/dbus-native_1.1.20.bb
packages/dbus/dbus_1.1.4.bb
packages/dbus/dbus_1.1.20.bb
packages/dbus/dbus-1.1.20/fix-dbus-launch-x11.patch
packages/dbus/dbus-native_1.0.2.bb
packages/dbus/dbus.inc
packages/dbus/dbus_1.0.2.bb
Diffs:

#
# mt diff -rafcd0ed729492c2094fdead173c36c2084ece1bc -rd954d523c897bdc03bc955807728abed35427069
#
# 
# 
# rename "packages/dbus/dbus-1.1.4"
#     to "packages/dbus/dbus-1.1.20"
# 
# rename "packages/dbus/dbus-native_1.1.4.bb"
#     to "packages/dbus/dbus-native_1.1.20.bb"
# 
# rename "packages/dbus/dbus_1.1.4.bb"
#     to "packages/dbus/dbus_1.1.20.bb"
# 
# add_file "packages/dbus/dbus-1.1.20/fix-dbus-launch-x11.patch"
#  content [c8951ae1f436c9dfbc14cc04cbdc1407c5034693]
# 
# patch "packages/dbus/dbus-native_1.0.2.bb"
#  from [fbff414912569dc50e61b109e28f9f86ec259886]
#    to [26211c462065427f00f5ba019151740871beb85d]
# 
# patch "packages/dbus/dbus-native_1.1.20.bb"
#  from [bbd25f9e7c9b77b2605b0107cbe8ef0396dee219]
#    to [80d48377314b49295fe94f56ce44b497d2ac75b5]
# 
# patch "packages/dbus/dbus.inc"
#  from [f59c7592c9d9fa4d19d5c3debfde3b58b9bfdf79]
#    to [c0911284b61f4d105576db29453fa27ce6d25f1a]
# 
# patch "packages/dbus/dbus_1.0.2.bb"
#  from [ae8eb57b8c2a17376e8e93257afc69060cc6a3fd]
#    to [962c6b5e32d4892e1a56132c30a8bfe9374c7805]
# 
# patch "packages/dbus/dbus_1.1.20.bb"
#  from [4586c438a647255b3ee0c4705493aa5f104d5d63]
#    to [9a3c726e42fc6c6bc3af37448fa5971843794a7c]
# 
============================================================
--- packages/dbus/dbus-1.1.20/fix-dbus-launch-x11.patch	c8951ae1f436c9dfbc14cc04cbdc1407c5034693
+++ packages/dbus/dbus-1.1.20/fix-dbus-launch-x11.patch	c8951ae1f436c9dfbc14cc04cbdc1407c5034693
@@ -0,0 +1,14 @@
+Index: dbus-1.1.20/tools/dbus-launch.c
+===================================================================
+--- dbus-1.1.20.orig/tools/dbus-launch.c
++++ dbus-1.1.20/tools/dbus-launch.c
+@@ -966,7 +966,9 @@ main (int argc, char **argv)
+       char write_pid_fd_as_string[MAX_FD_LEN];
+       char write_address_fd_as_string[MAX_FD_LEN];
+ 
++#ifdef DBUS_BUILD_X11
+       xdisplay = NULL;
++#endif
+ 
+       if (close_stderr)
+ 	do_close_stderr ();
============================================================
--- packages/dbus/dbus-native_1.0.2.bb	fbff414912569dc50e61b109e28f9f86ec259886
+++ packages/dbus/dbus-native_1.0.2.bb	26211c462065427f00f5ba019151740871beb85d
@@ -1,6 +1,7 @@ require dbus.inc
 require dbus.inc
-DEFAULT_PREFERENCE = "1"
 
+DEFAULT_PREFERENCE = "-1"
+
 inherit native
 
 DEPENDS = "glib-2.0-native libxml2-native expat-native"
@@ -25,4 +26,3 @@ do_install() {
 do_install() {
 	:
 }
-
============================================================
--- packages/dbus/dbus-native_1.1.4.bb	bbd25f9e7c9b77b2605b0107cbe8ef0396dee219
+++ packages/dbus/dbus-native_1.1.20.bb	80d48377314b49295fe94f56ce44b497d2ac75b5
@@ -5,9 +5,10 @@ SRC_URI = "\
 FILESDIR = "${@os.path.dirname(bb.data.getVar('FILE',d,1))}/dbus-${PV}"
 
 SRC_URI = "\
-  http://freedesktop.org/software/dbus/releases/dbus-${PV}.tar.gz \
+  http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
   file://cross.patch;patch=1 \
   file://tmpdir.patch;patch=1 \
+  file://fix-dbus-launch-x11.patch;patch=1 \
   file://dbus-1.init \
 "
 
============================================================
--- packages/dbus/dbus.inc	f59c7592c9d9fa4d19d5c3debfde3b58b9bfdf79
+++ packages/dbus/dbus.inc	c0911284b61f4d105576db29453fa27ce6d25f1a
@@ -1,13 +1,11 @@ DEPENDS = "expat glib-2.0 virtual/libint
 DESCRIPTION = "A message bus system for inter-process communication"
 HOMEPAGE = "http://dbus.freedesktop.org"
 SECTION = "base"
 LICENSE = "GPL"
 DEPENDS = "expat glib-2.0 virtual/libintl"
 
-DEFAULT_PREFERENCE = "-1"
-
 SRC_URI = "\
-  http://freedesktop.org/software/dbus/releases/dbus/dbus-${PV}.tar.gz \
+  http://dbus.freedesktop.org/releases/dbus/dbus-${PV}.tar.gz \
   file://cross.patch;patch=1 \
   file://tmpdir.patch;patch=1 \
   file://fix-install-daemon.patch;patch=1 \
============================================================
--- packages/dbus/dbus_1.0.2.bb	ae8eb57b8c2a17376e8e93257afc69060cc6a3fd
+++ packages/dbus/dbus_1.0.2.bb	962c6b5e32d4892e1a56132c30a8bfe9374c7805
@@ -1,6 +1,4 @@ require dbus.inc
 require dbus.inc
-DEFAULT_PREFERENCE = "1"
+PR = "r10"
 
+DEFAULT_PREFERENCE = "-1"
-PR = "r9"
-
-
============================================================
--- packages/dbus/dbus_1.1.4.bb	4586c438a647255b3ee0c4705493aa5f104d5d63
+++ packages/dbus/dbus_1.1.20.bb	9a3c726e42fc6c6bc3af37448fa5971843794a7c
@@ -1,3 +1,5 @@ include dbus.inc
 include dbus.inc
 
+PR = "r0"
+
+SRC_URI += "file://fix-dbus-launch-x11.patch;patch=1"
-PR = "r2"