[Libreoffice-commits] core.git: Branch 'libreoffice-4-3' - 2 commits - external/hyphen

[Stephan Bergmann]

 external/hyphen/hyphen-fdo48017-wfopen.patch |    7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

New commits:
commit e59d55a2e80495f4db38bdae4b1266c8b7c2aafb
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri May 23 09:51:11 2014 +0200

    Fold hyphen-c99.patch.0 into hyphen-fdo48017-wfopen.patch
    
    Change-Id: I2f866aa16704bc5492e0e0b78136fdfe41caa7a5
    (cherry picked from commit 24819d71ec9ce73840e82791c0219fe012e45c37)

diff --git a/external/hyphen/UnpackedTarball_hyphen.mk b/external/hyphen/UnpackedTarball_hyphen.mk
index 72d54fd..c112b35 100644
--- a/external/hyphen/UnpackedTarball_hyphen.mk
+++ b/external/hyphen/UnpackedTarball_hyphen.mk
@@ -18,7 +18,6 @@ $(eval $(call gb_UnpackedTarball_add_patches,hyphen,\
 	external/hyphen/hyphen-rhmin.patch \
 	external/hyphen/hyphen-build.patch \
 	external/hyphen/hyphen-fdo48017-wfopen.patch \
-	external/hyphen/hyphen-c99.patch.0 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/hyphen/hyphen-c99.patch.0 b/external/hyphen/hyphen-c99.patch.0
deleted file mode 100644
index 83930cb..0000000
--- a/external/hyphen/hyphen-c99.patch.0
+++ /dev/null
@@ -1,13 +0,0 @@
---- hyphen.c
-+++ hyphen.c
-@@ -382,8 +382,9 @@
-     if (strncmp(path, WIN32_LONG_PATH_PREFIX, 4) == 0) {
-         int len = MultiByteToWideChar(CP_UTF8, 0, path, -1, NULL, 0);
-         wchar_t *buff = (wchar_t *) malloc(len * sizeof(wchar_t));
-+        FILE * f;
-         MultiByteToWideChar(CP_UTF8, 0, path, -1, buff, len);
--        FILE * f = _wfopen(buff, (strcmp(mode, "r") == 0) ? L"r" : L"rb");
-+        f = _wfopen(buff, (strcmp(mode, "r") == 0) ? L"r" : L"rb");
-         free(buff);
-         return f;
-     }
diff --git a/external/hyphen/hyphen-fdo48017-wfopen.patch b/external/hyphen/hyphen-fdo48017-wfopen.patch
index 9a73b4a..27cffa0 100644
--- a/external/hyphen/hyphen-fdo48017-wfopen.patch
+++ b/external/hyphen/hyphen-fdo48017-wfopen.patch
@@ -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,21 @@
+@@ -371,6 +376,22 @@
  	    }
  }
  
@@ -23,8 +23,9 @@ diff -u hyphen/hyphen.c build/hyphen/hyphen.c
 +    if (strncmp(path, WIN32_LONG_PATH_PREFIX, 4) == 0) {
 +        int len = MultiByteToWideChar(CP_UTF8, 0, path, -1, NULL, 0);
 +        wchar_t *buff = (wchar_t *) malloc(len * sizeof(wchar_t));
++        FILE * f;
 +        MultiByteToWideChar(CP_UTF8, 0, path, -1, buff, len);
-+        FILE * f = _wfopen(buff, (strcmp(mode, "r") == 0) ? L"r" : L"rb");
++        f = _wfopen(buff, (strcmp(mode, "r") == 0) ? L"r" : L"rb");
 +        free(buff);
 +        return f;
 +    }
@@ -35,7 +36,7 @@ diff -u hyphen/hyphen.c build/hyphen/hyphen.c
  HyphenDict *
  hnj_hyphen_load (const char *fn)
  {
-@@ -383,7 +403,7 @@
+@@ -383,7 +404,7 @@
    HashEntry *e;
    int state_num = 0;
  
commit 9d96fc88646cc43ab05fb6fe98dfbf6a962f4ae3
Author: Stephan Bergmann <sbergman at redhat.com>
Date:   Fri May 23 09:37:23 2014 +0200

    external/hypen: Fix for pre-C99
    
    Change-Id: Iff0692768cbcaa68f79404a9a933044fe8bb9096
    (cherry picked from commit e21cb524274c6719fe953001a19ba2124f1e8385)

diff --git a/external/hyphen/UnpackedTarball_hyphen.mk b/external/hyphen/UnpackedTarball_hyphen.mk
index c112b35..72d54fd 100644
--- a/external/hyphen/UnpackedTarball_hyphen.mk
+++ b/external/hyphen/UnpackedTarball_hyphen.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,hyphen,\
 	external/hyphen/hyphen-rhmin.patch \
 	external/hyphen/hyphen-build.patch \
 	external/hyphen/hyphen-fdo48017-wfopen.patch \
+	external/hyphen/hyphen-c99.patch.0 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/hyphen/hyphen-c99.patch.0 b/external/hyphen/hyphen-c99.patch.0
new file mode 100644
index 0000000..83930cb
--- /dev/null
+++ b/external/hyphen/hyphen-c99.patch.0
@@ -0,0 +1,13 @@
+--- hyphen.c
++++ hyphen.c
+@@ -382,8 +382,9 @@
+     if (strncmp(path, WIN32_LONG_PATH_PREFIX, 4) == 0) {
+         int len = MultiByteToWideChar(CP_UTF8, 0, path, -1, NULL, 0);
+         wchar_t *buff = (wchar_t *) malloc(len * sizeof(wchar_t));
++        FILE * f;
+         MultiByteToWideChar(CP_UTF8, 0, path, -1, buff, len);
+-        FILE * f = _wfopen(buff, (strcmp(mode, "r") == 0) ? L"r" : L"rb");
++        f = _wfopen(buff, (strcmp(mode, "r") == 0) ? L"r" : L"rb");
+         free(buff);
+         return f;
+     }