add patch to work around libpcre changes submitted by Robert Varga via bug #409779

Package-Manager: portage-2.1.10.49/cvs/Linux x86_64

4 files changed, 74 insertions, 17 deletions

diff --git a/games-mud/tf/ChangeLog b/games-mud/tf/ChangeLog
index 64ebdb573232..6e10f29ecdc5 100644
--- a/games-mud/tf/ChangeLog
+++ b/games-mud/tf/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for games-mud/tf
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-mud/tf/ChangeLog,v 1.23 2011/10/01 03:19:26 phajdan.jr Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/games-mud/tf/ChangeLog,v 1.24 2012/05/27 21:09:58 mr_bones_ Exp $
+
+  27 May 2012; Michael Sterrett <mr_bones_@gentoo.org> tf-50_beta8-r1.ebuild,
+  +files/tf-50_beta8-pcre.patch:
+  add patch to work around libpcre changes submitted by Robert Varga via bug
+  #409779
 
   01 Oct 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org> tf-50_beta8-r1.ebuild:
   x86 stable wrt bug #381735
diff --git a/games-mud/tf/Manifest b/games-mud/tf/Manifest
index 3ace80b5158b..bf053638de6d 100644
--- a/games-mud/tf/Manifest
+++ b/games-mud/tf/Manifest
@@ -1,8 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX tf-40-gcc4.patch 1955 RMD160 409fb0205eaa12843b965574774f14f1b7e5bdae SHA1 0013b98568310baba645fb1aff00504fd580de58 SHA256 c6db5fa3a77a50c012f9a2e516dae708022d99bc0c111cc7af7d3553221af90c
 AUX tf-40-gentoo.diff 1093 RMD160 7b448315ab46d18c8ef546be65bf8f38328ab766 SHA1 f0aa1b6a9ad58871ac1012f8902388b9e0663ba2 SHA256 8c31afa6845a429f5b4623b40459672849a54d275d8847d63ec0aa102b2a80ac
+AUX tf-50_beta8-pcre.patch 1917 RMD160 e1799429a55fc3132146ee008480ff404ea42c97 SHA1 eba4d808018d917120e12821f4408b3d36c71b08 SHA256 01b9cd92ed205b4a2d750cec9e8cc21d9a541e4e47c46140a53cae05f5458628
 DIST tf-40s1-help.tar.gz 121936 RMD160 847833d010f82869e411a87294fa3dd53f2c59ba SHA1 26e328ce88bd9739f8d409cea229272edab34762 SHA256 057668bdbe63e7cd1b5121343ebbfc182956e75feb9e273dd42fe22ce0d45a48
 DIST tf-40s1.tar.gz 349239 RMD160 2852daa3363bb134f29cc25d3177e9599ecacc1f SHA1 89ee75d0d8501dd7fe5440c81cf9b294e5ccf746 SHA256 488715d3c75ff05c08a518b0e1cd4518245842fbc1e4178c6da515e415101beb
 DIST tf-50b8-help.tar.gz 175591 RMD160 44bbdaa4feb21ac05e4a3a733e60ad427ebef588 SHA1 09bc75ee37dfeaf9fa0ae7d95b28fa0d7f971043 SHA256 d9f7c2475c6641100ff3f2e877917d4ec4660df1aaa46e0a4d510479f5d11b83
@@ -10,14 +8,7 @@ DIST tf-50b8.tar.gz 719553 RMD160 dd19528548c4139a1182ad7dc41bb561c17697ef SHA1
 DIST tf-allrootpatch.txt 3349 RMD160 360f0fb92a6cd9aa0a56478efcb8920ecfcb1ba6 SHA1 3edea95029ce2c7354205cafd0ad5a74a459627b SHA256 c11c5480666d7e0045680abd16e2dbd004e42036964b6a7862005402fbfe4600
 DIST tf-allsrcpatch.txt 10392 RMD160 276b27dd8d8e19b467074d6eb567fba5cacc2da9 SHA1 005484fdd64af1e9dd33e02e9eade56aac60b9fe SHA256 f2829b3de7cdf99fe636bbc90e72e9c6203fd64e6ff319dd018be50145084b9a
 EBUILD tf-40-r2.ebuild 1012 RMD160 71444902017b05709ec0548bf7eb2326921aeb68 SHA1 b043e1a28216c2d56dd885913954c6cced98e724 SHA256 5e48a7aa0450fbd415f2a7c960275a8dcf03cb3a03cf583070ce4d083d56f638
-EBUILD tf-50_beta8-r1.ebuild 1880 RMD160 5c84db0e8fe5ad3f13f5b5f220a159e77ba32855 SHA1 e341ec3de320dec15db2e7c79a8b5e65f999a85e SHA256 f83ff81a7ebb8448e31739e05099d8b7937cfb31242118eed17237419f678dc7
+EBUILD tf-50_beta8-r1.ebuild 1909 RMD160 31f3bd24e57ffb30ab7504a2422ca725843bcd0d SHA1 fdf422638aa23256cc65881e902f5b807cfceee8 SHA256 b00f8ff1fd49c7fc98e8a0b69a6a574ab1bad6e46bb73b6ebbda6cd7c4c55883
 EBUILD tf-50_beta8.ebuild 1556 RMD160 504d1a128a660441320988b9540dbb8b52bbb470 SHA1 5a20911815616b671dd50c56fa6e641916aa30f4 SHA256 b3d76184397df1b28ac181324de8082c78dd8240e8365b1672fd42b593d2eaea
-MISC ChangeLog 3730 RMD160 54171b08a741510351e3b40efeabe1ab96da948f SHA1 255b3c40eb536ca34d82953ce65ca37d04c73e32 SHA256 9c19abddd7c58bbaa09026c9636fa176a7dc74a0cc746fa499bd52aad05ee002
+MISC ChangeLog 3928 RMD160 e610e54144d59b27d4c8df31f2f20f6f30bff466 SHA1 eb1ab27c4983843ac0e510301b5f8ff48f0d068b SHA256 5c9423829c2913cb87c11b8c9ab698abf622a3713abbea542ed1caf2100d5212
 MISC metadata.xml 343 RMD160 708f55e3064639adbd5a74829235ae9ec3f5cb2e SHA1 92aaf23372d4fb6ff8ea8119774c6613ef4378d9 SHA256 0bddfed9b721467cc6c068928d4b1f044d380a1eff9f2d934ca0bd52d7fcff52
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
-
-iEYEAREKAAYFAk6GhsUACgkQuUQtlDBCeQLqDwCfQuuIy9+hF0P5PwhIg8FLe3WH
-rMcAnjjW/TIbelHn7UEZrHZ0LOvKiunu
-=3QMv
------END PGP SIGNATURE-----
diff --git a/games-mud/tf/files/tf-50_beta8-pcre.patch b/games-mud/tf/files/tf-50_beta8-pcre.patch
new file mode 100644
index 000000000000..4ff5e44db91b
--- /dev/null
+++ b/games-mud/tf/files/tf-50_beta8-pcre.patch
@@ -0,0 +1,61 @@
+From f61b5859d69c2d99264182f60f5ae1e430812b59 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Petr=20=C5=A0abata?= <contyk@redhat.com>
+Date: Fri, 10 Feb 2012 13:55:46 +0100
+Subject: [PATCH] Fix build with PCRE-8.30+
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+This patch fixes build with the latest PCRE release which removes some
+obsolete code tinyfugue still uses, namely pcre_info().
+
+Signed-off-by: Petr Šabata <contyk@redhat.com>
+---
+ src/macro.c   |    3 ++-
+ src/pattern.c |    2 +-
+ src/pattern.h |    2 +-
+ 3 files changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/src/macro.c b/src/macro.c
+index ac28fc9..b492717 100644
+--- a/src/macro.c
++++ b/src/macro.c
+@@ -893,7 +893,8 @@ static int complete_macro(Macro *spec, unsigned int hash, int num,
+     }
+     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/src/pattern.c b/src/pattern.c
+index 047a44a..a7228ff 100644
+--- a/src/pattern.c
++++ b/src/pattern.c
+@@ -151,7 +151,7 @@ static RegInfo *tf_reg_compile_fl(const char *pattern, int optimize,
+ 	    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);
+diff --git a/src/pattern.h b/src/pattern.h
+index 1eec0f9..cbe9af9 100644
+--- a/src/pattern.h
++++ b/src/pattern.h
+@@ -10,7 +10,7 @@
+ #ifndef PATTERN_H
+ #define PATTERN_H
+ 
+-#include "pcre-2.08/pcre.h"
++#include <pcre.h>
+ 
+ typedef struct RegInfo {
+     pcre *re;
+-- 
+1.7.7.6
+
diff --git a/games-mud/tf/tf-50_beta8-r1.ebuild b/games-mud/tf/tf-50_beta8-r1.ebuild
index 7009c09e8768..ec74f40817a2 100644
--- a/games-mud/tf/tf-50_beta8-r1.ebuild
+++ b/games-mud/tf/tf-50_beta8-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-mud/tf/tf-50_beta8-r1.ebuild,v 1.2 2011/10/01 03:19:26 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-mud/tf/tf-50_beta8-r1.ebuild,v 1.3 2012/05/27 21:09:58 mr_bones_ Exp $
 EAPI=2
 
 inherit games
@@ -26,7 +26,7 @@ DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
-PATCHES=( "${DISTDIR}"/tf-all*patch.txt )
+PATCHES=( "${DISTDIR}"/tf-all*patch.txt "${FILESDIR}"/${P}-pcre.patch )
 
 src_configure() {
 	STRIP=: egamesconf \