diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2012-07-12 16:22:38 +0100 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2012-07-12 16:24:30 +0100 |
| commit | e3ae44e512dc08cce9d9cecaab2be93a94458431 (patch) | |
| tree | ff88e5d677f51b78bc7dc07d1eab543fafd111b7 /hyphen | |
| parent | ebdfaefc875d6ab5c42f1e659636759909072950 (diff) | |
make check in Hungarian locale uncovered old bug
which had been hidden by now because of an semi-optimized code path which got
removed in the latest hyphen version
Change-Id: Ica4b0cfa16b19469fea1f630bda09eaff82e8857
Diffstat (limited to 'hyphen')
| -rw-r--r-- | hyphen/hyphen-lenwaswrong.patch | 11 | ||||
| -rw-r--r-- | hyphen/makefile.mk | 9 |
2 files changed, 19 insertions, 1 deletions
diff --git a/hyphen/hyphen-lenwaswrong.patch b/hyphen/hyphen-lenwaswrong.patch new file mode 100644 index 000000000000..f42694ff1aae --- /dev/null +++ b/hyphen/hyphen-lenwaswrong.patch @@ -0,0 +1,11 @@ +--- 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/hyphen/makefile.mk b/hyphen/makefile.mk index 6275bd9bba13..cdc70d5c480f 100644 --- a/hyphen/makefile.mk +++ b/hyphen/makefile.mk @@ -44,7 +44,8 @@ ADDITIONAL_FILES += makefile.mk PATCH_FILES= \ hyphen-build.patch \ hyphen-android.patch \ - hyphen-fdo43931.patch + hyphen-fdo43931.patch \ + hyphen-lenwaswrong.patch .IF "$(GUI)"=="UNX" CONFIGURE_DIR=$(BUILD_DIR) @@ -110,3 +111,9 @@ CONFIGURE_FLAGS+= --build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) .INCLUDE : target.mk .INCLUDE : tg_ext.mk +# Since you never know what will be in a patch (for example, it may already +# patch at configure level) or in the case of a binary patch, we remove the +# entire package directory if a patch is newer. +# Changes in this makefile could also make a complete build necessary if +# configure is affected. +$(PACKAGE_DIR)$/$(UNTAR_FLAG_FILE) : makefile.mk |