diff options
Diffstat (limited to 'meta')
-rw-r--r-- | meta/packages/dbus/dbus-glib-0.78/native-binding-tool.patch | 19 | ||||
-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 1bdac5a39..000000000 --- a/meta/packages/dbus/dbus-glib-0.78/native-binding-tool.patch +++ /dev/null @@ -1,19 +0,0 @@ -Use the dbus-binding-tool from PATH, not the generated one. - -RP - 12/1/09 - -Index: dbus-glib-0.76/tools/Makefile.am -=================================================================== ---- dbus-glib-0.76.orig/tools/Makefile.am 2009-01-12 10:11:02.000000000 +0000 -+++ dbus-glib-0.76/tools/Makefile.am 2009-01-12 10:12:01.000000000 +0000 -@@ -3,8 +3,8 @@ - nodist_libdbus_glib_HEADERS = dbus-glib-bindings.h - libdbus_glibdir = $(includedir)/dbus-1.0/dbus - --dbus-glib-bindings.h: dbus-bus-introspect.xml $(top_builddir)/dbus/dbus-binding-tool$(EXEEXT) -- $(top_builddir)/dbus/dbus-binding-tool --mode=glib-client --prefix=dbus_bus --output=dbus-glib-bindings.h dbus-bus-introspect.xml -+dbus-glib-bindings.h: dbus-bus-introspect.xml -+ dbus-binding-tool --mode=glib-client --prefix=dbus_bus --output=dbus-glib-bindings.h dbus-bus-introspect.xml - - BUILT_SOURCES = dbus-glib-bindings.h dbus-bus-introspect.xml - 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 a0aaec372..eba4375db 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 @@ -Index: dbus-glib-0.78/dbus/Makefile.am +Index: dbus-glib-0.82/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-glib-0.82.orig/dbus/Makefile.am 2009-07-16 15:54:44.000000000 +0100 ++++ dbus-glib-0.82/dbus/Makefile.am 2009-12-11 09:27:20.000000000 +0000 +@@ -105,7 +105,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 +-dbus_bash_completion_helper_LDADD=$(DBUS_LIBS) $(DBUS_GLIB_LIBS) $(builddir)/libdbus-gtool.la -lexpat $(builddir)/libdbus-glib-1.la ++dbus_bash_completion_helper_LDADD=$(DBUS_LIBS) $(DBUS_GLIB_LIBS) $(builddir)/libdbus-gtool.la $(builddir)/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.78/no-examples.patch b/meta/packages/dbus/dbus-glib-0.82/no-examples.patch index 483153db7..483153db7 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 a04f404f7..a04f404f7 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 8395fced0..8395fced0 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 f7a176055..f54023684 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() { cp -p ${STAGING_DATADIR_NATIVE}/dbus/dbus-glib-bindings.h ${S}/tools/ } -SRC_URI += "file://native-binding-tool.patch;patch=1" +EXTRA_OECONF += "--with-dbus-binding-tool=${STAGING_BINDIR_NATIVE}/dbus-binding-tool" |