cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix CONFIGURE_ARGS and CONFIGURE_ENV.

Browse Source 
Add --disable-maintainer-mode to prevent *_DISABLE_DEPRECATED from being
set and ending up with implicit declarations.
Merge a patch from upstream to prevent a crash in the adblock extension.
This commit is contained in:
ajacoutot 2011-06-11 08:16:30 +00:00
parent 8cc034c3b3
commit a10080277c
3 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
x11/gnome3/www/epiphany-extensions/Makefile
View File

@ -1,10 +1,10 @@
# $OpenBSD: Makefile,v 1.6 2011/05/28 08:15:53 ajacoutot Exp $
# $OpenBSD: Makefile,v 1.7 2011/06/11 08:16:30 ajacoutot Exp $
COMMENT= collection of extensions for Epiphany
GNOME_PROJECT= epiphany-extensions
GNOME_VERSION= 3.0.0
REVISION= 6
REVISION= 7
# sync with www/epiphany
M= ${GNOME_VERSION:R}
@ -47,10 +47,13 @@ LIBTOOL_FLAGS= --tag=disable-static
MODGNOME_HELP_FILES= Yes
CONFIGURE_STYLE=gnu
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib"
CONFIGURE_ARGS= ${CONFIGURE_SHARED} \
--disable-static \
--enable-opensp=no
CONFIGURE_ENV= CPPFLAGS="-I${LOCALBASE}/include" \
LDFLAGS="-L${LOCALBASE}/lib" \
# prevents implicit declarations by not setting *_DISABLE_DEPRECATED
CONFIGURE_ARGS += --disable-maintainer-mode
.include <bsd.port.mk>

17
x11/gnome3/www/epiphany-extensions/patches/patch-extensions_adblock_adblock-pattern_c Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-extensions_adblock_adblock-pattern_c,v 1.1 2011/06/11 08:16:30 ajacoutot Exp $
From feabc53b368c244215d3ba507abe76071f9ef81f Mon Sep 17 00:00:00 2001
From: Tim-Philipp Müller <tim@centricular.net>
Date: Sun, 29 May 2011 19:36:40 +0000
Subject: adblock: reset error to NULL if list regexp could not be parsed
--- extensions/adblock/adblock-pattern.c.orig Thu Aug 26 14:44:24 2010
+++ extensions/adblock/adblock-pattern.c Fri Jun 10 21:41:08 2011
@@ -79,6 +79,7 @@ adblock_pattern_load_from_file (GHashTable *patterns,
"Error: %s",
line, error->message);
g_error_free (error);
+ error = NULL;
continue;
}

3
x11/gnome3/www/epiphany-extensions/pkg/PLIST
View File

@ -1,4 +1,4 @@
@comment $OpenBSD: PLIST,v 1.3 2011/05/28 08:15:34 ajacoutot Exp $
@comment $OpenBSD: PLIST,v 1.4 2011/06/11 08:16:30 ajacoutot Exp $
lib/epiphany/
lib/epiphany/${M}/
lib/epiphany/${M}/extensions/
@ -281,6 +281,7 @@ share/locale/wa/LC_MESSAGES/epiphany-extensions-${M}.mo
share/locale/zh_CN/LC_MESSAGES/epiphany-extensions-${M}.mo
share/locale/zh_HK/LC_MESSAGES/epiphany-extensions-${M}.mo
share/locale/zh_TW/LC_MESSAGES/epiphany-extensions-${M}.mo
share/omf/
share/omf/epiphany-extensions/
share/omf/epiphany-extensions/epiphany-extensions-C.omf
share/omf/epiphany-extensions/epiphany-extensions-de.omf