summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCaolán McNamara <caolanm@redhat.com>2011-12-22 23:41:29 +0000
committerCaolán McNamara <caolanm@redhat.com>2011-12-22 23:45:16 +0000
commit84897d4b3b2a0e4719b00fb06abb8c04e3c20c24 (patch)
treed43669d827031cc94a51c3bdff8684dcf89edb0d
parent279b71044d1a8b60452425b5b192d3dfb21a62fe (diff)
Recover fix for fdo#43931
-rw-r--r--hyphen/hyphen-fdo43931.patch11
-rw-r--r--hyphen/makefile.mk3
2 files changed, 13 insertions, 1 deletions
diff --git a/hyphen/hyphen-fdo43931.patch b/hyphen/hyphen-fdo43931.patch
new file mode 100644
index 000000000000..5299066a1ef3
--- /dev/null
+++ b/hyphen/hyphen-fdo43931.patch
@@ -0,0 +1,11 @@
+--- misc/hyphen-2.8.3/hyphen.c 2011-12-22 23:37:55.929693094 +0000
++++ misc/build/hyphen-2.8.3/hyphen.c 2011-12-22 23:38:32.294088592 +0000
+@@ -437,7 +437,7 @@
+ /* 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
++ strcpy(buf, "1-1\n"); // buf rewritten by hnj_hyphen_load here
+ 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 feb0ea7615b3..f44953f7e077 100644
--- a/hyphen/makefile.mk
+++ b/hyphen/makefile.mk
@@ -43,7 +43,8 @@ ADDITIONAL_FILES += makefile.mk
PATCH_FILES= \
hyphen-build.patch \
- hyphen-android.patch
+ hyphen-android.patch \
+ hyphen-fdo43931.patch
.IF "$(GUI)"=="UNX"
CONFIGURE_DIR=$(BUILD_DIR)