CaROS/meta-openembedded
3
1
Fork 0
mirror of git://git.openembedded.org/meta-openembedded synced 2026-01-01 13:58:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

goffice: add patch to use pcre_fullinfo instead of pcre_info

Browse Source 
* pcre_info was removed in newer pcre and abiword now fails to build
  /usr/lib/libgoffice-0.8.so: undefined reference to pcre_info

Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>
This commit is contained in:
Martin Jansa 2013-01-10 13:13:05 +01:00
parent 469cd4ff12
commit d1eb834bd0
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
meta-gnome/recipes-support/goffice/goffice/pcre-8.30.patch Normal file
View File

@ -0,0 +1,19 @@
Taken from http://trac.macports.org/ticket/34812
Fixes abiword build failing with:
/usr/lib/libgoffice-0.8.so: undefined reference to `pcre_info'
Upstream-Status: pending
http://www.linuxfromscratch.org/blfs/view/cvs/x/goffice.html
--- a/goffice/utils/regutf8.c.orig 2009-09-05 18:52:09.000000000 -0500
+++ b/goffice/utils/regutf8.c 2012-06-09 18:04:29.000000000 -0500
@@ -155,7 +155,7 @@
default: return GO_REG_BADPAT;
}
} else {
- gor->re_nsub = pcre_info (r, NULL, NULL);
+ gor->re_nsub = pcre_fullinfo (r, NULL, 0, NULL);
gor->nosub = (cflags & GO_REG_NOSUB) != 0;
return 0;
}

5
meta-gnome/recipes-support/goffice/goffice_0.8.17.bb
View File

@ -7,8 +7,11 @@ DEPENDS = "libxml-parser-perl-native glib-2.0 gtk+ pango cairo libgsf libpcre li
inherit gnome pkgconfig perlnative
PR = "r1"
SRC_URI += " file://c99math.patch \
file://nodolt.patch "
file://nodolt.patch \
file://pcre-8.30.patch"
SRC_URI[archive.md5sum] = "b4c924457163e02daf8a8d2428f51d10"
SRC_URI[archive.sha256sum] = "dd8caef5fefffbc53938fa619de9f58e7c4dc71a1803de134065d42138a68c06"