diff options
author | Thomas Lange [tl] <tl@openoffice.org> | 2010-12-03 09:55:02 +0100 |
---|---|---|
committer | Thomas Lange [tl] <tl@openoffice.org> | 2010-12-03 09:55:02 +0100 |
commit | 6d45ebb928b2e8df70502ca5cede6695ccb5bcc1 (patch) | |
tree | bd1bbaee568c0190e18a12e94587d470fd08284c /hyphen/hyphen-2.4.patch | |
parent | 1d03bbae912835cbff353183bc97b3be7ec61947 (diff) |
cws tl84: #i109543# updating hyphen library to v2.7.1
Diffstat (limited to 'hyphen/hyphen-2.4.patch')
-rw-r--r-- | hyphen/hyphen-2.4.patch | 169 |
1 files changed, 0 insertions, 169 deletions
diff --git a/hyphen/hyphen-2.4.patch b/hyphen/hyphen-2.4.patch deleted file mode 100644 index 33947f550a88..000000000000 --- a/hyphen/hyphen-2.4.patch +++ /dev/null @@ -1,169 +0,0 @@ -diff -u misc/hyphen-2.4/csutil.c misc/build/hyphen-2.4/csutil.c ---- misc/hyphen-2.4/csutil.c 2003-06-01 02:04:00.000000000 +0200 -+++ misc/build/hyphen-2.4/csutil.c 2008-06-04 10:03:40.000000000 +0200 -@@ -3493,7 +3493,7 @@ - }; - - --struct enc_entry encds[] = { -+static struct enc_entry encds[] = { - {"ISO8859-1",iso1_tbl}, - {"ISO8859-2",iso2_tbl}, - {"ISO8859-3",iso3_tbl}, -Common subdirectories: misc/hyphen-2.4/doc and misc/build/hyphen-2.4/doc -diff -u misc/hyphen-2.4/hyphen.c misc/build/hyphen-2.4/hyphen.c ---- misc/hyphen-2.4/hyphen.c 2008-05-01 02:18:15.000000000 +0200 -+++ misc/build/hyphen-2.4/hyphen.c 2008-06-04 10:06:57.000000000 +0200 -@@ -326,7 +326,7 @@ - } else { - hnj_strchomp(repl + 1); - replindex = 0; -- replcut = strlen(buf); -+ replcut = (signed char) strlen(buf); - } - repl = hnj_strdup(repl + 1); - } -@@ -359,10 +359,10 @@ - if ((((unsigned char) word[pc]) >> 6) != 2) pu++; - if ((ps < 0) && (replindex == pu)) { - ps = replindex; -- replindex = pc; -+ replindex = (signed char) pc; - } - if ((ps >= 0) && ((pu - ps) == replcut)) { -- replcut = (pc - replindex); -+ replcut = (signed char) (pc - replindex); - break; - } - } -@@ -379,7 +379,7 @@ - dict[k]->states[state_num].repl = repl; - dict[k]->states[state_num].replindex = replindex; - if (!replcut) { -- dict[k]->states[state_num].replcut = strlen(word); -+ dict[k]->states[state_num].replcut = (signed char) strlen(word); - } else { - dict[k]->states[state_num].replcut = replcut; - } -@@ -702,7 +702,7 @@ - prep_word[j++] = '.'; - prep_word[j] = '\0'; - -- for (i = 0; i < j; i++) -+ for (i = 0; i < word_size + 5; i++) - hyphens[i] = '0'; - - #ifdef VERBOSE -@@ -941,13 +941,13 @@ - int hnj_hyphen_norm(const char *word, int word_size, char * hyphens, - char *** rep, int ** pos, int ** cut) - { -+ int i, j, k; - if ((((unsigned char) word[0]) >> 6) == 2) { - fprintf(stderr, "error - bad, non UTF-8 input: %s\n", word); - return 1; - } - - /* calculate UTF-8 character positions */ -- int i, j, k; - for (i = 0, j = -1; i < word_size; i++) { - /* beginning of an UTF-8 character (not '10' start bits) */ - if ((((unsigned char) word[i]) >> 6) != 2) j++; -diff -u misc/hyphen-2.4/Makefile.am misc/build/hyphen-2.4/Makefile.am ---- misc/hyphen-2.4/Makefile.am 2008-04-30 12:33:44.000000000 +0200 -+++ misc/build/hyphen-2.4/Makefile.am 2008-06-04 11:33:23.000000000 +0200 -@@ -24,12 +24,12 @@ - - hyphen.us3: - cp -f $(srcdir)/hyphen.tex hyphen.us -- patch < $(srcdir)/hyphen.patch -+ $(GNUPATCH) < $(srcdir)/hyphen.patch - $(srcdir)/tbhyphext.sh <$(srcdir)/tbhyphext.tex >hyphen.us2 - cat hyphen.us hyphen.us2 >hyphen.us3 - --hyph_en_US.dic: hyphen.us3 -- perl $(srcdir)/substrings.pl hyphen.us3 hyph_en_US.dic ISO8859-1 2 3 >/dev/null -+hyph_en_US.dic: -+ @echo "hyph_en_US.txt distributed with Hyphen library" - - clean-local: - rm -rf hyphen.us* hyph_en_US.dic -diff -u misc/hyphen-2.4/Makefile.in misc/build/hyphen-2.4/Makefile.in ---- misc/hyphen-2.4/Makefile.in 2008-04-30 14:29:57.000000000 +0200 -+++ misc/build/hyphen-2.4/Makefile.in 2008-06-04 11:33:44.000000000 +0200 -@@ -795,12 +795,12 @@ - - hyphen.us3: - cp -f $(srcdir)/hyphen.tex hyphen.us -- patch < $(srcdir)/hyphen.patch -+ $(GNUPATCH) < $(srcdir)/hyphen.patch - $(srcdir)/tbhyphext.sh <$(srcdir)/tbhyphext.tex >hyphen.us2 - cat hyphen.us hyphen.us2 >hyphen.us3 - --hyph_en_US.dic: hyphen.us3 -- perl $(srcdir)/substrings.pl hyphen.us3 hyph_en_US.dic ISO8859-1 2 3 >/dev/null -+hyph_en_US.dic: -+ @echo "hyph_en_US.txt distributed with Hyphen library" - - clean-local: - rm -rf hyphen.us* hyph_en_US.dic -diff -u misc/hyphen-2.4/makefile.mk misc/build/hyphen-2.4/makefile.mk ---- misc/hyphen-2.4/makefile.mk 2008-06-04 10:43:21.000000000 +0200 -+++ misc/build/hyphen-2.4/makefile.mk 2008-06-04 12:40:46.000000000 +0200 -@@ -1 +1,54 @@ --dummy -+#************************************************************************* -+# -+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. -+# -+# Copyright 2000, 2010 Oracle and/or its affiliates. -+# -+# OpenOffice.org - a multi-platform office productivity suite -+# -+# This file is part of OpenOffice.org. -+# -+# OpenOffice.org is free software: you can redistribute it and/or modify -+# it under the terms of the GNU Lesser General Public License version 3 -+# only, as published by the Free Software Foundation. -+# -+# OpenOffice.org is distributed in the hope that it will be useful, -+# but WITHOUT ANY WARRANTY; without even the implied warranty of -+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+# GNU Lesser General Public License version 3 for more details -+# (a copy is included in the LICENSE file that accompanied this code). -+# -+# You should have received a copy of the GNU Lesser General Public License -+# version 3 along with OpenOffice.org. If not, see -+# <http://www.openoffice.org/license.html> -+# for a copy of the LGPLv3 License. -+# -+#************************************************************************* -+ -+PRJ = ..$/..$/..$/.. -+ -+PRJNAME = hyphen -+TARGET = hyphen -+CFLAGSCALL=gsd -+ -+USE_DEFFILE=TRUE -+EXTERNAL_WARNINGS_NOT_ERRORS := TRUE -+UWINAPILIB=
-+ -+.INCLUDE : settings.mk -+ -+# --- Files -------------------------------------------------------- -+ -+# !! not to be compiled because those belong to a stand alone programs: !! -+# $(SLO)$/createfp.obj\ -+# $(SLO)$/testtextcat.obj -+ -+SLOFILES= \ -+ $(SLO)$/hyphen.obj\ -+ $(SLO)$/hnjalloc.obj -+ -+# --- Targets ------------------------------------------------------ -+ -+ALL: ALLTAR -+ -+.INCLUDE : target.mk -Common subdirectories: misc/hyphen-2.4/tests and misc/build/hyphen-2.4/tests |