diff options
author | Sven 'sleipnir' Rebhan <odinshorse@googlemail.com> | 2010-01-25 19:27:53 +0000 |
---|---|---|
committer | Sven 'sleipnir' Rebhan <odinshorse@googlemail.com> | 2010-01-25 19:27:53 +0000 |
commit | 3e46d0d028f98f930fc16f69975a6a76fa450f0f (patch) | |
tree | 1d52723b3381b12adaf46ff30361034ffc636535 | |
parent | Keyword newer fixed version of dbus-glib. (diff) | |
download | embedded-cross-3e46d0d028f98f930fc16f69975a6a76fa450f0f.tar.gz embedded-cross-3e46d0d028f98f930fc16f69975a6a76fa450f0f.tar.bz2 embedded-cross-3e46d0d028f98f930fc16f69975a6a76fa450f0f.zip |
Remove older dbus-glib-0.80, we have 0.82 instead and save a few patches.
4 files changed, 0 insertions, 263 deletions
diff --git a/dev-libs/dbus-glib/dbus-glib-0.80.ebuild b/dev-libs/dbus-glib/dbus-glib-0.80.ebuild deleted file mode 100644 index 205b8b4..0000000 --- a/dev-libs/dbus-glib/dbus-glib-0.80.ebuild +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright 1999-2009 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/dbus-glib/dbus-glib-0.80.ebuild,v 1.1 2009/03/08 19:32:07 eva Exp $ - -EAPI="2" - -inherit eutils bash-completion autotools - -DESCRIPTION="D-Bus bindings for glib" -HOMEPAGE="http://dbus.freedesktop.org/" -SRC_URI="http://dbus.freedesktop.org/releases/${PN}/${P}.tar.gz" - -LICENSE="|| ( GPL-2 AFL-2.1 )" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" -IUSE="bash-completion debug doc test" - -RDEPEND=">=sys-apps/dbus-1.1.0 - >=dev-libs/glib-2.10 - >=dev-libs/expat-1.95.8" -DEPEND="${RDEPEND} - dev-util/pkgconfig - sys-devel/gettext - doc? ( - app-doc/doxygen - app-text/xmlto - >=dev-util/gtk-doc-1.4 ) - dev-util/gtk-doc-am" - -BASH_COMPLETION_NAME="dbus" - -src_prepare() { - # description ? - epatch "${FILESDIR}"/${PN}-introspection.patch - - # submitted upstream to bug #19325 - #epatch "${FILESDIR}"/${PN}-0.78-fix-building-tests.patch - - epatch "${FILESDIR}/${PN}-crosscompile-dbus-binding-tool.patch" - epatch "${FILESDIR}/${PN}-configurable-examples.patch" - - eautoreconf || die "eautoreconf failed" -} - -src_configure() { - econf \ - $(use_enable bash-completion) \ - $(use_enable debug verbose-mode) \ - $(use_enable debug checks) \ - $(use_enable debug asserts) \ - $(use_enable test tests) \ - $(use_with test test-socket-dir "${T}"/dbus-test-socket) \ - --localstatedir=/var \ - $(use_enable doc doxygen-docs) \ - $(use_enable doc gtk-doc) -} - -src_install() { - emake DESTDIR="${D}" install || die "make install failed" - - dodoc AUTHORS ChangeLog HACKING NEWS README || die "dodoc failed." - - #FIXME: We need --with-bash-completion-dir - if use bash-completion ; then - dobashcompletion "${D}"/etc/bash_completion.d/dbus-bash-completion.sh - rm -rf "${D}"/etc/bash_completion.d - fi -} diff --git a/dev-libs/dbus-glib/files/dbus-glib-0.78-fix-building-tests.patch b/dev-libs/dbus-glib/files/dbus-glib-0.78-fix-building-tests.patch deleted file mode 100644 index 081c9da..0000000 --- a/dev-libs/dbus-glib/files/dbus-glib-0.78-fix-building-tests.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 0cec05aa65a4803b0217f35af539ee2369903364 Mon Sep 17 00:00:00 2001 -From: Doug Goldstein <cardoe@gentoo.org> -Date: Tue, 30 Dec 2008 14:10:15 -0500 -Subject: [PATCH] fix building of tests - -Fix parallel make issues when building tests. Additionally fixes -potential cases where the test can be built against the system copy -instead of the currently building copy of libdbus-glib. Fix convenience -library linking against expat so it builds. - -Signed-off-by: Doug Goldstein <cardoe@gentoo.org> ---- - dbus/Makefile.am | 8 ++++---- - 1 files changed, 4 insertions(+), 4 deletions(-) - -diff --git a/dbus/Makefile.am b/dbus/Makefile.am -index 5998587..c6c9ebf 100644 ---- a/dbus/Makefile.am -+++ b/dbus/Makefile.am -@@ -72,7 +72,7 @@ libdbus_gtool_la_SOURCES = $(DBUS_GLIB_INTERNALS) \ - dbus-gparser.c \ - dbus-gparser.h - --libdbus_gtool_la_LIBADD = $(DBUS_LIBS) -+libdbus_gtool_la_LIBADD = $(DBUS_LIBS) -lexpat - - bin_PROGRAMS=dbus-binding-tool - -@@ -82,7 +82,7 @@ dbus_binding_tool_SOURCES = \ - dbus-glib-tool.h \ - dbus-glib-tool.c - --dbus_binding_tool_LDADD= libdbus-gtool.la libdbus-glib-1.la $(DBUS_LIBS) $(DBUS_GLIB_LIBS) -lexpat -+dbus_binding_tool_LDADD= $(builddir)/libdbus-gtool.la $(builddir)/libdbus-glib-1.la $(DBUS_LIBS) $(DBUS_GLIB_LIBS) -lexpat - - ## we just rebuilt these manually and check them into cvs; easier than - ## convincing automake/make to do this properly -@@ -104,7 +104,7 @@ CLEANFILES += dbus-bash-completion.sh - - dbus_bash_completion_helper_SOURCES = \ - dbus-bash-completion-helper.c --dbus_bash_completion_helper_LDADD=$(DBUS_LIBS) $(DBUS_GLIB_LIBS) libdbus-gtool.la -lexpat libdbus-glib-1.la -+dbus_bash_completion_helper_LDADD=$(DBUS_LIBS) $(DBUS_GLIB_LIBS) $(builddir)/libdbus-gtool.la -lexpat $(builddir)/libdbus-glib-1.la - - - EXTRA_DIST=dbus-gmarshal.list make-dbus-glib-error-switch.sh make-dbus-glib-error-enum.sh dbus-bash-completion.sh.in -@@ -126,7 +126,7 @@ TESTS=dbus-glib-test - dbus_glib_test_SOURCES= \ - dbus-gtest-main.c - --dbus_glib_test_LDADD= $(top_builddir)/dbus/libdbus-glib-1.la -+dbus_glib_test_LDADD= $(builddir)/libdbus-glib-1.la - - else - ### not building tests --- -1.6.0.6 - diff --git a/dev-libs/dbus-glib/files/dbus-glib-configurable-examples.patch b/dev-libs/dbus-glib/files/dbus-glib-configurable-examples.patch deleted file mode 100644 index 886de35..0000000 --- a/dev-libs/dbus-glib/files/dbus-glib-configurable-examples.patch +++ /dev/null @@ -1,46 +0,0 @@ -Add a conditional to switch off the build of the package examples. - ---- configure.ac 2008-09-17 16:15:35.000000000 +0200 -+++ configure.ac.new 2008-09-17 16:19:07.000000000 +0200 -@@ -47,6 +47,7 @@ - AC_ISC_POSIX - AC_HEADER_STDC - -+AC_ARG_ENABLE(examples, AS_HELP_STRING([--enable-examples],[compile example code]),enable_examples=$enableval,enable_examples=$USE_MAINTAINER_MODE) - AC_ARG_ENABLE(tests, AS_HELP_STRING([--enable-tests],[enable unit test code]),enable_tests=$enableval,enable_tests=$USE_MAINTAINER_MODE) - AC_ARG_ENABLE(ansi, AS_HELP_STRING([--enable-ansi],[enable -ansi -pedantic gcc flags]),enable_ansi=$enableval,enable_ansi=no) - AC_ARG_ENABLE(verbose-mode, AS_HELP_STRING([--enable-verbose-mode],[support verbose debug mode]),enable_verbose_mode=$enableval,enable_verbose_mode=$USE_MAINTAINER_MODE) -@@ -59,6 +60,13 @@ - - AC_ARG_WITH(introspect-xml, AS_HELP_STRING([--with-introspect-xml=[filename]],[Pass in a pregenerated dbus daemon introspection xml file (as generated by 'dbus-daemon --introspect') to use instead of querying the installed dbus daemon])) - -+dnl DBUS_BUILD_EXAMPLES controls wether we want to built the examples -+dnl in the examples/ subdir -+AM_CONDITIONAL(DBUS_BUILD_EXAMPLES, test x$enable_examples = xyes) -+if test x$enable_examples = xyes; then -+ AC_DEFINE(DBUS_BUILD_EXAMPLES,1,[Build example code]) -+fi -+ - dnl DBUS_BUILD_TESTS controls unit tests built in to .c files - dnl and also some stuff in the test/ subdir - AM_CONDITIONAL(DBUS_BUILD_TESTS, test x$enable_tests = xyes) -@@ -861,6 +869,7 @@ - echo " - Maintainer mode: ${USE_MAINTAINER_MODE} - gcc coverage profiling: ${enable_gcov} -+ Building example code: ${enable_examples} - Building unit tests: ${enable_tests} - Building verbose mode: ${enable_verbose_mode} - Building assertions: ${enable_asserts} - ---- dbus/Makefile.am 2008-05-14 12:21:15.000000000 +0200 -+++ dbus/Makefile.am.new 2008-09-17 16:34:01.000000000 +0200 -@@ -1,4 +1,8 @@ -+if DBUS_BUILD_EXAMPLES - SUBDIRS = . examples -+else -+SUBDIRS = -+endif - - INCLUDES = \ - -I$(top_srcdir) \ diff --git a/dev-libs/dbus-glib/files/dbus-glib-crosscompile-dbus-binding-tool.patch b/dev-libs/dbus-glib/files/dbus-glib-crosscompile-dbus-binding-tool.patch deleted file mode 100644 index 7242859..0000000 --- a/dev-libs/dbus-glib/files/dbus-glib-crosscompile-dbus-binding-tool.patch +++ /dev/null @@ -1,91 +0,0 @@ -We need to build the dbus-binding-tool with the host toolchain, -because we have to execute it later during the building process. - ---- configure.ac 2008-06-05 20:55:24.000000000 +0200 -+++ configure.ac.new 2008-09-17 14:09:58.000000000 +0200 -@@ -78,6 +78,9 @@ - AC_DEFINE(G_DISABLE_CHECKS,1,[Disable GLib public API sanity checking]) - fi - -+dnl Check if we are crosscompiling -+AM_CONDITIONAL(CROSS_COMPILING, [ test $cross_compiling = yes ]) -+ - #### gcc warning flags - - AC_DEFUN([AC_CC_TRY_FLAG], [ - ---- tools/Makefile.am 2008-09-17 16:57:54.000000000 +0200 -+++ tools/Makefile.am.new 2008-09-17 16:59:55.000000000 +0200 -@@ -3,8 +3,13 @@ - nodist_libdbus_glib_HEADERS = dbus-glib-bindings.h - libdbus_glibdir = $(includedir)/dbus-1.0/dbus - -+if CROSS_COMPILING -+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 -+else - 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 -+endif - - BUILT_SOURCES = dbus-glib-bindings.h dbus-bus-introspect.xml - - ---- dbus/examples/Makefile.am 2008-05-14 12:21:15.000000000 +0200 -+++ dbus/examples/Makefile.am.new 2008-09-17 17:04:42.000000000 +0200 -@@ -1,5 +1,11 @@ - SUBDIRS = . statemachine - -+if CROSS_COMPILING -+DBUS_BINDING_TOOL=dbus-binding-tool -+else -+DBUS_BINDING_TOOL=$(top_builddir)/dbus/dbus-binding-tool -+endif -+ - INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_builddir) \ -@@ -21,7 +27,7 @@ - BUILT_SOURCES = example-service-glue.h - - example-service-glue.h: example-service.xml -- $(LIBTOOL) --mode=execute $(top_builddir)/dbus/dbus-binding-tool --prefix=some_object --mode=glib-server --output=example-service-glue.h $(srcdir)/example-service.xml -+ $(LIBTOOL) --mode=execute $(DBUS_BINDING_TOOL) --prefix=some_object --mode=glib-server --output=example-service-glue.h $(srcdir)/example-service.xml - - - ## Makefile.am bits for another client/server pair -@@ -37,7 +43,7 @@ - BUILT_SOURCES += example-signal-emitter-glue.h - - example-signal-emitter-glue.h: example-signal-emitter.xml -- $(LIBTOOL) --mode=execute $(top_builddir)/dbus/dbus-binding-tool --prefix=test_object --mode=glib-server --output=example-signal-emitter-glue.h $(srcdir)/example-signal-emitter.xml -+ $(LIBTOOL) --mode=execute $(DBUS_BINDING_TOOL) --prefix=test_object --mode=glib-server --output=example-signal-emitter-glue.h $(srcdir)/example-signal-emitter.xml - - CLEANFILES = $(BUILT_SOURCES) - - ---- dbus/examples/statemachine/Makefile.am 2008-05-14 12:21:15.000000000 +0200 -+++ dbus/examples/statemachine/Makefile.am.new 2008-09-17 17:06:59.000000000 +0200 -@@ -1,3 +1,9 @@ -+if CROSS_COMPILING -+DBUS_BINDING_TOOL=dbus-binding-tool -+else -+DBUS_BINDING_TOOL=$(top_builddir)/dbus/dbus-binding-tool -+endif -+ - INCLUDES = \ - -I$(top_srcdir) \ - -I$(top_builddir) \ -@@ -26,10 +32,10 @@ - BUILT_SOURCES = statemachine-server-glue.h statemachine-glue.h - - statemachine-server-glue.h: statemachine-server.xml -- $(LIBTOOL) --mode=execute $(top_builddir)/dbus/dbus-binding-tool --prefix=sm_server --mode=glib-server --output=$@ $< -+ $(LIBTOOL) --mode=execute $(DBUS_BINDING_TOOL) --prefix=sm_server --mode=glib-server --output=$@ $< - - statemachine-glue.h: statemachine.xml -- $(LIBTOOL) --mode=execute $(top_builddir)/dbus/dbus-binding-tool --prefix=sm_object --mode=glib-server --output=$@ $< -+ $(LIBTOOL) --mode=execute $(DBUS_BINDING_TOOL) --prefix=sm_object --mode=glib-server --output=$@ $< - - sm-marshal.c: Makefile sm-marshal.list - @GLIB_GENMARSHAL@ --prefix=sm_marshal $(srcdir)/sm-marshal.list --header --body > $@.tmp && mv $@.tmp $@ |