diff options
| author | Thomas Lange [tl] <tl@openoffice.org> | 2011-01-18 16:42:10 +0100 |
|---|---|---|
| committer | Thomas Lange [tl] <tl@openoffice.org> | 2011-01-18 16:42:10 +0100 |
| commit | 97286ac1ff22bfb7dca87d4f74a4f92c03e1d265 (patch) | |
| tree | 20c138f26edd9ae396b5eb606b260da54e62dc27 /hyphen | |
| parent | 6d45ebb928b2e8df70502ca5cede6695ccb5bcc1 (diff) | |
cws tl84: #i109543# patch to fix hyphenation for Linux
Diffstat (limited to 'hyphen')
| -rw-r--r-- | hyphen/hyphen-2.7.1-read-charset.patch | 20 | ||||
| -rw-r--r-- | hyphen/makefile.mk | 4 |
2 files changed, 23 insertions, 1 deletions
diff --git a/hyphen/hyphen-2.7.1-read-charset.patch b/hyphen/hyphen-2.7.1-read-charset.patch new file mode 100644 index 000000000000..e846955517bc --- /dev/null +++ b/hyphen/hyphen-2.7.1-read-charset.patch @@ -0,0 +1,20 @@ +--- 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); diff --git a/hyphen/makefile.mk b/hyphen/makefile.mk index b77343772e3a..94c1592df21e 100644 --- a/hyphen/makefile.mk +++ b/hyphen/makefile.mk @@ -41,7 +41,9 @@ TARFILE_MD5=48a9f787f43a09c0a9b7b00cd1fddbbf ADDITIONAL_FILES += makefile.mk -PATCH_FILES=hyphen-2.7.1.patch +PATCH_FILES= \ + hyphen-2.7.1.patch \ + hyphen-2.7.1-read-charset.patch .IF "$(GUI)"=="UNX" CONFIGURE_DIR=$(BUILD_DIR) |