svn commit: r314112 - in head/devel/goffice: . files
Koop Mast
kwm at FreeBSD.org
Wed Mar 13 20:54:35 UTC 2013
Author: kwm
Date: Wed Mar 13 20:54:33 2013
New Revision: 314112
URL: http://svnweb.freebsd.org/changeset/ports/314112
Log:
Fix unresolved symbol pcre_info from pcre. This symbol was deprecated for a
while now and in a recent update removed. The check to enable replacement code
from using glib functions doesn't work quite correctly. So enable it manualy.
Tested by: madpilot@
Added:
head/devel/goffice/files/
head/devel/goffice/files/patch-goffice_utils_regutf8.c (contents, props changed)
Modified:
head/devel/goffice/Makefile (contents, props changed)
Modified: head/devel/goffice/Makefile
==============================================================================
--- head/devel/goffice/Makefile Wed Mar 13 19:46:38 2013 (r314111)
+++ head/devel/goffice/Makefile Wed Mar 13 20:54:33 2013 (r314112)
@@ -10,7 +10,7 @@
PORTNAME= goffice
PORTVERSION= 0.8.17
-PORTREVISION= 3
+PORTREVISION= 4
CATEGORIES= devel gnome
MASTER_SITES= GNOME
Added: head/devel/goffice/files/patch-goffice_utils_regutf8.c
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ head/devel/goffice/files/patch-goffice_utils_regutf8.c Wed Mar 13 20:54:33 2013 (r314112)
@@ -0,0 +1,48 @@
+--- goffice/utils/regutf8.c.orig 2009-09-05 23:52:09.000000000 +0000
++++ goffice/utils/regutf8.c 2013-03-13 17:22:39.000000000 +0000
+@@ -21,11 +21,7 @@ void
+ go_regfree (GORegexp *gor)
+ {
+ if (gor->ppcre) {
+-#ifdef HAVE_G_REGEX_ERROR_STRAY_BACKSLASH
+ g_regex_unref (gor->ppcre);
+-#else
+- pcre_free (gor->ppcre);
+-#endif
+ gor->ppcre = NULL;
+ }
+ }
+@@ -70,7 +66,6 @@ go_regerror (int errcode, const GORegexp
+ int
+ go_regcomp (GORegexp *gor, const char *pat, int cflags)
+ {
+-#ifdef HAVE_G_REGEX_ERROR_STRAY_BACKSLASH
+ GError *error = NULL;
+ GRegex *r;
+ int coptions =
+@@ -119,7 +114,7 @@ go_regcomp (GORegexp *gor, const char *p
+ gor->nosub = (cflags & GO_REG_NOSUB) != 0;
+ return 0;
+ }
+-#else
++#if 0
+ const char *errorptr;
+ int errorofs, errorcode;
+ pcre *r;
+@@ -167,7 +162,6 @@ int
+ go_regexec (const GORegexp *gor, const char *txt,
+ size_t nmatch, GORegmatch *pmatch, int eflags)
+ {
+-#ifdef HAVE_G_REGEX_ERROR_STRAY_BACKSLASH
+ int eoptions =
+ ((eflags & GO_REG_NOTBOL) ? G_REGEX_MATCH_NOTBOL : 0) |
+ ((eflags & GO_REG_NOTEOL) ? G_REGEX_MATCH_NOTEOL : 0);
+@@ -196,7 +190,7 @@ go_regexec (const GORegexp *gor, const c
+ g_match_info_free (match_info);
+
+ return matched ? GO_REG_NOERROR : GO_REG_NOMATCH;
+-#else
++#if 0
+ size_t txtlen = strlen (txt);
+ int eoptions =
+ ((eflags & GO_REG_NOTBOL) ? PCRE_NOTBOL : 0) |
More information about the svn-ports-all
mailing list