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

bump hyphen to 2.8.3

üst 5c1dc778
This diff is collapsed.
--- misc/hyphen-2.7.1/hyphen.c 2010-12-01 01:47:22.000000000 +0100
+++ misc/build/hyphen-2.7.1/hyphen.c 2011-01-18 16:26:50.953125000 +0100
@@ -291,13 +291,10 @@
/* read in character set info */
if (k == 0) {
for (i=0;i<MAX_NAME;i++) dict[k]->cset[i]= 0;
- if (fgets(dict[k]->cset, sizeof(dict[k]->cset),f) != NULL) {
- for (i=0;i<MAX_NAME;i++)
- if ((dict[k]->cset[i] == '\r') || (dict[k]->cset[i] == '\n'))
- dict[k]->cset[i] = 0;
- } else {
- dict[k]->cset[0] = 0;
- }
+ fgets(dict[k]->cset, sizeof(dict[k]->cset),f);
+ for (i=0;i<MAX_NAME;i++)
+ if ((dict[k]->cset[i] == '\r') || (dict[k]->cset[i] == '\n'))
+ dict[k]->cset[i] = 0;
dict[k]->utf8 = (strcmp(dict[k]->cset, "UTF-8") == 0);
} else {
strcpy(dict[k]->cset, dict[0]->cset);
--- misc/hyphen-2.7.1/config.sub --- misc/hyphen-2.8.3/config.sub
+++ misc/build/hyphen-2.7.1/config.sub +++ misc/build/hyphen-2.8.3/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.7.1/Makefile.am 2010-07-19 11:23:17.000000000 +0200 --- misc/hyphen-2.8.3/Makefile.am 2010-07-19 11:23:17.000000000 +0200
+++ misc/build/hyphen-2.7.1/Makefile.am 2010-12-02 10:15:44.390625000 +0100 +++ misc/build/hyphen-2.8.3/Makefile.am 2010-12-02 10:15:44.390625000 +0100
@@ -25,14 +25,13 @@ @@ -25,13 +25,13 @@
hyphen.us3: hyphen.us3:
cp -f $(srcdir)/hyphen.tex hyphen.us cp -f $(srcdir)/hyphen.tex hyphen.us
...@@ -11,16 +11,15 @@ ...@@ -11,16 +11,15 @@
cat $(srcdir)/ligpatch.txt >>hyphen.us3 cat $(srcdir)/ligpatch.txt >>hyphen.us3
-hyph_en_US.dic: hyphen.us3 -hyph_en_US.dic: hyphen.us3
- perl $(srcdir)/substrings.pl hyphen.us3 hyphen.us4 UTF-8 2 3 >/dev/null - perl $(srcdir)/substrings.pl hyphen.us3 hyph_en_US.dic UTF-8 2 3 >/dev/null
- cat hyphen.us4 | $(SED) -f $(srcdir)/ooopatch.sed >hyph_en_US.dic
+hyph_en_US.dic: +hyph_en_US.dic:
+ @echo "hyph_en_US.txt distributed with Hyphen library" + @echo "hyph_en_US.txt distributed with Hyphen library"
clean-local: clean-local:
rm -rf hyphen.us* hyph_en_US.dic rm -rf hyphen.us* hyph_en_US.dic
--- misc/hyphen-2.7.1/Makefile.in 2010-12-01 02:31:29.000000000 +0100 --- misc/hyphen-2.8.3/Makefile.in 2010-12-01 02:31:29.000000000 +0100
+++ misc/build/hyphen-2.7.1/Makefile.in 2010-12-02 10:17:16.546875000 +0100 +++ misc/build/hyphen-2.8.3/Makefile.in 2010-12-02 10:17:16.546875000 +0100
@@ -940,14 +940,13 @@ @@ -940,13 +940,13 @@
hyphen.us3: hyphen.us3:
cp -f $(srcdir)/hyphen.tex hyphen.us cp -f $(srcdir)/hyphen.tex hyphen.us
...@@ -31,15 +30,14 @@ ...@@ -31,15 +30,14 @@
cat $(srcdir)/ligpatch.txt >>hyphen.us3 cat $(srcdir)/ligpatch.txt >>hyphen.us3
-hyph_en_US.dic: hyphen.us3 -hyph_en_US.dic: hyphen.us3
- perl $(srcdir)/substrings.pl hyphen.us3 hyphen.us4 UTF-8 2 3 >/dev/null - perl $(srcdir)/substrings.pl hyphen.us3 hyph_en_US.dic UTF-8 2 3 >/dev/null
- cat hyphen.us4 | $(SED) -f $(srcdir)/ooopatch.sed >hyph_en_US.dic
+hyph_en_US.dic: +hyph_en_US.dic:
+ @echo "hyph_en_US.txt distributed with Hyphen library" + @echo "hyph_en_US.txt distributed with Hyphen library"
clean-local: clean-local:
rm -rf hyphen.us* hyph_en_US.dic rm -rf hyphen.us* hyph_en_US.dic
--- misc/hyphen-2.7.1/makefile.mk 2010-12-02 10:35:40.265625000 +0100 --- misc/hyphen-2.8.3/makefile.mk 2010-12-02 10:35:40.265625000 +0100
+++ misc/build/hyphen-2.7.1/makefile.mk 2010-12-02 10:25:45.750000000 +0100 +++ misc/build/hyphen-2.8.3/makefile.mk 2010-12-02 10:25:45.750000000 +0100
@@ -1 +1,28 @@ @@ -1 +1,28 @@
-dummy -dummy
+PRJ = ..$/..$/..$/.. +PRJ = ..$/..$/..$/..
......
...@@ -36,15 +36,13 @@ TARGET=hyphen ...@@ -36,15 +36,13 @@ TARGET=hyphen
# --- Files -------------------------------------------------------- # --- Files --------------------------------------------------------
TARFILE_NAME=hyphen-2.7.1 TARFILE_NAME=hyphen-2.8.3
TARFILE_MD5=48a9f787f43a09c0a9b7b00cd1fddbbf TARFILE_MD5=86261f06c097d3e425a2f6d0b0635380
ADDITIONAL_FILES += makefile.mk ADDITIONAL_FILES += makefile.mk
PATCH_FILES= \ PATCH_FILES= \
hyphen-2.7.1.patch \ hyphen-build.patch \
hyphen-2.7.1-read-charset.patch \
hyphen-2.7.1-2.8.3.patch \
hyphen-android.patch hyphen-android.patch
.IF "$(GUI)"=="UNX" .IF "$(GUI)"=="UNX"
......
..\%__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.7.1\.libs\libhyphen.a %_DEST%\lib\libhyphen.a ..\%__SRC%\misc\build\hyphen-2.8.3\.libs\libhyphen.a %_DEST%\lib\libhyphen.a
..\%__SRC%\misc\build\hyphen-2.7.1\hyph_en_US.dic %_DEST%\bin\hyph_en_US.dic ..\%__SRC%\misc\build\hyphen-2.8.3\hyph_en_US.dic %_DEST%\bin\hyph_en_US.dic
http://dev-www.libreoffice.org/src http://dev-www.libreoffice.org/src
48a9f787f43a09c0a9b7b00cd1fddbbf-hyphen-2.7.1.tar.gz 86261f06c097d3e425a2f6d0b0635380-hyphen-2.8.3.tar.gz
63ddc5116488985e820075e65fbe6aa4-openssl-0.9.8o.tar.gz 63ddc5116488985e820075e65fbe6aa4-openssl-0.9.8o.tar.gz
db5ffcd50064421176e8afb7b85fd1a7-pixman-0.24.0.tar.bz2 db5ffcd50064421176e8afb7b85fd1a7-pixman-0.24.0.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