RepositoryModule_host.mk | 1 external/Module_external.mk | 1 external/hunspell/ExternalProject_hunspell.mk | 27 ++++++ external/hunspell/Makefile | 7 + external/hunspell/Module_hunspell.mk | 25 ++++++ external/hunspell/README | 4 external/hunspell/StaticLibrary_hunspell.mk | 37 ++++++++ external/hunspell/UnpackedTarball_hunspell.mk | 32 +++++++ external/hunspell/hunspell-1.3.2-compound.patch | 11 ++ external/hunspell/hunspell-1.3.2-literal.patch | 11 ++ external/hunspell/hunspell-1.3.2-nullptr.patch | 20 ++++ external/hunspell/hunspell-1.3.2-overflow.patch | 91 ++++++++++++++++++++++ external/hunspell/hunspell-android.patch | 42 ++++++++++ external/hunspell/hunspell-solaris.patch | 12 ++ external/hunspell/hunspell-twoaffixcompound.patch | 80 +++++++++++++++++++ external/hunspell/hunspell-wundef.patch.1 | 11 ++ external/hunspell/hunspell.rhbz918938.patch | 72 +++++++++++++++++ hunspell/ExternalProject_hunspell.mk | 27 ------ hunspell/Makefile | 7 - hunspell/Module_hunspell.mk | 27 ------ hunspell/README | 4 hunspell/StaticLibrary_hunspell.mk | 37 -------- hunspell/UnpackedTarball_hunspell.mk | 32 ------- hunspell/hunspell-1.3.2-compound.patch | 11 -- hunspell/hunspell-1.3.2-literal.patch | 11 -- hunspell/hunspell-1.3.2-nullptr.patch | 20 ---- hunspell/hunspell-1.3.2-overflow.patch | 91 ---------------------- hunspell/hunspell-android.patch | 42 ---------- hunspell/hunspell-solaris.patch | 12 -- hunspell/hunspell-twoaffixcompound.patch | 80 ------------------- hunspell/hunspell-wundef.patch.1 | 11 -- hunspell/hunspell.rhbz918938.patch | 72 ----------------- 32 files changed, 483 insertions(+), 485 deletions(-)
New commits: commit 64b6499371fa22d52648523e65a28c041dd6579f Author: Khaled Hosny <khaledho...@eglug.org> Date: Thu Oct 17 19:58:07 2013 +0200 fdo#70393: move hunspell to a subdir of external Change-Id: Id3aafd95cb8c064f84898844a91f350e9aad0ed4 Reviewed-on: https://gerrit.libreoffice.org/6307 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 2fd2400..484d380 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 2b8e836..46bceaf 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 similarity index 100% rename from hunspell/ExternalProject_hunspell.mk rename to external/hunspell/ExternalProject_hunspell.mk diff --git a/hunspell/Makefile b/external/hunspell/Makefile similarity index 100% rename from hunspell/Makefile rename to external/hunspell/Makefile diff --git a/hunspell/Module_hunspell.mk b/external/hunspell/Module_hunspell.mk similarity index 94% rename from hunspell/Module_hunspell.mk rename to external/hunspell/Module_hunspell.mk index 6acd732..505a9fb 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 similarity index 100% rename from hunspell/README rename to external/hunspell/README diff --git a/hunspell/StaticLibrary_hunspell.mk b/external/hunspell/StaticLibrary_hunspell.mk similarity index 100% rename from hunspell/StaticLibrary_hunspell.mk rename to external/hunspell/StaticLibrary_hunspell.mk diff --git a/hunspell/UnpackedTarball_hunspell.mk b/external/hunspell/UnpackedTarball_hunspell.mk similarity index 60% rename from hunspell/UnpackedTarball_hunspell.mk rename to external/hunspell/UnpackedTarball_hunspell.mk index 2c532ea..8c23f03 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 similarity index 100% rename from hunspell/hunspell-1.3.2-compound.patch rename to 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 similarity index 100% rename from hunspell/hunspell-1.3.2-literal.patch rename to 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 similarity index 100% rename from hunspell/hunspell-1.3.2-nullptr.patch rename to 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 similarity index 100% rename from hunspell/hunspell-1.3.2-overflow.patch rename to external/hunspell/hunspell-1.3.2-overflow.patch diff --git a/hunspell/hunspell-android.patch b/external/hunspell/hunspell-android.patch similarity index 100% rename from hunspell/hunspell-android.patch rename to external/hunspell/hunspell-android.patch diff --git a/hunspell/hunspell-solaris.patch b/external/hunspell/hunspell-solaris.patch similarity index 100% rename from hunspell/hunspell-solaris.patch rename to external/hunspell/hunspell-solaris.patch diff --git a/hunspell/hunspell-twoaffixcompound.patch b/external/hunspell/hunspell-twoaffixcompound.patch similarity index 100% rename from hunspell/hunspell-twoaffixcompound.patch rename to external/hunspell/hunspell-twoaffixcompound.patch diff --git a/hunspell/hunspell-wundef.patch.1 b/external/hunspell/hunspell-wundef.patch.1 similarity index 100% rename from hunspell/hunspell-wundef.patch.1 rename to external/hunspell/hunspell-wundef.patch.1 diff --git a/hunspell/hunspell.rhbz918938.patch b/external/hunspell/hunspell.rhbz918938.patch similarity index 100% rename from hunspell/hunspell.rhbz918938.patch rename to external/hunspell/hunspell.rhbz918938.patch _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits