download.lst | 2 +-
external/hyphen/UnpackedTarball_hyphen.mk | 4 ----
external/hyphen/hyphen-android.patch | 20 --------------------
external/hyphen/hyphen-fdo43931.patch | 15 ---------------
external/hyphen/hyphen-fdo48017-wfopen.patch | 10 ++++------
external/hyphen/hyphen-lenwaswrong.patch | 11 -----------
external/hyphen/hyphen-rhmin.patch | 27 ---------------------------
7 files changed, 5 insertions(+), 84 deletions(-)
New commits:
commit 77af6cd18c2df43b75cd2c973a5267647de2f6e5
Author: Caolán McNamara <caol...@redhat.com>
Date: Fri Jun 27 09:59:03 2014 +0100
update hyphen 2.8.7
Change-Id: Icbe95429903dd3605acfd659c46f001d838b52c3
diff --git a/download.lst b/download.lst
index 3614789..2e74282 100644
--- a/download.lst
+++ b/download.lst
@@ -62,7 +62,7 @@ export HARFBUZZ_MD5SUM := a4a9b548577e2ee22f0887937da5fd6c
export HARFBUZZ_TARBALL := harfbuzz-0.9.23.tar.bz2
export HSQLDB_TARBALL := 17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
export HUNSPELL_TARBALL :=
3121aaf3e13e5d88dfff13fb4a5f1ab8-hunspell-1.3.2.tar.gz
-export HYPHEN_TARBALL := a2f6010987e1c601274ab5d63b72c944-hyphen-2.8.4.tar.gz
+export HYPHEN_TARBALL := ecaf645cb09bd7b6ad0497b8a91fbd22-hyphen-2.8.7.tar.gz
export ICU_TARBALL := b73baa6fbdfef197608d1f69300919b9-icu4c-53_1-src.tgz
export JFREEREPORT_FLOW_ENGINE_TARBALL :=
ba2930200c9f019c2d93a8c88c651a0f-flow-engine-0.9.4.zip
export JFREEREPORT_FLUTE_TARBALL :=
d8bd5eed178db6e2b18eeed243f85aa8-flute-1.1.6.zip
diff --git a/external/hyphen/UnpackedTarball_hyphen.mk
b/external/hyphen/UnpackedTarball_hyphen.mk
index c112b35..0f41367 100644
--- a/external/hyphen/UnpackedTarball_hyphen.mk
+++ b/external/hyphen/UnpackedTarball_hyphen.mk
@@ -12,10 +12,6 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,hyphen))
$(eval $(call gb_UnpackedTarball_set_tarball,hyphen,$(HYPHEN_TARBALL)))
$(eval $(call gb_UnpackedTarball_add_patches,hyphen,\
- external/hyphen/hyphen-lenwaswrong.patch \
- external/hyphen/hyphen-fdo43931.patch \
- external/hyphen/hyphen-android.patch \
- external/hyphen/hyphen-rhmin.patch \
external/hyphen/hyphen-build.patch \
external/hyphen/hyphen-fdo48017-wfopen.patch \
))
diff --git a/external/hyphen/hyphen-android.patch
b/external/hyphen/hyphen-android.patch
deleted file mode 100644
index d092d78..0000000
--- a/external/hyphen/hyphen-android.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- 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/'`
- case $maybe_os in
-- nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-+ nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* |
linux-uclibc* | \
- uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* |
netbsd*-gnu* | \
- storm-chaos* | os2-emx* | rtmk-nova*)
- os=-$maybe_os
-@@ -1215,7 +1215,7 @@
- | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- | -chorusos* | -chorusrdb* \
- | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-- | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-+ | -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib*
| -linux-uclibc* \
- | -uxpv* | -beos* | -mpeix* | -udk* \
- | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
diff --git a/external/hyphen/hyphen-fdo43931.patch
b/external/hyphen/hyphen-fdo43931.patch
deleted file mode 100644
index 0a1f0b9..0000000
--- a/external/hyphen/hyphen-fdo43931.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- 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);
-- 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);
-+ 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 */
diff --git a/external/hyphen/hyphen-fdo48017-wfopen.patch
b/external/hyphen/hyphen-fdo48017-wfopen.patch
index 27cffa0..4bcf633 100644
--- a/external/hyphen/hyphen-fdo48017-wfopen.patch
+++ b/external/hyphen/hyphen-fdo48017-wfopen.patch
@@ -1,6 +1,6 @@
diff -u hyphen/hyphen.c build/hyphen/hyphen.c
--- hyphen/hyphen.c 2014-05-22 00:28:13.164587974 +0200
-+++ build/hyphen/hyphen.c 2014-05-22 11:08:55.000000000 +0200
++++ build/hyphen/hyphen.c 2015-05-22 11:08:55.000000000 +0200
@@ -44,6 +44,11 @@
#include <unistd.h> /* for exit */
#endif
@@ -13,7 +13,7 @@ diff -u hyphen/hyphen.c build/hyphen/hyphen.c
#define noVERBOSE
/* calculate hyphenmin values with long ligature length (2 or 3 characters
-@@ -371,6 +376,22 @@
+@@ -371,12 +376,28 @@
}
}
@@ -36,10 +36,8 @@ diff -u hyphen/hyphen.c build/hyphen/hyphen.c
HyphenDict *
hnj_hyphen_load (const char *fn)
{
-@@ -383,7 +404,7 @@
- HashEntry *e;
- int state_num = 0;
-
+ HyphenDict *result;
+ FILE *f;
- f = fopen (fn, "r");
+ f = hnj_fopen (fn, "r");
if (f == NULL)
diff --git a/external/hyphen/hyphen-lenwaswrong.patch
b/external/hyphen/hyphen-lenwaswrong.patch
deleted file mode 100644
index f42694f..0000000
--- a/external/hyphen/hyphen-lenwaswrong.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- misc/hyphen-2.8.4/hyphen.c 29 Jun 2012 10:02:24 -0000 1.6
-+++ misc/build/hyphen-2.8.4/hyphen.c 12 Jul 2012 15:19:16 -0000
-@@ -951,7 +951,7 @@
- rep2 = hnj_malloc (word_size * sizeof(char *));
- pos2 = hnj_malloc (word_size * sizeof(int));
- cut2 = hnj_malloc (word_size * sizeof(int));
-- hyphens2 = hnj_malloc (word_size);
-+ hyphens2 = hnj_malloc (word_size + 3);
- for (i = 0; i < word_size; i++) rep2[i] = NULL;
- for (i = 0; i < word_size; i++) if
- (hyphens[i]&1 || (begin > 0 && i + 1 == word_size)) {
diff --git a/external/hyphen/hyphen-rhmin.patch
b/external/hyphen/hyphen-rhmin.patch
deleted file mode 100644
index 12fff19..0000000
--- a/external/hyphen/hyphen-rhmin.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- misc//hyphen-2.8.4/hyphen.c
-+++ misc/build/hyphen-2.8.4/hyphen.c
-@@ -734,13 +734,13 @@
- int hnj_hyphen_rhmin(int utf8, const char *word, int word_size, char *
hyphens,
- char *** rep, int ** pos, int ** cut, int rhmin)
- {
-- int i = 1;
-+ int i = 0;
- int j;
-
- // ignore numbers
- for (j = word_size - 1; j > 0 && word[j] <= '9' && word[j] >= '0'; j--)
i--;
-
-- for (j = word_size - 2; i < rhmin && j > 0; j--) {
-+ for (j = word_size - 1; i < rhmin && j > 0; j--) {
- // check length of the non-standard part
- if (*rep && *pos && *cut && (*rep)[j]) {
- char * rh = strchr((*rep)[j], '=');
-@@ -753,7 +753,7 @@
- } else {
- hyphens[j] = '0';
- }
-- if (!utf8 || (word[j] & 0xc0) != 0xc0) i++;
-+ if (!utf8 || (word[j] & 0xc0) == 0xc0 || (word[j] & 0x80) != 0x80) i++;
- }
- return 0;
- }
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
