[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/poppler-nochecknew.patch.1 poppler/poppler-notests.patch.1 poppler/poppler-snprintf.patch.1 poppler/README poppler/UnpackedTarball_poppler.mk RepositoryModule_host.mk

[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 <khaledhosny at 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 <dtardon at redhat.com>
    Tested-by: David Tardon <dtardon at 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 b/external/poppler/poppler-nochecknew.patch.1
similarity index 100%
rename from poppler/poppler-nochecknew.patch.1
rename to external/poppler/poppler-nochecknew.patch.1
diff --git a/poppler/poppler-notests.patch.1 b/external/poppler/poppler-notests.patch.1
similarity index 100%
rename from poppler/poppler-notests.patch.1
rename to external/poppler/poppler-notests.patch.1
diff --git a/poppler/poppler-snprintf.patch.1 b/external/poppler/poppler-snprintf.patch.1
similarity index 100%
rename from poppler/poppler-snprintf.patch.1
rename to external/poppler/poppler-snprintf.patch.1