[Libreoffice-commits] core.git: external/hyphen

2017-06-12 Thread jan Iversen 
 external/hyphen/UnpackedTarball_hyphen.mk |1 +
 external/hyphen/hyphen-iOS.patch.0|   20 
 2 files changed, 21 insertions(+)

New commits:
commit 2487bc42780b698bcee3572422dd3585ee845eef
Author: jan Iversen 
Date:   Mon Jun 12 17:30:49 2017 +0200

iOS hyphen patch

Added support for arm64

Change-Id: Ie48a463b0f0a8af98001fed592d59a8e7b0d0225

diff --git a/external/hyphen/UnpackedTarball_hyphen.mk 
b/external/hyphen/UnpackedTarball_hyphen.mk
index 0f41367756b6..c2cbe7f1040b 100644
--- a/external/hyphen/UnpackedTarball_hyphen.mk
+++ b/external/hyphen/UnpackedTarball_hyphen.mk
@@ -14,6 +14,7 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,hyphen,$(HYPHEN_TARBALL)))
 $(eval $(call gb_UnpackedTarball_add_patches,hyphen,\
external/hyphen/hyphen-build.patch \
external/hyphen/hyphen-fdo48017-wfopen.patch \
+   external/hyphen/hyphen-iOS.patch.0 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/hyphen/hyphen-iOS.patch.0 
b/external/hyphen/hyphen-iOS.patch.0
new file mode 100644
index ..9e578338b858
--- /dev/null
+++ b/external/hyphen/hyphen-iOS.patch.0
@@ -0,0 +1,20 @@
+--- config.sub 2014-06-27 10:59:40.0 +0200
 config.sub 2017-06-12 17:03:16.0 +0200
+@@ -257,7 +257,7 @@
+   | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | 
alpha64pca5[67] \
+   | am33_2.0 \
+   | arc \
+-  | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \
++  | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] | 
arm64 \
+   | avr | avr32 \
+   | be32 | be64 \
+   | bfin \
+@@ -370,7 +370,7 @@
+   | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
+   | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
+   | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
+-  | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
++  | arm-*  | armbe-* | armle-* | armeb-* | armv*-* | arm64-* \
+   | avr-* | avr32-* \
+   | be32-* | be64-* \
+   | bfin-* | bs2000-* \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/hyphen

2014-05-23 Thread Stephan Bergmann 
 external/hyphen/UnpackedTarball_hyphen.mk |1 +
 external/hyphen/hyphen-c99.patch.0|   13 +
 2 files changed, 14 insertions(+)

New commits:
commit e21cb524274c6719fe953001a19ba2124f1e8385
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri May 23 09:37:23 2014 +0200

external/hypen: Fix for pre-C99

Change-Id: Iff0692768cbcaa68f79404a9a933044fe8bb9096

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 000..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) ? Lr : Lrb);
++f = _wfopen(buff, (strcmp(mode, r) == 0) ? Lr : Lrb);
+ free(buff);
+ return f;
+ }
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/hyphen

2014-05-23 Thread Stephan Bergmann 
 external/hyphen/UnpackedTarball_hyphen.mk|1 -
 external/hyphen/hyphen-c99.patch.0   |   13 -
 external/hyphen/hyphen-fdo48017-wfopen.patch |7 ---
 3 files changed, 4 insertions(+), 17 deletions(-)

New commits:
commit 24819d71ec9ce73840e82791c0219fe012e45c37
Author: Stephan Bergmann sberg...@redhat.com
Date:   Fri May 23 09:51:11 2014 +0200

Fold hyphen-c99.patch.0 into hyphen-fdo48017-wfopen.patch

Change-Id: I2f866aa16704bc5492e0e0b78136fdfe41caa7a5

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..000
--- 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) ? Lr : Lrb);
-+f = _wfopen(buff, (strcmp(mode, r) == 0) ? Lr : Lrb);
- 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) ? Lr : Lrb);
++f = _wfopen(buff, (strcmp(mode, r) == 0) ? Lr : Lrb);
 +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;
  
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/hyphen external/mythes lingucomponent/source

2014-05-22 Thread László Németh 
 external/hyphen/UnpackedTarball_hyphen.mk |1 
 external/hyphen/hyphen-fdo48017-wfopen.patch  |   46 +++
 external/mythes/UnpackedTarball_mythes.mk |1 
 external/mythes/mythes-fdo48017-wfopen.patch  |   72 ++
 lingucomponent/source/hyphenator/hyphen/hyphenimp.cxx |   10 +-
 lingucomponent/source/lingutil/lingutil.cxx   |   27 --
 lingucomponent/source/lingutil/lingutil.hxx   |   10 --
 lingucomponent/source/thesaurus/libnth/nthesimp.cxx   |   14 +--
 8 files changed, 130 insertions(+), 51 deletions(-)

New commits:
commit 6d06aa8ba83b7629603cd86cf14a63c432ce268f
Author: László Németh nem...@numbertext.org
Date:   Thu May 22 12:27:44 2014 +0200

fdo#48017 WIN32 long path support in Hyphen and MyThes

Change-Id: Ifb068efb553ed24a7caf65dbab28726bdeced0e6

diff --git a/external/hyphen/UnpackedTarball_hyphen.mk 
b/external/hyphen/UnpackedTarball_hyphen.mk
index 5cd0af8..c112b35 100644
--- a/external/hyphen/UnpackedTarball_hyphen.mk
+++ b/external/hyphen/UnpackedTarball_hyphen.mk
@@ -17,6 +17,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,hyphen,\
external/hyphen/hyphen-android.patch \
external/hyphen/hyphen-rhmin.patch \
external/hyphen/hyphen-build.patch \
+   external/hyphen/hyphen-fdo48017-wfopen.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/hyphen/hyphen-fdo48017-wfopen.patch 
b/external/hyphen/hyphen-fdo48017-wfopen.patch
new file mode 100644
index 000..9a73b4a
--- /dev/null
+++ b/external/hyphen/hyphen-fdo48017-wfopen.patch
@@ -0,0 +1,46 @@
+diff -u hyphen/hyphen.c build/hyphen/hyphen.c
+--- hyphen/hyphen.c2014-05-22 00:28:13.164587974 +0200
 build/hyphen/hyphen.c  2014-05-22 11:08:55.0 +0200
+@@ -44,6 +44,11 @@
+ #include unistd.h /* for exit */
+ #endif
+ 
++#ifdef _WIN32
++#include windows.h
++#include wchar.h
++#endif
++
+ #define noVERBOSE
+ 
+ /* calculate hyphenmin values with long ligature length (2 or 3 characters
+@@ -371,6 +376,21 @@
+   }
+ }
+ 
++FILE * hnj_fopen(const char * path, const char * mode) {
++#ifdef _WIN32
++#define WIN32_LONG_PATH_PREFIX ?\\
++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));
++MultiByteToWideChar(CP_UTF8, 0, path, -1, buff, len);
++FILE * f = _wfopen(buff, (strcmp(mode, r) == 0) ? Lr : Lrb);
++free(buff);
++return f;
++}
++#endif
++return fopen(path, mode);
++}
++
+ HyphenDict *
+ hnj_hyphen_load (const char *fn)
+ {
+@@ -383,7 +403,7 @@
+   HashEntry *e;
+   int state_num = 0;
+ 
+-  f = fopen (fn, r);
++  f = hnj_fopen (fn, r);
+   if (f == NULL)
+ return NULL;
+ 
diff --git a/external/mythes/UnpackedTarball_mythes.mk 
b/external/mythes/UnpackedTarball_mythes.mk
index d2d4e1d..7571c34 100644
--- a/external/mythes/UnpackedTarball_mythes.mk
+++ b/external/mythes/UnpackedTarball_mythes.mk
@@ -15,6 +15,7 @@ $(eval $(call gb_UnpackedTarball_add_patches,mythes,\
external/mythes/mythes-1.2.0-vanilla-th-gen-idx.patch \
external/mythes/mythes-1.2.0-android.patch \
external/mythes/mythes-ssizet.patch \
+   external/mythes/mythes-fdo48017-wfopen.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/mythes/mythes-fdo48017-wfopen.patch 
b/external/mythes/mythes-fdo48017-wfopen.patch
new file mode 100644
index 000..1621b1d
--- /dev/null
+++ b/external/mythes/mythes-fdo48017-wfopen.patch
@@ -0,0 +1,72 @@
+diff -u mythes/mythes.cxx build/mythes/mythes.cxx
+--- mythes/mythes.cxx  2014-05-22 00:27:38.508588487 +0200
 build/mythes/mythes.cxx2014-05-22 10:07:06.107547417 +0200
+@@ -8,6 +8,11 @@
+ 
+ #include mythes.hxx
+ 
++#ifdef _WIN32
++#include windows.h
++#include wchar.h
++#endif
++
+ MyThes::MyThes(const char* idxpath, const char * datpath)
+ {
+ nw = 0;
+@@ -35,7 +40,7 @@
+ {
+ 
+ // open the index file
+-FILE * pifile = fopen(idxpath,r);
++FILE * pifile = myfopen(idxpath,r);
+ if (!pifile) {
+ return 0;
+ } 
+@@ -90,7 +95,7 @@
+ fclose(pifile);
+ 
+ /* next open the data file */
+-pdfile = fopen(datpath,r);
++pdfile = myfopen(datpath,r);
+ if (!pdfile) {
+ return 0;
+ } 
+@@ -370,3 +375,17 @@
+   return -1;
+ }
+ 
++FILE * MyThes::myfopen(const char * path, const char * mode) {
++#ifdef _WIN32
++#define WIN32_LONG_PATH_PREFIX ?\\
++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));
++MultiByteToWideChar(CP_UTF8, 0, path, -1, buff, len);
++FILE * f = _wfopen(buff, (strcmp(mode, r) == 0) ? Lr : Lrb);
++free(buff);
++return f;
++}
++#endif
++return fopen(path, mode);
++}
+diff -u mythes/mythes.hxx

[Libreoffice-commits] core.git: external/hyphen external/Module_external.mk hyphen/ExternalPackage_hyphen.mk hyphen/ExternalProject_hyphen.mk hyphen/hyphen-android.patch hyphen/hyphen-build.patch hyph

2013-10-18 Thread Khaled Hosny 
 RepositoryModule_host.mk  |1 
 external/Module_external.mk   |1 
 external/hyphen/ExternalPackage_hyphen.mk |   20 +++
 external/hyphen/ExternalProject_hyphen.mk |   28 ++
 external/hyphen/Makefile  |7 +
 external/hyphen/Module_hyphen.mk  |   32 +
 external/hyphen/README|1 
 external/hyphen/StaticLibrary_hyphen.mk   |   22 +
 external/hyphen/UnpackedTarball_hyphen.mk |   22 +
 external/hyphen/hyphen-android.patch  |   20 +++
 external/hyphen/hyphen-build.patch|   38 ++
 external/hyphen/hyphen-fdo43931.patch |   15 +++
 external/hyphen/hyphen-lenwaswrong.patch  |   11 
 external/hyphen/hyphen-rhmin.patch|   27 +
 hyphen/ExternalPackage_hyphen.mk  |   20 ---
 hyphen/ExternalProject_hyphen.mk  |   28 --
 hyphen/Makefile   |7 -
 hyphen/Module_hyphen.mk   |   32 -
 hyphen/README |1 
 hyphen/StaticLibrary_hyphen.mk|   22 -
 hyphen/UnpackedTarball_hyphen.mk  |   22 -
 hyphen/hyphen-android.patch   |   20 ---
 hyphen/hyphen-build.patch |   38 --
 hyphen/hyphen-fdo43931.patch  |   15 ---
 hyphen/hyphen-lenwaswrong.patch   |   11 
 hyphen/hyphen-rhmin.patch |   27 -
 26 files changed, 244 insertions(+), 244 deletions(-)

New commits:
commit 0ba2b78a07e208eef45813e14c33c95cef6d
Author: Khaled Hosny khaledho...@eglug.org
Date:   Thu Oct 17 20:00:40 2013 +0200

fdo#70393: move hyphen to a subdir of external

Change-Id: I5a112b6f588a704e682e7b50d5399d3da77fbacf
Reviewed-on: https://gerrit.libreoffice.org/6308
Tested-by: LibreOffice gerrit bot ger...@libreoffice.org
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 484d380..2c21a6c 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -58,7 +58,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
$(call gb_Helper_optional,DESKTOP,helpcompiler) \
$(call gb_Helper_optional,HELP,helpcontent2) \
hwpfilter \
-   $(call gb_Helper_optional,HYPHEN,hyphen) \
i18nlangtag \
i18npool \
i18nutil \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 46bceaf..dac8d0a 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -36,6 +36,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,HARFBUZZ,harfbuzz) \
$(call gb_Helper_optional,HSQLDB,hsqldb) \
$(call gb_Helper_optional,HUNSPELL,hunspell) \
+   $(call gb_Helper_optional,HYPHEN,hyphen) \
$(call gb_Helper_optional,LIBATOMIC_OPS,libatomic_ops) \
$(call gb_Helper_optional,LIBPNG,libpng) \
 ))
diff --git a/hyphen/ExternalPackage_hyphen.mk 
b/external/hyphen/ExternalPackage_hyphen.mk
similarity index 100%
rename from hyphen/ExternalPackage_hyphen.mk
rename to external/hyphen/ExternalPackage_hyphen.mk
diff --git a/hyphen/ExternalProject_hyphen.mk 
b/external/hyphen/ExternalProject_hyphen.mk
similarity index 100%
rename from hyphen/ExternalProject_hyphen.mk
rename to external/hyphen/ExternalProject_hyphen.mk
diff --git a/hyphen/Makefile b/external/hyphen/Makefile
similarity index 100%
rename from hyphen/Makefile
rename to external/hyphen/Makefile
diff --git a/hyphen/Module_hyphen.mk b/external/hyphen/Module_hyphen.mk
similarity index 100%
rename from hyphen/Module_hyphen.mk
rename to external/hyphen/Module_hyphen.mk
diff --git a/hyphen/README b/external/hyphen/README
similarity index 100%
rename from hyphen/README
rename to external/hyphen/README
diff --git a/hyphen/StaticLibrary_hyphen.mk 
b/external/hyphen/StaticLibrary_hyphen.mk
similarity index 100%
rename from hyphen/StaticLibrary_hyphen.mk
rename to external/hyphen/StaticLibrary_hyphen.mk
diff --git a/hyphen/UnpackedTarball_hyphen.mk 
b/external/hyphen/UnpackedTarball_hyphen.mk
similarity index 72%
rename from hyphen/UnpackedTarball_hyphen.mk
rename to external/hyphen/UnpackedTarball_hyphen.mk
index 58049e9..5cd0af8 100644
--- a/hyphen/UnpackedTarball_hyphen.mk
+++ b/external/hyphen/UnpackedTarball_hyphen.mk
@@ -12,11 +12,11 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,hyphen))
 $(eval $(call gb_UnpackedTarball_set_tarball,hyphen,$(HYPHEN_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_add_patches,hyphen,\
-   hyphen/hyphen-lenwaswrong.patch \
-   hyphen/hyphen-fdo43931.patch \
-   hyphen/hyphen-android.patch \
-