tdf#141709: Use poppler_data

Bundle the files from poppler_data and provide the path to them to
poppler when the bundled poppler library is used.

Change-Id: I13a2ef861303a0be17aa0a861ef8ac96ed8a93be
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117523
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>

3 files changed, 312 insertions, 0 deletions

diff --git a/external/poppler/ExternalPackage_poppler_data.mk b/external/poppler/ExternalPackage_poppler_data.mk
new file mode 100644
index 000000000000..78024d3fec8b
--- /dev/null
+++ b/external/poppler/ExternalPackage_poppler_data.mk
@@ -0,0 +1,297 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_ExternalPackage_ExternalPackage,poppler_data,poppler_data))
+
+poppler_unicode-map-files =     \
+	unicodeMap/Big5             \
+	unicodeMap/Big5ascii        \
+	unicodeMap/EUC-CN           \
+	unicodeMap/EUC-JP           \
+	unicodeMap/GBK              \
+	unicodeMap/ISO-2022-CN      \
+	unicodeMap/ISO-2022-JP      \
+	unicodeMap/ISO-2022-KR      \
+	unicodeMap/ISO-8859-6       \
+	unicodeMap/ISO-8859-7       \
+	unicodeMap/ISO-8859-8       \
+	unicodeMap/ISO-8859-9       \
+	unicodeMap/KOI8-R           \
+	unicodeMap/Latin2           \
+	unicodeMap/Shift-JIS        \
+	unicodeMap/TIS-620          \
+	unicodeMap/Windows-1255
+
+
+poppler_cmap-files =                            \
+	cMap/Adobe-CNS1/Adobe-CNS1-0                \
+	cMap/Adobe-CNS1/Adobe-CNS1-1                \
+	cMap/Adobe-CNS1/Adobe-CNS1-2                \
+	cMap/Adobe-CNS1/Adobe-CNS1-3                \
+	cMap/Adobe-CNS1/Adobe-CNS1-4                \
+	cMap/Adobe-CNS1/Adobe-CNS1-5                \
+	cMap/Adobe-CNS1/Adobe-CNS1-6                \
+	cMap/Adobe-CNS1/Adobe-CNS1-7                \
+	cMap/Adobe-CNS1/Adobe-CNS1-B5pc             \
+	cMap/Adobe-CNS1/Adobe-CNS1-ETen-B5          \
+	cMap/Adobe-CNS1/Adobe-CNS1-H-CID            \
+	cMap/Adobe-CNS1/Adobe-CNS1-H-Host           \
+	cMap/Adobe-CNS1/Adobe-CNS1-H-Mac            \
+	cMap/Adobe-CNS1/Adobe-CNS1-UCS2             \
+	cMap/Adobe-CNS1/B5-H                        \
+	cMap/Adobe-CNS1/B5pc-H                      \
+	cMap/Adobe-CNS1/B5pc-UCS2                   \
+	cMap/Adobe-CNS1/B5pc-UCS2C                  \
+	cMap/Adobe-CNS1/B5pc-V                      \
+	cMap/Adobe-CNS1/B5-V                        \
+	cMap/Adobe-CNS1/CNS1-H                      \
+	cMap/Adobe-CNS1/CNS1-V                      \
+	cMap/Adobe-CNS1/CNS2-H                      \
+	cMap/Adobe-CNS1/CNS2-V                      \
+	cMap/Adobe-CNS1/CNS-EUC-H                   \
+	cMap/Adobe-CNS1/CNS-EUC-V                   \
+	cMap/Adobe-CNS1/ETen-B5-H                   \
+	cMap/Adobe-CNS1/ETen-B5-UCS2                \
+	cMap/Adobe-CNS1/ETen-B5-V                   \
+	cMap/Adobe-CNS1/ETenms-B5-H                 \
+	cMap/Adobe-CNS1/ETenms-B5-V                 \
+	cMap/Adobe-CNS1/ETHK-B5-H                   \
+	cMap/Adobe-CNS1/ETHK-B5-V                   \
+	cMap/Adobe-CNS1/HKdla-B5-H                  \
+	cMap/Adobe-CNS1/HKdla-B5-V                  \
+	cMap/Adobe-CNS1/HKdlb-B5-H                  \
+	cMap/Adobe-CNS1/HKdlb-B5-V                  \
+	cMap/Adobe-CNS1/HKgccs-B5-H                 \
+	cMap/Adobe-CNS1/HKgccs-B5-V                 \
+	cMap/Adobe-CNS1/HKm314-B5-H                 \
+	cMap/Adobe-CNS1/HKm314-B5-V                 \
+	cMap/Adobe-CNS1/HKm471-B5-H                 \
+	cMap/Adobe-CNS1/HKm471-B5-V                 \
+	cMap/Adobe-CNS1/HKscs-B5-H                  \
+	cMap/Adobe-CNS1/HKscs-B5-V                  \
+	cMap/Adobe-CNS1/UCS2-B5pc                   \
+	cMap/Adobe-CNS1/UCS2-ETen-B5                \
+	cMap/Adobe-CNS1/UniCNS-UCS2-H               \
+	cMap/Adobe-CNS1/UniCNS-UCS2-V               \
+	cMap/Adobe-CNS1/UniCNS-UTF16-H              \
+	cMap/Adobe-CNS1/UniCNS-UTF16-V              \
+	cMap/Adobe-CNS1/UniCNS-UTF32-H              \
+	cMap/Adobe-CNS1/UniCNS-UTF32-V              \
+	cMap/Adobe-CNS1/UniCNS-UTF8-H               \
+	cMap/Adobe-CNS1/UniCNS-UTF8-V               \
+	cMap/Adobe-GB1/Adobe-GB1-0                  \
+	cMap/Adobe-GB1/Adobe-GB1-1                  \
+	cMap/Adobe-GB1/Adobe-GB1-2                  \
+	cMap/Adobe-GB1/Adobe-GB1-3                  \
+	cMap/Adobe-GB1/Adobe-GB1-4                  \
+	cMap/Adobe-GB1/Adobe-GB1-5                  \
+	cMap/Adobe-GB1/Adobe-GB1-GBK-EUC            \
+	cMap/Adobe-GB1/Adobe-GB1-GBpc-EUC           \
+	cMap/Adobe-GB1/Adobe-GB1-H-CID              \
+	cMap/Adobe-GB1/Adobe-GB1-H-Host             \
+	cMap/Adobe-GB1/Adobe-GB1-H-Mac              \
+	cMap/Adobe-GB1/Adobe-GB1-UCS2               \
+	cMap/Adobe-GB1/GB-EUC-H                     \
+	cMap/Adobe-GB1/GB-EUC-V                     \
+	cMap/Adobe-GB1/GB-H                         \
+	cMap/Adobe-GB1/GBK2K-H                      \
+	cMap/Adobe-GB1/GBK2K-V                      \
+	cMap/Adobe-GB1/GBK-EUC-H                    \
+	cMap/Adobe-GB1/GBK-EUC-UCS2                 \
+	cMap/Adobe-GB1/GBK-EUC-V                    \
+	cMap/Adobe-GB1/GBKp-EUC-H                   \
+	cMap/Adobe-GB1/GBKp-EUC-V                   \
+	cMap/Adobe-GB1/GBpc-EUC-H                   \
+	cMap/Adobe-GB1/GBpc-EUC-UCS2                \
+	cMap/Adobe-GB1/GBpc-EUC-UCS2C               \
+	cMap/Adobe-GB1/GBpc-EUC-V                   \
+	cMap/Adobe-GB1/GBT-EUC-H                    \
+	cMap/Adobe-GB1/GBT-EUC-V                    \
+	cMap/Adobe-GB1/GBT-H                        \
+	cMap/Adobe-GB1/GBTpc-EUC-H                  \
+	cMap/Adobe-GB1/GBTpc-EUC-V                  \
+	cMap/Adobe-GB1/GBT-V                        \
+	cMap/Adobe-GB1/GB-V                         \
+	cMap/Adobe-GB1/UCS2-GBK-EUC                 \
+	cMap/Adobe-GB1/UCS2-GBpc-EUC                \
+	cMap/Adobe-GB1/UniGB-UCS2-H                 \
+	cMap/Adobe-GB1/UniGB-UCS2-V                 \
+	cMap/Adobe-GB1/UniGB-UTF16-H                \
+	cMap/Adobe-GB1/UniGB-UTF16-V                \
+	cMap/Adobe-GB1/UniGB-UTF32-H                \
+	cMap/Adobe-GB1/UniGB-UTF32-V                \
+	cMap/Adobe-GB1/UniGB-UTF8-H                 \
+	cMap/Adobe-GB1/UniGB-UTF8-V                 \
+	cMap/Adobe-Japan1/78-EUC-H                  \
+	cMap/Adobe-Japan1/78-EUC-V                  \
+	cMap/Adobe-Japan1/78-H                      \
+	cMap/Adobe-Japan1/78ms-RKSJ-H               \
+	cMap/Adobe-Japan1/78ms-RKSJ-V               \
+	cMap/Adobe-Japan1/78-RKSJ-H                 \
+	cMap/Adobe-Japan1/78-RKSJ-V                 \
+	cMap/Adobe-Japan1/78-V                      \
+	cMap/Adobe-Japan1/83pv-RKSJ-H               \
+	cMap/Adobe-Japan1/90msp-RKSJ-H              \
+	cMap/Adobe-Japan1/90msp-RKSJ-V              \
+	cMap/Adobe-Japan1/90ms-RKSJ-H               \
+	cMap/Adobe-Japan1/90ms-RKSJ-UCS2            \
+	cMap/Adobe-Japan1/90ms-RKSJ-V               \
+	cMap/Adobe-Japan1/90pv-RKSJ-H               \
+	cMap/Adobe-Japan1/90pv-RKSJ-UCS2            \
+	cMap/Adobe-Japan1/90pv-RKSJ-UCS2C           \
+	cMap/Adobe-Japan1/90pv-RKSJ-V               \
+	cMap/Adobe-Japan1/Add-H                     \
+	cMap/Adobe-Japan1/Add-RKSJ-H                \
+	cMap/Adobe-Japan1/Add-RKSJ-V                \
+	cMap/Adobe-Japan1/Add-V                     \
+	cMap/Adobe-Japan1/Adobe-Japan1-0            \
+	cMap/Adobe-Japan1/Adobe-Japan1-1            \
+	cMap/Adobe-Japan1/Adobe-Japan1-2            \
+	cMap/Adobe-Japan1/Adobe-Japan1-3            \
+	cMap/Adobe-Japan1/Adobe-Japan1-4            \
+	cMap/Adobe-Japan1/Adobe-Japan1-5            \
+	cMap/Adobe-Japan1/Adobe-Japan1-6            \
+	cMap/Adobe-Japan1/Adobe-Japan1-7            \
+	cMap/Adobe-Japan1/Adobe-Japan1-90ms-RKSJ    \
+	cMap/Adobe-Japan1/Adobe-Japan1-90pv-RKSJ    \
+	cMap/Adobe-Japan1/Adobe-Japan1-H-CID        \
+	cMap/Adobe-Japan1/Adobe-Japan1-H-Host       \
+	cMap/Adobe-Japan1/Adobe-Japan1-H-Mac        \
+	cMap/Adobe-Japan1/Adobe-Japan1-PS-H         \
+	cMap/Adobe-Japan1/Adobe-Japan1-PS-V         \
+	cMap/Adobe-Japan1/Adobe-Japan1-UCS2         \
+	cMap/Adobe-Japan1/EUC-H                     \
+	cMap/Adobe-Japan1/EUC-V                     \
+	cMap/Adobe-Japan1/Ext-H                     \
+	cMap/Adobe-Japan1/Ext-RKSJ-H                \
+	cMap/Adobe-Japan1/Ext-RKSJ-V                \
+	cMap/Adobe-Japan1/Ext-V                     \
+	cMap/Adobe-Japan1/H                         \
+	cMap/Adobe-Japan1/Hankaku                   \
+	cMap/Adobe-Japan1/Hiragana                  \
+	cMap/Adobe-Japan1/Hojo-EUC-H                \
+	cMap/Adobe-Japan1/Hojo-EUC-V                \
+	cMap/Adobe-Japan1/Hojo-H                    \
+	cMap/Adobe-Japan1/Hojo-V                    \
+	cMap/Adobe-Japan1/Katakana                  \
+	cMap/Adobe-Japan1/NWP-H                     \
+	cMap/Adobe-Japan1/NWP-V                     \
+	cMap/Adobe-Japan1/RKSJ-H                    \
+	cMap/Adobe-Japan1/RKSJ-V                    \
+	cMap/Adobe-Japan1/Roman                     \
+	cMap/Adobe-Japan1/UCS2-90ms-RKSJ            \
+	cMap/Adobe-Japan1/UCS2-90pv-RKSJ            \
+	cMap/Adobe-Japan1/UniHojo-UCS2-H            \
+	cMap/Adobe-Japan1/UniHojo-UCS2-V            \
+	cMap/Adobe-Japan1/UniHojo-UTF16-H           \
+	cMap/Adobe-Japan1/UniHojo-UTF16-V           \
+	cMap/Adobe-Japan1/UniHojo-UTF32-H           \
+	cMap/Adobe-Japan1/UniHojo-UTF32-V           \
+	cMap/Adobe-Japan1/UniHojo-UTF8-H            \
+	cMap/Adobe-Japan1/UniHojo-UTF8-V            \
+	cMap/Adobe-Japan1/UniJIS2004-UTF16-H        \
+	cMap/Adobe-Japan1/UniJIS2004-UTF16-V        \
+	cMap/Adobe-Japan1/UniJIS2004-UTF32-H        \
+	cMap/Adobe-Japan1/UniJIS2004-UTF32-V        \
+	cMap/Adobe-Japan1/UniJIS2004-UTF8-H         \
+	cMap/Adobe-Japan1/UniJIS2004-UTF8-V         \
+	cMap/Adobe-Japan1/UniJISPro-UCS2-HW-V       \
+	cMap/Adobe-Japan1/UniJISPro-UCS2-V          \
+	cMap/Adobe-Japan1/UniJISPro-UTF8-V          \
+	cMap/Adobe-Japan1/UniJIS-UCS2-H             \
+	cMap/Adobe-Japan1/UniJIS-UCS2-HW-H          \
+	cMap/Adobe-Japan1/UniJIS-UCS2-HW-V          \
+	cMap/Adobe-Japan1/UniJIS-UCS2-V             \
+	cMap/Adobe-Japan1/UniJIS-UTF16-H            \
+	cMap/Adobe-Japan1/UniJIS-UTF16-V            \
+	cMap/Adobe-Japan1/UniJIS-UTF32-H            \
+	cMap/Adobe-Japan1/UniJIS-UTF32-V            \
+	cMap/Adobe-Japan1/UniJIS-UTF8-H             \
+	cMap/Adobe-Japan1/UniJIS-UTF8-V             \
+	cMap/Adobe-Japan1/UniJISX02132004-UTF32-H   \
+	cMap/Adobe-Japan1/UniJISX02132004-UTF32-V   \
+	cMap/Adobe-Japan1/UniJISX0213-UTF32-H       \
+	cMap/Adobe-Japan1/UniJISX0213-UTF32-V       \
+	cMap/Adobe-Japan1/V                         \
+	cMap/Adobe-Japan1/WP-Symbol                 \
+	cMap/Adobe-Japan2/Adobe-Japan2-0            \
+	cMap/Adobe-Korea1/Adobe-Korea1-0            \
+	cMap/Adobe-Korea1/Adobe-Korea1-1            \
+	cMap/Adobe-Korea1/Adobe-Korea1-2            \
+	cMap/Adobe-Korea1/Adobe-Korea1-H-CID        \
+	cMap/Adobe-Korea1/Adobe-Korea1-H-Host       \
+	cMap/Adobe-Korea1/Adobe-Korea1-H-Mac        \
+	cMap/Adobe-Korea1/Adobe-Korea1-KSCms-UHC    \
+	cMap/Adobe-Korea1/Adobe-Korea1-KSCpc-EUC    \
+	cMap/Adobe-Korea1/Adobe-Korea1-UCS2         \
+	cMap/Adobe-Korea1/KSC-EUC-H                 \
+	cMap/Adobe-Korea1/KSC-EUC-V                 \
+	cMap/Adobe-Korea1/KSC-H                     \
+	cMap/Adobe-Korea1/KSC-Johab-H               \
+	cMap/Adobe-Korea1/KSC-Johab-V               \
+	cMap/Adobe-Korea1/KSCms-UHC-H               \
+	cMap/Adobe-Korea1/KSCms-UHC-HW-H            \
+	cMap/Adobe-Korea1/KSCms-UHC-HW-V            \
+	cMap/Adobe-Korea1/KSCms-UHC-UCS2            \
+	cMap/Adobe-Korea1/KSCms-UHC-V               \
+	cMap/Adobe-Korea1/KSCpc-EUC-H               \
+	cMap/Adobe-Korea1/KSCpc-EUC-UCS2            \
+	cMap/Adobe-Korea1/KSCpc-EUC-UCS2C           \
+	cMap/Adobe-Korea1/KSCpc-EUC-V               \
+	cMap/Adobe-Korea1/KSC-V                     \
+	cMap/Adobe-Korea1/UCS2-KSCms-UHC            \
+	cMap/Adobe-Korea1/UCS2-KSCpc-EUC            \
+	cMap/Adobe-Korea1/UniKS-UCS2-H              \
+	cMap/Adobe-Korea1/UniKS-UCS2-V              \
+	cMap/Adobe-Korea1/UniKS-UTF16-H             \
+	cMap/Adobe-Korea1/UniKS-UTF16-V             \
+	cMap/Adobe-Korea1/UniKS-UTF32-H             \
+	cMap/Adobe-Korea1/UniKS-UTF32-V             \
+	cMap/Adobe-Korea1/UniKS-UTF8-H              \
+	cMap/Adobe-Korea1/UniKS-UTF8-V              \
+	cMap/Adobe-KR/Adobe-KR-0                    \
+	cMap/Adobe-KR/Adobe-KR-1                    \
+	cMap/Adobe-KR/Adobe-KR-2                    \
+	cMap/Adobe-KR/Adobe-KR-3                    \
+	cMap/Adobe-KR/Adobe-KR-4                    \
+	cMap/Adobe-KR/Adobe-KR-5                    \
+	cMap/Adobe-KR/Adobe-KR-6                    \
+	cMap/Adobe-KR/Adobe-KR-7                    \
+	cMap/Adobe-KR/Adobe-KR-8                    \
+	cMap/Adobe-KR/Adobe-KR-9                    \
+	cMap/Adobe-KR/Adobe-KR-UCS2                 \
+	cMap/Adobe-KR/UniAKR-UTF16-H                \
+	cMap/Adobe-KR/UniAKR-UTF32-H                \
+	cMap/Adobe-KR/UniAKR-UTF8-H
+
+poppler_name-to-unicode-files =         \
+	nameToUnicode/Bulgarian             \
+	nameToUnicode/Greek                 \
+	nameToUnicode/Thai
+
+poppler_cid-to-unicode-files =          \
+	cidToUnicode/Adobe-CNS1             \
+	cidToUnicode/Adobe-GB1              \
+	cidToUnicode/Adobe-Japan1           \
+	cidToUnicode/Adobe-Korea1
+
+poppler_DISTFILES =                     \
+	README                              \
+	COPYING                             \
+	COPYING.adobe                       \
+	COPYING.gpl2                        \
+	$(poppler_unicode-map-files)        \
+	$(poppler_cmap-files)               \
+	$(poppler_name-to-unicode-files)    \
+	$(poppler_cid-to-unicode-files)
+
+$(eval $(call gb_ExternalPackage_add_unpacked_files_with_dir,poppler_data,$(LIBO_SHARE_FOLDER)/xpdfimport/poppler_data,\
+   $(poppler_DISTFILES)))
+
+# vim: set noet sw=4 ts=4:
diff --git a/external/poppler/Module_poppler.mk b/external/poppler/Module_poppler.mk
index ebae6e7aaddd..a35bae436a6d 100644
--- a/external/poppler/Module_poppler.mk
+++ b/external/poppler/Module_poppler.mk
@@ -12,6 +12,8 @@ $(eval $(call gb_Module_Module,poppler))
 $(eval $(call gb_Module_add_targets,poppler,\
 	StaticLibrary_poppler \
 	UnpackedTarball_poppler \
+	ExternalPackage_poppler_data \
+	UnpackedTarball_poppler_data \
 ))
 
 # vim: set noet sw=4 ts=4:
diff --git a/external/poppler/UnpackedTarball_poppler_data.mk b/external/poppler/UnpackedTarball_poppler_data.mk
new file mode 100644
index 000000000000..e0357df5a182
--- /dev/null
+++ b/external/poppler/UnpackedTarball_poppler_data.mk
@@ -0,0 +1,13 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+#
+# This file is part of the LibreOffice project.
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
+#
+
+$(eval $(call gb_UnpackedTarball_UnpackedTarball,poppler_data))
+
+$(eval $(call gb_UnpackedTarball_set_tarball,poppler_data,$(POPPLER_DATA_TARBALL),,poppler_data))
+# vim: set noet sw=4 ts=4: