From c6315e162ab7e44cd710df3d0d1d7af423bf48bc Mon Sep 17 00:00:00 2001 From: Katarina Behrens Date: Mon, 30 Jan 2017 18:01:18 +0100 Subject: gpg4libre: Download external gpgme and dependent libs in particular, libgpg-error and libassuan This only downloads and unpacks the tarball. Building them needs some work still Change-Id: I562fd01571929ddfb47a319038f88ea8dbfb4bdd Reviewed-on: https://gerrit.libreoffice.org/33712 Reviewed-by: Siegmund Gorr Tested-by: Thorsten Behrens Reviewed-by: Thorsten Behrens --- Makefile.fetch | 3 +++ configure.ac | 4 +++- download.lst | 6 ++++++ external/Module_external.mk | 3 +++ external/gpgme/Makefile | 14 ++++++++++++++ external/gpgme/Module_gpgme.mk | 16 ++++++++++++++++ external/gpgme/README | 2 ++ external/gpgme/UnpackedTarball_gpgme.mk | 14 ++++++++++++++ external/libassuan/Makefile | 14 ++++++++++++++ external/libassuan/Module_libassuan.mk | 16 ++++++++++++++++ external/libassuan/README | 3 +++ external/libassuan/UnpackedTarball_libassuan.mk | 14 ++++++++++++++ external/libgpg-error/Makefile | 14 ++++++++++++++ external/libgpg-error/Module_libgpg-error.mk | 16 ++++++++++++++++ external/libgpg-error/README | 2 ++ external/libgpg-error/UnpackedTarball_libgpg-error.mk | 14 ++++++++++++++ 16 files changed, 154 insertions(+), 1 deletion(-) create mode 100644 external/gpgme/Makefile create mode 100644 external/gpgme/Module_gpgme.mk create mode 100644 external/gpgme/README create mode 100644 external/gpgme/UnpackedTarball_gpgme.mk create mode 100644 external/libassuan/Makefile create mode 100644 external/libassuan/Module_libassuan.mk create mode 100644 external/libassuan/README create mode 100644 external/libassuan/UnpackedTarball_libassuan.mk create mode 100644 external/libgpg-error/Makefile create mode 100644 external/libgpg-error/Module_libgpg-error.mk create mode 100644 external/libgpg-error/README create mode 100644 external/libgpg-error/UnpackedTarball_libgpg-error.mk diff --git a/Makefile.fetch b/Makefile.fetch index b01fdd6fe293..edb1fd25bf17 100644 --- a/Makefile.fetch +++ b/Makefile.fetch @@ -131,6 +131,7 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) $(call fetch_Optional,FREETYPE,FREETYPE_TARBALL) \ $(call fetch_Optional,EPOXY,EPOXY_TARBALL) \ $(call fetch_Optional,GLM,GLM_TARBALL) \ + $(call fetch_Optional,GPGME,GPGME_TARBALL) \ $(call fetch_Optional,GRAPHITE,GRAPHITE_TARBALL) \ $(call fetch_Optional,HARFBUZZ,HARFBUZZ_TARBALL) \ $(call fetch_Optional,HSQLDB,HSQLDB_TARBALL) \ @@ -153,8 +154,10 @@ $(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR) $(call fetch_Optional,LANGUAGETOOL,LANGUAGETOOL_TARBALL) \ $(call fetch_Optional,LCMS2,LCMS2_TARBALL) \ $(call fetch_Optional,LIBATOMIC_OPS,LIBATOMIC_OPS_TARBALL) \ + $(call fetch_Optional,LIBASSUAN,LIBASSUAN_TARBALL) \ $(call fetch_Optional,LIBEOT,LIBEOT_TARBALL) \ $(call fetch_Optional,LIBEXTTEXTCAT,LIBEXTTEXTCAT_TARBALL) \ + $(call fetch_Optional,LIBGPGERROR,LIBGPGERROR_TARBALL) \ $(call fetch_Optional,LIBLANGTAG,LANGTAGREG_TARBALL) \ $(call fetch_Optional,LIBLANGTAG,LIBLANGTAG_TARBALL) \ $(call fetch_Optional,LIBPNG,PNG_TARBALL) \ diff --git a/configure.ac b/configure.ac index 6219c5d0a000..5f23f29c5412 100644 --- a/configure.ac +++ b/configure.ac @@ -10652,7 +10652,9 @@ if test "$_os" = "Linux"; then GPGME_CFLAGS=`$GPGMECONFIG --cflags` GPGME_LIBS=`$GPGMECONFIG --libs` else - AC_MSG_RESULT([none]) +# This is work in progress, please DO NOT MODIFY OR REMOVE + AC_MSG_RESULT([internal]) + BUILD_TYPE="$BUILD_TYPE LIBGPGERROR LIBASSUAN GPGME" fi fi AC_SUBST(SYSTEM_GPGME) diff --git a/download.lst b/download.lst index 7f48a49adf87..8d2efcf40e97 100644 --- a/download.lst +++ b/download.lst @@ -59,6 +59,8 @@ export FREEHAND_TARBALL := libfreehand-0.1.1.tar.bz2 export FREETYPE_MD5SUM := b3230110e0cab777e0df7631837ac36e export FREETYPE_TARBALL := freetype-2.7.1.tar.bz2 export GLM_TARBALL := bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip +export GPGME_TARBALL := gpgme-1.8.0.tar.bz2 +export GPGME_MD5SUM := 722a4153904b9b5dc15485a22d29263b export GRAPHITE_TARBALL := 3069842a88b8f40c6b83ad2850cda293-graphite2-minimal-1.3.9.tgz export HARFBUZZ_MD5SUM := 5986e1bfcd983d1f6caa53ef64c4abc5 export HARFBUZZ_TARBALL := harfbuzz-1.3.2.tar.bz2 @@ -86,6 +88,8 @@ export LANGTAGREG_TARBALL := language-subtag-registry-2016-07-19.tar.bz2 export LANGUAGETOOL_TARBALL := b63e6340a02ff1cacfeadb2c42286161-JLanguageTool-1.7.0.tar.bz2 export LCMS2_MD5SUM := 87a5913f1a52464190bb655ad230539c export LCMS2_TARBALL := lcms2-2.8.tar.gz +export LIBASSUAN_MD5SUM := 8e01a7c72d3e5d154481230668e6eb5a +export LIBASSUAN_TARBALL := libassuan-2.4.3.tar.bz2 export LIBATOMIC_OPS_MD5SUM := c0b86562d5aa40761a87134f83e6adcf export LIBATOMIC_OPS_TARBALL := libatomic_ops-7_2d.zip export LIBEOT_MD5SUM := aa24f5dd2a2992f4a116aa72af817548 @@ -93,6 +97,8 @@ export LIBEOT_TARBALL := libeot-0.01.tar.bz2 export LIBEXTTEXTCAT_TARBALL := 10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2 export LIBGLTF_MD5SUM := 63ae962d0c436909979826fce0fca2fd export LIBGLTF_TARBALL := libgltf-0.1.0.tar.gz +export LIBGPGERROR_MD5SUM := 97456709dbbcbb69354317ffe3e347cd +export LIBGPGERROR_TARBALL := libgpg-error-1.26.tar.bz2 export LIBLANGTAG_MD5SUM := 284f120247323a35122ab32b4b359c45 export LIBLANGTAG_TARBALL := liblangtag-0.6.2.tar.bz2 export LIBTOMMATH_MD5SUM := da283d2e3e72137d0c600ac36b991c9d diff --git a/external/Module_external.mk b/external/Module_external.mk index c14e6680bbc3..610b65f07fda 100644 --- a/external/Module_external.mk +++ b/external/Module_external.mk @@ -46,6 +46,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,FREEHAND,libfreehand) \ $(call gb_Helper_optional,FREETYPE,freetype) \ $(call gb_Helper_optional,GLM,glm) \ + $(call gb_Helper_optional,GPGME,gpgme) \ $(call gb_Helper_optional,GRAPHITE,graphite) \ $(call gb_Helper_optional,HARFBUZZ,harfbuzz) \ $(call gb_Helper_optional,HSQLDB,hsqldb) \ @@ -57,10 +58,12 @@ $(eval $(call gb_Module_add_moduledirs,external,\ $(call gb_Helper_optional,JPEG_TURBO,jpeg-turbo) \ $(call gb_Helper_optional,LANGUAGETOOL,languagetool) \ $(call gb_Helper_optional,LCMS2,lcms2) \ + $(call gb_Helper_optional,LIBASSUAN,libassuan) \ $(call gb_Helper_optional,LIBATOMIC_OPS,libatomic_ops) \ $(call gb_Helper_optional,LIBEOT,libeot) \ $(call gb_Helper_optional,LIBEXTTEXTCAT,libexttextcat) \ $(call gb_Helper_optional,LIBGLTF,libgltf) \ + $(call gb_Helper_optional,LIBGPGERROR,libgpg-error) \ $(call gb_Helper_optional,LIBLANGTAG,liblangtag) \ $(call gb_Helper_optional,LIBPNG,libpng) \ $(call gb_Helper_optional,LIBXML2,libxml2) \ diff --git a/external/gpgme/Makefile b/external/gpgme/Makefile new file mode 100644 index 000000000000..569ad8a0ba7a --- /dev/null +++ b/external/gpgme/Makefile @@ -0,0 +1,14 @@ +# -*- 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/. +# + +module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) + +include $(module_directory)/../../solenv/gbuild/partial_build.mk + +# vim: set noet sw=4 ts=4: diff --git a/external/gpgme/Module_gpgme.mk b/external/gpgme/Module_gpgme.mk new file mode 100644 index 000000000000..b0b9def23cd2 --- /dev/null +++ b/external/gpgme/Module_gpgme.mk @@ -0,0 +1,16 @@ +# -*- 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_Module_Module,gpgme)) + +$(eval $(call gb_Module_add_targets,gpgme,\ + UnpackedTarball_gpgme \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/gpgme/README b/external/gpgme/README new file mode 100644 index 000000000000..220028e42471 --- /dev/null +++ b/external/gpgme/README @@ -0,0 +1,2 @@ +A library for easy access to GnuPG (GnuPG Made Easy) +[https://www.gnupg.org/related_software/gpgme/index.html] diff --git a/external/gpgme/UnpackedTarball_gpgme.mk b/external/gpgme/UnpackedTarball_gpgme.mk new file mode 100644 index 000000000000..22c52cdb85a6 --- /dev/null +++ b/external/gpgme/UnpackedTarball_gpgme.mk @@ -0,0 +1,14 @@ +# -*- 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,gpgme)) + +$(eval $(call gb_UnpackedTarball_set_tarball,gpgme,$(GPGME_TARBALL))) + +# vim: set noet sw=4 ts=4: diff --git a/external/libassuan/Makefile b/external/libassuan/Makefile new file mode 100644 index 000000000000..569ad8a0ba7a --- /dev/null +++ b/external/libassuan/Makefile @@ -0,0 +1,14 @@ +# -*- 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/. +# + +module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) + +include $(module_directory)/../../solenv/gbuild/partial_build.mk + +# vim: set noet sw=4 ts=4: diff --git a/external/libassuan/Module_libassuan.mk b/external/libassuan/Module_libassuan.mk new file mode 100644 index 000000000000..38c830c26132 --- /dev/null +++ b/external/libassuan/Module_libassuan.mk @@ -0,0 +1,16 @@ +# -*- 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_Module_Module,libassuan)) + +$(eval $(call gb_Module_add_targets,libassuan,\ + UnpackedTarball_libassuan \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/libassuan/README b/external/libassuan/README new file mode 100644 index 000000000000..cd35103a1e94 --- /dev/null +++ b/external/libassuan/README @@ -0,0 +1,3 @@ +A small library implementing Assuan protocol which is used as IPC +between most of the newer GnuPG components +[https://www.gnupg.org/related_software/libassuan/index.html] diff --git a/external/libassuan/UnpackedTarball_libassuan.mk b/external/libassuan/UnpackedTarball_libassuan.mk new file mode 100644 index 000000000000..c34f3de7584b --- /dev/null +++ b/external/libassuan/UnpackedTarball_libassuan.mk @@ -0,0 +1,14 @@ +# -*- 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,libassuan)) + +$(eval $(call gb_UnpackedTarball_set_tarball,libassuan,$(LIBASSUAN_TARBALL))) + +# vim: set noet sw=4 ts=4: diff --git a/external/libgpg-error/Makefile b/external/libgpg-error/Makefile new file mode 100644 index 000000000000..569ad8a0ba7a --- /dev/null +++ b/external/libgpg-error/Makefile @@ -0,0 +1,14 @@ +# -*- 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/. +# + +module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST)))) + +include $(module_directory)/../../solenv/gbuild/partial_build.mk + +# vim: set noet sw=4 ts=4: diff --git a/external/libgpg-error/Module_libgpg-error.mk b/external/libgpg-error/Module_libgpg-error.mk new file mode 100644 index 000000000000..814da428f0ec --- /dev/null +++ b/external/libgpg-error/Module_libgpg-error.mk @@ -0,0 +1,16 @@ +# -*- 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_Module_Module,libgpg-error)) + +$(eval $(call gb_Module_add_targets,libgpg-error,\ + UnpackedTarball_libgpg-error \ +)) + +# vim: set noet sw=4 ts=4: diff --git a/external/libgpg-error/README b/external/libgpg-error/README new file mode 100644 index 000000000000..84288267a18a --- /dev/null +++ b/external/libgpg-error/README @@ -0,0 +1,2 @@ +A small library that defines common error values for GnuPG components +[https://www.gnupg.org/related_software/libgpg-error/index.html] diff --git a/external/libgpg-error/UnpackedTarball_libgpg-error.mk b/external/libgpg-error/UnpackedTarball_libgpg-error.mk new file mode 100644 index 000000000000..4f124d6a9229 --- /dev/null +++ b/external/libgpg-error/UnpackedTarball_libgpg-error.mk @@ -0,0 +1,14 @@ +# -*- 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,libgpg-error)) + +$(eval $(call gb_UnpackedTarball_set_tarball,libgpg-error,$(LIBGPGERROR_TARBALL))) + +# vim: set noet sw=4 ts=4: -- cgit