diff --git a/tf-50b8.pcre.patch b/tf-50b8.pcre.patch index c0d9a66..4ff5e44 100644 --- a/tf-50b8.pcre.patch +++ b/tf-50b8.pcre.patch @@ -1,5 +1,23 @@ +From f61b5859d69c2d99264182f60f5ae1e430812b59 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Petr=20=C5=A0abata?= +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 +--- + 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..b847d09 100644 +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, @@ -13,7 +31,7 @@ index ac28fc9..b847d09 100644 spec->subattr[i].attr &= ~F_NONE; if (spec->subattr[i].subexp > n) { diff --git a/src/pattern.c b/src/pattern.c -index 047a44a..f1b22ed 100644 +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, @@ -38,3 +56,6 @@ index 1eec0f9..cbe9af9 100644 typedef struct RegInfo { pcre *re; +-- +1.7.7.6 + diff --git a/tinyfugue.spec b/tinyfugue.spec index 680c317..c45c6e2 100644 --- a/tinyfugue.spec +++ b/tinyfugue.spec @@ -10,6 +10,7 @@ URL: http://tinyfugue.sourceforge.net/ Source: http://downloads.sourceforge.net/tinyfugue/tf-%{packageversion}.tar.gz Patch0: tf-50b7.build.patch Patch1: tf-50b8.x86_64.patch +# https://sourceforge.net/tracker/?func=detail&aid=3486514&group_id=186112&atid=915972 Patch2: tf-50b8.pcre.patch BuildRequires: ncurses-devel BuildRequires: pcre-devel