[arch-commits] Commit in epiphany/trunk (PKGBUILD fix-introspection.patch)

[Jan de Groot]

    Date: Friday, December 3, 2010 @ 07:57:35
  Author: jgc
Revision: 101977

Fix build with later versions of gobject-introspection

Added:
  epiphany/trunk/fix-introspection.patch
Modified:
  epiphany/trunk/PKGBUILD

-------------------------+
 PKGBUILD                |    8 ++++++--
 fix-introspection.patch |   21 +++++++++++++++++++++
 2 files changed, 27 insertions(+), 2 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2010-12-03 10:23:09 UTC (rev 101976)
+++ PKGBUILD	2010-12-03 12:57:35 UTC (rev 101977)
@@ -13,11 +13,15 @@
 options=('!libtool' '!emptydirs')
 groups=('gnome')
 url="http://www.gnome.org/projects/epiphany/"
-source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('278a5c00ce07e6a3ea440d289de22dbec3ebec4ded4ff3b4c48b580f469c2dcc')
+source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/2.30/${pkgname}-${pkgver}.tar.bz2
+        fix-introspection.patch)
+sha256sums=('278a5c00ce07e6a3ea440d289de22dbec3ebec4ded4ff3b4c48b580f469c2dcc'
+            'fed862407db7d971aa759168f889e68e914c4e6d80d7768f3db549bc36bd8dbf')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -Np1 -i "${srcdir}/fix-introspection.patch"
+  autoreconf
   ./configure --prefix=/usr --sysconfdir=/etc \
       --localstatedir=/var \
       --disable-scrollkeeper \

Added: fix-introspection.patch
===================================================================
--- fix-introspection.patch	                        (rev 0)
+++ fix-introspection.patch	2010-12-03 12:57:35 UTC (rev 101977)
@@ -0,0 +1,21 @@
+From 78b9eac0fca36e27c83c7678b18962ba286f041b Mon Sep 17 00:00:00 2001
+From: Vincent Untz <vuntz at gnome.org>
+Date: Fri, 01 Oct 2010 16:36:23 +0000
+Subject: introspection: Fix build by telling g-ir-scanner what the prefix is
+
+https://bugzilla.gnome.org/show_bug.cgi?id=631119
+---
+diff --git a/src/Makefile.am b/src/Makefile.am
+index e9d3715..acbf8ff 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -350,6 +350,7 @@ Epiphany-$(EPIPHANY_API_VERSION).gir: $(INTROSPECTION_SCANNER) $(EPHY_GIR_H_FILE
+ 		--include=WebKit-1.0 \
+ 		--program=./epiphany \
+ 		--output $@ \
++		--strip-prefix=Ephy \
+ 		--pkg epiphany-$(EPIPHANY_API_VERSION) \
+ 		-DEPIPHANY_COMPILATION \
+ 		-I$(top_srcdir)/embed \
+--
+cgit v0.8.3.1