fdo#70393: move hyphen to a subdir of external

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

12 files changed, 0 insertions, 243 deletions

diff --git a/hyphen/ExternalPackage_hyphen.mk b/hyphen/ExternalPackage_hyphen.mk
deleted file mode 100644
index 13303cc7c903..000000000000
--- a/hyphen/ExternalPackage_hyphen.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_ExternalPackage_ExternalPackage,hyphen,hyphen))
-
-ifeq ($(WITH_MYSPELL_DICTS),YES)
-
-$(eval $(call gb_ExternalPackage_add_unpacked_files,hyphen,bin,\
-    hyph_en_US.dic \
-))
-
-endif
-
-# vim: set noet sw=4 ts=4:
diff --git a/hyphen/ExternalProject_hyphen.mk b/hyphen/ExternalProject_hyphen.mk
deleted file mode 100644
index e7d36730fd70..000000000000
--- a/hyphen/ExternalProject_hyphen.mk
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_ExternalProject_ExternalProject,hyphen))
-
-$(eval $(call gb_ExternalProject_use_external,hyphen,hunspell))
-
-$(eval $(call gb_ExternalProject_register_targets,hyphen,\
-	build \
-))
-
-$(call gb_ExternalProject_get_state_target,hyphen,build):
-	$(call gb_ExternalProject_run,build,\
-		./configure --disable-shared \
-			$(if $(filter-out IOS,$(OS)),--with-pic) \
-			$(if $(filter YES,$(CROSS_COMPILING)),--build=$(BUILD_PLATFORM) --host=$(HOST_PLATFORM) gio_can_sniff=no) \
-			$(if $(filter C52U,$(COM)$(CPU)),CFLAGS="-m64") \
-		&& $(MAKE) \
-			$(if $(filter YESYES,$(SYSTEM_HYPH)$(WITH_MYSPELL_DICTS)),hyph_en_US.dic) \
-	)
-
-# vim: set noet sw=4 ts=4:
diff --git a/hyphen/Makefile b/hyphen/Makefile
deleted file mode 100644
index ccb1c85a04da..000000000000
--- a/hyphen/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-
-module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
-
-include $(module_directory)/../solenv/gbuild/partial_build.mk
-
-# vim: set noet sw=4 ts=4:
diff --git a/hyphen/Module_hyphen.mk b/hyphen/Module_hyphen.mk
deleted file mode 100644
index 2ab3245d17a3..000000000000
--- a/hyphen/Module_hyphen.mk
+++ /dev/null
@@ -1,32 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_Module_Module,hyphen))
-
-ifneq ($(or $(filter NO,$(SYSTEM_HYPH)),$(filter TRUE,$(WITH_MYSPELL_DICTS))),)
-$(eval $(call gb_Module_add_targets,hyphen,\
-	UnpackedTarball_hyphen \
-	ExternalPackage_hyphen \
-))
-ifeq ($(COM),MSC)
-
-ifeq ($(SYSTEM_HYPH),NO)
-$(eval $(call gb_Module_add_targets,hyphen,\
-	StaticLibrary_hyphen \
-))
-endif
-
-else
-$(eval $(call gb_Module_add_targets,hyphen,\
-	ExternalProject_hyphen \
-))
-endif
-endif
-
-# vim: set noet sw=4 ts=4:
diff --git a/hyphen/README b/hyphen/README
deleted file mode 100644
index 327b5b6e8954..000000000000
--- a/hyphen/README
+++ /dev/null
@@ -1 +0,0 @@
-Hyphenator library from [http://hunspell.sourceforge.net]
diff --git a/hyphen/StaticLibrary_hyphen.mk b/hyphen/StaticLibrary_hyphen.mk
deleted file mode 100644
index 81eddf17d850..000000000000
--- a/hyphen/StaticLibrary_hyphen.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(eval $(call gb_StaticLibrary_StaticLibrary,hyphen))
-
-$(eval $(call gb_StaticLibrary_use_unpacked,hyphen,hyphen))
-
-$(eval $(call gb_StaticLibrary_set_warnings_not_errors,hyphen))
-
-$(eval $(call gb_StaticLibrary_add_generated_cobjects,hyphen,\
-	UnpackedTarball/hyphen/hyphen \
-	UnpackedTarball/hyphen/hnjalloc \
-))
-
-
-# vim: set noet sw=4 ts=4:
diff --git a/hyphen/UnpackedTarball_hyphen.mk b/hyphen/UnpackedTarball_hyphen.mk
deleted file mode 100644
index 58049e92b5fe..000000000000
--- a/hyphen/UnpackedTarball_hyphen.mk
+++ /dev/null
@@ -1,22 +0,0 @@
-# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
-#
-# This file is part of the LibreOffice project.
-#
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-#
-
-$(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 \
-	hyphen/hyphen-rhmin.patch \
-	hyphen/hyphen-build.patch \
-))
-
-# vim: set noet sw=4 ts=4:
diff --git a/hyphen/hyphen-android.patch b/hyphen/hyphen-android.patch
deleted file mode 100644
index d092d786f6f0..000000000000
--- a/hyphen/hyphen-android.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- misc/hyphen-2.8.4/config.sub
-+++ misc/build/hyphen-2.8.4/config.sub
-@@ -120,7 +120,7 @@
- # Here we must recognize all the valid KERNEL-OS combinations.
- maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
- case $maybe_os in
--  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-   uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
-   storm-chaos* | os2-emx* | rtmk-nova*)
-     os=-$maybe_os
-@@ -1215,7 +1215,7 @@
- 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
- 	      | -chorusos* | -chorusrdb* \
- 	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
--	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-+	      | -mingw32* | -linux-gnu* | -linux-androideabi* | -linux-newlib* | -linux-uclibc* \
- 	      | -uxpv* | -beos* | -mpeix* | -udk* \
- 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
- 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
diff --git a/hyphen/hyphen-build.patch b/hyphen/hyphen-build.patch
deleted file mode 100644
index 6df2bb680cdb..000000000000
--- a/hyphen/hyphen-build.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- misc/hyphen-2.8.4/Makefile.am	2010-07-19 11:23:17.000000000 +0200
-+++ misc/build/hyphen-2.8.4/Makefile.am	2010-12-02 10:15:44.390625000 +0100
-@@ -25,13 +25,13 @@
- 
- hyphen.us3:
- 	cp -f $(srcdir)/hyphen.tex hyphen.us
--	patch < $(srcdir)/hyphen.patch
-+	$(GNUPATCH) < $(srcdir)/hyphen.patch
- 	$(srcdir)/tbhyphext.sh <$(srcdir)/tbhyphext.tex >hyphen.us2
- 	cat hyphen.us hyphen.us2 | $(AWK) -f $(srcdir)/lig.awk >hyphen.us3
- 	cat $(srcdir)/ligpatch.txt >>hyphen.us3
- 
--hyph_en_US.dic: hyphen.us3
--	perl $(srcdir)/substrings.pl hyphen.us3 hyph_en_US.dic UTF-8 2 3 >/dev/null
-+hyph_en_US.dic:
-+	@echo "hyph_en_US.txt distributed with Hyphen library"
- 
- clean-local:
- 	rm -rf hyphen.us* hyph_en_US.dic
---- misc/hyphen-2.8.4/Makefile.in	2010-12-01 02:31:29.000000000 +0100
-+++ misc/build/hyphen-2.8.4/Makefile.in	2010-12-02 10:17:16.546875000 +0100
-@@ -940,13 +940,13 @@
- 
- hyphen.us3:
- 	cp -f $(srcdir)/hyphen.tex hyphen.us
--	patch < $(srcdir)/hyphen.patch
-+	$(GNUPATCH) < $(srcdir)/hyphen.patch
- 	$(srcdir)/tbhyphext.sh <$(srcdir)/tbhyphext.tex >hyphen.us2
- 	cat hyphen.us hyphen.us2 | $(AWK) -f $(srcdir)/lig.awk >hyphen.us3
- 	cat $(srcdir)/ligpatch.txt >>hyphen.us3
- 
--hyph_en_US.dic: hyphen.us3
--	perl $(srcdir)/substrings.pl hyphen.us3 hyph_en_US.dic UTF-8 2 3 >/dev/null
-+hyph_en_US.dic:
-+	@echo "hyph_en_US.txt distributed with Hyphen library"
- 
- clean-local:
- 	rm -rf hyphen.us* hyph_en_US.dic
diff --git a/hyphen/hyphen-fdo43931.patch b/hyphen/hyphen-fdo43931.patch
deleted file mode 100644
index 0a1f0b9cbdee..000000000000
--- a/hyphen/hyphen-fdo43931.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- misc//hyphen-2.8.4/hyphen.c	2011-10-10 15:49:33.000000000 +0200
-+++ misc/build/hyphen-2.8.4/hyphen.c	2011-12-27 13:49:07.568283812 +0100
-@@ -436,9 +436,9 @@
-     }
-   } else if (k == 1) {
-     /* default first level: hyphen and ASCII apostrophe */
--    if (!dict[0]->utf8) hnj_hyphen_load_line("NOHYPHEN '\n", dict[k], hashtab);
--    else hnj_hyphen_load_line("NOHYPHEN ',\xe2\x80\x93,\xe2\x80\x99\n", dict[k], hashtab);
--    strncpy(buf, "1-1/=,1,1\n", MAX_CHARS-1); // buf rewritten by hnj_hyphen_load here
-+    if (!dict[0]->utf8) hnj_hyphen_load_line("NOHYPHEN ',-\n", dict[k], hashtab);
-+    else hnj_hyphen_load_line("NOHYPHEN ',\xe2\x80\x93,\xe2\x80\x99,-\n", dict[k], hashtab);
-+    strncpy(buf, "1-1\n", MAX_CHARS-1); // buf rewritten by hnj_hyphen_load here
-     buf[MAX_CHARS-1] = '\0';
-     hnj_hyphen_load_line(buf, dict[k], hashtab); /* remove hyphen */
-     hnj_hyphen_load_line("1'1\n", dict[k], hashtab); /* ASCII apostrophe */
diff --git a/hyphen/hyphen-lenwaswrong.patch b/hyphen/hyphen-lenwaswrong.patch
deleted file mode 100644
index f42694ff1aae..000000000000
--- a/hyphen/hyphen-lenwaswrong.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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/hyphen-rhmin.patch b/hyphen/hyphen-rhmin.patch
deleted file mode 100644
index 12fff19f4466..000000000000
--- a/hyphen/hyphen-rhmin.patch
+++ /dev/null
@@ -1,27 +0,0 @@
---- misc//hyphen-2.8.4/hyphen.c
-+++ misc/build/hyphen-2.8.4/hyphen.c
-@@ -734,13 +734,13 @@
- int hnj_hyphen_rhmin(int utf8, const char *word, int word_size, char * hyphens,
- 	char *** rep, int ** pos, int ** cut, int rhmin)
- {
--    int i = 1;
-+    int i = 0;
-     int j;
- 
-     // ignore numbers
-     for (j = word_size - 1; j > 0 && word[j] <= '9' && word[j] >= '0'; j--) i--;
- 
--    for (j = word_size - 2; i < rhmin && j > 0; j--) {
-+    for (j = word_size - 1; i < rhmin && j > 0; j--) {
-       // check length of the non-standard part
-       if (*rep && *pos && *cut && (*rep)[j]) {
-         char * rh = strchr((*rep)[j], '=');
-@@ -753,7 +753,7 @@
-        } else {
-          hyphens[j] = '0';
-        }
--       if (!utf8 || (word[j] & 0xc0) != 0xc0) i++;
-+       if (!utf8 || (word[j] & 0xc0) == 0xc0 || (word[j] & 0x80) != 0x80) i++;
-     }
-     return 0;
- }