Sat Oct 19 00:35:14 PDT 2013

RepositoryModule_build.mk                                                       |    1 
 RepositoryModule_host.mk                                                        |    1 
 external/Module_external.mk                                                     |    1 
 external/liblangtag/ExternalPackage_langtag_data.mk                             |   28 ++++
 external/liblangtag/ExternalPackage_liblangtag_data.mk                          |   36 +++++
 external/liblangtag/ExternalProject_langtag.mk                                  |   40 ++++++
 external/liblangtag/Makefile                                                    |    7 +
 external/liblangtag/Module_liblangtag.mk                                        |   19 ++
 external/liblangtag/README                                                      |    1 
 external/liblangtag/UnpackedTarball_langtag.mk                                  |   34 +++++
 external/liblangtag/liblangtag-0.5.1-mingw.patch                                |   64 ++++++++++
 external/liblangtag/liblangtag-0.5.1-msvc-snprintf.patch                        |   25 +++
 external/liblangtag/liblangtag-0.5.1-msvc-ssize_t.patch                         |   12 +
 external/liblangtag/liblangtag-0.5.1-msvc-strtoull.patch                        |   15 ++
 external/liblangtag/liblangtag-0.5.1-msvc-warning.patch                         |   21 +++
 external/liblangtag/liblangtag-0.5.1-redefinition-of-typedef.patch              |   31 ++++
 external/liblangtag/liblangtag-0.5.1-scope-declaration.patch                    |   13 ++
 external/liblangtag/liblangtag-0.5.1-undefined-have-sys-param-h.patch           |   14 ++
 external/liblangtag/liblangtag-0.5.1-unistd.patch                               |   12 +
 external/liblangtag/liblangtag-0.5.1-vsnprintf.patch                            |   18 ++
 external/liblangtag/liblangtag-0.5.1-windows-do-not-prepend-dir-separator.patch |   16 ++
 liblangtag/ExternalPackage_langtag_data.mk                                      |   28 ----
 liblangtag/ExternalPackage_liblangtag_data.mk                                   |   36 -----
 liblangtag/ExternalProject_langtag.mk                                           |   40 ------
 liblangtag/Makefile                                                             |    7 -
 liblangtag/Module_liblangtag.mk                                                 |   24 ---
 liblangtag/README                                                               |    1 
 liblangtag/UnpackedTarball_langtag.mk                                           |   34 -----
 liblangtag/liblangtag-0.5.1-mingw.patch                                         |   64 ----------
 liblangtag/liblangtag-0.5.1-msvc-snprintf.patch                                 |   25 ---
 liblangtag/liblangtag-0.5.1-msvc-ssize_t.patch                                  |   12 -
 liblangtag/liblangtag-0.5.1-msvc-strtoull.patch                                 |   15 --
 liblangtag/liblangtag-0.5.1-msvc-warning.patch                                  |   21 ---
 liblangtag/liblangtag-0.5.1-redefinition-of-typedef.patch                       |   31 ----
 liblangtag/liblangtag-0.5.1-scope-declaration.patch                             |   13 --
 liblangtag/liblangtag-0.5.1-undefined-have-sys-param-h.patch                    |   14 --
 liblangtag/liblangtag-0.5.1-unistd.patch                                        |   12 -
 liblangtag/liblangtag-0.5.1-vsnprintf.patch                                     |   18 --
 liblangtag/liblangtag-0.5.1-windows-do-not-prepend-dir-separator.patch          |   16 --
 39 files changed, 407 insertions(+), 413 deletions(-)

New commits:
commit fc26490252a63b851560be0af97e14b784a20350
Author: Khaled Hosny <khaledhosny at eglug.org>
Date:   Fri Oct 18 19:58:14 2013 +0200

    fdo#70393: move liblangtag to a subdir of external
    
    Change-Id: I18cded289591bdf872c7a818326a35ac00d38482
    Reviewed-on: https://gerrit.libreoffice.org/6330
    Reviewed-by: David Tardon <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at redhat.com>

diff --git a/RepositoryModule_build.mk b/RepositoryModule_build.mk
index aa15853..70cf74f 100644
--- a/RepositoryModule_build.mk
+++ b/RepositoryModule_build.mk
@@ -87,7 +87,6 @@ $(eval $(call gb_Module_add_moduledirs,cross_toolset,\
 		helpcompiler \
 		xmlhelp \
 	) \
-	$(call gb_Helper_optional,LIBLANGTAG,liblangtag) \
 	$(call gb_Helper_optional,LIBXML2,libxml2) \
 	$(call gb_Helper_optional,LIBXSLT,libxslt) \
 	$(call gb_Helper_optional,QADEVOOO,qadevOOo) \
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 706a9e9..7a2acad 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -70,7 +70,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	jvmaccess \
 	jvmfwk \
 	$(call gb_Helper_optional,LANGUAGETOOL,languagetool) \
-	$(call gb_Helper_optional,LIBLANGTAG,liblangtag) \
 	$(call gb_Helper_optional,MSPUB,libmspub) \
 	$(call gb_Helper_optional,MWAW,libmwaw) \
 	$(call gb_Helper_optional,ODFGEN,libodfgen) \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 3e4326e..30249aa 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -44,6 +44,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
 	$(call gb_Helper_optional,LCMS2,lcms2) \
 	$(call gb_Helper_optional,LIBATOMIC_OPS,libatomic_ops) \
 	$(call gb_Helper_optional,LIBEXTTEXTCAT,libexttextcat) \
+	$(call gb_Helper_optional,LIBLANGTAG,liblangtag) \
 	$(call gb_Helper_optional,LIBPNG,libpng) \
 ))
 
diff --git a/liblangtag/ExternalPackage_langtag_data.mk b/external/liblangtag/ExternalPackage_langtag_data.mk
similarity index 100%
rename from liblangtag/ExternalPackage_langtag_data.mk
rename to external/liblangtag/ExternalPackage_langtag_data.mk
diff --git a/liblangtag/ExternalPackage_liblangtag_data.mk b/external/liblangtag/ExternalPackage_liblangtag_data.mk
similarity index 100%
rename from liblangtag/ExternalPackage_liblangtag_data.mk
rename to external/liblangtag/ExternalPackage_liblangtag_data.mk
diff --git a/liblangtag/ExternalProject_langtag.mk b/external/liblangtag/ExternalProject_langtag.mk
similarity index 100%
rename from liblangtag/ExternalProject_langtag.mk
rename to external/liblangtag/ExternalProject_langtag.mk
diff --git a/liblangtag/Makefile b/external/liblangtag/Makefile
similarity index 71%
rename from liblangtag/Makefile
rename to external/liblangtag/Makefile
index ccb1c85..e4968cf 100644
--- a/liblangtag/Makefile
+++ b/external/liblangtag/Makefile
@@ -2,6 +2,6 @@
 
 module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-include $(module_directory)/../solenv/gbuild/partial_build.mk
+include $(module_directory)/../../solenv/gbuild/partial_build.mk
 
 # vim: set noet sw=4 ts=4:
diff --git a/liblangtag/Module_liblangtag.mk b/external/liblangtag/Module_liblangtag.mk
similarity index 88%
rename from liblangtag/Module_liblangtag.mk
rename to external/liblangtag/Module_liblangtag.mk
index a1bcdab..54827d2 100644
--- a/liblangtag/Module_liblangtag.mk
+++ b/external/liblangtag/Module_liblangtag.mk
@@ -9,16 +9,11 @@
 
 $(eval $(call gb_Module_Module,liblangtag))
 
-ifeq ($(ENABLE_LIBLANGTAG),TRUE)
-ifeq ($(SYSTEM_LIBLANGTAG),NO)
-
 $(eval $(call gb_Module_add_targets,liblangtag,\
 	UnpackedTarball_langtag \
 	ExternalPackage_langtag_data \
 	ExternalProject_langtag \
 	ExternalPackage_liblangtag_data \
 ))
-endif
-endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/liblangtag/README b/external/liblangtag/README
similarity index 100%
rename from liblangtag/README
rename to external/liblangtag/README
diff --git a/external/liblangtag/UnpackedTarball_langtag.mk b/external/liblangtag/UnpackedTarball_langtag.mk
new file mode 100644
index 0000000..88f7f16
--- /dev/null
+++ b/external/liblangtag/UnpackedTarball_langtag.mk
@@ -0,0 +1,34 @@
+# -*- 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,langtag))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,langtag,$(LIBLANGTAG_TARBALL),,liblangtag))
+
+$(eval $(call gb_UnpackedTarball_add_patches,langtag,\
+	external/liblangtag/liblangtag-0.5.1-msvc-warning.patch \
+	external/liblangtag/liblangtag-0.5.1-vsnprintf.patch \
+	external/liblangtag/liblangtag-0.5.1-msvc-ssize_t.patch \
+	external/liblangtag/liblangtag-0.5.1-msvc-snprintf.patch \
+	external/liblangtag/liblangtag-0.5.1-msvc-strtoull.patch \
+	external/liblangtag/liblangtag-0.5.1-scope-declaration.patch \
+	external/liblangtag/liblangtag-0.5.1-redefinition-of-typedef.patch \
+	external/liblangtag/liblangtag-0.5.1-undefined-have-sys-param-h.patch \
+	external/liblangtag/liblangtag-0.5.1-windows-do-not-prepend-dir-separator.patch \
+	external/liblangtag/liblangtag-0.5.1-unistd.patch \
+))
+
+ifeq ($(OS),WNT)
+ifeq ($(COM),GCC)
+$(eval $(call gb_UnpackedTarball_add_patches,langtag,\
+	external/liblangtag/liblangtag-0.5.1-mingw.patch \
+))
+endif
+endif
+# vim: set noet sw=4 ts=4:
diff --git a/liblangtag/liblangtag-0.5.1-mingw.patch b/external/liblangtag/liblangtag-0.5.1-mingw.patch
similarity index 100%
rename from liblangtag/liblangtag-0.5.1-mingw.patch
rename to external/liblangtag/liblangtag-0.5.1-mingw.patch
diff --git a/liblangtag/liblangtag-0.5.1-msvc-snprintf.patch b/external/liblangtag/liblangtag-0.5.1-msvc-snprintf.patch
similarity index 100%
rename from liblangtag/liblangtag-0.5.1-msvc-snprintf.patch
rename to external/liblangtag/liblangtag-0.5.1-msvc-snprintf.patch
diff --git a/liblangtag/liblangtag-0.5.1-msvc-ssize_t.patch b/external/liblangtag/liblangtag-0.5.1-msvc-ssize_t.patch
similarity index 100%
rename from liblangtag/liblangtag-0.5.1-msvc-ssize_t.patch
rename to external/liblangtag/liblangtag-0.5.1-msvc-ssize_t.patch
diff --git a/liblangtag/liblangtag-0.5.1-msvc-strtoull.patch b/external/liblangtag/liblangtag-0.5.1-msvc-strtoull.patch
similarity index 100%
rename from liblangtag/liblangtag-0.5.1-msvc-strtoull.patch
rename to external/liblangtag/liblangtag-0.5.1-msvc-strtoull.patch
diff --git a/liblangtag/liblangtag-0.5.1-msvc-warning.patch b/external/liblangtag/liblangtag-0.5.1-msvc-warning.patch
similarity index 100%
rename from liblangtag/liblangtag-0.5.1-msvc-warning.patch
rename to external/liblangtag/liblangtag-0.5.1-msvc-warning.patch
diff --git a/liblangtag/liblangtag-0.5.1-redefinition-of-typedef.patch b/external/liblangtag/liblangtag-0.5.1-redefinition-of-typedef.patch
similarity index 100%
rename from liblangtag/liblangtag-0.5.1-redefinition-of-typedef.patch
rename to external/liblangtag/liblangtag-0.5.1-redefinition-of-typedef.patch
diff --git a/liblangtag/liblangtag-0.5.1-scope-declaration.patch b/external/liblangtag/liblangtag-0.5.1-scope-declaration.patch
similarity index 100%
rename from liblangtag/liblangtag-0.5.1-scope-declaration.patch
rename to external/liblangtag/liblangtag-0.5.1-scope-declaration.patch
diff --git a/liblangtag/liblangtag-0.5.1-undefined-have-sys-param-h.patch b/external/liblangtag/liblangtag-0.5.1-undefined-have-sys-param-h.patch
similarity index 100%
rename from liblangtag/liblangtag-0.5.1-undefined-have-sys-param-h.patch
rename to external/liblangtag/liblangtag-0.5.1-undefined-have-sys-param-h.patch
diff --git a/liblangtag/liblangtag-0.5.1-unistd.patch b/external/liblangtag/liblangtag-0.5.1-unistd.patch
similarity index 100%
rename from liblangtag/liblangtag-0.5.1-unistd.patch
rename to external/liblangtag/liblangtag-0.5.1-unistd.patch
diff --git a/liblangtag/liblangtag-0.5.1-vsnprintf.patch b/external/liblangtag/liblangtag-0.5.1-vsnprintf.patch
similarity index 100%
rename from liblangtag/liblangtag-0.5.1-vsnprintf.patch
rename to external/liblangtag/liblangtag-0.5.1-vsnprintf.patch
diff --git a/liblangtag/liblangtag-0.5.1-windows-do-not-prepend-dir-separator.patch b/external/liblangtag/liblangtag-0.5.1-windows-do-not-prepend-dir-separator.patch
similarity index 100%
rename from liblangtag/liblangtag-0.5.1-windows-do-not-prepend-dir-separator.patch
rename to external/liblangtag/liblangtag-0.5.1-windows-do-not-prepend-dir-separator.patch
diff --git a/liblangtag/UnpackedTarball_langtag.mk b/liblangtag/UnpackedTarball_langtag.mk
deleted file mode 100644
index b7c80b0..0000000
--- a/liblangtag/UnpackedTarball_langtag.mk
+++ /dev/null
@@ -1,34 +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,langtag))
-
-$(eval $(call gb_UnpackedTarball_set_tarball,langtag,$(LIBLANGTAG_TARBALL),,liblangtag))
-
-$(eval $(call gb_UnpackedTarball_add_patches,langtag,\
-	liblangtag/liblangtag-0.5.1-msvc-warning.patch \
-	liblangtag/liblangtag-0.5.1-vsnprintf.patch \
-	liblangtag/liblangtag-0.5.1-msvc-ssize_t.patch \
-	liblangtag/liblangtag-0.5.1-msvc-snprintf.patch \
-	liblangtag/liblangtag-0.5.1-msvc-strtoull.patch \
-	liblangtag/liblangtag-0.5.1-scope-declaration.patch \
-	liblangtag/liblangtag-0.5.1-redefinition-of-typedef.patch \
-	liblangtag/liblangtag-0.5.1-undefined-have-sys-param-h.patch \
-	liblangtag/liblangtag-0.5.1-windows-do-not-prepend-dir-separator.patch \
-	liblangtag/liblangtag-0.5.1-unistd.patch \
-))
-
-ifeq ($(OS),WNT)
-ifeq ($(COM),GCC)
-$(eval $(call gb_UnpackedTarball_add_patches,langtag,\
-	liblangtag/liblangtag-0.5.1-mingw.patch \
-))
-endif
-endif
-# vim: set noet sw=4 ts=4:
