From: Artur Frysiak <artur@frysiak.net>
Date: Wed, 28 Mar 2012 14:20:52 +0000 (+0000)
Subject: - fix build with pcre 8.30
X-Git-Tag: auto/th/tf-50b8-4
X-Git-Url: http://git.pld-linux.org/?p=packages%2Ftf.git;a=commitdiff_plain;h=0659945

- fix build with pcre 8.30
- rel. 4

Changed files:
    pcre.patch -> 1.1
    tf.spec -> 1.38
---

diff --git a/pcre.patch b/pcre.patch
new file mode 100644
index 0000000..416f14d
--- /dev/null
+++ b/pcre.patch
@@ -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) {
diff --git a/tf.spec b/tf.spec
index 102a892..cd7d8ee 100644
--- a/tf.spec
+++ b/tf.spec
@@ -6,7 +6,7 @@ Summary:	tf - TinyFugue - text-mode MUD client
 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
@@ -15,6 +15,7 @@ Source1:	http://dl.sourceforge.net/tinyfugue/%{name}-%{doc_ver}-help.tar.gz
 # 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
@@ -50,6 +51,8 @@ Pliki pomocy w HTML.
 %setup -q
 tar xzPf %{SOURCE1}
 cp %{SOURCE2} .
+%patch0 -p1
+
 %build
 %{__autoconf}
 %configure