summaryrefslogtreecommitdiffstats
path: root/meta/packages/dbus
diff options
context:
space:
mode:
authorRichard Purdie <rpurdie@linux.intel.com>2009-12-11 09:33:21 +0000
committerRichard Purdie <rpurdie@linux.intel.com>2009-12-11 09:33:21 +0000
commit1805dbd8496df246385f42f1edfde8abf763dc17 (patch)
tree534d2203e1861a336aa484671becf65e9f06e1a5 /meta/packages/dbus
parent12691f24e578323d9d6903db3989b343cb59a899 (diff)
downloadpoky-1805dbd8496df246385f42f1edfde8abf763dc17.tar.gz
dbus-glib: 0.78 -> 0.82
Signed-off-by: Richard Purdie <rpurdie@linux.intel.com>
Diffstat (limited to 'meta/packages/dbus')
-rw-r--r--meta/packages/dbus/dbus-glib-0.78/native-binding-tool.patch19
-rw-r--r--meta/packages/dbus/dbus-glib-0.82/fix_asneeded.patch (renamed from meta/packages/dbus/dbus-glib-0.78/fix_asneeded.patch)12
-rw-r--r--meta/packages/dbus/dbus-glib-0.82/no-examples.patch (renamed from meta/packages/dbus/dbus-glib-0.78/no-examples.patch)0
-rw-r--r--meta/packages/dbus/dbus-glib-0.82/run-with-tmp-session-bus.patch (renamed from meta/packages/dbus/dbus-glib-0.78/run-with-tmp-session-bus.patch)0
-rw-r--r--meta/packages/dbus/dbus-glib-native_0.82.bb (renamed from meta/packages/dbus/dbus-glib-native_0.78.bb)0
-rw-r--r--meta/packages/dbus/dbus-glib_0.82.bb (renamed from meta/packages/dbus/dbus-glib_0.78.bb)2
6 files changed, 7 insertions, 26 deletions
diff --git a/meta/packages/dbus/dbus-glib-0.78/native-binding-tool.patch b/meta/packages/dbus/dbus-glib-0.78/native-binding-tool.patch
deleted file mode 100644
index 1bdac5a390..0000000000
--- a/meta/packages/dbus/dbus-glib-0.78/native-binding-tool.patch
+++ /dev/null
@@ -1,19 +0,0 @@
1Use the dbus-binding-tool from PATH, not the generated one.
2
3RP - 12/1/09
4
5Index: dbus-glib-0.76/tools/Makefile.am
6===================================================================
7--- dbus-glib-0.76.orig/tools/Makefile.am 2009-01-12 10:11:02.000000000 +0000
8+++ dbus-glib-0.76/tools/Makefile.am 2009-01-12 10:12:01.000000000 +0000
9@@ -3,8 +3,8 @@
10 nodist_libdbus_glib_HEADERS = dbus-glib-bindings.h
11 libdbus_glibdir = $(includedir)/dbus-1.0/dbus
12
13-dbus-glib-bindings.h: dbus-bus-introspect.xml $(top_builddir)/dbus/dbus-binding-tool$(EXEEXT)
14- $(top_builddir)/dbus/dbus-binding-tool --mode=glib-client --prefix=dbus_bus --output=dbus-glib-bindings.h dbus-bus-introspect.xml
15+dbus-glib-bindings.h: dbus-bus-introspect.xml
16+ dbus-binding-tool --mode=glib-client --prefix=dbus_bus --output=dbus-glib-bindings.h dbus-bus-introspect.xml
17
18 BUILT_SOURCES = dbus-glib-bindings.h dbus-bus-introspect.xml
19
diff --git a/meta/packages/dbus/dbus-glib-0.78/fix_asneeded.patch b/meta/packages/dbus/dbus-glib-0.82/fix_asneeded.patch
index a0aaec3720..eba4375db2 100644
--- a/meta/packages/dbus/dbus-glib-0.78/fix_asneeded.patch
+++ b/meta/packages/dbus/dbus-glib-0.82/fix_asneeded.patch
@@ -1,13 +1,13 @@
1Index: dbus-glib-0.78/dbus/Makefile.am 1Index: dbus-glib-0.82/dbus/Makefile.am
2=================================================================== 2===================================================================
3--- dbus-glib-0.78.orig/dbus/Makefile.am 2009-01-15 15:14:29.000000000 +0000 3--- dbus-glib-0.82.orig/dbus/Makefile.am 2009-07-16 15:54:44.000000000 +0100
4+++ dbus-glib-0.78/dbus/Makefile.am 2009-01-15 15:14:46.000000000 +0000 4+++ dbus-glib-0.82/dbus/Makefile.am 2009-12-11 09:27:20.000000000 +0000
5@@ -104,7 +104,7 @@ 5@@ -105,7 +105,7 @@
6 6
7 dbus_bash_completion_helper_SOURCES = \ 7 dbus_bash_completion_helper_SOURCES = \
8 dbus-bash-completion-helper.c 8 dbus-bash-completion-helper.c
9-dbus_bash_completion_helper_LDADD=$(DBUS_LIBS) $(DBUS_GLIB_LIBS) -lexpat libdbus-gtool.la libdbus-glib-1.la 9-dbus_bash_completion_helper_LDADD=$(DBUS_LIBS) $(DBUS_GLIB_LIBS) $(builddir)/libdbus-gtool.la -lexpat $(builddir)/libdbus-glib-1.la
10+dbus_bash_completion_helper_LDADD=$(DBUS_LIBS) $(DBUS_GLIB_LIBS) libdbus-gtool.la libdbus-glib-1.la -lexpat 10+dbus_bash_completion_helper_LDADD=$(DBUS_LIBS) $(DBUS_GLIB_LIBS) $(builddir)/libdbus-gtool.la $(builddir)/libdbus-glib-1.la -lexpat
11 11
12 12
13 EXTRA_DIST=dbus-gmarshal.list make-dbus-glib-error-switch.sh make-dbus-glib-error-enum.sh dbus-bash-completion.sh.in 13 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.78/no-examples.patch b/meta/packages/dbus/dbus-glib-0.82/no-examples.patch
index 483153db74..483153db74 100644
--- a/meta/packages/dbus/dbus-glib-0.78/no-examples.patch
+++ b/meta/packages/dbus/dbus-glib-0.82/no-examples.patch
diff --git a/meta/packages/dbus/dbus-glib-0.78/run-with-tmp-session-bus.patch b/meta/packages/dbus/dbus-glib-0.82/run-with-tmp-session-bus.patch
index a04f404f75..a04f404f75 100644
--- a/meta/packages/dbus/dbus-glib-0.78/run-with-tmp-session-bus.patch
+++ b/meta/packages/dbus/dbus-glib-0.82/run-with-tmp-session-bus.patch
diff --git a/meta/packages/dbus/dbus-glib-native_0.78.bb b/meta/packages/dbus/dbus-glib-native_0.82.bb
index 8395fced0c..8395fced0c 100644
--- a/meta/packages/dbus/dbus-glib-native_0.78.bb
+++ b/meta/packages/dbus/dbus-glib-native_0.82.bb
diff --git a/meta/packages/dbus/dbus-glib_0.78.bb b/meta/packages/dbus/dbus-glib_0.82.bb
index f7a1760557..f54023684b 100644
--- a/meta/packages/dbus/dbus-glib_0.78.bb
+++ b/meta/packages/dbus/dbus-glib_0.82.bb
@@ -6,4 +6,4 @@ do_configure_prepend() {
6 cp -p ${STAGING_DATADIR_NATIVE}/dbus/dbus-glib-bindings.h ${S}/tools/ 6 cp -p ${STAGING_DATADIR_NATIVE}/dbus/dbus-glib-bindings.h ${S}/tools/
7} 7}
8 8
9SRC_URI += "file://native-binding-tool.patch;patch=1" 9EXTRA_OECONF += "--with-dbus-binding-tool=${STAGING_BINDIR_NATIVE}/dbus-binding-tool"