summaryrefslogtreecommitdiff
path: root/meta
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-01-15 15:17:54 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-01-15 15:17:54 +0000
commitb10b195b8ceabbb3f2ac1620ac4663792978b9ff (patch)
tree1f12a5fe31842d1995f45b528b746a4519c4f8bd /meta
parent932fc6a37ddba80d6e52b55db4442df437d1cb61 (diff)
downloadopenembedded-core-b10b195b8ceabbb3f2ac1620ac4663792978b9ff.tar.gz
openembedded-core-b10b195b8ceabbb3f2ac1620ac4663792978b9ff.tar.bz2
openembedded-core-b10b195b8ceabbb3f2ac1620ac4663792978b9ff.tar.xz
openembedded-core-b10b195b8ceabbb3f2ac1620ac4663792978b9ff.zip
dbus-glib: 0.76 -> 0.78
Diffstat (limited to 'meta')
-rw-r--r--meta/packages/dbus/dbus-glib-0.78/fix_asneeded.patch13
-rw-r--r--meta/packages/dbus/dbus-glib-0.78/native-binding-tool.patch (renamed from meta/packages/dbus/dbus-glib-0.76/native-binding-tool.patch)0
-rw-r--r--meta/packages/dbus/dbus-glib-0.78/no-examples.patch (renamed from meta/packages/dbus/dbus-glib-0.76/no-examples.patch)0
-rw-r--r--meta/packages/dbus/dbus-glib-0.78/run-with-tmp-session-bus.patch (renamed from meta/packages/dbus/dbus-glib-0.76/run-with-tmp-session-bus.patch)0
-rw-r--r--meta/packages/dbus/dbus-glib-native_0.78.bb (renamed from meta/packages/dbus/dbus-glib-native_0.76.bb)2
-rw-r--r--meta/packages/dbus/dbus-glib.inc1
-rw-r--r--meta/packages/dbus/dbus-glib_0.78.bb (renamed from meta/packages/dbus/dbus-glib_0.76.bb)2
7 files changed, 16 insertions, 2 deletions
diff --git a/meta/packages/dbus/dbus-glib-0.78/fix_asneeded.patch b/meta/packages/dbus/dbus-glib-0.78/fix_asneeded.patch
new file mode 100644
index 000000000..a0aaec372
--- /dev/null
+++ b/meta/packages/dbus/dbus-glib-0.78/fix_asneeded.patch
@@ -0,0 +1,13 @@
+Index: dbus-glib-0.78/dbus/Makefile.am
+===================================================================
+--- dbus-glib-0.78.orig/dbus/Makefile.am 2009-01-15 15:14:29.000000000 +0000
++++ dbus-glib-0.78/dbus/Makefile.am 2009-01-15 15:14:46.000000000 +0000
+@@ -104,7 +104,7 @@
+
+ dbus_bash_completion_helper_SOURCES = \
+ dbus-bash-completion-helper.c
+-dbus_bash_completion_helper_LDADD=$(DBUS_LIBS) $(DBUS_GLIB_LIBS) -lexpat libdbus-gtool.la libdbus-glib-1.la
++dbus_bash_completion_helper_LDADD=$(DBUS_LIBS) $(DBUS_GLIB_LIBS) libdbus-gtool.la libdbus-glib-1.la -lexpat
+
+
+ EXTRA_DIST=dbus-gmarshal.list make-dbus-glib-error-switch.sh make-dbus-glib-error-enum.sh dbus-bash-completion.sh.in
diff --git a/meta/packages/dbus/dbus-glib-0.76/native-binding-tool.patch b/meta/packages/dbus/dbus-glib-0.78/native-binding-tool.patch
index 1bdac5a39..1bdac5a39 100644
--- a/meta/packages/dbus/dbus-glib-0.76/native-binding-tool.patch
+++ b/meta/packages/dbus/dbus-glib-0.78/native-binding-tool.patch
diff --git a/meta/packages/dbus/dbus-glib-0.76/no-examples.patch b/meta/packages/dbus/dbus-glib-0.78/no-examples.patch
index 483153db7..483153db7 100644
--- a/meta/packages/dbus/dbus-glib-0.76/no-examples.patch
+++ b/meta/packages/dbus/dbus-glib-0.78/no-examples.patch
diff --git a/meta/packages/dbus/dbus-glib-0.76/run-with-tmp-session-bus.patch b/meta/packages/dbus/dbus-glib-0.78/run-with-tmp-session-bus.patch
index a04f404f7..a04f404f7 100644
--- a/meta/packages/dbus/dbus-glib-0.76/run-with-tmp-session-bus.patch
+++ b/meta/packages/dbus/dbus-glib-0.78/run-with-tmp-session-bus.patch
diff --git a/meta/packages/dbus/dbus-glib-native_0.76.bb b/meta/packages/dbus/dbus-glib-native_0.78.bb
index fe69b2dfc..81be0e123 100644
--- a/meta/packages/dbus/dbus-glib-native_0.76.bb
+++ b/meta/packages/dbus/dbus-glib-native_0.78.bb
@@ -3,7 +3,7 @@ inherit native
DEPENDS = "glib-2.0-native dbus-native"
-PR = "r3"
+PR = "r0"
SRC_URI += "file://run-with-tmp-session-bus.patch;patch=1"
diff --git a/meta/packages/dbus/dbus-glib.inc b/meta/packages/dbus/dbus-glib.inc
index 6a922b6da..7d811f912 100644
--- a/meta/packages/dbus/dbus-glib.inc
+++ b/meta/packages/dbus/dbus-glib.inc
@@ -5,6 +5,7 @@ LICENSE = "GPL"
DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native dbus"
SRC_URI = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \
+ file://fix_asneeded.patch;patch=1 \
file://no-examples.patch;patch=1"
inherit autotools_stage pkgconfig gettext
diff --git a/meta/packages/dbus/dbus-glib_0.76.bb b/meta/packages/dbus/dbus-glib_0.78.bb
index 22b882e2f..f7a176055 100644
--- a/meta/packages/dbus/dbus-glib_0.76.bb
+++ b/meta/packages/dbus/dbus-glib_0.78.bb
@@ -1,6 +1,6 @@
require dbus-glib.inc
-PR = "r4"
+PR = "r0"
do_configure_prepend() {
cp -p ${STAGING_DATADIR_NATIVE}/dbus/dbus-glib-bindings.h ${S}/tools/