summaryrefslogtreecommitdiff
path: root/hyphen
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2012-06-29 11:20:03 +0100
committerCaolán McNamara <caolanm@redhat.com>2012-06-29 11:20:33 +0100
commitff3c4e9e54efff3b8701fb562291a9edacae8100 (patch)
tree4c75411e4b00f3b5c974f88a775ffc37c7fcbec2 /hyphen
parent9e0cbe5eb3f4785d8db26f87ce0208823c87c5ad (diff)
bump hyphen to 2.8.4
Change-Id: Iafcd6d7b06529534abb1470c7739bb9f935f3c61
Diffstat (limited to 'hyphen')
-rw-r--r--hyphen/hyphen-android.patch4
-rw-r--r--hyphen/hyphen-build.patch12
-rw-r--r--hyphen/hyphen-fdo43931.patch12
-rw-r--r--hyphen/makefile.mk4
-rw-r--r--hyphen/prj/d.lst4
5 files changed, 18 insertions, 18 deletions
diff --git a/hyphen/hyphen-android.patch b/hyphen/hyphen-android.patch
index 1cc3365458e9..6adc51d09ada 100644
--- a/hyphen/hyphen-android.patch
+++ b/hyphen/hyphen-android.patch
@@ -1,5 +1,5 @@
---- misc/hyphen-2.8.3/config.sub
-+++ misc/build/hyphen-2.8.3/config.sub
+--- misc/hyphen-2.8.4/config.sub
++++ misc/build/hyphen-2.8.4/config.sub
@@ -120,7 +120,7 @@
# Here we must recognize all the valid KERNEL-OS combinations.
maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
diff --git a/hyphen/hyphen-build.patch b/hyphen/hyphen-build.patch
index abd02ef8ef42..7b8ceaa47d29 100644
--- a/hyphen/hyphen-build.patch
+++ b/hyphen/hyphen-build.patch
@@ -1,5 +1,5 @@
---- misc/hyphen-2.8.3/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/hyphen-2.8.4/Makefile.am 2010-07-19 11:23:17.000000000 +0200
++++ misc/build/hyphen-2.8.4/Makefile.am 2010-12-02 10:15:44.390625000 +0100
@@ -25,13 +25,13 @@
hyphen.us3:
@@ -17,8 +17,8 @@
clean-local:
rm -rf hyphen.us* hyph_en_US.dic
---- misc/hyphen-2.8.3/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/hyphen-2.8.4/Makefile.in 2010-12-01 02:31:29.000000000 +0100
++++ misc/build/hyphen-2.8.4/Makefile.in 2010-12-02 10:17:16.546875000 +0100
@@ -940,13 +940,13 @@
hyphen.us3:
@@ -36,8 +36,8 @@
clean-local:
rm -rf hyphen.us* hyph_en_US.dic
---- misc/hyphen-2.8.3/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/hyphen-2.8.4/makefile.mk 2010-12-02 10:35:40.265625000 +0100
++++ misc/build/hyphen-2.8.4/makefile.mk 2010-12-02 10:25:45.750000000 +0100
@@ -1 +1,28 @@
-dummy
+PRJ = ..$/..$/..$/..
diff --git a/hyphen/hyphen-fdo43931.patch b/hyphen/hyphen-fdo43931.patch
index 17e1320b2659..0a1f0b9cbdee 100644
--- a/hyphen/hyphen-fdo43931.patch
+++ b/hyphen/hyphen-fdo43931.patch
@@ -1,15 +1,15 @@
---- misc//hyphen-2.8.3/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
-@@ -435,9 +435,9 @@
+--- misc//hyphen-2.8.4/hyphen.c 2011-10-10 15:49:33.000000000 +0200
++++ misc/build/hyphen-2.8.4/hyphen.c 2011-12-27 13:49:07.568283812 +0100
+@@ -436,9 +436,9 @@
}
} else if (k == 1) {
/* default first level: hyphen and ASCII apostrophe */
- 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);
-- 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);
+ 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("1'1\n", dict[k], hashtab); /* ASCII apostrophe */
- if (dict[0]->utf8) {
diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk
index f44953f7e077..6275bd9bba13 100644
--- a/hyphen/makefile.mk
+++ b/hyphen/makefile.mk
@@ -36,8 +36,8 @@ TARGET=hyphen
# --- Files --------------------------------------------------------
-TARFILE_NAME=hyphen-2.8.3
-TARFILE_MD5=86261f06c097d3e425a2f6d0b0635380
+TARFILE_NAME=hyphen-2.8.4
+TARFILE_MD5=a2f6010987e1c601274ab5d63b72c944
ADDITIONAL_FILES += makefile.mk
diff --git a/hyphen/prj/d.lst b/hyphen/prj/d.lst
index dbaf96ed490f..0588179ef9b7 100644
--- a/hyphen/prj/d.lst
+++ b/hyphen/prj/d.lst
@@ -1,5 +1,5 @@
..\%__SRC%\slb\hyphen.lib %_DEST%\lib\hyphen.lib
..\%__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.3\hyph_en_US.dic %_DEST%\bin\hyph_en_US.dic
+..\%__SRC%\misc\build\hyphen-2.8.4\.libs\libhyphen.a %_DEST%\lib\libhyphen.a
+..\%__SRC%\misc\build\hyphen-2.8.4\hyph_en_US.dic %_DEST%\bin\hyph_en_US.dic