Author: wiget Date: Wed Mar 28 14:20:57 2012 GMT Module: packages Tag: HEAD ---- Log message: - fix build with pcre 8.30 - rel. 4
---- Files affected: packages/tf: tf.spec (1.37 -> 1.38) , pcre.patch (NONE -> 1.1) (NEW) ---- Diffs: ================================================================ Index: packages/tf/tf.spec diff -u packages/tf/tf.spec:1.37 packages/tf/tf.spec:1.38 --- packages/tf/tf.spec:1.37 Wed Mar 28 09:24:06 2012 +++ packages/tf/tf.spec Wed Mar 28 16:20:52 2012 @@ -7,7 +7,7 @@ Summary(pl.UTF-8): tf - TinyFugue - tekstowy klient do MUD-ów Name: tf Version: 50b8 -Release: 3 +Release: 4 License: GPL Group: Applications/Games Source0: http://dl.sourceforge.net/tinyfugue/%{name}-%{version}.tar.gz @@ -16,6 +16,7 @@ # Source1-md5: 26eb64b2f811c8143e9c08654d26d138 Source2: http://www.ingwar.eu.org/downloads/%{name}.syntax.gz # Source2-md5: 398aa4c28e83fb2ce688eade24c5fc88 +Patch0: pcre.patch URL: http://sourceforge.net/projects/tinyfugue/ BuildRequires: autoconf BuildRequires: ncurses-devel @@ -51,6 +52,8 @@ %setup -q tar xzPf %{SOURCE1} cp %{SOURCE2} . +%patch0 -p1 + %build %{__autoconf} %configure @@ -95,6 +98,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.38 2012/03/28 14:20:52 wiget +- fix build with pcre 8.30 +- rel. 4 + Revision 1.37 2012/03/28 07:24:06 arekm - release 3 ================================================================ Index: packages/tf/pcre.patch diff -u /dev/null packages/tf/pcre.patch:1.1 --- /dev/null Wed Mar 28 16:20:57 2012 +++ packages/tf/pcre.patch Wed Mar 28 16:20:52 2012 @@ -0,0 +1,34 @@ +--- tf-50b8/src/pattern.h.wiget 2012-03-28 14:25:55.720865901 +0200 ++++ tf-50b8/src/pattern.h 2012-03-28 14:26:14.157532261 +0200 +@@ -10,7 +10,7 @@ + #ifndef PATTERN_H + #define PATTERN_H + +-#include "pcre-2.08/pcre.h" ++#include <pcre.h> + + typedef struct RegInfo { + pcre *re; +--- tf-50b8/src/pattern.c.wiget 2012-03-28 15:55:13.910312594 +0200 ++++ tf-50b8/src/pattern.c 2012-03-28 15:56:16.456978228 +0200 +@@ -151,7 +151,7 @@ static RegInfo *tf_reg_compile_fl(const + emsg ? emsg : "unknown error"); + goto tf_reg_compile_error; + } +- n = pcre_info(ri->re, NULL, NULL); ++ pcre_fullinfo(ri->re, NULL, PCRE_INFO_CAPTURECOUNT, &n); + if (n < 0) goto tf_reg_compile_error; + ri->ovecsize = 3 * (n + 1); + ri->ovector = dmalloc(NULL, sizeof(int) * ri->ovecsize, file, line); +--- tf-50b8/src/macro.c.wiget 2012-03-28 13:44:42.280320322 +0200 ++++ tf-50b8/src/macro.c 2012-03-28 15:56:32.813644628 +0200 +@@ -893,7 +893,8 @@ static int complete_macro(Macro *spec, u + } + spec->attr &= ~F_NONE; + if (spec->nsubattr) { +- int n = pcre_info(spec->trig.ri->re, NULL, NULL); ++ int n; ++ pcre_fullinfo(spec->trig.ri->re, NULL, PCRE_INFO_CAPTURECOUNT, &n); + for (i = 0; i < spec->nsubattr; i++) { + spec->subattr[i].attr &= ~F_NONE; + if (spec->subattr[i].subexp > n) { ================================================================ ---- CVS-web: http://cvs.pld-linux.org/packages/tf/tf.spec?r1=1.37&r2=1.38 _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
