summaryrefslogtreecommitdiff
path: root/external
diff options
context:
space:
mode:
authorStephan Bergmann <sbergman@redhat.com>2014-05-23 09:51:11 +0200
committerStephan Bergmann <sbergman@redhat.com>2014-05-23 09:51:11 +0200
commit24819d71ec9ce73840e82791c0219fe012e45c37 (patch)
treeeaf0f9c1eaa5c1fdad2a4a4f97ddce9fdcc5b326 /external
parent2a99a22af0062e9561046a4a00f12dc97e5bd4f4 (diff)
Fold hyphen-c99.patch.0 into hyphen-fdo48017-wfopen.patch
Change-Id: I2f866aa16704bc5492e0e0b78136fdfe41caa7a5
Diffstat (limited to 'external')
-rw-r--r--external/hyphen/UnpackedTarball_hyphen.mk1
-rw-r--r--external/hyphen/hyphen-c99.patch.013
-rw-r--r--external/hyphen/hyphen-fdo48017-wfopen.patch7
3 files changed, 4 insertions, 17 deletions
diff --git a/external/hyphen/UnpackedTarball_hyphen.mk b/external/hyphen/UnpackedTarball_hyphen.mk
index 72d54fd5a928..c112b3597338 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 83930cb09e00..000000000000
--- 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 9a73b4a75025..27cffa08703c 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;