[Libreoffice-commits] .: hyphen/hyphen-lenwaswrong.patch hyphen/makefile.mk

[Caolán McNamara]

 hyphen/hyphen-lenwaswrong.patch |   11 +++++++++++
 hyphen/makefile.mk              |    9 ++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

New commits:
commit e3ae44e512dc08cce9d9cecaab2be93a94458431
Author: Caolán McNamara <caolanm at redhat.com>
Date:   Thu Jul 12 16:22:38 2012 +0100

    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

diff --git a/hyphen/hyphen-lenwaswrong.patch b/hyphen/hyphen-lenwaswrong.patch
new file mode 100644
index 0000000..f42694f
--- /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 6275bd9..cdc70d5 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