From e7fbcca1b50123b57566ea557f2ace17ee5bbad5 Mon Sep 17 00:00:00 2001 From: Nagy Karoly Gabriel Date: Sat, 23 Feb 2013 12:41:22 +0100 Subject: [PATCH] tre: Updated (0.7.5 -> 0.8.0) --- textproc/tre/tre-0.7.5-api-doc.patch | 43 ------- textproc/tre/tre-0.7.5-match.patch | 31 ----- textproc/tre/tre-0.7.5-tre_compile.patch | 137 ----------------------- textproc/tre/tre-0.8.8-pkgcfg.patch | 30 +++++ textproc/tre/tre.desc | 6 +- 5 files changed, 33 insertions(+), 214 deletions(-) delete mode 100644 textproc/tre/tre-0.7.5-api-doc.patch delete mode 100644 textproc/tre/tre-0.7.5-match.patch delete mode 100644 textproc/tre/tre-0.7.5-tre_compile.patch create mode 100644 textproc/tre/tre-0.8.8-pkgcfg.patch diff --git a/textproc/tre/tre-0.7.5-api-doc.patch b/textproc/tre/tre-0.7.5-api-doc.patch deleted file mode 100644 index dd76ebe57..000000000 --- a/textproc/tre/tre-0.7.5-api-doc.patch +++ /dev/null @@ -1,43 +0,0 @@ -Sun Jan 28 21:08:45 EET 2007 Ville Laurikari - * Fixed regoff_t documentation for wide characters. - The documentation erroneously claimed that offsets are always given in - bytes (they are bytes in byte and multibyte strings, but wchar_t - offsets in wchar_t strings). - - Thanks to Gregory Sharp for pointing this out. -diff -rN -u old-stable/doc/tre-api.html new-stable/doc/tre-api.html ---- old-stable/doc/tre-api.html 2007-11-04 20:25:00.000000000 +0200 -+++ new-stable/doc/tre-api.html 2007-11-04 20:25:00.000000000 +0200 -@@ -323,22 +323,21 @@ -
-
regoff_t rm_so
--
Byte offset from start of string --to start of substring.
-+
Offset from start of string to start of -+substring.
-
regoff_t rm_eo
--
Byte offset from start of string --to the first character after the substring.
-+
Offset from start of string to the first -+character after the substring.
-
- - -

--The length of a submatch in bytes can be computed by subtracting --rm_eo and rm_so. --If a parenthesized subexpression did not participate in a match, the --rm_so and rm_eo fields for the corresponding --pmatch element are set to -1. --When a multibyte character set is in effect, the submatch offsets are -+The length of a submatch can be computed by subtracting rm_eo and -+rm_so. If a parenthesized subexpression did not participate in a -+match, the rm_so and rm_eo fields for the -+corresponding pmatch element are set to -1. Note -+that when a multibyte character set is in effect, the submatch offsets are - given as byte offsets, not character offsets. -

- - diff --git a/textproc/tre/tre-0.7.5-match.patch b/textproc/tre/tre-0.7.5-match.patch deleted file mode 100644 index 79040b0d5..000000000 --- a/textproc/tre/tre-0.7.5-match.patch +++ /dev/null @@ -1,31 +0,0 @@ -Sun Nov 4 18:47:56 EET 2007 Ville Laurikari - * Fixed a bug in \<. - \< always matched at the beginning of the string. Thanks to Shmuel - Zeigerman for the bug report. - - See http://laurikari.net/pipermail/tre-general/2007-February/000128.html -diff -rN -u old-stable/lib/tre-match-utils.h new-stable/lib/tre-match-utils.h ---- old-stable/lib/tre-match-utils.h 2007-11-04 20:30:23.000000000 +0200 -+++ new-stable/lib/tre-match-utils.h 2007-11-04 20:30:23.000000000 +0200 -@@ -161,7 +161,7 @@ - && (next_c != L'\0' || reg_noteol) \ - && (next_c != L'\n' || !reg_newline)) \ - || ((assertions & ASSERT_AT_BOW) \ -- && (pos > 0 && (IS_WORD_CHAR(prev_c) || !IS_WORD_CHAR(next_c)))) \ -+ && (IS_WORD_CHAR(prev_c) || !IS_WORD_CHAR(next_c))) \ - || ((assertions & ASSERT_AT_EOW) \ - && (!IS_WORD_CHAR(prev_c) || IS_WORD_CHAR(next_c))) \ - || ((assertions & ASSERT_AT_WB) \ -diff -rN -u old-stable/tests/retest.c new-stable/tests/retest.c ---- old-stable/tests/retest.c 2007-11-04 20:30:23.000000000 +0200 -+++ new-stable/tests/retest.c 2007-11-04 20:30:23.000000000 +0200 -@@ -1121,6 +1121,8 @@ - test_exec("aax xxa", 0, REG_OK, 2, 3, END); - test_comp("\\Bx\\b", REG_EXTENDED, 0); - test_exec("aax xxx", 0, REG_OK, 2, 3, END); -+ test_comp("\\<.", REG_EXTENDED, 0); -+ test_exec(";xaa", 0, REG_OK, 1, 2, END); - - /* Shorthands for character classes. */ - test_comp("\\w+", REG_EXTENDED, 0); - diff --git a/textproc/tre/tre-0.7.5-tre_compile.patch b/textproc/tre/tre-0.7.5-tre_compile.patch deleted file mode 100644 index 28dbb0be4..000000000 --- a/textproc/tre/tre-0.7.5-tre_compile.patch +++ /dev/null @@ -1,137 +0,0 @@ -Fri Mar 16 19:18:02 EET 2007 Ville Laurikari - * Refactoring. -diff -rN -u old-stable/lib/tre-compile.c new-stable/lib/tre-compile.c ---- old-stable/lib/tre-compile.c 2007-11-04 20:27:45.000000000 +0200 -+++ new-stable/lib/tre-compile.c 2007-11-04 20:27:45.000000000 +0200 -@@ -1,7 +1,7 @@ - /* - tre-compile.c - TRE regex compiler - -- Copyright (c) 2001-2006 Ville Laurikari -+ Copyright (c) 2001-2007 Ville Laurikari - - This library is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public -@@ -127,6 +127,30 @@ - int next_tag; - } tre_tag_states_t; - -+ -+/* Go through `regset' and set submatch data for submatches that are -+ using this tag. */ -+static void -+tre_purge_regset(int *regset, tre_tnfa_t *tnfa, int tag) -+{ -+ int i; -+ -+ for (i = 0; regset[i] >= 0; i++) -+ { -+ int id = regset[i] / 2; -+ int start = !(regset[i] % 2); -+ DPRINT((" Using tag %d for %s offset of " -+ "submatch %d\n", tag, -+ start ? "start" : "end", id)); -+ if (start) -+ tnfa->submatch_data[id].so_tag = tag; -+ else -+ tnfa->submatch_data[id].eo_tag = tag; -+ } -+ regset[0] = -1; -+} -+ -+ - /* Adds tags to appropriate locations in the parse tree in `tree', so that - subexpressions marked for submatch addressing can be traced. */ - static reg_errcode_t -@@ -281,20 +305,7 @@ - minimal_tag = -1; - num_minimals++; - } -- /* Go through the regset and set submatch data for -- submatches that are using this tag. */ -- for (i = 0; regset[i] >= 0; i++) -- { -- int id = regset[i] / 2; -- int start = !(regset[i] % 2); -- DPRINT((" Using tag %d for %s offset of " -- "submatch %d\n", tag, -- start ? "start" : "end", id)); -- if (start) -- tnfa->submatch_data[id].so_tag = tag; -- else -- tnfa->submatch_data[id].eo_tag = tag; -- } -+ tre_purge_regset(regset, tnfa, tag); - } - else - { -@@ -394,20 +405,7 @@ - minimal_tag = -1; - num_minimals++; - } -- /* Go through the regset and set submatch data for -- submatches that are using this tag. */ -- for (i = 0; regset[i] >= 0; i++) -- { -- int id = regset[i] / 2; -- int start = !(regset[i] % 2); -- DPRINT((" Using tag %d for %s offset of " -- "submatch %d\n", tag, -- start ? "start" : "end", id)); -- if (start) -- tnfa->submatch_data[id].so_tag = tag; -- else -- tnfa->submatch_data[id].eo_tag = tag; -- } -+ tre_purge_regset(regset, tnfa, tag); - } - - DPRINT((" num_tags++\n")); -@@ -479,20 +477,7 @@ - minimal_tag = -1; - num_minimals++; - } -- /* Go through the regset and set submatch data for -- submatches that are using this tag. */ -- for (i = 0; regset[i] >= 0; i++) -- { -- int id = regset[i] / 2; -- int start = !(regset[i] % 2); -- DPRINT((" Using tag %d for %s offset of " -- "submatch %d\n", tag, -- start ? "start" : "end", id)); -- if (start) -- tnfa->submatch_data[id].so_tag = tag; -- else -- tnfa->submatch_data[id].eo_tag = tag; -- } -+ tre_purge_regset(regset, tnfa, tag); - } - - DPRINT((" num_tags++\n")); -@@ -640,23 +625,7 @@ - } /* end while(tre_stack_num_objects(stack) > bottom) */ - - if (!first_pass) -- { -- int i; -- /* Go through the regset and set submatch data for -- submatches that are using this tag. */ -- for (i = 0; regset[i] >= 0; i++) -- { -- int id = regset[i] / 2; -- int start = !(regset[i] % 2); -- DPRINT((" Using tag %d for %s offset of " -- "submatch %d\n", num_tags, -- start ? "start" : "end", id)); -- if (start) -- tnfa->submatch_data[id].so_tag = num_tags; -- else -- tnfa->submatch_data[id].eo_tag = num_tags; -- } -- } -+ tre_purge_regset(regset, tnfa, tag); - - if (!first_pass && minimal_tag >= 0) - { - diff --git a/textproc/tre/tre-0.8.8-pkgcfg.patch b/textproc/tre/tre-0.8.8-pkgcfg.patch new file mode 100644 index 000000000..1902b8311 --- /dev/null +++ b/textproc/tre/tre-0.8.8-pkgcfg.patch @@ -0,0 +1,30 @@ +# --- SDE-COPYRIGHT-NOTE-BEGIN --- +# This copyright note is auto-generated by ./scripts/Create-CopyPatch. +# +# Filename: package/.../tre/tre-0.8.8-pkgcfg.patch +# Copyright (C) 2013 The OpenSDE Project +# +# More information can be found in the files COPYING and README. +# +# This patch file is dual-licensed. It is available under the license the +# patched project is licensed under, as long as it is an OpenSource license +# as defined at http://www.opensource.org/ (e.g. BSD, X11) or under the terms +# of the GNU General Public License as published by the Free Software +# Foundation; either version 2 of the License, or (at your option) any later +# version. +# --- SDE-COPYRIGHT-NOTE-END --- + + tre.pc.in | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/tre.pc.in b/tre.pc.in +index fdc45fa..b8d0676 100644 +--- ./tre.pc.in ++++ ./tre.pc.in +@@ -6,5 +6,5 @@ includedir=@includedir@ + Name: TRE + Description: TRE regexp matching library + Version: @PACKAGE_VERSION@ +-Libs: -L${libdir} -ltre @LDFLAGS@ @LIBINTL@ @LIBS@ ++Libs: -L${libdir} -ltre @LIBINTL@ @LIBS@ + Cflags: -I${includedir} @CPPFLAGS@ diff --git a/textproc/tre/tre.desc b/textproc/tre/tre.desc index a2a89c7c9..2d2d0d1b6 100644 --- a/textproc/tre/tre.desc +++ b/textproc/tre/tre.desc @@ -2,7 +2,7 @@ [COPY] This copyright note is auto-generated by ./scripts/Create-CopyPatch. [COPY] [COPY] Filename: package/.../tre/tre.desc -[COPY] Copyright (C) 2007 The OpenSDE Project +[COPY] Copyright (C) 2007 - 2013 The OpenSDE Project [COPY] [COPY] More information can be found in the files COPYING and README. [COPY] @@ -31,7 +31,7 @@ [L] GPL [S] Stable -[V] 0.7.5 +[V] 0.8.0 [P] X -----5---9 110.000 -[D] 73926865 tre-0.7.5.tar.bz2 http://laurikari.net/tre/ +[D] 1297459124 tre-0.8.0.tar.bz2 http://laurikari.net/tre/