diff options
| author | Khaled Hosny <khaledhosny@eglug.org> | 2013-11-03 20:21:01 +0200 |
|---|---|---|
| committer | David Tardon <dtardon@redhat.com> | 2013-11-04 02:31:25 -0600 |
| commit | 40276b4ceb72f1d070bb1457ed5b403b35ca4deb (patch) | |
| tree | d3853c906a5732c5d4de226f727cb4a38e58d80a | |
| parent | fde2065b0f3266fc7ee9e1b85733e3ddcf1c9e03 (diff) | |
fdo#70393: move poppler to a subdir of external
Change-Id: I399df92d2b6907c129e18f3a55afeadf02783c14
Reviewed-on: https://gerrit.libreoffice.org/6548
Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>
| -rw-r--r-- | RepositoryModule_host.mk | 1 | ||||
| -rw-r--r-- | external/Module_external.mk | 1 | ||||
| -rw-r--r-- | external/poppler/ExternalProject_poppler.mk (renamed from poppler/ExternalProject_poppler.mk) | 0 | ||||
| -rw-r--r-- | external/poppler/Makefile (renamed from poppler/Makefile) | 2 | ||||
| -rw-r--r-- | external/poppler/Module_poppler.mk (renamed from poppler/Module_poppler.mk) | 0 | ||||
| -rw-r--r-- | external/poppler/README (renamed from poppler/README) | 0 | ||||
| -rw-r--r-- | external/poppler/UnpackedTarball_poppler.mk (renamed from poppler/UnpackedTarball_poppler.mk) | 8 | ||||
| -rw-r--r-- | external/poppler/poppler-mac-fake.patch.1 (renamed from poppler/poppler-mac-fake.patch.1) | 0 | ||||
| -rw-r--r-- | external/poppler/poppler-nochecknew.patch.1 (renamed from poppler/poppler-nochecknew.patch.1) | 0 | ||||
| -rw-r--r-- | external/poppler/poppler-notests.patch.1 (renamed from poppler/poppler-notests.patch.1) | 0 | ||||
| -rw-r--r-- | external/poppler/poppler-snprintf.patch.1 (renamed from poppler/poppler-snprintf.patch.1) | 0 |
11 files changed, 6 insertions, 6 deletions
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index 7ed7dff825c1..ced54decd36e 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 63e3bf364299..481f46e76d61 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 index d1cfde8d9513..d1cfde8d9513 100644 --- a/poppler/ExternalProject_poppler.mk +++ b/external/poppler/ExternalProject_poppler.mk diff --git a/poppler/Makefile b/external/poppler/Makefile index ccb1c85a04da..e4968cf85fb6 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 index 910145a138f0..910145a138f0 100644 --- a/poppler/Module_poppler.mk +++ b/external/poppler/Module_poppler.mk diff --git a/poppler/README b/external/poppler/README index 35a640264618..35a640264618 100644 --- a/poppler/README +++ b/external/poppler/README diff --git a/poppler/UnpackedTarball_poppler.mk b/external/poppler/UnpackedTarball_poppler.mk index f3bf0db9d1a6..93c8fa19a772 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 index d0b1936658ca..d0b1936658ca 100644 --- a/poppler/poppler-mac-fake.patch.1 +++ b/external/poppler/poppler-mac-fake.patch.1 diff --git a/poppler/poppler-nochecknew.patch.1 b/external/poppler/poppler-nochecknew.patch.1 index 1e4890fe758f..1e4890fe758f 100644 --- a/poppler/poppler-nochecknew.patch.1 +++ b/external/poppler/poppler-nochecknew.patch.1 diff --git a/poppler/poppler-notests.patch.1 b/external/poppler/poppler-notests.patch.1 index 7fcfee95ab2b..7fcfee95ab2b 100644 --- a/poppler/poppler-notests.patch.1 +++ b/external/poppler/poppler-notests.patch.1 diff --git a/poppler/poppler-snprintf.patch.1 b/external/poppler/poppler-snprintf.patch.1 index 389a5b0fc97e..389a5b0fc97e 100644 --- a/poppler/poppler-snprintf.patch.1 +++ b/external/poppler/poppler-snprintf.patch.1 |