diff options
| author | dholland <dholland@pkgsrc.org> | 2012-05-10 04:43:53 +0000 |
|---|---|---|
| committer | dholland <dholland@pkgsrc.org> | 2012-05-10 04:43:53 +0000 |
| commit | cb431c14be99e6ff71368adc5da17ee22451895f (patch) | |
| tree | 8161839a206cfbda4db3987082ebeef94841b62d /misc/goffice0.6/patches | |
| parent | dbe408aab8a951f3428579f3fa3444863e04ba42 (diff) | |
| download | pkgsrc-cb431c14be99e6ff71368adc5da17ee22451895f.tar.gz | |
Merge wiz's build fixes for goffice0.8. Add pcre's bl3 to Makefile
(was previously only in the bl3 file, which pkglint justifiably
considers broken) and bump PKGREVISION to 16.
Diffstat (limited to 'misc/goffice0.6/patches')
| -rw-r--r-- | misc/goffice0.6/patches/patch-configure | 15 | ||||
| -rw-r--r-- | misc/goffice0.6/patches/patch-goffice_utils_regutf8.c | 15 |
2 files changed, 30 insertions, 0 deletions
diff --git a/misc/goffice0.6/patches/patch-configure b/misc/goffice0.6/patches/patch-configure new file mode 100644 index 00000000000..ff193c9c7a1 --- /dev/null +++ b/misc/goffice0.6/patches/patch-configure @@ -0,0 +1,15 @@ +$NetBSD: patch-configure,v 1.1 2012/05/10 04:43:53 dholland Exp $ + +pcretest -C also reports UTF-16 support, adapt pattern. + +--- configure~ 2008-09-02 17:35:35.000000000 +0000 ++++ configure +@@ -27158,7 +27158,7 @@ fi + + { echo "$as_me:$LINENO: checking for UTF-8 support in pcre" >&5 + echo $ECHO_N "checking for UTF-8 support in pcre... $ECHO_C" >&6; } +- if (pcretest -C 2>&1) | grep -i "^ *UTF-8 support" >/dev/null; then ++ if (pcretest -C 2>&1) | grep -i "^ *UTF-8 .*support" >/dev/null; then + { echo "$as_me:$LINENO: result: yes" >&5 + echo "${ECHO_T}yes" >&6; } + LIBS="$LIBS -lpcre" diff --git a/misc/goffice0.6/patches/patch-goffice_utils_regutf8.c b/misc/goffice0.6/patches/patch-goffice_utils_regutf8.c new file mode 100644 index 00000000000..4853bb4398f --- /dev/null +++ b/misc/goffice0.6/patches/patch-goffice_utils_regutf8.c @@ -0,0 +1,15 @@ +$NetBSD: patch-goffice_utils_regutf8.c,v 1.1 2012/05/10 04:43:53 dholland Exp $ + +Replace call to obsolete function. + +--- goffice/utils/regutf8.c~ 2008-07-08 09:54:59.000000000 +0000 ++++ goffice/utils/regutf8.c +@@ -155,7 +155,7 @@ go_regcomp (GORegexp *gor, const char *p + default: return REG_BADPAT; + } + } else { +- gor->re_nsub = pcre_info (r, NULL, NULL); ++ pcre_fullinfo (r, NULL, PCRE_INFO_CAPTURECOUNT, &gor->re_nsub); + gor->nosub = (cflags & REG_NOSUB) != 0; + return 0; + } |