aboutsummaryrefslogtreecommitdiffstats
path: root/recipes-core
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2010-12-23 20:24:51 +0100
committerKoen Kooi <koen@dominion.thruhere.net>2010-12-23 20:24:51 +0100
commit6661f4da6e46dcb9b2c95dd6914cc06218a4a8bc (patch)
treec04600464e8a70a7b2b0188ae74195f78fee4af5 /recipes-core
parent7eb7dce48ba082c30f1fceced04c275420158b9a (diff)
downloadmeta-openembedded-contrib-6661f4da6e46dcb9b2c95dd6914cc06218a4a8bc.tar.gz
dbus-glib: drop from layer and the one in yocto core
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'recipes-core')
-rw-r--r--recipes-core/dbus/dbus-glib-0.86/no-examples.patch8
-rw-r--r--recipes-core/dbus/dbus-glib-0.86/no-introspect.patch12
-rw-r--r--recipes-core/dbus/dbus-glib-0.86/run-with-tmp-session-bus.patch24
-rw-r--r--recipes-core/dbus/dbus-glib.inc53
-rw-r--r--recipes-core/dbus/dbus-glib_0.86.bb14
5 files changed, 0 insertions, 111 deletions
diff --git a/recipes-core/dbus/dbus-glib-0.86/no-examples.patch b/recipes-core/dbus/dbus-glib-0.86/no-examples.patch
deleted file mode 100644
index 483153db74..0000000000
--- a/recipes-core/dbus/dbus-glib-0.86/no-examples.patch
+++ /dev/null
@@ -1,8 +0,0 @@
---- dbus-glib-0.70/dbus/Makefile.am.orig 2006-07-23 16:04:43.000000000 +0200
-+++ dbus-glib-0.70/dbus/Makefile.am 2006-07-23 16:04:52.000000000 +0200
-@@ -1,4 +1,4 @@
--SUBDIRS = . examples
-+SUBDIRS = .
-
- INCLUDES=-I$(top_srcdir) $(DBUS_CFLAGS) $(DBUS_GLIB_CFLAGS) $(DBUS_GLIB_TOOL_CFLAGS) -DDBUS_COMPILATION=1 -DDBUS_LOCALEDIR=\"$(prefix)/@DATADIRNAME@/locale\"
-
diff --git a/recipes-core/dbus/dbus-glib-0.86/no-introspect.patch b/recipes-core/dbus/dbus-glib-0.86/no-introspect.patch
deleted file mode 100644
index 84c22fb8c5..0000000000
--- a/recipes-core/dbus/dbus-glib-0.86/no-introspect.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- /tmp/Makefile.am 2010-03-28 12:24:13.000000000 +0200
-+++ dbus-glib-0.86/tools/Makefile.am 2010-03-28 12:24:30.000000000 +0200
-@@ -3,9 +3,6 @@
- nodist_libdbus_glib_HEADERS = dbus-glib-bindings.h
- libdbus_glibdir = $(includedir)/dbus-1.0/dbus
-
--dbus-glib-bindings.h: $(top_srcdir)/dbus-bus-introspect.xml $(top_builddir)/dbus/dbus-binding-tool$(EXEEXT)
-- $(DBUS_BINDING_TOOL) --mode=glib-client --prefix=dbus_bus --output=dbus-glib-bindings.h $(top_srcdir)/dbus-bus-introspect.xml
--
- BUILT_SOURCES = dbus-glib-bindings.h
-
- EXTRA_DIST = run-with-tmp-session-bus.sh session.conf
diff --git a/recipes-core/dbus/dbus-glib-0.86/run-with-tmp-session-bus.patch b/recipes-core/dbus/dbus-glib-0.86/run-with-tmp-session-bus.patch
deleted file mode 100644
index a04f404f75..0000000000
--- a/recipes-core/dbus/dbus-glib-0.86/run-with-tmp-session-bus.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Index: dbus-glib-0.76/tools/run-with-tmp-session-bus.sh
-===================================================================
---- dbus-glib-0.76.orig/tools/run-with-tmp-session-bus.sh 2008-06-13 16:31:54.000000000 +0100
-+++ dbus-glib-0.76/tools/run-with-tmp-session-bus.sh 2008-06-13 16:32:54.000000000 +0100
-@@ -30,17 +30,15 @@
- echo "escaped service dir is: $ESCAPED_SERVICE_DIR" >&2
-
- ## create a configuration file based on the standard session.conf
--cat $DBUS_TOP_SRCDIR/tools/session.conf | \
-+cat $datadir/tools/session.conf | \
- sed -e 's/<servicedir>.*$/<servicedir>'$ESCAPED_SERVICE_DIR'<\/servicedir>/g' | \
- sed -e 's/<include.*$//g' \
- > $CONFIG_FILE
-
- echo "Created configuration file $CONFIG_FILE" >&2
-
--PATH=$DBUS_TOP_BUILDDIR/bus:$PATH
--export PATH
- ## the libtool script found by the path search should already do this, but
--LD_LIBRARY_PATH=$DBUS_TOP_BUILDDIR/dbus/.libs:$LD_LIBRARY_PATH
-+LD_LIBRARY_PATH=$libdir:$LD_LIBRARY_PATH
- export PATH
- unset DBUS_SESSION_BUS_ADDRESS
- unset DBUS_SESSION_BUS_PID
diff --git a/recipes-core/dbus/dbus-glib.inc b/recipes-core/dbus/dbus-glib.inc
deleted file mode 100644
index c1c1813d9a..0000000000
--- a/recipes-core/dbus/dbus-glib.inc
+++ /dev/null
@@ -1,53 +0,0 @@
-DESCRIPTION = "GLib bindings for the dbus message bus system"
-HOMEPAGE = "http://www.freedesktop.org/Software/dbus"
-SECTION = "libs"
-LICENSE = "GPLv2+ AFLv2.1"
-
-DEPENDS = "expat glib-2.0 virtual/libintl dbus-glib-native dbus"
-DEPENDS_virtclass-native = "expat-native glib-2.0-native dbus-native"
-
-INC_PR = "r2"
-
-
-SRC_URI = "\
- http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz \
- file://no-examples.patch \
- file://no-introspect.patch \
- "
-
-SRC_URI_virtclass-native = "http://dbus.freedesktop.org/releases/dbus-glib/dbus-glib-${PV}.tar.gz"
-
-inherit autotools pkgconfig gettext
-
-BBCLASSEXTEND = "native"
-
-do_configure_prepend() {
- install -m 0644 ${STAGING_DATADIR_NATIVE}/dbus/dbus-bus-introspect.xml ${S}/tools/
- install -m 0644 ${STAGING_DATADIR_NATIVE}/dbus/dbus-glib-bindings.h ${S}/tools/
-
-}
-
-do_configure_virtclass-native() {
- autotools_do_configure
-}
-
-do_install_virtclass-native() {
- autotools_do_install
- install -d ${D}${datadir}/dbus
- install -m 0644 tools/dbus-glib-bindings.h ${D}${datadir}/dbus
-}
-
-PACKAGES += "${PN}-bash-completion"
-
-FILES_${PN}-bash-completion = "\
- ${sysconfdir}/bash_completion.d \
- ${prefix}/libexec/dbus-bash-completion-helper \
-"
-
-FILES_${PN} = "${libdir}/lib*.so.*"
-
-FILES_${PN}-dev += "\
- ${libdir}/dbus-1.0/include \
- ${bindir}/dbus-glib-tool \
- ${bindir}/dbus-binding-tool \
-"
diff --git a/recipes-core/dbus/dbus-glib_0.86.bb b/recipes-core/dbus/dbus-glib_0.86.bb
deleted file mode 100644
index ce87d5d43e..0000000000
--- a/recipes-core/dbus/dbus-glib_0.86.bb
+++ /dev/null
@@ -1,14 +0,0 @@
-require dbus-glib.inc
-
-PR = "${INC_PR}.1"
-
-SRC_URI_virtclass-native += "file://run-with-tmp-session-bus.patch"
-
-do_install_virtclass-native_prepend() {
- install -d ${D}${datadir}/dbus
- install -m 0644 dbus-bus-introspect.xml ${D}${datadir}/dbus
-}
-
-SRC_URI[md5sum] = "cd0ab148fb0c786fc88be49d19971f50"
-SRC_URI[sha256sum] = "5351a6e7f38ffc641c34b4a4cdd9bed1c1dc7043a501096bac00a2876ea90bdc"
-