Attachment #577518 for bug #686082

View | Details | Raw Unified | Return to bug 686082
Collapse All | Expand All




From 4c11ef4b824c352ab0f6b132575b017741c2b29b Mon Sep 17 00:00:00 2001
From: Denis Dupeyron <calchan@gentoo.org>
Date: Tue, 21 May 2019 13:11:36 -0600
Subject: [PATCH] Fix make breakage, bug #686082

---
 Makefile.am | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 044193c..3995689 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -633,9 +633,9 @@ endif
 endif
 
 # Code coverage
-@CODE_COVERAGE_RULES@
-CODE_COVERAGE_DIRECTORY = $(top_builddir)/gdata
-CODE_COVERAGE_LCOV_OPTIONS = --base-directory $(abs_top_srcdir)
+#@CODE_COVERAGE_RULES@
+#CODE_COVERAGE_DIRECTORY = $(top_builddir)/gdata
+#CODE_COVERAGE_LCOV_OPTIONS = --base-directory $(abs_top_srcdir)
 
 # Demo programs
 noinst_PROGRAMS = \
-- 
2.21.0





# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2

EAPI=6
VALA_USE_DEPEND="vapigen"
GNOME2_EAUTORECONF="yes"

inherit gnome2 vala

DESCRIPTION="GLib-based library for accessing online service APIs using the GData protocol"
HOMEPAGE="https://wiki.gnome.org/Projects/libgdata"

LICENSE="LGPL-2.1+"
SLOT="0/22" # subslot = libgdata soname version

IUSE="+crypt gnome-online-accounts +introspection static-libs test vala"
REQUIRED_USE="
	gnome-online-accounts? ( crypt )
	vala? ( introspection )
"

KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"

RDEPEND="
	>=dev-libs/glib-2.44.0:2
	>=dev-libs/json-glib-0.15[introspection?]
	>=dev-libs/libxml2-2:2
	>=net-libs/liboauth-0.9.4
	>=net-libs/libsoup-2.55.90:2.4[introspection?]
	>=x11-libs/gdk-pixbuf-2.14:2
	crypt? ( app-crypt/gcr:= )
	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:=[introspection?,vala?] )
	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
"
DEPEND="${RDEPEND}
	dev-util/glib-utils
	>=dev-util/gtk-doc-am-1.25
	>=dev-util/intltool-0.40
	sys-devel/autoconf-archive
	virtual/pkgconfig
	test? ( >=net-libs/uhttpmock-0.5 )
	vala? ( $(vala_depend) )
"
# eautoreconf needs autoconf-archive

PATCHES=(
	"${FILESDIR}"/${PN}-0.17.8-disable-demos.patch
	"${FILESDIR}"/${PN}-0.17.9-fix-make-breakage.patch
)

src_prepare() {
	use vala && vala_src_prepare
	gnome2_src_prepare
}

src_configure() {
	gnome2_src_configure \
		--disable-build-demos \
		$(use_enable crypt gnome) \
		$(use_enable gnome-online-accounts goa) \
		$(use_enable introspection) \
		$(use_enable vala) \
		$(use_enable static-libs static) \
		$(use_enable test always-build-tests)
}

src_test() {
	unset ORBIT_SOCKETDIR
	dbus-run-session emake check
}

Return to bug 686082

Line 0 Link Here

(-)a/dev-libs/libgdata/files/libgdata-0.17.9-fix-make-breakage.patch (+29 lines)
	1	From 4c11ef4b824c352ab0f6b132575b017741c2b29b Mon Sep 17 00:00:00 2001
	2	From: Denis Dupeyron <calchan@gentoo.org>
	3	Date: Tue, 21 May 2019 13:11:36 -0600
	4	Subject: [PATCH] Fix make breakage, bug #686082
	5
	6	---
	7	Makefile.am \| 6 +++---
	8	1 file changed, 3 insertions(+), 3 deletions(-)
	9
	10	diff --git a/Makefile.am b/Makefile.am
	11	index 044193c..3995689 100644
	12	--- a/Makefile.am
	13	+++ b/Makefile.am
	14	@@ -633,9 +633,9 @@ endif
	15	endif
	16
	17	# Code coverage
	18	-@CODE_COVERAGE_RULES@
	19	-CODE_COVERAGE_DIRECTORY = $(top_builddir)/gdata
	20	-CODE_COVERAGE_LCOV_OPTIONS = --base-directory $(abs_top_srcdir)
	21	+#@CODE_COVERAGE_RULES@
	22	+#CODE_COVERAGE_DIRECTORY = $(top_builddir)/gdata
	23	+#CODE_COVERAGE_LCOV_OPTIONS = --base-directory $(abs_top_srcdir)
	24
	25	# Demo programs
	26	noinst_PROGRAMS = \
	27	--
	28	2.21.0
	29

Line 0 Link Here

(-)a/dev-libs/libgdata/libgdata-0.17.9-r2.ebuild (-1 / +70 lines)
0	-	1	# Copyright 1999-2019 Gentoo Authors
		2	# Distributed under the terms of the GNU General Public License v2
		3
		4	EAPI=6
		5	VALA_USE_DEPEND="vapigen"
		6	GNOME2_EAUTORECONF="yes"
		7
		8	inherit gnome2 vala
		9
		10	DESCRIPTION="GLib-based library for accessing online service APIs using the GData protocol"
		11	HOMEPAGE="https://wiki.gnome.org/Projects/libgdata"
		12
		13	LICENSE="LGPL-2.1+"
		14	SLOT="0/22" # subslot = libgdata soname version
		15
		16	IUSE="+crypt gnome-online-accounts +introspection static-libs test vala"
		17	REQUIRED_USE="
		18	gnome-online-accounts? ( crypt )
		19	vala? ( introspection )
		20	"
		21
		22	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
		23
		24	RDEPEND="
		25	>=dev-libs/glib-2.44.0:2
		26	>=dev-libs/json-glib-0.15[introspection?]
		27	>=dev-libs/libxml2-2:2
		28	>=net-libs/liboauth-0.9.4
		29	>=net-libs/libsoup-2.55.90:2.4[introspection?]
		30	>=x11-libs/gdk-pixbuf-2.14:2
		31	crypt? ( app-crypt/gcr:= )
		32	gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:=[introspection?,vala?] )
		33	introspection? ( >=dev-libs/gobject-introspection-0.9.7:= )
		34	"
		35	DEPEND="${RDEPEND}
		36	dev-util/glib-utils
		37	>=dev-util/gtk-doc-am-1.25
		38	>=dev-util/intltool-0.40
		39	sys-devel/autoconf-archive
		40	virtual/pkgconfig
		41	test? ( >=net-libs/uhttpmock-0.5 )
		42	vala? ( $(vala_depend) )
		43	"
		44	# eautoreconf needs autoconf-archive
		45
		46	PATCHES=(
		47	"${FILESDIR}"/${PN}-0.17.8-disable-demos.patch
		48	"${FILESDIR}"/${PN}-0.17.9-fix-make-breakage.patch
		49	)
		50
		51	src_prepare() {
		52	use vala && vala_src_prepare
		53	gnome2_src_prepare
		54	}
		55
		56	src_configure() {
		57	gnome2_src_configure \
		58	--disable-build-demos \
		59	$(use_enable crypt gnome) \
		60	$(use_enable gnome-online-accounts goa) \
		61	$(use_enable introspection) \
		62	$(use_enable vala) \
		63	$(use_enable static-libs static) \
		64	$(use_enable test always-build-tests)
		65	}
66
67	src_test() {
68	unset ORBIT_SOCKETDIR
69	dbus-run-session emake check
70	}