diff options
| -rw-r--r-- | RepositoryModule_host.mk | 1 | ||||
| -rw-r--r-- | external/Module_external.mk | 1 | ||||
| -rw-r--r-- | external/hunspell/ExternalProject_hunspell.mk (renamed from hunspell/ExternalProject_hunspell.mk) | 0 | ||||
| -rw-r--r-- | external/hunspell/Makefile (renamed from hunspell/Makefile) | 0 | ||||
| -rw-r--r-- | external/hunspell/Module_hunspell.mk (renamed from hunspell/Module_hunspell.mk) | 2 | ||||
| -rw-r--r-- | external/hunspell/README (renamed from hunspell/README) | 0 | ||||
| -rw-r--r-- | external/hunspell/StaticLibrary_hunspell.mk (renamed from hunspell/StaticLibrary_hunspell.mk) | 0 | ||||
| -rw-r--r-- | external/hunspell/UnpackedTarball_hunspell.mk (renamed from hunspell/UnpackedTarball_hunspell.mk) | 18 | ||||
| -rw-r--r-- | external/hunspell/hunspell-1.3.2-compound.patch (renamed from hunspell/hunspell-1.3.2-compound.patch) | 0 | ||||
| -rw-r--r-- | external/hunspell/hunspell-1.3.2-literal.patch (renamed from hunspell/hunspell-1.3.2-literal.patch) | 0 | ||||
| -rw-r--r-- | external/hunspell/hunspell-1.3.2-nullptr.patch (renamed from hunspell/hunspell-1.3.2-nullptr.patch) | 0 | ||||
| -rw-r--r-- | external/hunspell/hunspell-1.3.2-overflow.patch (renamed from hunspell/hunspell-1.3.2-overflow.patch) | 0 | ||||
| -rw-r--r-- | external/hunspell/hunspell-android.patch (renamed from hunspell/hunspell-android.patch) | 0 | ||||
| -rw-r--r-- | external/hunspell/hunspell-solaris.patch (renamed from hunspell/hunspell-solaris.patch) | 0 | ||||
| -rw-r--r-- | external/hunspell/hunspell-twoaffixcompound.patch (renamed from hunspell/hunspell-twoaffixcompound.patch) | 0 | ||||
| -rw-r--r-- | external/hunspell/hunspell-wundef.patch.1 (renamed from hunspell/hunspell-wundef.patch.1) | 0 | ||||
| -rw-r--r-- | external/hunspell/hunspell.rhbz918938.patch (renamed from hunspell/hunspell.rhbz918938.patch) | 0 |
17 files changed, 10 insertions, 12 deletions
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index 2fd24005c644..484d380b2d2b 100644 --- a/RepositoryModule_host.mk +++ b/RepositoryModule_host.mk @@ -57,7 +57,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\ framework \ $(call gb_Helper_optional,DESKTOP,helpcompiler) \ $(call gb_Helper_optional,HELP,helpcontent2) \ - $(call gb_Helper_optional,HUNSPELL,hunspell) \ hwpfilter \ $(call gb_Helper_optional,HYPHEN,hyphen) \ i18nlangtag \ diff --git a/external/Module_external.mk b/external/Module_external.mk index 2b8e83603321..46bceafc5d23 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -35,6 +35,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,GRAPHITE,graphite) \ $(call gb_Helper_optional,HARFBUZZ,harfbuzz) \ $(call gb_Helper_optional,HSQLDB,hsqldb) \ + $(call gb_Helper_optional,HUNSPELL,hunspell) \ $(call gb_Helper_optional,LIBATOMIC_OPS,libatomic_ops) \ $(call gb_Helper_optional,LIBPNG,libpng) \ )) diff --git a/hunspell/ExternalProject_hunspell.mk b/external/hunspell/ExternalProject_hunspell.mk index 6bbb6183cf01..6bbb6183cf01 100644 --- a/hunspell/ExternalProject_hunspell.mk +++ b/external/hunspell/ExternalProject_hunspell.mk diff --git a/hunspell/Makefile b/external/hunspell/Makefile index ccb1c85a04da..ccb1c85a04da 100644 --- a/hunspell/Makefile +++ b/external/hunspell/Makefile diff --git a/hunspell/Module_hunspell.mk b/external/hunspell/Module_hunspell.mk index 6acd732ae701..505a9fb0cbc1 100644 --- a/hunspell/Module_hunspell.mk +++ b/external/hunspell/Module_hunspell.mk @@ -9,7 +9,6 @@ $(eval $(call gb_Module_Module,hunspell)) -ifeq ($(SYSTEM_HUNSPELL),NO) $(eval $(call gb_Module_add_targets,hunspell,\ UnpackedTarball_hunspell \ )) @@ -22,6 +21,5 @@ $(eval $(call gb_Module_add_targets,hunspell,\ ExternalProject_hunspell \ )) endif -endif # vim: set noet sw=4 ts=4: diff --git a/hunspell/README b/external/hunspell/README index 1221735cad65..1221735cad65 100644 --- a/hunspell/README +++ b/external/hunspell/README diff --git a/hunspell/StaticLibrary_hunspell.mk b/external/hunspell/StaticLibrary_hunspell.mk index 29fe6249d37f..29fe6249d37f 100644 --- a/hunspell/StaticLibrary_hunspell.mk +++ b/external/hunspell/StaticLibrary_hunspell.mk diff --git a/hunspell/UnpackedTarball_hunspell.mk b/external/hunspell/UnpackedTarball_hunspell.mk index 2c532ea7fb25..8c23f0396332 100644 --- a/hunspell/UnpackedTarball_hunspell.mk +++ b/external/hunspell/UnpackedTarball_hunspell.mk @@ -12,15 +12,15 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,hunspell)) $(eval $(call gb_UnpackedTarball_set_tarball,hunspell,$(HUNSPELL_TARBALL))) $(eval $(call gb_UnpackedTarball_add_patches,hunspell,\ - hunspell/hunspell-twoaffixcompound.patch \ - hunspell/hunspell-solaris.patch \ - hunspell/hunspell-1.3.2-overflow.patch \ - hunspell/hunspell-android.patch \ - hunspell/hunspell-1.3.2-nullptr.patch \ - hunspell/hunspell-1.3.2-literal.patch \ - hunspell/hunspell-1.3.2-compound.patch \ - hunspell/hunspell.rhbz918938.patch \ - hunspell/hunspell-wundef.patch.1 \ + external/hunspell/hunspell-twoaffixcompound.patch \ + external/hunspell/hunspell-solaris.patch \ + external/hunspell/hunspell-1.3.2-overflow.patch \ + external/hunspell/hunspell-android.patch \ + external/hunspell/hunspell-1.3.2-nullptr.patch \ + external/hunspell/hunspell-1.3.2-literal.patch \ + external/hunspell/hunspell-1.3.2-compound.patch \ + external/hunspell/hunspell.rhbz918938.patch \ + external/hunspell/hunspell-wundef.patch.1 \ )) ifeq ($(COM),MSC) diff --git a/hunspell/hunspell-1.3.2-compound.patch b/external/hunspell/hunspell-1.3.2-compound.patch index 3629add70ca5..3629add70ca5 100644 --- a/hunspell/hunspell-1.3.2-compound.patch +++ b/external/hunspell/hunspell-1.3.2-compound.patch diff --git a/hunspell/hunspell-1.3.2-literal.patch b/external/hunspell/hunspell-1.3.2-literal.patch index 4cbf377c1442..4cbf377c1442 100644 --- a/hunspell/hunspell-1.3.2-literal.patch +++ b/external/hunspell/hunspell-1.3.2-literal.patch diff --git a/hunspell/hunspell-1.3.2-nullptr.patch b/external/hunspell/hunspell-1.3.2-nullptr.patch index 624e6ce6e6c5..624e6ce6e6c5 100644 --- a/hunspell/hunspell-1.3.2-nullptr.patch +++ b/external/hunspell/hunspell-1.3.2-nullptr.patch diff --git a/hunspell/hunspell-1.3.2-overflow.patch b/external/hunspell/hunspell-1.3.2-overflow.patch index 8500b483d53f..8500b483d53f 100644 --- a/hunspell/hunspell-1.3.2-overflow.patch +++ b/external/hunspell/hunspell-1.3.2-overflow.patch diff --git a/hunspell/hunspell-android.patch b/external/hunspell/hunspell-android.patch index 1bfbb4beb0f9..1bfbb4beb0f9 100644 --- a/hunspell/hunspell-android.patch +++ b/external/hunspell/hunspell-android.patch diff --git a/hunspell/hunspell-solaris.patch b/external/hunspell/hunspell-solaris.patch index b07bbb254c3f..b07bbb254c3f 100644 --- a/hunspell/hunspell-solaris.patch +++ b/external/hunspell/hunspell-solaris.patch diff --git a/hunspell/hunspell-twoaffixcompound.patch b/external/hunspell/hunspell-twoaffixcompound.patch index 71881a25ac43..71881a25ac43 100644 --- a/hunspell/hunspell-twoaffixcompound.patch +++ b/external/hunspell/hunspell-twoaffixcompound.patch diff --git a/hunspell/hunspell-wundef.patch.1 b/external/hunspell/hunspell-wundef.patch.1 index 75131e06a2bc..75131e06a2bc 100644 --- a/hunspell/hunspell-wundef.patch.1 +++ b/external/hunspell/hunspell-wundef.patch.1 diff --git a/hunspell/hunspell.rhbz918938.patch b/external/hunspell/hunspell.rhbz918938.patch index f1bdbd4ff8ba..f1bdbd4ff8ba 100644 --- a/hunspell/hunspell.rhbz918938.patch +++ b/external/hunspell/hunspell.rhbz918938.patch |