5860fa13cb
tiny-fugue was crafted in 2007 to use pcre, and it uses system pcre or HB pcre over its own internal pcre-2.08 by linking against `-lpcre`. However it uses a removed API, `pcre_info` like goffice tries to do. - Add a dep on HB pcre. - patch this to change to using `pcre_fullinfo` - design the patch like the goffice patch. Fixes Homebrew/homebrew#15105 Closes Homebrew/homebrew#15681. Signed-off-by: Adam Vandenberg <flangy@gmail.com>
71 lines
2.2 KiB
Ruby
71 lines
2.2 KiB
Ruby
require 'formula'
|
|
|
|
class TinyFugue < Formula
|
|
url 'http://downloads.sourceforge.net/project/tinyfugue/tinyfugue/5.0%20beta%208/tf-50b8.tar.gz'
|
|
homepage 'http://tinyfugue.sourceforge.net/'
|
|
sha1 '37bb70bfb7b44d36c28606c6bd45e435502fb4b4'
|
|
version '5.0b8'
|
|
|
|
depends_on 'libnet'
|
|
depends_on 'pcre'
|
|
|
|
# pcre deprecated pcre_info. Switch to HB pcre-8.31 and pcre_fullinfo.
|
|
# Not reported upstream. The project is in stasis since 2007. The patch
|
|
# is crafted like the patch for goffice.
|
|
def patches
|
|
DATA
|
|
end
|
|
|
|
def install
|
|
system "./configure", "--disable-debug", "--disable-dependency-tracking",
|
|
"--enable-getaddrinfo", "--enable-termcap=ncurses",
|
|
"--prefix=#{prefix}"
|
|
system "make install"
|
|
end
|
|
end
|
|
|
|
|
|
__END__
|
|
--- a/src/malloc.c 2007-01-13 15:12:39.000000000 -0800
|
|
+++ b/src/malloc.c 2012-10-26 08:23:30.000000000 -0700
|
|
@@ -7,6 +7,7 @@
|
|
************************************************************************/
|
|
static const char RCSid[] = "$Id: malloc.c,v 35004.22 2007/01/13 23:12:39 kkeys Exp $";
|
|
|
|
+#include "sys/types.h"
|
|
#include "tfconfig.h"
|
|
#include "port.h"
|
|
#include "signals.h"
|
|
--- a/src/macro.c 2007-01-13 15:12:39.000000000 -0800
|
|
+++ b/src/macro.c 2012-10-26 08:15:31.000000000 -0700
|
|
@@ -893,7 +893,7 @@
|
|
}
|
|
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, 0, NULL);
|
|
for (i = 0; i < spec->nsubattr; i++) {
|
|
spec->subattr[i].attr &= ~F_NONE;
|
|
if (spec->subattr[i].subexp > n) {
|
|
--- a/src/pattern.c 2007-01-13 15:12:39.000000000 -0800
|
|
+++ b/src/pattern.c 2012-10-26 08:16:19.000000000 -0700
|
|
@@ -151,7 +151,7 @@
|
|
emsg ? emsg : "unknown error");
|
|
goto tf_reg_compile_error;
|
|
}
|
|
- n = pcre_info(ri->re, NULL, NULL);
|
|
+ n = pcre_fullinfo(ri->re, NULL, 0, NULL);
|
|
if (n < 0) goto tf_reg_compile_error;
|
|
ri->ovecsize = 3 * (n + 1);
|
|
ri->ovector = dmalloc(NULL, sizeof(int) * ri->ovecsize, file, line);
|
|
--- a/src/pattern.h 2007-01-13 15:12:39.000000000 -0800
|
|
+++ b/src/pattern.h 2012-10-26 08:17:54.000000000 -0700
|
|
@@ -10,7 +10,7 @@
|
|
#ifndef PATTERN_H
|
|
#define PATTERN_H
|
|
|
|
-#include "pcre-2.08/pcre.h"
|
|
+#include <pcre.h>
|
|
|
|
typedef struct RegInfo {
|
|
pcre *re;
|