aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPriit Laes <plaes@plaes.org>2009-10-12 09:32:45 +0300
committerPriit Laes <plaes@plaes.org>2009-10-12 09:32:45 +0300
commit2d96359bc68058b4d551a247f49b120bd53769a1 (patch)
treef502776509ed9967b15d7a748fd7adbe2469498a /www-client
parentgnome-extra/evolution-webcal: bump to 2.28 (diff)
downloadgnome-2d96359bc68058b4d551a247f49b120bd53769a1.tar.gz
gnome-2d96359bc68058b4d551a247f49b120bd53769a1.tar.bz2
gnome-2d96359bc68058b4d551a247f49b120bd53769a1.zip
www-client/epiphany: Fix parallel-build when introspection is enabled.
Diffstat (limited to 'www-client')
-rw-r--r--www-client/epiphany/Manifest3
-rw-r--r--www-client/epiphany/epiphany-2.28.0.ebuild8
-rw-r--r--www-client/epiphany/files/epiphany-parallel-build-fix.patch21
3 files changed, 30 insertions, 2 deletions
diff --git a/www-client/epiphany/Manifest b/www-client/epiphany/Manifest
index a008f2e2..7bd0ebdd 100644
--- a/www-client/epiphany/Manifest
+++ b/www-client/epiphany/Manifest
@@ -1,2 +1,3 @@
+AUX epiphany-parallel-build-fix.patch 732 RMD160 fa1f8dcd0d82f92e017ddba87af6e3c48c7e266a SHA1 7866cdcea827f82b31e73effbb66a34ed9ecfde7 SHA256 dab2cbe2fdf640db2b8d4592f44cfe232ed4da3342416a578b8ee038cb3296a6
DIST epiphany-2.28.0.tar.bz2 5690293 RMD160 cf897c682e210535adb55fc83d3d5dafe33ff40c SHA1 7314ef22297752199b0850127694d7f88ae83a4d SHA256 23e0379c41c378221338fb327d747f3e42b2b98cdf1512c9df7cbeab45f311ea
-EBUILD epiphany-2.28.0.ebuild 1556 RMD160 3246ed8b9724bdfdda09cf908172b96912529cce SHA1 438e32585607e05b5dd89cb5b0872e34fcdd6d47 SHA256 46c943968461a77c55caa3f69f90648949fe1aa7b759ade6c039e959ba610b27
+EBUILD epiphany-2.28.0.ebuild 1681 RMD160 d35c5e1249d52cbe896de3edc612daeb02857663 SHA1 6104662a22f94b62930458f63ebbf1f0ccf9cb7b SHA256 2bf549a00c1b92e4c2a8044ebab8b0d81e631c33700d51b77ab97d4d2535494c
diff --git a/www-client/epiphany/epiphany-2.28.0.ebuild b/www-client/epiphany/epiphany-2.28.0.ebuild
index 3d5bff32..6998b6ad 100644
--- a/www-client/epiphany/epiphany-2.28.0.ebuild
+++ b/www-client/epiphany/epiphany-2.28.0.ebuild
@@ -4,7 +4,7 @@
EAPI="2"
-inherit gnome2
+inherit autotools eutils gnome2
DESCRIPTION="GNOME webbrowser based on Webkit"
HOMEPAGE="http://www.gnome.org/projects/epiphany/"
@@ -41,10 +41,16 @@ DEPEND="${RDEPEND}
>=dev-util/pkgconfig-0.9
>=dev-util/intltool-0.40
>=app-text/gnome-doc-utils-0.3.2
+ gnome-base/gnome-common
doc? ( >=dev-util/gtk-doc-1 )"
DOCS="AUTHORS ChangeLog* HACKING MAINTAINERS NEWS README TODO"
+src_prepare() {
+ epatch ${FILESDIR}/${PN}-parallel-build-fix.patch
+ eautoreconf
+}
+
pkg_setup() {
G2CONF="${G2CONF}
--disable-scrollkeeper
diff --git a/www-client/epiphany/files/epiphany-parallel-build-fix.patch b/www-client/epiphany/files/epiphany-parallel-build-fix.patch
new file mode 100644
index 00000000..1ed44e7f
--- /dev/null
+++ b/www-client/epiphany/files/epiphany-parallel-build-fix.patch
@@ -0,0 +1,21 @@
+From 68bbd6ce05ee700ea1c77daae4c063ab7ae5b853 Mon Sep 17 00:00:00 2001
+From: Priit Laes <plaes@plaes.org>
+Date: Sun, 27 Sep 2009 14:02:31 +0000
+Subject: src/Makefile.am: Fix parallel-build issue when introspection enabled.
+
+---
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 456d63b..9b7872a 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -315,7 +315,7 @@ EPHY_GIR_H_FILES = \
+ $(top_srcdir)/src/ephy-window.h \
+ $(NULL)
+
+-Epiphany-$(EPIPHANY_API_VERSION).gir: $(G_IR_SCANNER) $(EPHY_GIR_H_FILES)
++Epiphany-$(EPIPHANY_API_VERSION).gir: $(G_IR_SCANNER) $(EPHY_GIR_H_FILES) epiphany
+ $(AM_V_GEN) PKG_CONFIG_PATH=$(top_builddir)/data:$$PKG_CONFIG_PATH \
+ $(G_IR_SCANNER) -v \
+ --namespace Epiphany \
+--
+cgit v0.8.2