diff options
Diffstat (limited to 'dev-libs/libindicate')
7 files changed, 81 insertions, 28 deletions
diff --git a/dev-libs/libindicate/ChangeLog b/dev-libs/libindicate/ChangeLog index 864a894f1442..8da322b104ba 100644 --- a/dev-libs/libindicate/ChangeLog +++ b/dev-libs/libindicate/ChangeLog @@ -1,6 +1,14 @@ # ChangeLog for dev-libs/libindicate # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate/ChangeLog,v 1.18 2011/08/20 10:39:30 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate/ChangeLog,v 1.19 2011/08/28 17:36:11 jlec Exp $ + + 28 Aug 2011; Justin Lecher <jlec@gentoo.org> libindicate-0.2.3-r1.ebuild, + libindicate-0.4.4.ebuild, libindicate-0.4.4-r1.ebuild, + libindicate-0.4.4-r2.ebuild, + +files/libindicate-0.4.4-as-needed-introspection.patch, + +files/libindicate-0.4.4-parallel.patch: + Fix for parallel build, #354495; Fix for forced as-needed with introspection, + #379543; removed src_test as it duplicates the default function 20 Aug 2011; Justin Lecher <jlec@gentoo.org> libindicate-0.4.4-r2.ebuild, metadata.xml: diff --git a/dev-libs/libindicate/files/libindicate-0.4.4-as-needed-introspection.patch b/dev-libs/libindicate/files/libindicate-0.4.4-as-needed-introspection.patch new file mode 100644 index 000000000000..fda48a86f65c --- /dev/null +++ b/dev-libs/libindicate/files/libindicate-0.4.4-as-needed-introspection.patch @@ -0,0 +1,30 @@ + libindicate-gtk/Makefile.am | 2 +- + libindicate/Makefile.am | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libindicate-gtk/Makefile.am b/libindicate-gtk/Makefile.am +index 9e73402..4527996 100644 +--- a/libindicate-gtk/Makefile.am ++++ b/libindicate-gtk/Makefile.am +@@ -56,7 +56,7 @@ Indicate-Gtk-0.2.gir: $(INTROSPECTION_SCANNER) $(irscanner_headers) Makefile.am + --include=GLib-2.0 \ + --include=GdkPixbuf-2.0 \ + --include=Indicate-0.2 \ +- --library=indicate-gtk \ ++ --library=libindicate-gtk.la \ + --add-include-path=$(top_builddir)/libindicate \ + $(LIBINDICATEGTK_CFLAGS) -I$(srcdir) -I$(top_srcdir) \ + --output Indicate-Gtk-0.2.gir $(irscanner_headers) \ +diff --git a/libindicate/Makefile.am b/libindicate/Makefile.am +index 3703299..22cf1e2 100644 +--- a/libindicate/Makefile.am ++++ b/libindicate/Makefile.am +@@ -119,7 +119,7 @@ Indicate-0.2.gir: $(INTROSPECTION_SCANNER) $(irscanner_headers) Makefile.am + --include=GObject-2.0 \ + --include=GLib-2.0 \ + --include=Dbusmenu-Glib-0.2 \ +- --library=indicate \ ++ --library=libindicate.la \ + $(LIBINDICATE_CFLAGS) -I $(srcdir) -I $(top_srcdir) \ + --output Indicate-0.2.gir $(irscanner_headers) \ + $(addprefix --c-include=libindicate/, $(indicate_headers)) diff --git a/dev-libs/libindicate/files/libindicate-0.4.4-parallel.patch b/dev-libs/libindicate/files/libindicate-0.4.4-parallel.patch new file mode 100644 index 000000000000..bf0828e5ac7b --- /dev/null +++ b/dev-libs/libindicate/files/libindicate-0.4.4-parallel.patch @@ -0,0 +1,30 @@ + libindicate-gtk/Makefile.am | 2 +- + libindicate/Makefile.am | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libindicate-gtk/Makefile.am b/libindicate-gtk/Makefile.am +index 4527996..3fd9c5e 100644 +--- a/libindicate-gtk/Makefile.am ++++ b/libindicate-gtk/Makefile.am +@@ -47,7 +47,7 @@ BUILT_GIRSOURCES = + + irscanner_headers = $(patsubst %,$(srcdir)/%,$(indicate_gtk_headers)) + +-Indicate-Gtk-0.2.gir: $(INTROSPECTION_SCANNER) $(irscanner_headers) Makefile.am ++Indicate-Gtk-0.2.gir: $(INTROSPECTION_SCANNER) $(irscanner_headers) libindicate-gtk.la Makefile.am + $(INTROSPECTION_SCANNER) \ + -v --namespace Indicate \ + --nsversion=0.2 \ +diff --git a/libindicate/Makefile.am b/libindicate/Makefile.am +index 22cf1e2..8712b4e 100644 +--- a/libindicate/Makefile.am ++++ b/libindicate/Makefile.am +@@ -111,7 +111,7 @@ BUILT_GIRSOURCES = + + irscanner_headers = $(patsubst %,$(srcdir)/%,$(indicate_headers)) + +-Indicate-0.2.gir: $(INTROSPECTION_SCANNER) $(irscanner_headers) Makefile.am ++Indicate-0.2.gir: $(INTROSPECTION_SCANNER) $(irscanner_headers) libindicate.la Makefile.am + $(INTROSPECTION_SCANNER) \ + -v --namespace Indicate \ + --nsversion=0.2 \ diff --git a/dev-libs/libindicate/libindicate-0.2.3-r1.ebuild b/dev-libs/libindicate/libindicate-0.2.3-r1.ebuild index 64ceb9c000b4..6654875b58c4 100644 --- a/dev-libs/libindicate/libindicate-0.2.3-r1.ebuild +++ b/dev-libs/libindicate/libindicate-0.2.3-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2010 Gentoo Foundation +# Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate/libindicate-0.2.3-r1.ebuild,v 1.3 2010/06/06 00:37:37 reavertm Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate/libindicate-0.2.3-r1.ebuild,v 1.4 2011/08/28 17:36:11 jlec Exp $ EAPI=2 @@ -46,10 +46,6 @@ src_configure() { econf $my_conf } -src_test() { - emake check || die "testsuite failed" -} - src_install() { emake DESTDIR="${D}" install || die "make install failed" dodoc AUTHORS || die "dodoc failed" diff --git a/dev-libs/libindicate/libindicate-0.4.4-r1.ebuild b/dev-libs/libindicate/libindicate-0.4.4-r1.ebuild index ae611f5226a8..75c3bfafb7b4 100644 --- a/dev-libs/libindicate/libindicate-0.4.4-r1.ebuild +++ b/dev-libs/libindicate/libindicate-0.4.4-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate/libindicate-0.4.4-r1.ebuild,v 1.2 2011/08/19 19:18:35 nirbheek Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate/libindicate-0.4.4-r1.ebuild,v 1.3 2011/08/28 17:36:11 jlec Exp $ EAPI=2 @@ -67,12 +67,7 @@ src_configure() { --disable-dependency-tracking \ --docdir=/usr/share/doc/${PF} \ $(use_enable doc) \ - $(use_enable introspection) \ - || die "configure failed" -} - -src_test() { - emake check || die "testsuite failed" + $(use_enable introspection) } src_install() { diff --git a/dev-libs/libindicate/libindicate-0.4.4-r2.ebuild b/dev-libs/libindicate/libindicate-0.4.4-r2.ebuild index ddc0c6c4701b..5d8cf68d92aa 100644 --- a/dev-libs/libindicate/libindicate-0.4.4-r2.ebuild +++ b/dev-libs/libindicate/libindicate-0.4.4-r2.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate/libindicate-0.4.4-r2.ebuild,v 1.5 2011/08/20 10:39:30 jlec Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate/libindicate-0.4.4-r2.ebuild,v 1.6 2011/08/28 17:36:11 jlec Exp $ EAPI=2 @@ -58,6 +58,10 @@ src_prepare() { epatch "${FILESDIR}/${P}-fix-python-version.patch" # Fix parallel-make for mono bindings, launchpad-bug #709954 epatch "${FILESDIR}/${P}-mono-parallel-make.patch" + # Fix for forced as-needed #379543 + epatch "${FILESDIR}/${P}-as-needed-introspection.patch" + # Fix for forced as-needed #354495 + epatch "${FILESDIR}/${P}-parallel.patch" # Drop -Werror in a release sed -e 's:-Werror::g' -i libindicate/Makefile.am libindicate-gtk/Makefile.am || die "sed failed" # Find slotted vapigen @@ -72,12 +76,7 @@ src_configure() { --disable-dependency-tracking \ --docdir=/usr/share/doc/${PF} \ $(use_enable doc) \ - $(use_enable introspection) \ - || die "configure failed" -} - -src_test() { - emake check || die "testsuite failed" + $(use_enable introspection) } src_install() { diff --git a/dev-libs/libindicate/libindicate-0.4.4.ebuild b/dev-libs/libindicate/libindicate-0.4.4.ebuild index f812b18e16dc..6b1d9302edb4 100644 --- a/dev-libs/libindicate/libindicate-0.4.4.ebuild +++ b/dev-libs/libindicate/libindicate-0.4.4.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate/libindicate-0.4.4.ebuild,v 1.1 2011/01/17 09:34:20 tampakrap Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libindicate/libindicate-0.4.4.ebuild,v 1.2 2011/08/28 17:36:11 jlec Exp $ EAPI=2 @@ -65,12 +65,7 @@ src_configure() { econf \ --disable-dependency-tracking \ --docdir=/usr/share/doc/${PF} \ - $(use_enable doc) \ - || die "configure failed" -} - -src_test() { - emake check || die "testsuite failed" + $(use_enable doc) } src_install() { |