diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-10-05 03:35:32 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2010-10-05 03:35:32 +0800 |
| commit | 78ec5f5204539473ab483f71b8feb10f206a20e5 (patch) | |
| tree | 948a232908a292116976037e222e96875154e373 | |
| parent | 1670c61f8b50ebf612c6c9f75e1bd4d371d0c6aa (diff) | |
| download | marcuscom-ports-78ec5f5204539473ab483f71b8feb10f206a20e5.tar marcuscom-ports-78ec5f5204539473ab483f71b8feb10f206a20e5.tar.gz marcuscom-ports-78ec5f5204539473ab483f71b8feb10f206a20e5.tar.bz2 marcuscom-ports-78ec5f5204539473ab483f71b8feb10f206a20e5.tar.lz marcuscom-ports-78ec5f5204539473ab483f71b8feb10f206a20e5.tar.xz marcuscom-ports-78ec5f5204539473ab483f71b8feb10f206a20e5.tar.zst marcuscom-ports-78ec5f5204539473ab483f71b8feb10f206a20e5.zip | |
Fix build with new gobject-introspection.
When I figured it out and wanted to make a patch for upsteam it just got fixed :).
Obtained from: GNOME git (epiphany branch)
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@14783 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | www/epiphany/Makefile | 4 | ||||
| -rw-r--r-- | www/epiphany/files/patch-src_Makefile.in | 26 |
2 files changed, 28 insertions, 2 deletions
diff --git a/www/epiphany/Makefile b/www/epiphany/Makefile index d6d5bbf6f..8f7f8c9d8 100644 --- a/www/epiphany/Makefile +++ b/www/epiphany/Makefile @@ -3,7 +3,7 @@ # Whom: Joe Marcus Clarke <marcus@FreeBSD.org> # # $FreeBSD$ -# $MCom: ports/www/epiphany/Makefile,v 1.236 2010/08/28 19:22:03 marcus Exp $ +# $MCom: ports/www/epiphany/Makefile,v 1.237 2010/09/19 15:26:46 kwm Exp $ # PORTNAME= epiphany @@ -38,7 +38,7 @@ WANT_GNOME= yes GNU_CONFIGURE= yes USE_GMAKE= yes INSTALLS_OMF= yes -CONFIGURE_ARGS+=--enable-introspection \ +CONFIGURE_ARGS+=--enable-introspection --disable-silent-rules \ --with-ca-file=${LOCALBASE}/share/certs/ca-root-nss.crt CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS} ${EXTRA_CFLAGS}" \ LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS} ${EXTRA_LIBS}" diff --git a/www/epiphany/files/patch-src_Makefile.in b/www/epiphany/files/patch-src_Makefile.in new file mode 100644 index 000000000..2d715ad69 --- /dev/null +++ b/www/epiphany/files/patch-src_Makefile.in @@ -0,0 +1,26 @@ +--- src/Makefile.in.orig 2010-10-04 21:25:05.000000000 +0000 ++++ src/Makefile.in 2010-10-04 21:29:36.000000000 +0000 +@@ -1584,8 +1584,10 @@ + @HAVE_INTROSPECTION_TRUE@Epiphany-$(EPIPHANY_API_VERSION).gir: $(INTROSPECTION_SCANNER) $(EPHY_GIR_H_FILES) \ + @HAVE_INTROSPECTION_TRUE@ $(EPHY_GIR_C_FILES) epiphany + @HAVE_INTROSPECTION_TRUE@ $(AM_V_GEN) PKG_CONFIG_PATH=$(top_builddir)/data:$$PKG_CONFIG_PATH \ +-@HAVE_INTROSPECTION_TRUE@ $(INTROSPECTION_SCANNER) -v \ +-@HAVE_INTROSPECTION_TRUE@ --namespace Epiphany \ ++@HAVE_INTROSPECTION_TRUE@ $(INTROSPECTION_SCANNER) -v --warn-all \ ++@HAVE_INTROSPECTION_TRUE@ --identifier-prefix=Ephy \ ++@HAVE_INTROSPECTION_TRUE@ --symbol-prefix=ephy \ ++@HAVE_INTROSPECTION_TRUE@ --namespace=Epiphany \ + @HAVE_INTROSPECTION_TRUE@ --nsversion=$(EPIPHANY_API_VERSION) \ + @HAVE_INTROSPECTION_TRUE@ --add-include-path=. \ + @HAVE_INTROSPECTION_TRUE@ --add-include-path=$(srcdir) \ +@@ -1593,8 +1595,8 @@ + @HAVE_INTROSPECTION_TRUE@ --include=libxml2-2.0 \ + @HAVE_INTROSPECTION_TRUE@ --include=WebKit-1.0 \ + @HAVE_INTROSPECTION_TRUE@ --program=./epiphany \ +-@HAVE_INTROSPECTION_TRUE@ --output $@ \ +-@HAVE_INTROSPECTION_TRUE@ --pkg epiphany-$(EPIPHANY_API_VERSION) \ ++@HAVE_INTROSPECTION_TRUE@ --output=$@ \ ++@HAVE_INTROSPECTION_TRUE@ --pkg=epiphany-$(EPIPHANY_API_VERSION) \ + @HAVE_INTROSPECTION_TRUE@ -DEPIPHANY_COMPILATION \ + @HAVE_INTROSPECTION_TRUE@ -I$(top_srcdir)/embed \ + @HAVE_INTROSPECTION_TRUE@ -I$(top_srcdir)/lib \ |