Kaydet (Commit) ff3c4e9e authored tarafından Caolán McNamara's avatar Caolán McNamara

bump hyphen to 2.8.4

Change-Id: Iafcd6d7b06529534abb1470c7739bb9f935f3c61
üst 9e0cbe5e
--- misc/hyphen-2.8.3/config.sub --- misc/hyphen-2.8.4/config.sub
+++ misc/build/hyphen-2.8.3/config.sub +++ misc/build/hyphen-2.8.4/config.sub
@@ -120,7 +120,7 @@ @@ -120,7 +120,7 @@
# Here we must recognize all the valid KERNEL-OS combinations. # Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
......
--- misc/hyphen-2.8.3/Makefile.am 2010-07-19 11:23:17.000000000 +0200 --- misc/hyphen-2.8.4/Makefile.am 2010-07-19 11:23:17.000000000 +0200
+++ misc/build/hyphen-2.8.3/Makefile.am 2010-12-02 10:15:44.390625000 +0100 +++ misc/build/hyphen-2.8.4/Makefile.am 2010-12-02 10:15:44.390625000 +0100
@@ -25,13 +25,13 @@ @@ -25,13 +25,13 @@
hyphen.us3: hyphen.us3:
...@@ -17,8 +17,8 @@ ...@@ -17,8 +17,8 @@
clean-local: clean-local:
rm -rf hyphen.us* hyph_en_US.dic rm -rf hyphen.us* hyph_en_US.dic
--- misc/hyphen-2.8.3/Makefile.in 2010-12-01 02:31:29.000000000 +0100 --- misc/hyphen-2.8.4/Makefile.in 2010-12-01 02:31:29.000000000 +0100
+++ misc/build/hyphen-2.8.3/Makefile.in 2010-12-02 10:17:16.546875000 +0100 +++ misc/build/hyphen-2.8.4/Makefile.in 2010-12-02 10:17:16.546875000 +0100
@@ -940,13 +940,13 @@ @@ -940,13 +940,13 @@
hyphen.us3: hyphen.us3:
...@@ -36,8 +36,8 @@ ...@@ -36,8 +36,8 @@
clean-local: clean-local:
rm -rf hyphen.us* hyph_en_US.dic rm -rf hyphen.us* hyph_en_US.dic
--- misc/hyphen-2.8.3/makefile.mk 2010-12-02 10:35:40.265625000 +0100 --- misc/hyphen-2.8.4/makefile.mk 2010-12-02 10:35:40.265625000 +0100
+++ misc/build/hyphen-2.8.3/makefile.mk 2010-12-02 10:25:45.750000000 +0100 +++ misc/build/hyphen-2.8.4/makefile.mk 2010-12-02 10:25:45.750000000 +0100
@@ -1 +1,28 @@ @@ -1 +1,28 @@
-dummy -dummy
+PRJ = ..$/..$/..$/.. +PRJ = ..$/..$/..$/..
......
--- misc//hyphen-2.8.3/hyphen.c 2011-10-10 15:49:33.000000000 +0200 --- misc//hyphen-2.8.4/hyphen.c 2011-10-10 15:49:33.000000000 +0200
+++ misc/build/hyphen-2.8.3/hyphen.c 2011-12-27 13:49:07.568283812 +0100 +++ misc/build/hyphen-2.8.4/hyphen.c 2011-12-27 13:49:07.568283812 +0100
@@ -435,9 +435,9 @@ @@ -436,9 +436,9 @@
} }
} else if (k == 1) { } else if (k == 1) {
/* default first level: hyphen and ASCII apostrophe */ /* default first level: hyphen and ASCII apostrophe */
- if (!dict[0]->utf8) hnj_hyphen_load_line("NOHYPHEN '\n", dict[k], hashtab); - if (!dict[0]->utf8) hnj_hyphen_load_line("NOHYPHEN '\n", dict[k], hashtab);
- else hnj_hyphen_load_line("NOHYPHEN ',\xe2\x80\x93,\xe2\x80\x99\n", dict[k], hashtab); - else hnj_hyphen_load_line("NOHYPHEN ',\xe2\x80\x93,\xe2\x80\x99\n", dict[k], hashtab);
- strcpy(buf, "1-1/=,1,1\n"); // buf rewritten by hnj_hyphen_load here - strncpy(buf, "1-1/=,1,1\n", MAX_CHARS-1); // buf rewritten by hnj_hyphen_load here
+ if (!dict[0]->utf8) hnj_hyphen_load_line("NOHYPHEN ',-\n", dict[k], hashtab); + if (!dict[0]->utf8) hnj_hyphen_load_line("NOHYPHEN ',-\n", dict[k], hashtab);
+ else hnj_hyphen_load_line("NOHYPHEN ',\xe2\x80\x93,\xe2\x80\x99,-\n", dict[k], hashtab); + else hnj_hyphen_load_line("NOHYPHEN ',\xe2\x80\x93,\xe2\x80\x99,-\n", dict[k], hashtab);
+ strcpy(buf, "1-1\n"); // buf rewritten by hnj_hyphen_load here + strncpy(buf, "1-1\n", MAX_CHARS-1); // buf rewritten by hnj_hyphen_load here
buf[MAX_CHARS-1] = '\0';
hnj_hyphen_load_line(buf, dict[k], hashtab); /* remove hyphen */ hnj_hyphen_load_line(buf, dict[k], hashtab); /* remove hyphen */
hnj_hyphen_load_line("1'1\n", dict[k], hashtab); /* ASCII apostrophe */ hnj_hyphen_load_line("1'1\n", dict[k], hashtab); /* ASCII apostrophe */
if (dict[0]->utf8) {
...@@ -36,8 +36,8 @@ TARGET=hyphen ...@@ -36,8 +36,8 @@ TARGET=hyphen
# --- Files -------------------------------------------------------- # --- Files --------------------------------------------------------
TARFILE_NAME=hyphen-2.8.3 TARFILE_NAME=hyphen-2.8.4
TARFILE_MD5=86261f06c097d3e425a2f6d0b0635380 TARFILE_MD5=a2f6010987e1c601274ab5d63b72c944
ADDITIONAL_FILES += makefile.mk ADDITIONAL_FILES += makefile.mk
......
..\%__SRC%\slb\hyphen.lib %_DEST%\lib\hyphen.lib ..\%__SRC%\slb\hyphen.lib %_DEST%\lib\hyphen.lib
..\%__SRC%\inc\hyphen.h %_DEST%\inc\hyphen.h ..\%__SRC%\inc\hyphen.h %_DEST%\inc\hyphen.h
..\%__SRC%\misc\build\hyphen-2.8.3\.libs\libhyphen.a %_DEST%\lib\libhyphen.a ..\%__SRC%\misc\build\hyphen-2.8.4\.libs\libhyphen.a %_DEST%\lib\libhyphen.a
..\%__SRC%\misc\build\hyphen-2.8.3\hyph_en_US.dic %_DEST%\bin\hyph_en_US.dic ..\%__SRC%\misc\build\hyphen-2.8.4\hyph_en_US.dic %_DEST%\bin\hyph_en_US.dic
http://dev-www.libreoffice.org/src http://dev-www.libreoffice.org/src
86261f06c097d3e425a2f6d0b0635380-hyphen-2.8.3.tar.gz a2f6010987e1c601274ab5d63b72c944-hyphen-2.8.4.tar.gz
51a40a81b3b7abe8a5c33670bd3da0ce-openssl-0.9.8v.tar.gz 51a40a81b3b7abe8a5c33670bd3da0ce-openssl-0.9.8v.tar.gz
c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2 c63f411b3ad147db2bcce1bf262a0e02-pixman-0.24.4.tar.bz2
0b49ede71c21c0599b0cc19b353a6cb3-README_apache-commons.txt 0b49ede71c21c0599b0cc19b353a6cb3-README_apache-commons.txt
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment