[Libreoffice-commits] core.git: external/Module_external.mk Repository.mk solenv/gbuild

[Matúš Kukan]

 Repository.mk  |2 +-
 external/Module_external.mk|7 ---
 solenv/gbuild/Helper.mk|1 +
 solenv/gbuild/Module.mk|2 ++
 solenv/gbuild/extensions/pre_BuildTools.mk |3 +++
 5 files changed, 7 insertions(+), 8 deletions(-)

New commits:
commit 52d409f0d657f314a53f945c9ffb5b8025bea034
Author: Matúš Kukan 
Date:   Wed Nov 30 14:36:51 2016 +0100

gbuild: Prevent wrong use of gb_Helper_optional_for_host

It's empty, unless gb_Side=build.
This fixes commit 1193443b15b0e38cbfb41573b31acf9a8d90ce2c

Change-Id: I83efad36d8f40c460d09ee1bd1addd7fb26c177b
Reviewed-on: https://gerrit.libreoffice.org/31419
Tested-by: Jenkins 
Reviewed-by: Michael Stahl 

diff --git a/Repository.mk b/Repository.mk
index 6ed227c..33bf6d0 100644
--- a/Repository.mk
+++ b/Repository.mk
@@ -992,7 +992,7 @@ $(eval $(call gb_Helper_register_resources,\
eur \
for \
forui \
-   $(call gb_Helper_optional_for_host,DESKTOP,fps_office) \
+   $(call gb_Helper_optional,DESKTOP,fps_office) \
frm \
fwe \
gal \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 3b54b52..1dbf97b 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -101,13 +101,6 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,XSLTML,xsltml) \
$(call gb_Helper_optional,ZLIB,zlib) \
$(call gb_Helper_optional,ZMF,libzmf) \
-   $(call gb_Helper_optional_for_host,DESKTOP, \
-   $(if $(WITH_GALLERY_BUILD), \
-   $(call gb_Helper_optional,HARFBUZZ,harfbuzz) \
-   $(call gb_Helper_optional,LCMS2,lcms2) \
-   $(call gb_Helper_optional,NSS,nss) \
-   ) \
-   ) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/solenv/gbuild/Helper.mk b/solenv/gbuild/Helper.mk
index 4e914d1..1464411 100644
--- a/solenv/gbuild/Helper.mk
+++ b/solenv/gbuild/Helper.mk
@@ -299,6 +299,7 @@ endef
 endif
 
 define gb_Helper_optional_for_host
+$(if $(filter build,$(gb_Side)),,$(call 
gb_Output_error,gb_Helper_optional_for_host: Use only when gb_Side=build))
 $(if $(filter $(1),$(BUILD_TYPE_FOR_HOST)),$(2))
 endef
 
diff --git a/solenv/gbuild/Module.mk b/solenv/gbuild/Module.mk
index eb558a8..6af2b5c 100644
--- a/solenv/gbuild/Module.mk
+++ b/solenv/gbuild/Module.mk
@@ -144,10 +144,12 @@ $(call gb_Module_get_target,%) :
 
 all : build $(if $(CROSS_COMPILING),,unitcheck $(if 
$(gb_PARTIAL_BUILD),,slowcheck))
 
+ifeq ($(gb_Side),build)
 build-tools : $(gb_BUILD_TOOLS)
$(call gb_Output_announce,loaded tools: $(gb_BUILD_TOOLS),$(true),ALL,6)
$(call gb_Output_announce_title,build-tools done.)
$(call gb_Output_announce_bell)
+endif
 
 build :
$(call gb_Output_announce,top level modules: $(foreach 
module,$(filter-out deliverlog $(WORKDIR)/bootstrap,$^),$(notdir 
$(module))),$(true),ALL,6)
diff --git a/solenv/gbuild/extensions/pre_BuildTools.mk 
b/solenv/gbuild/extensions/pre_BuildTools.mk
index f387df6..5daf671 100644
--- a/solenv/gbuild/extensions/pre_BuildTools.mk
+++ b/solenv/gbuild/extensions/pre_BuildTools.mk
@@ -8,6 +8,7 @@
 #
 
 # Tools we need to build for cross-compiling
+ifeq ($(gb_Side),build)
 gb_BUILD_TOOLS = \
$(foreach executable, \
bestreversemap \
@@ -44,4 +45,6 @@ gb_BUILD_TOOLS = \
,$(call gb_ExternalExecutable_get_dependencies,$(executable))) \
$(INSTROOT)/$(LIBO_URE_ETC_FOLDER)/$(call gb_Helper_get_rcfile,uno) \
 
+endif
+
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/Module_external.mk external/nss nss/ExternalPackage_nss.mk nss/ExternalProject_nss.mk nss/Makefile nss/Module_nss.mk nss/nsinstall.py nss/nspr-4.9-build.patch.

[Khaled Hosny]

 RepositoryModule_build.mk |1 
 RepositoryModule_host.mk  |1 
 external/Module_external.mk   |2 
 external/nss/ExternalPackage_nss.mk   |   60 ++
 external/nss/ExternalProject_nss.mk   |   87 +
 external/nss/Makefile |7 
 external/nss/Module_nss.mk|   22 ++
 external/nss/README   |   77 
 external/nss/UnpackedTarball_nss.mk   |   26 ++
 external/nss/nsinstall.py |  164 +
 external/nss/nspr-4.9-build.patch.3   |  285 ++
 external/nss/nss-3.13.3-build.patch.3 |  259 +++
 external/nss/nss-3.13.5-zlib-werror.patch |   12 +
 external/nss/nss.aix.patch|  143 +++
 external/nss/nss.mingw.patch.3|  128 +
 external/nss/nss.patch|  242 +
 external/nss/nss.wheader-guard.patch.0|   11 +
 external/nss/nss.windows.patch|   22 ++
 external/nss/nss_macosx.patch |   78 
 nss/ExternalPackage_nss.mk|   60 --
 nss/ExternalProject_nss.mk|   87 -
 nss/Makefile  |7 
 nss/Module_nss.mk |   22 --
 nss/README|   77 
 nss/UnpackedTarball_nss.mk|   26 --
 nss/nsinstall.py  |  164 -
 nss/nspr-4.9-build.patch.3|  285 --
 nss/nss-3.13.3-build.patch.3  |  259 ---
 nss/nss-3.13.5-zlib-werror.patch  |   12 -
 nss/nss.aix.patch |  143 ---
 nss/nss.mingw.patch.3 |  128 -
 nss/nss.patch |  242 -
 nss/nss.wheader-guard.patch.0 |   11 -
 nss/nss.windows.patch |   22 --
 nss/nss_macosx.patch  |   78 
 35 files changed, 1625 insertions(+), 1625 deletions(-)

New commits:
commit 55df380f008851af859970bfb88942b8872f9cda
Author: Khaled Hosny khaledho...@eglug.org
Date:   Sun Nov 3 20:15:13 2013 +0200

fdo#70393: move nss to a subdir of external

Change-Id: Ibbeb6b284c6c5fb9bba4ad52abed69321bba90d8
Reviewed-on: https://gerrit.libreoffice.org/6545
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/RepositoryModule_build.mk b/RepositoryModule_build.mk
index 18ea8bc..acd899b 100644
--- a/RepositoryModule_build.mk
+++ b/RepositoryModule_build.mk
@@ -67,7 +67,6 @@ $(eval $(call gb_Module_add_moduledirs,cross_toolset,\
editeng \
framework \
linguistic \
-   nss \
package \
sfx2 \
sot \
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 7655e0f..1b9b9d3 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -77,7 +77,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
$(call gb_Helper_optional,MARIADBC,mysqlc) \
$(call gb_Helper_optional,NLPSOLVER,nlpsolver) \
np_sdk \
-   $(call gb_Helper_optional,NSS,nss) \
o3tl \
$(call gb_Helper_optional,ODK,odk) \
offapi \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 2547160..8321a2e 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -63,6 +63,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,MYSQLCPPCONN,mysqlcppconn) \
$(call gb_Helper_optional,MYTHES,mythes) \
$(call gb_Helper_optional,NEON,neon) \
+   $(call gb_Helper_optional,NSS,nss) \
$(call gb_Helper_optional,ODFGEN,libodfgen) \
$(call gb_Helper_optional,ORCUS,liborcus) \
$(call gb_Helper_optional,VISIO,libvisio) \
@@ -73,6 +74,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(if $(filter YES,$(WITH_GALLERY_BUILD)), \
$(call gb_Helper_optional,HARFBUZZ,harfbuzz) \
$(call gb_Helper_optional,LCMS2,lcms2) \
+   $(call gb_Helper_optional,NSS,nss) \
) \
) \
 ))
diff --git a/nss/ExternalPackage_nss.mk b/external/nss/ExternalPackage_nss.mk
similarity index 100%
rename from nss/ExternalPackage_nss.mk
rename to external/nss/ExternalPackage_nss.mk
diff --git a/nss/ExternalProject_nss.mk b/external/nss/ExternalProject_nss.mk
similarity index 97%
rename from nss/ExternalProject_nss.mk
rename to external/nss/ExternalProject_nss.mk
index 475a7d8..af354e5 100644
--- a/nss/ExternalProject_nss.mk
+++ b/external/nss/ExternalProject_nss.mk
@@ -32,7 +32,7 @@ $(call 

[Libreoffice-commits] core.git: external/Module_external.mk external/openldap openldap/ExternalProject_openldap.mk openldap/Makefile openldap/Module_openldap.mk openldap/openldap-2.4.31.patch openldap

[Khaled Hosny]

 RepositoryModule_host.mk  |1 
 external/Module_external.mk   |1 
 external/openldap/ExternalProject_openldap.mk |   43 +++
 external/openldap/Makefile|7 ++
 external/openldap/Module_openldap.mk  |   21 +++
 external/openldap/UnpackedTarball_openldap.mk |   18 ++
 external/openldap/openldap-2.4.31.patch   |   73 ++
 openldap/ExternalProject_openldap.mk  |   43 ---
 openldap/Makefile |7 --
 openldap/Module_openldap.mk   |   21 ---
 openldap/UnpackedTarball_openldap.mk  |   18 --
 openldap/openldap-2.4.31.patch|   73 --
 12 files changed, 163 insertions(+), 163 deletions(-)

New commits:
commit 8339d33a24e9810ae23544f0f4d1a52bd732c49f
Author: Khaled Hosny khaledho...@eglug.org
Date:   Sun Nov 3 20:17:25 2013 +0200

fdo#70393: move openldap to a subdir of external

Change-Id: I0225484e976b5317c2ac5d5b50ade153425f22b0
Reviewed-on: https://gerrit.libreoffice.org/6546
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 1b9b9d3..a5500ab 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -83,7 +83,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
officecfg \
oovbaapi \
oox \
-   $(call gb_Helper_optional,OPENLDAP,openldap) \
$(call gb_Helper_optional,OPENSSL,openssl) \
package \
padmin \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 8321a2e..23ca67d 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -65,6 +65,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,NEON,neon) \
$(call gb_Helper_optional,NSS,nss) \
$(call gb_Helper_optional,ODFGEN,libodfgen) \
+   $(call gb_Helper_optional,OPENLDAP,openldap) \
$(call gb_Helper_optional,ORCUS,liborcus) \
$(call gb_Helper_optional,VISIO,libvisio) \
$(call gb_Helper_optional,WPD,libwpd) \
diff --git a/openldap/ExternalProject_openldap.mk 
b/external/openldap/ExternalProject_openldap.mk
similarity index 100%
rename from openldap/ExternalProject_openldap.mk
rename to external/openldap/ExternalProject_openldap.mk
diff --git a/openldap/Makefile b/external/openldap/Makefile
similarity index 71%
rename from openldap/Makefile
rename to external/openldap/Makefile
index ccb1c85..e4968cf 100644
--- a/openldap/Makefile
+++ b/external/openldap/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/openldap/Module_openldap.mk b/external/openldap/Module_openldap.mk
similarity index 100%
rename from openldap/Module_openldap.mk
rename to external/openldap/Module_openldap.mk
diff --git a/openldap/UnpackedTarball_openldap.mk 
b/external/openldap/UnpackedTarball_openldap.mk
similarity index 92%
rename from openldap/UnpackedTarball_openldap.mk
rename to external/openldap/UnpackedTarball_openldap.mk
index 43e3e2a..f22cb97 100644
--- a/openldap/UnpackedTarball_openldap.mk
+++ b/external/openldap/UnpackedTarball_openldap.mk
@@ -12,7 +12,7 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,openldap))
 $(eval $(call 
gb_UnpackedTarball_set_tarball,openldap,$(OPENLDAP_TARBALL),,openldap))
 
 $(eval $(call gb_UnpackedTarball_add_patches,openldap,\
-   openldap/openldap-2.4.31.patch \
+   external/openldap/openldap-2.4.31.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/openldap/openldap-2.4.31.patch 
b/external/openldap/openldap-2.4.31.patch
similarity index 100%
rename from openldap/openldap-2.4.31.patch
rename to external/openldap/openldap-2.4.31.patch
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/Module_external.mk external/openssl openssl/ExternalPackage_openssl.mk openssl/ExternalProject_openssl.mk openssl/Makefile openssl/Module_openssl.mk openssl/op

[Khaled Hosny]

 RepositoryModule_host.mk|1 
 external/Module_external.mk |1 
 external/openssl/ExternalPackage_openssl.mk |   21 +++
 external/openssl/ExternalProject_openssl.mk |   93 
 external/openssl/Makefile   |7 +
 external/openssl/Module_openssl.mk  |   20 +++
 external/openssl/README |7 +
 external/openssl/UnpackedTarball_openssl.mk |  101 ++
 external/openssl/opensslios.patch   |   12 ++
 external/openssl/openssllnx.patch   |   23 
 external/openssl/opensslmingw.patch |  109 +++
 external/openssl/opensslsol.patch   |   81 ++
 external/openssl/opensslwnt.patch   |  154 
 openssl/ExternalPackage_openssl.mk  |   21 ---
 openssl/ExternalProject_openssl.mk  |   93 
 openssl/Makefile|7 -
 openssl/Module_openssl.mk   |   20 ---
 openssl/README  |7 -
 openssl/UnpackedTarball_openssl.mk  |  101 --
 openssl/opensslios.patch|   12 --
 openssl/openssllnx.patch|   23 
 openssl/opensslmingw.patch  |  109 ---
 openssl/opensslsol.patch|   81 --
 openssl/opensslwnt.patch|  154 
 24 files changed, 629 insertions(+), 629 deletions(-)

New commits:
commit fde2065b0f3266fc7ee9e1b85733e3ddcf1c9e03
Author: Khaled Hosny khaledho...@eglug.org
Date:   Sun Nov 3 20:19:22 2013 +0200

fdo#70393: move openssl to a subdir of external

Change-Id: I10bf92b18ee5ad56f1b4fbee3e4008b35b822be4
Reviewed-on: https://gerrit.libreoffice.org/6547
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 a5500ab..7ed7dff 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -83,7 +83,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
officecfg \
oovbaapi \
oox \
-   $(call gb_Helper_optional,OPENSSL,openssl) \
package \
padmin \
$(call gb_Helper_optional,POPPLER,poppler) \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 23ca67d..63e3bf3 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -66,6 +66,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,NSS,nss) \
$(call gb_Helper_optional,ODFGEN,libodfgen) \
$(call gb_Helper_optional,OPENLDAP,openldap) \
+   $(call gb_Helper_optional,OPENSSL,openssl) \
$(call gb_Helper_optional,ORCUS,liborcus) \
$(call gb_Helper_optional,VISIO,libvisio) \
$(call gb_Helper_optional,WPD,libwpd) \
diff --git a/openssl/ExternalPackage_openssl.mk 
b/external/openssl/ExternalPackage_openssl.mk
similarity index 100%
rename from openssl/ExternalPackage_openssl.mk
rename to external/openssl/ExternalPackage_openssl.mk
diff --git a/openssl/ExternalProject_openssl.mk 
b/external/openssl/ExternalProject_openssl.mk
similarity index 100%
rename from openssl/ExternalProject_openssl.mk
rename to external/openssl/ExternalProject_openssl.mk
diff --git a/openssl/Makefile b/external/openssl/Makefile
similarity index 71%
rename from openssl/Makefile
rename to external/openssl/Makefile
index ccb1c85..e4968cf 100644
--- a/openssl/Makefile
+++ b/external/openssl/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/openssl/Module_openssl.mk b/external/openssl/Module_openssl.mk
similarity index 100%
rename from openssl/Module_openssl.mk
rename to external/openssl/Module_openssl.mk
diff --git a/openssl/README b/external/openssl/README
similarity index 100%
rename from openssl/README
rename to external/openssl/README
diff --git a/openssl/UnpackedTarball_openssl.mk 
b/external/openssl/UnpackedTarball_openssl.mk
similarity index 88%
rename from openssl/UnpackedTarball_openssl.mk
rename to external/openssl/UnpackedTarball_openssl.mk
index e7fdfce..cec09d2 100644
--- a/openssl/UnpackedTarball_openssl.mk
+++ b/external/openssl/UnpackedTarball_openssl.mk
@@ -91,11 +91,11 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,openssl,\
 ))
 
 $(eval $(call gb_UnpackedTarball_add_patches,openssl,\
-   $(if $(filter LINUX FREEBSD ANDROID,$(OS)),openssl/openssllnx.patch) \
-   $(if $(filter WNTGCC,$(OS)$(COM)),openssl/opensslmingw.patch) \
-   $(if $(filter MSC,$(COM)),openssl/opensslwnt.patch) \
-   $(if $(filter SOLARIS,$(OS)),openssl/opensslsol.patch) \
-   $(if $(filter 

[Libreoffice-commits] core.git: external/Module_external.mk external/poppler poppler/ExternalProject_poppler.mk poppler/Makefile poppler/Module_poppler.mk poppler/poppler-mac-fake.patch.1 poppler/popp

[Khaled Hosny]

 RepositoryModule_host.mk|1 
 external/Module_external.mk |1 
 external/poppler/ExternalProject_poppler.mk |   45 +
 external/poppler/Makefile   |7 +++
 external/poppler/Module_poppler.mk  |   21 +++
 external/poppler/README |1 
 external/poppler/UnpackedTarball_poppler.mk |   21 +++
 external/poppler/poppler-mac-fake.patch.1   |   13 +++
 external/poppler/poppler-nochecknew.patch.1 |   11 ++
 external/poppler/poppler-notests.patch.1|   11 ++
 external/poppler/poppler-snprintf.patch.1   |   50 
 poppler/ExternalProject_poppler.mk  |   45 -
 poppler/Makefile|7 ---
 poppler/Module_poppler.mk   |   21 ---
 poppler/README  |1 
 poppler/UnpackedTarball_poppler.mk  |   21 ---
 poppler/poppler-mac-fake.patch.1|   13 ---
 poppler/poppler-nochecknew.patch.1  |   11 --
 poppler/poppler-notests.patch.1 |   11 --
 poppler/poppler-snprintf.patch.1|   50 
 20 files changed, 181 insertions(+), 181 deletions(-)

New commits:
commit 40276b4ceb72f1d070bb1457ed5b403b35ca4deb
Author: Khaled Hosny khaledho...@eglug.org
Date:   Sun Nov 3 20:21:01 2013 +0200

fdo#70393: move poppler to a subdir of external

Change-Id: I399df92d2b6907c129e18f3a55afeadf02783c14
Reviewed-on: https://gerrit.libreoffice.org/6548
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 7ed7dff..ced54de 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -85,7 +85,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
oox \
package \
padmin \
-   $(call gb_Helper_optional,POPPLER,poppler) \
$(call gb_Helper_optional,POSTGRESQL,postgresql) \
postprocess \
psprint_config \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 63e3bf3..481f46e 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -68,6 +68,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,OPENLDAP,openldap) \
$(call gb_Helper_optional,OPENSSL,openssl) \
$(call gb_Helper_optional,ORCUS,liborcus) \
+   $(call gb_Helper_optional,POPPLER,poppler) \
$(call gb_Helper_optional,VISIO,libvisio) \
$(call gb_Helper_optional,WPD,libwpd) \
$(call gb_Helper_optional,WPG,libwpg) \
diff --git a/poppler/ExternalProject_poppler.mk 
b/external/poppler/ExternalProject_poppler.mk
similarity index 100%
rename from poppler/ExternalProject_poppler.mk
rename to external/poppler/ExternalProject_poppler.mk
diff --git a/poppler/Makefile b/external/poppler/Makefile
similarity index 71%
rename from poppler/Makefile
rename to external/poppler/Makefile
index ccb1c85..e4968cf 100644
--- a/poppler/Makefile
+++ b/external/poppler/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/poppler/Module_poppler.mk b/external/poppler/Module_poppler.mk
similarity index 100%
rename from poppler/Module_poppler.mk
rename to external/poppler/Module_poppler.mk
diff --git a/poppler/README b/external/poppler/README
similarity index 100%
rename from poppler/README
rename to external/poppler/README
diff --git a/poppler/UnpackedTarball_poppler.mk 
b/external/poppler/UnpackedTarball_poppler.mk
similarity index 75%
rename from poppler/UnpackedTarball_poppler.mk
rename to external/poppler/UnpackedTarball_poppler.mk
index f3bf0db..93c8fa1 100644
--- a/poppler/UnpackedTarball_poppler.mk
+++ b/external/poppler/UnpackedTarball_poppler.mk
@@ -12,10 +12,10 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,poppler))
 $(eval $(call 
gb_UnpackedTarball_set_tarball,poppler,$(POPPLER_TARBALL),,poppler))
 
 $(eval $(call gb_UnpackedTarball_add_patches,poppler,\
-   poppler/poppler-notests.patch.1 \
-   poppler/poppler-snprintf.patch.1 \
-   poppler/poppler-mac-fake.patch.1 \
-   poppler/poppler-nochecknew.patch.1 \
+   external/poppler/poppler-notests.patch.1 \
+   external/poppler/poppler-snprintf.patch.1 \
+   external/poppler/poppler-mac-fake.patch.1 \
+   external/poppler/poppler-nochecknew.patch.1 \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/poppler/poppler-mac-fake.patch.1 
b/external/poppler/poppler-mac-fake.patch.1
similarity index 100%
rename from poppler/poppler-mac-fake.patch.1
rename to external/poppler/poppler-mac-fake.patch.1
diff --git a/poppler/poppler-nochecknew.patch.1 

[Libreoffice-commits] core.git: external/Module_external.mk external/postgresql postgresql/ExternalProject_postgresql.mk postgresql/Makefile postgresql/Module_postgresql.mk postgresql/postgresql-9.2.1

[Khaled Hosny]

 RepositoryModule_host.mk   |1 
 external/Module_external.mk|1 
 external/postgresql/ExternalProject_postgresql.mk  |   69 ++
 external/postgresql/Makefile   |7 
 external/postgresql/Module_postgresql.mk   |   21 
 external/postgresql/README |3 
 external/postgresql/UnpackedTarball_postgresql.mk  |   22 
 external/postgresql/postgresql-9.2.1-autoreconf.patch  |  521 +
 external/postgresql/postgresql-9.2.1-libreoffice.patch |  113 +++
 external/postgresql/postgresql-libs-leak.patch |   40 +
 postgresql/ExternalProject_postgresql.mk   |   69 --
 postgresql/Makefile|7 
 postgresql/Module_postgresql.mk|   21 
 postgresql/README  |3 
 postgresql/UnpackedTarball_postgresql.mk   |   22 
 postgresql/postgresql-9.2.1-autoreconf.patch   |  521 -
 postgresql/postgresql-9.2.1-libreoffice.patch  |  113 ---
 postgresql/postgresql-libs-leak.patch  |   40 -
 18 files changed, 797 insertions(+), 797 deletions(-)

New commits:
commit 547d2c75824ab0e22fe33ff6d7d40fd5b313ff26
Author: Khaled Hosny khaledho...@eglug.org
Date:   Sun Nov 3 20:22:44 2013 +0200

fdo#70393: move postgresql to a subdir of external

Change-Id: Ibd7c9a4db0150bdb115b061e21587ca964dc2c84
Reviewed-on: https://gerrit.libreoffice.org/6549
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 ced54de..253c52e 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -85,7 +85,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
oox \
package \
padmin \
-   $(call gb_Helper_optional,POSTGRESQL,postgresql) \
postprocess \
psprint_config \
$(call gb_Helper_optional,PYTHON,python3) \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 481f46e..d7b041b 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -69,6 +69,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,OPENSSL,openssl) \
$(call gb_Helper_optional,ORCUS,liborcus) \
$(call gb_Helper_optional,POPPLER,poppler) \
+   $(call gb_Helper_optional,POSTGRESQL,postgresql) \
$(call gb_Helper_optional,VISIO,libvisio) \
$(call gb_Helper_optional,WPD,libwpd) \
$(call gb_Helper_optional,WPG,libwpg) \
diff --git a/postgresql/ExternalProject_postgresql.mk 
b/external/postgresql/ExternalProject_postgresql.mk
similarity index 100%
rename from postgresql/ExternalProject_postgresql.mk
rename to external/postgresql/ExternalProject_postgresql.mk
diff --git a/postgresql/Makefile b/external/postgresql/Makefile
similarity index 71%
rename from postgresql/Makefile
rename to external/postgresql/Makefile
index ccb1c85..e4968cf 100644
--- a/postgresql/Makefile
+++ b/external/postgresql/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/postgresql/Module_postgresql.mk 
b/external/postgresql/Module_postgresql.mk
similarity index 100%
rename from postgresql/Module_postgresql.mk
rename to external/postgresql/Module_postgresql.mk
diff --git a/postgresql/README b/external/postgresql/README
similarity index 100%
rename from postgresql/README
rename to external/postgresql/README
diff --git a/postgresql/UnpackedTarball_postgresql.mk 
b/external/postgresql/UnpackedTarball_postgresql.mk
similarity index 79%
rename from postgresql/UnpackedTarball_postgresql.mk
rename to external/postgresql/UnpackedTarball_postgresql.mk
index c7e1704..3d0fe6c 100644
--- a/postgresql/UnpackedTarball_postgresql.mk
+++ b/external/postgresql/UnpackedTarball_postgresql.mk
@@ -14,9 +14,9 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,postgresql,$(POSTGRESQL_TARBALL),,p
 $(eval $(call gb_UnpackedTarball_set_patchlevel,postgresql,3))
 
 $(eval $(call gb_UnpackedTarball_add_patches,postgresql, \
-   postgresql/postgresql-libs-leak.patch \
-   postgresql/postgresql-9.2.1-autoreconf.patch \
-   postgresql/postgresql-9.2.1-libreoffice.patch \
+   external/postgresql/postgresql-libs-leak.patch \
+   external/postgresql/postgresql-9.2.1-autoreconf.patch \
+   external/postgresql/postgresql-9.2.1-libreoffice.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/postgresql/postgresql-9.2.1-autoreconf.patch 
b/external/postgresql/postgresql-9.2.1-autoreconf.patch
similarity index 100%
rename from postgresql/postgresql-9.2.1-autoreconf.patch
rename to 

[Libreoffice-commits] core.git: external/Module_external.mk external/python3 python3/ExternalPackage_python3.mk python3/ExternalProject_python3.mk python3/GeneratedPackage_python3.mk python3/i100492-f

[Khaled Hosny]

 RepositoryModule_host.mk|1 
 external/Module_external.mk |1 
 external/python3/ExternalPackage_python3.mk |  829 
 external/python3/ExternalProject_python3.mk |  142 +++
 external/python3/GeneratedPackage_python3.mk|   18 
 external/python3/Makefile   |7 
 external/python3/Module_python3.mk  |   24 
 external/python3/README |1 
 external/python3/UnpackedTarball_python3.mk |   50 +
 external/python3/i100492-freebsd.patch.1|   80 +
 external/python3/python-3.3.0-15833.patch.1 |   28 
 external/python3/python-3.3.0-aix.patch.1   |  156 +++
 external/python3/python-3.3.0-clang.patch.1 |   13 
 external/python3/python-3.3.0-darwin.patch.1|   63 +
 external/python3/python-3.3.0-elf-rpath.patch.1 |   13 
 external/python3/python-3.3.0-ffi-clang.patch.1 |   40 
 external/python3/python-3.3.0-gcc-4.8.patch.1   |   15 
 external/python3/python-3.3.0-i42553.patch.2|   18 
 external/python3/python-3.3.0-implicit-int.patch.1  |   30 
 external/python3/python-3.3.0-msvc-disable.patch.1  |  123 ++
 external/python3/python-3.3.0-msvc-x64.patch.1  |  362 
 external/python3/python-3.3.0-msvc2012.patch.1  |   72 +
 external/python3/python-3.3.0-pythreadstate.patch.1 |   15 
 external/python3/python-3.3.0-ssl.patch.1   |  370 
 python3/ExternalPackage_python3.mk  |  829 
 python3/ExternalProject_python3.mk  |  142 ---
 python3/GeneratedPackage_python3.mk |   18 
 python3/Makefile|7 
 python3/Module_python3.mk   |   24 
 python3/README  |1 
 python3/UnpackedTarball_python3.mk  |   50 -
 python3/i100492-freebsd.patch.1 |   80 -
 python3/python-3.3.0-15833.patch.1  |   28 
 python3/python-3.3.0-aix.patch.1|  156 ---
 python3/python-3.3.0-clang.patch.1  |   13 
 python3/python-3.3.0-darwin.patch.1 |   63 -
 python3/python-3.3.0-elf-rpath.patch.1  |   13 
 python3/python-3.3.0-ffi-clang.patch.1  |   40 
 python3/python-3.3.0-gcc-4.8.patch.1|   15 
 python3/python-3.3.0-i42553.patch.2 |   18 
 python3/python-3.3.0-implicit-int.patch.1   |   30 
 python3/python-3.3.0-msvc-disable.patch.1   |  123 --
 python3/python-3.3.0-msvc-x64.patch.1   |  362 
 python3/python-3.3.0-msvc2012.patch.1   |   72 -
 python3/python-3.3.0-pythreadstate.patch.1  |   15 
 python3/python-3.3.0-ssl.patch.1|  370 
 46 files changed, 2470 insertions(+), 2470 deletions(-)

New commits:
commit 9dc3f0f5af0fe64ced5d1aca2fc1ddf28c3974c9
Author: Khaled Hosny khaledho...@eglug.org
Date:   Sun Nov 3 20:28:42 2013 +0200

fdo#70393: move python3 to a subdir of external

Change-Id: Ic5796f096255d2d84e39415324e8a2e06bcf09c9
Reviewed-on: https://gerrit.libreoffice.org/6550
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 253c52e..cf4d8c3 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -87,7 +87,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
padmin \
postprocess \
psprint_config \
-   $(call gb_Helper_optional,PYTHON,python3) \
$(call gb_Helper_optional,PYUNO,pyuno) \
$(call gb_Helper_optional,QADEVOOO,qadevOOo) \
readlicense_oo \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index d7b041b..45f0ba2 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -70,6 +70,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,ORCUS,liborcus) \
$(call gb_Helper_optional,POPPLER,poppler) \
$(call gb_Helper_optional,POSTGRESQL,postgresql) \
+   $(call gb_Helper_optional,PYTHON,python3) \
$(call gb_Helper_optional,VISIO,libvisio) \
$(call gb_Helper_optional,WPD,libwpd) \
$(call gb_Helper_optional,WPG,libwpg) \
diff --git a/python3/ExternalPackage_python3.mk 
b/external/python3/ExternalPackage_python3.mk
similarity index 100%
rename from python3/ExternalPackage_python3.mk
rename to external/python3/ExternalPackage_python3.mk
diff --git a/python3/ExternalProject_python3.mk 
b/external/python3/ExternalProject_python3.mk
similarity index 100%
rename from python3/ExternalProject_python3.mk
rename to external/python3/ExternalProject_python3.mk
diff --git a/python3/GeneratedPackage_python3.mk 
b/external/python3/GeneratedPackage_python3.mk
similarity index 100%

[Libreoffice-commits] core.git: external/Module_external.mk external/redland redland/ExternalPackage_raptor.mk redland/ExternalPackage_rasqal.mk redland/ExternalPackage_redland.mk redland/ExternalProj

[Khaled Hosny]

 RepositoryModule_host.mk   |1 
 external/Module_external.mk|1 
 external/redland/ExternalPackage_raptor.mk |   24 
 external/redland/ExternalPackage_rasqal.mk |   24 
 external/redland/ExternalPackage_redland.mk|   24 
 external/redland/ExternalProject_raptor.mk |   56 
 external/redland/ExternalProject_rasqal.mk |   68 
 external/redland/ExternalProject_redland.mk|   73 
 external/redland/Library_raptor.mk |   77 
 external/redland/Library_rasqal.mk |  112 
 external/redland/Library_rdf.mk|   73 
 external/redland/Makefile  |7 
 external/redland/Module_redland.mk |   36 
 external/redland/README|   24 
 external/redland/UnpackedTarball_raptor.mk |   25 
 external/redland/UnpackedTarball_rasqal.mk |   28 
 external/redland/UnpackedTarball_redland.mk|   28 
 external/redland/raptor/raptor-android.patch.1 |   13 
 external/redland/raptor/raptor-bundled-soname.patch.1  |   13 
 external/redland/raptor/raptor-freebsd.patch.1 |   28 
 external/redland/raptor/raptor-mingw.patch.1   |   13 
 external/redland/raptor/raptor2.h  | 2100 
+
 external/redland/raptor/raptor_config.h|  393 +
 external/redland/rasqal/rasqal-aix.patch.1 |   25 
 external/redland/rasqal/rasqal-android.patch.1 |   14 
 external/redland/rasqal/rasqal-bundled-soname.patch.1  |   13 
 external/redland/rasqal/rasqal-freebsd.patch.1 |   28 
 external/redland/rasqal/rasqal-mingw.patch.1   |   13 
 external/redland/rasqal/rasqal-msvc.patch.1|   87 
 external/redland/rasqal/rasqal-pkgconfig.patch.1   |  512 ++
 external/redland/rasqal/rasqal-xcompile.patch.1|   15 
 external/redland/rasqal/rasqal.h   | 2221 
++
 external/redland/redland/librdf.h  |  434 +
 external/redland/redland/redland-android.patch.1   |   14 
 external/redland/redland/redland-bundled-soname.patch.1|   13 
 external/redland/redland/redland-freebsd.patch.1   |   28 
 external/redland/redland/redland-mingw.patch.1 |   13 
 external/redland/redland/redland-msvc.patch.1  |  146 
 external/redland/redland/redland-pkgconfig.patch.1 |  619 ++
 external/redland/redland/redland-query-rasqal-avoid-assert.patch.1 |   17 
 external/redland/redland/redland-xcompile.patch.1  |   15 
 redland/ExternalPackage_raptor.mk  |   24 
 redland/ExternalPackage_rasqal.mk  |   24 
 redland/ExternalPackage_redland.mk |   24 
 redland/ExternalProject_raptor.mk  |   56 
 redland/ExternalProject_rasqal.mk  |   68 
 redland/ExternalProject_redland.mk |   73 
 redland/Library_raptor.mk  |   77 
 redland/Library_rasqal.mk  |  112 
 redland/Library_rdf.mk |   73 
 redland/Makefile   |7 
 redland/Module_redland.mk  |   36 
 redland/README |   24 
 redland/UnpackedTarball_raptor.mk  |   25 
 redland/UnpackedTarball_rasqal.mk  |   28 
 redland/UnpackedTarball_redland.mk |   28 
 redland/raptor/raptor-android.patch.1  |   13 
 redland/raptor/raptor-bundled-soname.patch.1   |   13 
 redland/raptor/raptor-freebsd.patch.1  |   28 
 redland/raptor/raptor-mingw.patch.1|   13 
 redland/raptor/raptor2.h   | 2100 
-
 redland/raptor/raptor_config.h |  393 -
 redland/rasqal/rasqal-aix.patch.1  |   25 
 redland/rasqal/rasqal-android.patch.1  |   14 
 redland/rasqal/rasqal-bundled-soname.patch.1   |   13 
 

[Libreoffice-commits] core.git: external/Module_external.mk external/rhino RepositoryModule_host.mk rhino/ExternalPackage_rhino.mk rhino/ExternalProject_rhino.mk rhino/Makefile rhino/Module_rhino.mk r

[Khaled Hosny]

 RepositoryModule_host.mk  |1 
 external/Module_external.mk   |1 
 external/rhino/ExternalPackage_rhino.mk   |   16 
 external/rhino/ExternalProject_rhino.mk   |   32 
 external/rhino/Makefile   |7 
 external/rhino/Module_rhino.mk|   22 
 external/rhino/OfficeScriptInfo.java  |  118 ++
 external/rhino/README |   14 
 external/rhino/UnpackedTarball_rhino.mk   |   24 
 external/rhino/rhino1_5R5-find_swing.patch|   19 
 external/rhino/rhino1_5R5-updateToolTip.patch |   23 
 external/rhino/rhino1_5R5.patch   | 1071 ++
 rhino/ExternalPackage_rhino.mk|   16 
 rhino/ExternalProject_rhino.mk|   32 
 rhino/Makefile|7 
 rhino/Module_rhino.mk |   22 
 rhino/OfficeScriptInfo.java   |  118 --
 rhino/README  |   14 
 rhino/UnpackedTarball_rhino.mk|   24 
 rhino/rhino1_5R5-find_swing.patch |   19 
 rhino/rhino1_5R5-updateToolTip.patch  |   23 
 rhino/rhino1_5R5.patch| 1071 --
 22 files changed, 1347 insertions(+), 1347 deletions(-)

New commits:
commit 90a19aeac6cad56e33574685219a85ef98469513
Author: Khaled Hosny khaledho...@eglug.org
Date:   Sun Nov 3 20:35:47 2013 +0200

fdo#70393: move rhino to a subdir of external

Change-Id: I7d7858d84a62568d9b0c61403645da13658e78d2
Reviewed-on: https://gerrit.libreoffice.org/6552
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 1f60a30..a8788240 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -94,7 +94,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
remotebridges \
reportbuilder \
$(call gb_Helper_optional,DBCONNECTIVITY,reportdesign) \
-   $(call gb_Helper_optional,RHINO,rhino) \
ridljar \
rsc \
sal \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index aeba824..2a6977f 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -72,6 +72,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,POSTGRESQL,postgresql) \
$(call gb_Helper_optional,PYTHON,python3) \
$(call gb_Helper_optional,REDLAND,redland) \
+   $(call gb_Helper_optional,RHINO,rhino) \
$(call gb_Helper_optional,VISIO,libvisio) \
$(call gb_Helper_optional,WPD,libwpd) \
$(call gb_Helper_optional,WPG,libwpg) \
diff --git a/rhino/ExternalPackage_rhino.mk 
b/external/rhino/ExternalPackage_rhino.mk
similarity index 100%
rename from rhino/ExternalPackage_rhino.mk
rename to external/rhino/ExternalPackage_rhino.mk
diff --git a/rhino/ExternalProject_rhino.mk 
b/external/rhino/ExternalProject_rhino.mk
similarity index 100%
rename from rhino/ExternalProject_rhino.mk
rename to external/rhino/ExternalProject_rhino.mk
diff --git a/rhino/Makefile b/external/rhino/Makefile
similarity index 71%
rename from rhino/Makefile
rename to external/rhino/Makefile
index ccb1c85..e4968cf 100644
--- a/rhino/Makefile
+++ b/external/rhino/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/rhino/Module_rhino.mk b/external/rhino/Module_rhino.mk
similarity index 100%
rename from rhino/Module_rhino.mk
rename to external/rhino/Module_rhino.mk
diff --git a/rhino/OfficeScriptInfo.java b/external/rhino/OfficeScriptInfo.java
similarity index 100%
rename from rhino/OfficeScriptInfo.java
rename to external/rhino/OfficeScriptInfo.java
diff --git a/rhino/README b/external/rhino/README
similarity index 100%
rename from rhino/README
rename to external/rhino/README
diff --git a/rhino/UnpackedTarball_rhino.mk 
b/external/rhino/UnpackedTarball_rhino.mk
similarity index 75%
rename from rhino/UnpackedTarball_rhino.mk
rename to external/rhino/UnpackedTarball_rhino.mk
index 4ee92d2..0a1492b 100644
--- a/rhino/UnpackedTarball_rhino.mk
+++ b/external/rhino/UnpackedTarball_rhino.mk
@@ -14,11 +14,11 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,rhino,$(RHINO_TARBALL),,rhino))
 $(eval $(call gb_UnpackedTarball_set_patchlevel,rhino,2))
 
 $(eval $(call gb_UnpackedTarball_add_patches,rhino,\
-   rhino/rhino1_5R5.patch \
-   rhino/rhino1_5R5-find_swing.patch \
-   rhino/rhino1_5R5-updateToolTip.patch \
+   external/rhino/rhino1_5R5.patch \
+   external/rhino/rhino1_5R5-find_swing.patch \
+   external/rhino/rhino1_5R5-updateToolTip.patch \
 ))
 
-$(eval $(call 

[Libreoffice-commits] core.git: external/Module_external.mk external/ucpp RepositoryModule_build.mk RepositoryModule_host.mk ucpp/Executable_ucpp.mk ucpp/Makefile ucpp/Module_ucpp.mk ucpp/ucpp.patch u

[Khaled Hosny]

 RepositoryModule_build.mk |1 
 RepositoryModule_host.mk  |1 
 external/Module_external.mk   |1 
 external/ucpp/Executable_ucpp.mk  |   39 ++
 external/ucpp/Makefile|   14 
 external/ucpp/Module_ucpp.mk  |   20 +
 external/ucpp/UnpackedTarball_ucpp.mk |   20 +
 external/ucpp/ucpp.patch  |   11 +
 ucpp/Executable_ucpp.mk   |   39 --
 ucpp/Makefile |   14 
 ucpp/Module_ucpp.mk   |   20 -
 ucpp/UnpackedTarball_ucpp.mk  |   20 -
 ucpp/ucpp.patch   |   11 -
 13 files changed, 105 insertions(+), 106 deletions(-)

New commits:
commit a06d8eb9a92a438de6677d5e4196da0919aa790d
Author: Khaled Hosny khaledho...@eglug.org
Date:   Sun Nov 3 20:41:25 2013 +0200

fdo#70393: move ucpp to a subdir of external

Change-Id: I05419939ca0d6c55d24088d4b4adf3e262e50083
Reviewed-on: https://gerrit.libreoffice.org/6553
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/RepositoryModule_build.mk b/RepositoryModule_build.mk
index acd899b..1a4c033 100644
--- a/RepositoryModule_build.mk
+++ b/RepositoryModule_build.mk
@@ -86,7 +86,6 @@ $(eval $(call gb_Module_add_moduledirs,cross_toolset,\
xmlhelp \
) \
$(call gb_Helper_optional,QADEVOOO,qadevOOo) \
-   $(call gb_Helper_optional,UCPP,ucpp) \
$(call gb_Helper_optional,ZLIB,zlib) \
 ))
 
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index a8788240..92ff4f1 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -132,7 +132,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
tubes \
ucb \
ucbhelper \
-   $(call gb_Helper_optional,UCPP,ucpp) \
udkapi \
UnoControls \
unodevtools \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 2a6977f..f5484e4 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -73,6 +73,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,PYTHON,python3) \
$(call gb_Helper_optional,REDLAND,redland) \
$(call gb_Helper_optional,RHINO,rhino) \
+   $(call gb_Helper_optional,UCPP,ucpp) \
$(call gb_Helper_optional,VISIO,libvisio) \
$(call gb_Helper_optional,WPD,libwpd) \
$(call gb_Helper_optional,WPG,libwpg) \
diff --git a/ucpp/Executable_ucpp.mk b/external/ucpp/Executable_ucpp.mk
similarity index 100%
rename from ucpp/Executable_ucpp.mk
rename to external/ucpp/Executable_ucpp.mk
diff --git a/ucpp/Makefile b/external/ucpp/Makefile
similarity index 86%
rename from ucpp/Makefile
rename to external/ucpp/Makefile
index 0997e62..569ad8a 100644
--- a/ucpp/Makefile
+++ b/external/ucpp/Makefile
@@ -9,6 +9,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/ucpp/Module_ucpp.mk b/external/ucpp/Module_ucpp.mk
similarity index 100%
rename from ucpp/Module_ucpp.mk
rename to external/ucpp/Module_ucpp.mk
diff --git a/ucpp/UnpackedTarball_ucpp.mk 
b/external/ucpp/UnpackedTarball_ucpp.mk
similarity index 94%
rename from ucpp/UnpackedTarball_ucpp.mk
rename to external/ucpp/UnpackedTarball_ucpp.mk
index ee0543f7f..04d7113 100644
--- a/ucpp/UnpackedTarball_ucpp.mk
+++ b/external/ucpp/UnpackedTarball_ucpp.mk
@@ -14,7 +14,7 @@ $(eval $(call 
gb_UnpackedTarball_set_tarball,ucpp,$(UCPP_TARBALL)))
 $(eval $(call gb_UnpackedTarball_set_patchlevel,ucpp,0))
 
 $(eval $(call gb_UnpackedTarball_add_patches,ucpp,\
-ucpp/ucpp.patch \
+external/ucpp/ucpp.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/ucpp/ucpp.patch b/external/ucpp/ucpp.patch
similarity index 100%
rename from ucpp/ucpp.patch
rename to external/ucpp/ucpp.patch
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/Module_external.mk external/vigra RepositoryModule_build.mk RepositoryModule_host.mk vigra/Makefile vigra/Module_vigra.mk vigra/README vigra/UnpackedTarball_vi

[Khaled Hosny]

 RepositoryModule_build.mk |1 
 RepositoryModule_host.mk  |1 
 external/Module_external.mk   |2 
 external/vigra/Makefile   |7 
 external/vigra/Module_vigra.mk|   20 
 external/vigra/README |3 
 external/vigra/UnpackedTarball_vigra.mk   |   20 
 external/vigra/vigra1.6.0-unused-parameters.patch |   31 
 external/vigra/vigra1.6.0.patch   | 1453 ++
 vigra/Makefile|7 
 vigra/Module_vigra.mk |   20 
 vigra/README  |3 
 vigra/UnpackedTarball_vigra.mk|   20 
 vigra/vigra1.6.0-unused-parameters.patch  |   31 
 vigra/vigra1.6.0.patch| 1453 --
 15 files changed, 1536 insertions(+), 1536 deletions(-)

New commits:
commit 112c60b48463e30e930c0856ebf37461697a0863
Author: Khaled Hosny khaledho...@eglug.org
Date:   Sun Nov 3 20:43:21 2013 +0200

fdo#70393: move vigra to a subdir of external

Change-Id: I98e2ae25865c4ec38da19a24ba4347540d170e4f
Reviewed-on: https://gerrit.libreoffice.org/6554
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/RepositoryModule_build.mk b/RepositoryModule_build.mk
index 1a4c033..4ef18d8 100644
--- a/RepositoryModule_build.mk
+++ b/RepositoryModule_build.mk
@@ -78,7 +78,6 @@ $(eval $(call gb_Module_add_moduledirs,cross_toolset,\
ucb \
unoxml \
vcl \
-   $(call gb_Helper_optional,VIGRA,vigra) \
xmloff \
xmlscript \
) \
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 92ff4f1..ccae97c 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -144,7 +144,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
uui \
vbahelper \
vcl \
-   $(call gb_Helper_optional,VIGRA,vigra) \
wizards \
writerfilter \
writerperfect \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index f5484e4..d6c1184 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -74,6 +74,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,REDLAND,redland) \
$(call gb_Helper_optional,RHINO,rhino) \
$(call gb_Helper_optional,UCPP,ucpp) \
+   $(call gb_Helper_optional,VIGRA,vigra) \
$(call gb_Helper_optional,VISIO,libvisio) \
$(call gb_Helper_optional,WPD,libwpd) \
$(call gb_Helper_optional,WPG,libwpg) \
@@ -83,6 +84,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,HARFBUZZ,harfbuzz) \
$(call gb_Helper_optional,LCMS2,lcms2) \
$(call gb_Helper_optional,NSS,nss) \
+   $(call gb_Helper_optional,VIGRA,vigra) \
) \
) \
 ))
diff --git a/vigra/Makefile b/external/vigra/Makefile
similarity index 71%
rename from vigra/Makefile
rename to external/vigra/Makefile
index ccb1c85..e4968cf 100644
--- a/vigra/Makefile
+++ b/external/vigra/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/vigra/Module_vigra.mk b/external/vigra/Module_vigra.mk
similarity index 100%
rename from vigra/Module_vigra.mk
rename to external/vigra/Module_vigra.mk
diff --git a/vigra/README b/external/vigra/README
similarity index 100%
rename from vigra/README
rename to external/vigra/README
diff --git a/vigra/UnpackedTarball_vigra.mk 
b/external/vigra/UnpackedTarball_vigra.mk
similarity index 86%
rename from vigra/UnpackedTarball_vigra.mk
rename to external/vigra/UnpackedTarball_vigra.mk
index efab478..c368e21 100644
--- a/vigra/UnpackedTarball_vigra.mk
+++ b/external/vigra/UnpackedTarball_vigra.mk
@@ -12,9 +12,9 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,vigra))
 $(eval $(call gb_UnpackedTarball_set_tarball,vigra,$(VIGRA_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_add_patches,vigra,\
-   vigra/vigra1.6.0.patch \
+   external/vigra/vigra1.6.0.patch \
$(if $(filter GCC,$(COM)), \
-   vigra/vigra1.6.0-unused-parameters.patch) \
+   external/vigra/vigra1.6.0-unused-parameters.patch) \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/vigra/vigra1.6.0-unused-parameters.patch 
b/external/vigra/vigra1.6.0-unused-parameters.patch
similarity index 100%
rename from vigra/vigra1.6.0-unused-parameters.patch
rename to 

[Libreoffice-commits] core.git: external/Module_external.mk external/xsltml RepositoryModule_host.mk xsltml/Makefile xsltml/Module_xsltml.mk xsltml/README xsltml/UnpackedTarball_xsltml.mk xsltml/xsltm

[Khaled Hosny]

 RepositoryModule_host.mk  |1 
 external/Module_external.mk   |1 
 external/xsltml/Makefile  |7 
 external/xsltml/Module_xsltml.mk  |   20 
 external/xsltml/README|   14 
 external/xsltml/UnpackedTarball_xsltml.mk |   28 
 external/xsltml/xsltml_2.1.2.patch| 1713 ++
 xsltml/Makefile   |7 
 xsltml/Module_xsltml.mk   |   20 
 xsltml/README |   14 
 xsltml/UnpackedTarball_xsltml.mk  |   28 
 xsltml/xsltml_2.1.2.patch | 1713 --
 12 files changed, 1783 insertions(+), 1783 deletions(-)

New commits:
commit b36fb485d468ddf97076e55ad937caa6331298c0
Author: Khaled Hosny khaledho...@eglug.org
Date:   Sun Nov 3 20:45:21 2013 +0200

fdo#70393: move xsltml to a subdir of external

Change-Id: I2d244cc2ea9390f3a118bb620d397faa59e4e491
Reviewed-on: https://gerrit.libreoffice.org/6555
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 ccae97c..15394b8 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -153,7 +153,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
xmlreader \
xmlscript \
xmlsecurity \
-   $(call gb_Helper_optional,XSLTML,xsltml) \
$(call gb_Helper_optional,ZLIB,zlib) \
 ))
 
diff --git a/external/Module_external.mk b/external/Module_external.mk
index d6c1184..1a9f63a 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -79,6 +79,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,WPD,libwpd) \
$(call gb_Helper_optional,WPG,libwpg) \
$(call gb_Helper_optional,WPS,libwps) \
+   $(call gb_Helper_optional,XSLTML,xsltml) \
$(call gb_Helper_optional_for_host,DESKTOP, \
$(if $(filter YES,$(WITH_GALLERY_BUILD)), \
$(call gb_Helper_optional,HARFBUZZ,harfbuzz) \
diff --git a/xsltml/Makefile b/external/xsltml/Makefile
similarity index 71%
rename from xsltml/Makefile
rename to external/xsltml/Makefile
index ccb1c85..e4968cf 100644
--- a/xsltml/Makefile
+++ b/external/xsltml/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/xsltml/Module_xsltml.mk b/external/xsltml/Module_xsltml.mk
similarity index 100%
rename from xsltml/Module_xsltml.mk
rename to external/xsltml/Module_xsltml.mk
diff --git a/xsltml/README b/external/xsltml/README
similarity index 100%
rename from xsltml/README
rename to external/xsltml/README
diff --git a/xsltml/UnpackedTarball_xsltml.mk 
b/external/xsltml/UnpackedTarball_xsltml.mk
similarity index 94%
rename from xsltml/UnpackedTarball_xsltml.mk
rename to external/xsltml/UnpackedTarball_xsltml.mk
index 4151d26..743f2a0 100644
--- a/xsltml/UnpackedTarball_xsltml.mk
+++ b/external/xsltml/UnpackedTarball_xsltml.mk
@@ -22,7 +22,7 @@ $(eval $(call gb_UnpackedTarball_fix_end_of_line,xsltml,\
 ))
  
 $(eval $(call gb_UnpackedTarball_add_patches,xsltml,\
-   xsltml/xsltml_2.1.2.patch \
+   external/xsltml/xsltml_2.1.2.patch \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/xsltml/xsltml_2.1.2.patch b/external/xsltml/xsltml_2.1.2.patch
similarity index 100%
rename from xsltml/xsltml_2.1.2.patch
rename to external/xsltml/xsltml_2.1.2.patch
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/Module_external.mk external/zlib RepositoryModule_build.mk RepositoryModule_host.mk zlib/Makefile zlib/Module_zlib.mk zlib/README zlib/StaticLibrary_zlib.mk zl

[Khaled Hosny]

 RepositoryModule_build.mk   |1 
 RepositoryModule_host.mk|1 
 external/Module_external.mk |1 
 external/zlib/Makefile  |   14 
 external/zlib/Module_zlib.mk|   27 
 external/zlib/README|1 
 external/zlib/StaticLibrary_zlib.mk |   32 +
 external/zlib/StaticLibrary_zlib_x64.mk |   35 
 external/zlib/UnpackedTarball_zlib.mk   |   19 +
 zlib/Makefile   |   14 
 zlib/Module_zlib.mk |   27 
 zlib/README |1 
 zlib/StaticLibrary_zlib.mk  |   32 -
 zlib/StaticLibrary_zlib_x64.mk  |   35 
 zlib/UnpackedTarball_zlib.mk|   19 -
 15 files changed, 129 insertions(+), 130 deletions(-)

New commits:
commit 3273d2385b86bad0d3c3f7595c2f5896cf0b1440
Author: Khaled Hosny khaledho...@eglug.org
Date:   Sun Nov 3 20:47:18 2013 +0200

fdo#70393: move zlib to a subdir of external

Change-Id: I13dec52e6999d9c8aa0ba1f0c31ee8c36e1b6aac
Reviewed-on: https://gerrit.libreoffice.org/6556
Reviewed-by: David Tardon dtar...@redhat.com
Tested-by: David Tardon dtar...@redhat.com

diff --git a/RepositoryModule_build.mk b/RepositoryModule_build.mk
index 4ef18d8..74dcba4 100644
--- a/RepositoryModule_build.mk
+++ b/RepositoryModule_build.mk
@@ -85,7 +85,6 @@ $(eval $(call gb_Module_add_moduledirs,cross_toolset,\
xmlhelp \
) \
$(call gb_Helper_optional,QADEVOOO,qadevOOo) \
-   $(call gb_Helper_optional,ZLIB,zlib) \
 ))
 
 # vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 15394b8..85223e0 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -153,7 +153,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
xmlreader \
xmlscript \
xmlsecurity \
-   $(call gb_Helper_optional,ZLIB,zlib) \
 ))
 
 ifneq ($(MERGELIBS),)
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 1a9f63a..4633be3 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -80,6 +80,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,WPG,libwpg) \
$(call gb_Helper_optional,WPS,libwps) \
$(call gb_Helper_optional,XSLTML,xsltml) \
+   $(call gb_Helper_optional,ZLIB,zlib) \
$(call gb_Helper_optional_for_host,DESKTOP, \
$(if $(filter YES,$(WITH_GALLERY_BUILD)), \
$(call gb_Helper_optional,HARFBUZZ,harfbuzz) \
diff --git a/zlib/Makefile b/external/zlib/Makefile
similarity index 86%
rename from zlib/Makefile
rename to external/zlib/Makefile
index 0997e62..569ad8a 100644
--- a/zlib/Makefile
+++ b/external/zlib/Makefile
@@ -9,6 +9,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/zlib/Module_zlib.mk b/external/zlib/Module_zlib.mk
similarity index 100%
rename from zlib/Module_zlib.mk
rename to external/zlib/Module_zlib.mk
diff --git a/zlib/README b/external/zlib/README
similarity index 100%
rename from zlib/README
rename to external/zlib/README
diff --git a/zlib/StaticLibrary_zlib.mk b/external/zlib/StaticLibrary_zlib.mk
similarity index 100%
rename from zlib/StaticLibrary_zlib.mk
rename to external/zlib/StaticLibrary_zlib.mk
diff --git a/zlib/StaticLibrary_zlib_x64.mk 
b/external/zlib/StaticLibrary_zlib_x64.mk
similarity index 100%
rename from zlib/StaticLibrary_zlib_x64.mk
rename to external/zlib/StaticLibrary_zlib_x64.mk
diff --git a/zlib/UnpackedTarball_zlib.mk 
b/external/zlib/UnpackedTarball_zlib.mk
similarity index 100%
rename from zlib/UnpackedTarball_zlib.mk
rename to external/zlib/UnpackedTarball_zlib.mk
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/Module_external.mk external/np_sdk np_sdk/inc np_sdk/Makefile np_sdk/Module_np_sdk.mk np_sdk/npsdk np_sdk/README np_sdk/StaticLibrary_nputils.mk RepositoryExte

[Khaled Hosny]

 RepositoryExternal.mk|6 
 RepositoryModule_host.mk |1 
 external/Module_external.mk  |1 
 external/np_sdk/Makefile |7 
 external/np_sdk/Module_np_sdk.mk |   23 
 external/np_sdk/README   |1 
 external/np_sdk/StaticLibrary_nputils.mk |   33 
 external/np_sdk/inc/LEGAL|   43 +
 external/np_sdk/inc/LICENSE  |  567 +
 external/np_sdk/inc/npapi.h  |  886 +
 external/np_sdk/inc/npfunctions.h|  321 +++
 external/np_sdk/inc/npruntime.h  |  393 +
 external/np_sdk/inc/nptypes.h|  111 ++
 external/np_sdk/npsdk/LEGAL  |   43 +
 external/np_sdk/npsdk/LICENSE|  567 +
 external/np_sdk/npsdk/README |2 
 external/np_sdk/npsdk/jri.h  |  689 
 external/np_sdk/npsdk/jri_md.h   |  545 +
 external/np_sdk/npsdk/jritypes.h |  232 +
 external/np_sdk/npsdk/npunix.c   |  507 
 external/np_sdk/npsdk/npupp.h| 1267 +++
 external/np_sdk/npsdk/npwin.cxx  |  358 
 external/np_sdk/npsdk/plugin.h   |   44 +
 np_sdk/Makefile  |7 
 np_sdk/Module_np_sdk.mk  |   23 
 np_sdk/README|1 
 np_sdk/StaticLibrary_nputils.mk  |   33 
 np_sdk/inc/LEGAL |   43 -
 np_sdk/inc/LICENSE   |  567 -
 np_sdk/inc/npapi.h   |  886 -
 np_sdk/inc/npfunctions.h |  321 ---
 np_sdk/inc/npruntime.h   |  393 -
 np_sdk/inc/nptypes.h |  111 --
 np_sdk/npsdk/LEGAL   |   43 -
 np_sdk/npsdk/LICENSE |  567 -
 np_sdk/npsdk/README  |2 
 np_sdk/npsdk/jri.h   |  689 
 np_sdk/npsdk/jri_md.h|  545 -
 np_sdk/npsdk/jritypes.h  |  232 -
 np_sdk/npsdk/npunix.c|  507 
 np_sdk/npsdk/npupp.h | 1267 ---
 np_sdk/npsdk/npwin.cxx   |  358 
 np_sdk/npsdk/plugin.h|   44 -
 43 files changed, 6643 insertions(+), 6643 deletions(-)

New commits:
commit 622a6338dc9c5e1eb795f67cd3224ddfba4ab88a
Author: Khaled Hosny khaledho...@eglug.org
Date:   Sun Nov 3 20:58:47 2013 +0200

fdo#70393: move np_sdk to a subdir of external

Change-Id: Iafba7ff0d0a4b163f9d99195cab36c9968e0bd73
Reviewed-on: https://gerrit.libreoffice.org/6558
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/RepositoryExternal.mk b/RepositoryExternal.mk
index 08afde3..6fa5c82 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -84,7 +84,7 @@ ifeq ($(SYSTEM_NPAPI_HEADERS),YES)
 define gb_LinkTarget__use_npapi_headers
 $(call gb_LinkTarget_set_include,$(1),\
$(NPAPI_HEADERS_CFLAGS) \
-   -I$(SRCDIR)/np_sdk \
+   -I$(SRCDIR)/external/np_sdk \
$$(INCLUDE) \
 )
 
@@ -94,8 +94,8 @@ else #!SYSTEM_NPAPI_HEADERS
 
 define gb_LinkTarget__use_npapi_headers
 $(call gb_LinkTarget_set_include,$(1),\
-   -I$(SRCDIR)/np_sdk/inc \
-   -I$(SRCDIR)/np_sdk \
+   -I$(SRCDIR)/external/np_sdk/inc \
+   -I$(SRCDIR)/external/np_sdk \
$$(INCLUDE) \
 )
 
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk
index 85223e0..fb7268d 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -76,7 +76,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
$(call gb_Helper_optional,DESKTOP,l10ntools) \
$(call gb_Helper_optional,MARIADBC,mysqlc) \
$(call gb_Helper_optional,NLPSOLVER,nlpsolver) \
-   np_sdk \
o3tl \
$(call gb_Helper_optional,ODK,odk) \
offapi \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 4633be3..f0fae3e 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -18,6 +18,7 @@ $(eval $(call gb_Module_add_moduledir,external,msc-externals))
 endif
 
 $(eval $(call gb_Module_add_moduledirs,external,\
+   np_sdk \
$(call gb_Helper_optional,AFMS,afms) \
$(call gb_Helper_optional,APACHE_COMMONS,apache-commons) \
$(call gb_Helper_optional,BOOST,boost) \
diff --git a/np_sdk/Makefile b/external/np_sdk/Makefile
similarity index 71%
rename from np_sdk/Makefile
rename to external/np_sdk/Makefile
index ccb1c85..e4968cf 100644
--- a/np_sdk/Makefile
+++ b/external/np_sdk/Makefile
@@ -2,6 +2,6 @@
 
 module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST
 
-include 

[Libreoffice-commits] core.git: external/Module_external.mk external/mysqlcppconn mysqlcppconn/binding_config.h mysqlcppconn/config.h mysqlcppconn/Library_mysqlcppconn.mk mysqlcppconn/Makefile mysqlcp

[Khaled Hosny]

 RepositoryModule_host.mk  |1 
 external/Module_external.mk   |1 
 external/mysqlcppconn/Library_mysqlcppconn.mk |   77 ++
 external/mysqlcppconn/Makefile|7 
 external/mysqlcppconn/Module_mysqlcppconn.mk  |   17 +
 external/mysqlcppconn/README  |1 
 external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk |   23 +
 external/mysqlcppconn/binding_config.h|5 
 external/mysqlcppconn/config.h|   39 +++
 external/mysqlcppconn/patches/default_to_protocol_tcp.patch   |   12 +
 external/mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch |  117 ++
 mysqlcppconn/Library_mysqlcppconn.mk  |   77 --
 mysqlcppconn/Makefile |7 
 mysqlcppconn/Module_mysqlcppconn.mk   |   21 -
 mysqlcppconn/README   |1 
 mysqlcppconn/UnpackedTarball_mysqlcppconn.mk  |   23 -
 mysqlcppconn/binding_config.h |5 
 mysqlcppconn/config.h |   39 ---
 mysqlcppconn/patches/default_to_protocol_tcp.patch|   12 -
 mysqlcppconn/patches/mysql-connector-c++-1.1.0.patch  |  117 --
 20 files changed, 299 insertions(+), 303 deletions(-)

New commits:
commit 7495d220dd17c14fb48b384e117fcfa54d18cdac
Author: Khaled Hosny khaledho...@eglug.org
Date:   Fri Oct 18 22:57:07 2013 +0200

fdo#70393: move mysqlcppconn to a subdir of external

Change-Id: I5945fa432a9371854e25454feabcafabed7f7b7d
Reviewed-on: https://gerrit.libreoffice.org/6346
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 4164b9c..e03523b 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -80,7 +80,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
$(call gb_Helper_optional,MORE_FONTS,more_fonts) \
$(call gb_Helper_optional,MOZ,moz) \
$(call gb_Helper_optional,MARIADBC,mysqlc) \
-   $(call gb_Helper_optional,MYSQLCPPCONN,mysqlcppconn) \
$(call gb_Helper_optional,MYTHES,mythes) \
$(call gb_Helper_optional,NEON,neon) \
$(call gb_Helper_optional,NLPSOLVER,nlpsolver) \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 92727a4..bb949c4 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -52,6 +52,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,MARIADB,libmariadb) \
$(call gb_Helper_optional,MSPUB,libmspub) \
$(call gb_Helper_optional,MWAW,libmwaw) \
+   $(call gb_Helper_optional,MYSQLCPPCONN,mysqlcppconn) \
$(call gb_Helper_optional,ODFGEN,libodfgen) \
$(call gb_Helper_optional,ORCUS,liborcus) \
$(call gb_Helper_optional,VISIO,libvisio) \
diff --git a/mysqlcppconn/Library_mysqlcppconn.mk 
b/external/mysqlcppconn/Library_mysqlcppconn.mk
similarity index 100%
rename from mysqlcppconn/Library_mysqlcppconn.mk
rename to external/mysqlcppconn/Library_mysqlcppconn.mk
diff --git a/mysqlcppconn/Makefile b/external/mysqlcppconn/Makefile
similarity index 71%
rename from mysqlcppconn/Makefile
rename to external/mysqlcppconn/Makefile
index ccb1c85..e4968cf 100644
--- a/mysqlcppconn/Makefile
+++ b/external/mysqlcppconn/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/mysqlcppconn/Module_mysqlcppconn.mk 
b/external/mysqlcppconn/Module_mysqlcppconn.mk
similarity index 92%
rename from mysqlcppconn/Module_mysqlcppconn.mk
rename to external/mysqlcppconn/Module_mysqlcppconn.mk
index 01acff0..6a45dd8 100644
--- a/mysqlcppconn/Module_mysqlcppconn.mk
+++ b/external/mysqlcppconn/Module_mysqlcppconn.mk
@@ -9,13 +9,9 @@
 
 $(eval $(call gb_Module_Module,mysqlcppconn))
 
-ifeq ($(SYSTEM_MYSQL_CPPCONN),NO)
-
 $(eval $(call gb_Module_add_targets,mysqlcppconn,\
UnpackedTarball_mysqlcppconn \
Library_mysqlcppconn \
 ))
 
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/mysqlcppconn/README b/external/mysqlcppconn/README
similarity index 100%
rename from mysqlcppconn/README
rename to external/mysqlcppconn/README
diff --git a/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk 
b/external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
similarity index 74%
rename from mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
rename to external/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
index 3f86236..ae0f267 100644
--- a/mysqlcppconn/UnpackedTarball_mysqlcppconn.mk
+++ 

[Libreoffice-commits] core.git: external/Module_external.mk external/mythes mythes/ExternalProject_mythes.mk mythes/Makefile mythes/Module_mythes.mk mythes/mythes-1.2.0-android.patch mythes/mythes-1.2

[Khaled Hosny]

 RepositoryModule_host.mk  |1 
 external/Module_external.mk   |1 
 external/mythes/ExternalProject_mythes.mk |   26 +
 external/mythes/Makefile  |7 +
 external/mythes/Module_mythes.mk  |   25 +
 external/mythes/README|1 
 external/mythes/StaticLibrary_mythes.mk   |   21 
 external/mythes/UnpackedTarball_mythes.mk |   20 
 external/mythes/mythes-1.2.0-android.patch|   20 
 external/mythes/mythes-1.2.0-vanilla-th-gen-idx.patch |   90 ++
 external/mythes/mythes-ssizet.patch   |   20 
 mythes/ExternalProject_mythes.mk  |   26 -
 mythes/Makefile   |7 -
 mythes/Module_mythes.mk   |   27 -
 mythes/README |1 
 mythes/StaticLibrary_mythes.mk|   21 
 mythes/UnpackedTarball_mythes.mk  |   20 
 mythes/mythes-1.2.0-android.patch |   20 
 mythes/mythes-1.2.0-vanilla-th-gen-idx.patch  |   90 --
 mythes/mythes-ssizet.patch|   20 
 20 files changed, 231 insertions(+), 233 deletions(-)

New commits:
commit 67867f77d90eae4de276ef477a973ce68357d7d6
Author: Khaled Hosny khaledho...@eglug.org
Date:   Fri Oct 18 23:00:19 2013 +0200

fdo#70393: move mythes to a subdir of external

Change-Id: I132479fd26e45276f25af5615175b0fdaeaaeb01
Reviewed-on: https://gerrit.libreoffice.org/6347
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 e03523b..dba46e6 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -80,7 +80,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
$(call gb_Helper_optional,MORE_FONTS,more_fonts) \
$(call gb_Helper_optional,MOZ,moz) \
$(call gb_Helper_optional,MARIADBC,mysqlc) \
-   $(call gb_Helper_optional,MYTHES,mythes) \
$(call gb_Helper_optional,NEON,neon) \
$(call gb_Helper_optional,NLPSOLVER,nlpsolver) \
np_sdk \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index bb949c4..c0b95e0 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -53,6 +53,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,MSPUB,libmspub) \
$(call gb_Helper_optional,MWAW,libmwaw) \
$(call gb_Helper_optional,MYSQLCPPCONN,mysqlcppconn) \
+   $(call gb_Helper_optional,MYTHES,mythes) \
$(call gb_Helper_optional,ODFGEN,libodfgen) \
$(call gb_Helper_optional,ORCUS,liborcus) \
$(call gb_Helper_optional,VISIO,libvisio) \
diff --git a/mythes/ExternalProject_mythes.mk 
b/external/mythes/ExternalProject_mythes.mk
similarity index 100%
rename from mythes/ExternalProject_mythes.mk
rename to external/mythes/ExternalProject_mythes.mk
diff --git a/mythes/Makefile b/external/mythes/Makefile
similarity index 71%
rename from mythes/Makefile
rename to external/mythes/Makefile
index ccb1c85..e4968cf 100644
--- a/mythes/Makefile
+++ b/external/mythes/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/mythes/Module_mythes.mk b/external/mythes/Module_mythes.mk
similarity index 95%
rename from mythes/Module_mythes.mk
rename to external/mythes/Module_mythes.mk
index 4d9ac64..56d95fc 100644
--- a/mythes/Module_mythes.mk
+++ b/external/mythes/Module_mythes.mk
@@ -9,7 +9,6 @@
 
 $(eval $(call gb_Module_Module,mythes))
 
-ifeq ($(SYSTEM_MYTHES),NO)
 $(eval $(call gb_Module_add_targets,mythes,\
UnpackedTarball_mythes \
 ))
@@ -22,6 +21,5 @@ $(eval $(call gb_Module_add_targets,mythes,\
ExternalProject_mythes \
 ))
 endif
-endif
 
 # vim: set noet sw=4 ts=4:
diff --git a/mythes/README b/external/mythes/README
similarity index 100%
rename from mythes/README
rename to external/mythes/README
diff --git a/mythes/StaticLibrary_mythes.mk 
b/external/mythes/StaticLibrary_mythes.mk
similarity index 100%
rename from mythes/StaticLibrary_mythes.mk
rename to external/mythes/StaticLibrary_mythes.mk
diff --git a/mythes/UnpackedTarball_mythes.mk 
b/external/mythes/UnpackedTarball_mythes.mk
similarity index 79%
rename from mythes/UnpackedTarball_mythes.mk
rename to external/mythes/UnpackedTarball_mythes.mk
index a4928af..d2d4e1d 100644
--- a/mythes/UnpackedTarball_mythes.mk
+++ b/external/mythes/UnpackedTarball_mythes.mk
@@ -12,9 +12,9 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,mythes))
 $(eval 

[Libreoffice-commits] core.git: external/Module_external.mk external/neon neon/configs neon/Library_neon.mk neon/Makefile neon/Module_neon.mk neon/neon.def neon/neon_ne_set_request_flag.patch neon/neo

[Khaled Hosny]

 RepositoryModule_host.mk |1 
 external/Module_external.mk  |1 
 external/neon/Library_neon.mk|  106 
 external/neon/Makefile   |7 
 external/neon/Module_neon.mk |   17 
 external/neon/README |1 
 external/neon/UnpackedTarball_neon.mk|   26 +
 external/neon/configs/config.h   |  600 +++
 external/neon/neon.def   |  292 +
 external/neon/neon.patch |  423 +++
 external/neon/neon_ne_set_request_flag.patch |   11 
 external/neon/neon_with_gnutls.patch |   29 +
 neon/Library_neon.mk |  106 
 neon/Makefile|7 
 neon/Module_neon.mk  |   21 
 neon/README  |1 
 neon/UnpackedTarball_neon.mk |   26 -
 neon/configs/config.h|  600 ---
 neon/neon.def|  292 -
 neon/neon.patch  |  423 ---
 neon/neon_ne_set_request_flag.patch  |   11 
 neon/neon_with_gnutls.patch  |   29 -
 22 files changed, 1513 insertions(+), 1517 deletions(-)

New commits:
commit 5d98836cfb94176c7a50d0836ad8f0c153364063
Author: Khaled Hosny khaledho...@eglug.org
Date:   Fri Oct 18 23:02:24 2013 +0200

fdo#70393: move neon to a subdir of external

Change-Id: I504b69437ca2849a9bf825c67e52a671ec1e1ad8
Reviewed-on: https://gerrit.libreoffice.org/6348
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 dba46e6..99b24e1 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -80,7 +80,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
$(call gb_Helper_optional,MORE_FONTS,more_fonts) \
$(call gb_Helper_optional,MOZ,moz) \
$(call gb_Helper_optional,MARIADBC,mysqlc) \
-   $(call gb_Helper_optional,NEON,neon) \
$(call gb_Helper_optional,NLPSOLVER,nlpsolver) \
np_sdk \
$(call gb_Helper_optional,NSS,nss) \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index c0b95e0..988d477 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -54,6 +54,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,MWAW,libmwaw) \
$(call gb_Helper_optional,MYSQLCPPCONN,mysqlcppconn) \
$(call gb_Helper_optional,MYTHES,mythes) \
+   $(call gb_Helper_optional,NEON,neon) \
$(call gb_Helper_optional,ODFGEN,libodfgen) \
$(call gb_Helper_optional,ORCUS,liborcus) \
$(call gb_Helper_optional,VISIO,libvisio) \
diff --git a/neon/Library_neon.mk b/external/neon/Library_neon.mk
similarity index 100%
rename from neon/Library_neon.mk
rename to external/neon/Library_neon.mk
diff --git a/neon/Makefile b/external/neon/Makefile
similarity index 71%
rename from neon/Makefile
rename to external/neon/Makefile
index ccb1c85..e4968cf 100644
--- a/neon/Makefile
+++ b/external/neon/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/neon/Module_neon.mk b/external/neon/Module_neon.mk
similarity index 93%
rename from neon/Module_neon.mk
rename to external/neon/Module_neon.mk
index 26d4b4d..cc2e0cb 100644
--- a/neon/Module_neon.mk
+++ b/external/neon/Module_neon.mk
@@ -9,13 +9,9 @@
 
 $(eval $(call gb_Module_Module,neon))
 
-ifeq ($(SYSTEM_NEON),NO)
-
 $(eval $(call gb_Module_add_targets,neon,\
Library_neon \
UnpackedTarball_neon \
 ))
 
-endif
-
 # vim: set noet sw=4 ts=4:
diff --git a/neon/README b/external/neon/README
similarity index 100%
rename from neon/README
rename to external/neon/README
diff --git a/neon/UnpackedTarball_neon.mk 
b/external/neon/UnpackedTarball_neon.mk
similarity index 81%
rename from neon/UnpackedTarball_neon.mk
rename to external/neon/UnpackedTarball_neon.mk
index a6cb87b..1b922df 100644
--- a/neon/UnpackedTarball_neon.mk
+++ b/external/neon/UnpackedTarball_neon.mk
@@ -12,15 +12,15 @@ $(eval $(call gb_UnpackedTarball_UnpackedTarball,neon))
 $(eval $(call gb_UnpackedTarball_set_tarball,neon,$(NEON_TARBALL)))
 
 $(eval $(call gb_UnpackedTarball_add_files,neon,src,\
-   neon/configs/config.h \
+   external/neon/configs/config.h \
 ))
 
 $(eval $(call gb_UnpackedTarball_set_patchlevel,neon,0))
 
 $(eval $(call gb_UnpackedTarball_add_patches,neon,\
-   neon/neon.patch \
-   neon/neon_ne_set_request_flag.patch \
-   neon/neon_with_gnutls.patch \
+   external/neon/neon.patch \

[Libreoffice-commits] core.git: external/Module_external.mk external/more_fonts more_fonts/ExternalPackage_dejavu.mk more_fonts/ExternalPackage_gentium.mk more_fonts/ExternalPackage_liberation.mk more

[Khaled Hosny]

 RepositoryModule_host.mk |1 
 external/Module_external.mk  |1 
 external/more_fonts/ExternalPackage_dejavu.mk|   38 +++
 external/more_fonts/ExternalPackage_gentium.mk   |   25 +
 external/more_fonts/ExternalPackage_liberation.mk|   29 +++
 external/more_fonts/ExternalPackage_liberation_narrow.mk |   21 
 external/more_fonts/ExternalPackage_libertineg.mk|   27 ++
 external/more_fonts/ExternalPackage_opensans.mk  |   21 
 external/more_fonts/ExternalPackage_ptserif.mk   |   21 
 external/more_fonts/ExternalPackage_sourcecode.mk|   19 +++
 external/more_fonts/ExternalPackage_sourcesans.mk|   21 
 external/more_fonts/Makefile |7 ++
 external/more_fonts/Module_more_fonts.mk |   34 +
 external/more_fonts/Package_conf.mk  |   16 ++
 external/more_fonts/README   |1 
 external/more_fonts/UnpackedTarball_dejavu.mk|   14 +
 external/more_fonts/UnpackedTarball_gentium.mk   |   14 +
 external/more_fonts/UnpackedTarball_liberation.mk|   14 +
 external/more_fonts/UnpackedTarball_liberation_narrow.mk |   14 +
 external/more_fonts/UnpackedTarball_libertineg.mk|   15 +
 external/more_fonts/UnpackedTarball_opensans.mk  |   14 +
 external/more_fonts/UnpackedTarball_ptserif.mk   |   14 +
 external/more_fonts/UnpackedTarball_sourcecode.mk|   14 +
 external/more_fonts/UnpackedTarball_sourcesans.mk|   14 +
 external/more_fonts/fonts/fc_local.conf  |   35 +
 more_fonts/ExternalPackage_dejavu.mk |   38 ---
 more_fonts/ExternalPackage_gentium.mk|   25 -
 more_fonts/ExternalPackage_liberation.mk |   29 ---
 more_fonts/ExternalPackage_liberation_narrow.mk  |   21 
 more_fonts/ExternalPackage_libertineg.mk |   27 --
 more_fonts/ExternalPackage_opensans.mk   |   21 
 more_fonts/ExternalPackage_ptserif.mk|   21 
 more_fonts/ExternalPackage_sourcecode.mk |   19 ---
 more_fonts/ExternalPackage_sourcesans.mk |   21 
 more_fonts/Makefile  |7 --
 more_fonts/Module_more_fonts.mk  |   34 -
 more_fonts/Package_conf.mk   |   16 --
 more_fonts/README|1 
 more_fonts/UnpackedTarball_dejavu.mk |   14 -
 more_fonts/UnpackedTarball_gentium.mk|   14 -
 more_fonts/UnpackedTarball_liberation.mk |   14 -
 more_fonts/UnpackedTarball_liberation_narrow.mk  |   14 -
 more_fonts/UnpackedTarball_libertineg.mk |   15 -
 more_fonts/UnpackedTarball_opensans.mk   |   14 -
 more_fonts/UnpackedTarball_ptserif.mk|   14 -
 more_fonts/UnpackedTarball_sourcecode.mk |   14 -
 more_fonts/UnpackedTarball_sourcesans.mk |   14 -
 more_fonts/fonts/fc_local.conf   |   35 -
 48 files changed, 443 insertions(+), 443 deletions(-)

New commits:
commit f38b5ce9b87d86e73893a3d3384621da994d1499
Author: Khaled Hosny khaledho...@eglug.org
Date:   Fri Oct 18 22:50:26 2013 +0200

fdo#70393: move more_fonts to a subdir of external

Change-Id: I82d3c4e7ad274e906d55fe883242bd9014ebe2e9
Reviewed-on: https://gerrit.libreoffice.org/6344
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 5c33730..70eb666 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -76,7 +76,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
linguistic \
lotuswordpro \
$(call gb_Helper_optional,DESKTOP,l10ntools) \
-   $(call gb_Helper_optional,MORE_FONTS,more_fonts) \
$(call gb_Helper_optional,MOZ,moz) \
$(call gb_Helper_optional,MARIADBC,mysqlc) \
$(call gb_Helper_optional,NLPSOLVER,nlpsolver) \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index f4abc76..8e7b93a 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -51,6 +51,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,LPSOLVE,lpsolve) \
$(call gb_Helper_optional,MARIADB,libmariadb) \
$(call gb_Helper_optional,MDDS,mdds) \
+   $(call gb_Helper_optional,MORE_FONTS,more_fonts) \
$(call 

[Libreoffice-commits] core.git: external/Module_external.mk external/moz moz/ExternalPackage_moz_lib.mk moz/ExternalPackage_runtime.mk moz/Makefile moz/Module_moz.mk moz/README moz/UnpackedTarball_moz

[Khaled Hosny]

 RepositoryModule_host.mk   |1 
 external/Module_external.mk|1 
 external/moz/ExternalPackage_moz_lib.mk|   19 +
 external/moz/ExternalPackage_runtime.mk|   57 +
 external/moz/Makefile  |7 +++
 external/moz/Module_moz.mk |   24 
 external/moz/README|6 +++
 external/moz/UnpackedTarball_moz_inc.mk|   15 +++
 external/moz/UnpackedTarball_moz_lib.mk|   15 +++
 external/moz/UnpackedTarball_mozruntime.mk |   14 +++
 moz/ExternalPackage_moz_lib.mk |   19 -
 moz/ExternalPackage_runtime.mk |   57 -
 moz/Makefile   |7 ---
 moz/Module_moz.mk  |   24 
 moz/README |6 ---
 moz/UnpackedTarball_moz_inc.mk |   15 ---
 moz/UnpackedTarball_moz_lib.mk |   15 ---
 moz/UnpackedTarball_mozruntime.mk  |   14 ---
 18 files changed, 158 insertions(+), 158 deletions(-)

New commits:
commit 164b3e74e77a220e524fd077e4c6a55a5ea9f0f4
Author: Khaled Hosny khaledho...@eglug.org
Date:   Fri Oct 18 22:52:45 2013 +0200

fdo#70393: move moz to a subdir of external

Change-Id: I9e9b47a3b8fc298b0a371ef609f342a8366b0039
Reviewed-on: https://gerrit.libreoffice.org/6345
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 70eb666..5caf81a 100644
--- a/RepositoryModule_host.mk
+++ b/RepositoryModule_host.mk
@@ -76,7 +76,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
linguistic \
lotuswordpro \
$(call gb_Helper_optional,DESKTOP,l10ntools) \
-   $(call gb_Helper_optional,MOZ,moz) \
$(call gb_Helper_optional,MARIADBC,mysqlc) \
$(call gb_Helper_optional,NLPSOLVER,nlpsolver) \
np_sdk \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index 8e7b93a..ae4580f 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -52,6 +52,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,MARIADB,libmariadb) \
$(call gb_Helper_optional,MDDS,mdds) \
$(call gb_Helper_optional,MORE_FONTS,more_fonts) \
+   $(call gb_Helper_optional,MOZ,moz) \
$(call gb_Helper_optional,MSPUB,libmspub) \
$(call gb_Helper_optional,MWAW,libmwaw) \
$(call gb_Helper_optional,MYSQLCPPCONN,mysqlcppconn) \
diff --git a/moz/ExternalPackage_moz_lib.mk 
b/external/moz/ExternalPackage_moz_lib.mk
similarity index 100%
rename from moz/ExternalPackage_moz_lib.mk
rename to external/moz/ExternalPackage_moz_lib.mk
diff --git a/moz/ExternalPackage_runtime.mk 
b/external/moz/ExternalPackage_runtime.mk
similarity index 100%
rename from moz/ExternalPackage_runtime.mk
rename to external/moz/ExternalPackage_runtime.mk
diff --git a/moz/Makefile b/external/moz/Makefile
similarity index 71%
rename from moz/Makefile
rename to external/moz/Makefile
index ccb1c85..e4968cf 100644
--- a/moz/Makefile
+++ b/external/moz/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/moz/Module_moz.mk b/external/moz/Module_moz.mk
similarity index 100%
rename from moz/Module_moz.mk
rename to external/moz/Module_moz.mk
diff --git a/moz/README b/external/moz/README
similarity index 100%
rename from moz/README
rename to external/moz/README
diff --git a/moz/UnpackedTarball_moz_inc.mk 
b/external/moz/UnpackedTarball_moz_inc.mk
similarity index 100%
rename from moz/UnpackedTarball_moz_inc.mk
rename to external/moz/UnpackedTarball_moz_inc.mk
diff --git a/moz/UnpackedTarball_moz_lib.mk 
b/external/moz/UnpackedTarball_moz_lib.mk
similarity index 100%
rename from moz/UnpackedTarball_moz_lib.mk
rename to external/moz/UnpackedTarball_moz_lib.mk
diff --git a/moz/UnpackedTarball_mozruntime.mk 
b/external/moz/UnpackedTarball_mozruntime.mk
similarity index 100%
rename from moz/UnpackedTarball_mozruntime.mk
rename to external/moz/UnpackedTarball_mozruntime.mk
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/Module_external.mk RepositoryModule_build.mk

[David Tardon]

 RepositoryModule_build.mk   |2 --
 external/Module_external.mk |6 ++
 2 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit c7ce98cc4f98ca9273d734175c330881d510536c
Author: David Tardon dtar...@redhat.com
Date:   Sat Oct 19 10:17:12 2013 +0200

these are in external now

Change-Id: I3d84a202ae0058a8fe8a810f7e7de2522393f417

diff --git a/RepositoryModule_build.mk b/RepositoryModule_build.mk
index 926aca7..d656714 100644
--- a/RepositoryModule_build.mk
+++ b/RepositoryModule_build.mk
@@ -66,8 +66,6 @@ $(eval $(call gb_Module_add_moduledirs,cross_toolset,\
drawinglayer \
editeng \
framework \
-   harfbuzz \
-   lcms2 \
linguistic \
nss \
package \
diff --git a/external/Module_external.mk b/external/Module_external.mk
index ae4580f..c2eb5c3 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -64,6 +64,12 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,WPD,libwpd) \
$(call gb_Helper_optional,WPG,libwpg) \
$(call gb_Helper_optional,WPS,libwps) \
+   $(call gb_Helper_optional_for_host,DESKTOP, \
+   $(if $(filter YES,$(WITH_GALLERY_BUILD)), \
+   harfbuzz \
+   lcms2 \
+   ) \
+   ) \
 ))
 
 # vim: set noet sw=4 ts=4:
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/Module_external.mk

[Bjoern Michaelsen]

 external/Module_external.mk |3 ---
 1 file changed, 3 deletions(-)

New commits:
commit e2cec503d214be6b2f6cb64bbafcad8679c7891c
Author: Bjoern Michaelsen bjoern.michael...@canonical.com
Date:   Wed Oct 16 15:19:26 2013 +0200

empty statement is empty

Change-Id: I1b9dacea79b978384b61240bdecf83b9bd924a66
Reviewed-on: https://gerrit.libreoffice.org/6267
Reviewed-by: Björn Michaelsen bjoern.michael...@canonical.com
Tested-by: Björn Michaelsen bjoern.michael...@canonical.com

diff --git a/external/Module_external.mk b/external/Module_external.mk
index 4f7ce0a..9cbf588 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -9,9 +9,6 @@
 
 $(eval $(call gb_Module_Module,external))
 
-$(eval $(call gb_Module_add_targets,external,\
-))
-
 ifeq ($(OS)$(COM),WNTGCC)
 $(eval $(call gb_Module_add_targets,external,\
CustomTarget_jawt \
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits

[Libreoffice-commits] core.git: external/Module_external.mk

[David Tardon]

 external/Module_external.mk |2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit fdd24a57655c3d15addeeca12e844cc1cd4e1765
Author: David Tardon dtar...@redhat.com
Date:   Mon Apr 22 06:43:52 2013 +0200

msvc80 dlls are only needed for mozab driver

Change-Id: I6225926807122ed6b6a3fda4fb4067da9eb240b4

diff --git a/external/Module_external.mk b/external/Module_external.mk
index ee6e994..646a6d2 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -29,7 +29,7 @@ $(eval $(call gb_Module_add_targets,external,\
Package_msms \
Package_msvc_dlls \
$(if $(MSVC_USE_DEBUG_RUNTIME),Package_msvc_dlls_debug) \
-   Package_msvc80_dlls \
+   $(if $(filter YES,$(WITH_MOZAB4WIN)),Package_msvc80_dlls) \
 ))
 endif
 
___
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits