tdf#139778 qrcodegen library removal.
It was replaced by ZXing library.
Change-Id: I49eb809586c7b4ba3a93fd77f804bfc93fead669
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/112701
Reviewed-by: René Engelhard <rene@debian.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Tested-by: Jenkins
diff --git a/Makefile.fetch b/Makefile.fetch
index 5c50142..b559652 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -170,7 +170,6 @@ $(WORKDIR)/download: $(BUILDDIR)/config_$(gb_Side).mk $(SRCDIR)/download.lst $(S
$(call fetch_Optional,LXML,LXML_TARBALL) \
$(call fetch_Optional,MARIADB_CONNECTOR_C,MARIADB_CONNECTOR_C_TARBALL) \
$(call fetch_Optional,MDDS,MDDS_TARBALL) \
$(call fetch_Optional,QRCODEGEN,QRCODEGEN_TARBALL) \
$(call fetch_Optional,ZXING,ZXING_TARBALL) \
$(call fetch_Optional,MDNSRESPONDER,MDNSRESPONDER_TARBALL) \
$(call fetch_Optional,MORE_FONTS,FONT_CALADEA_TARBALL) \
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index 97d54f1..5303d12 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -4183,50 +4183,6 @@ $(eval $(call gb_Helper_register_libraries_for_install,OOOLIBS,ooo,\
))
endif
ifneq ($(SYSTEM_QRCODEGEN),)
define gb_LinkTarget__use_qrcodegen
$(call gb_LinkTarget_set_include,$(1),\
-DSYSTEM_QRCODEGEN \
$$(INCLUDE) \
$(QRCODEGEN_CFLAGS) \
)
$(call gb_LinkTarget_add_libs,$(1),$(QRCODEGEN_LIBS))
endef
gb_ExternalProject__use_qrcodegen :=
else # !SYSTEM_QRCODEGEN
ifneq ($(ENABLE_QRCODEGEN),)
define gb_LinkTarget__use_qrcodegen
$(call gb_LinkTarget_use_unpacked,$(1),qrcodegen)
$(call gb_LinkTarget_set_include,$(1),\
-I$(call gb_UnpackedTarball_get_dir,qrcodegen/cpp/)\
$$(INCLUDE) \
)
$(call gb_LinkTarget_use_static_libraries,$(1),\
qrcodegen \
)
endef
define gb_ExternalProject__use_qrcodegen
$(call gb_ExternalProject_use_static_libraries,$(1),qrcodegen)
endef
else # !ENABLE_QRCODEGEN
define gb_LinkTarget__use_qrcodegen
endef
endif # ENABLE_QRCODEGEN
endif # SYSTEM_QRCODEGEN
define gb_LinkTarget__use_dtoa
$(call gb_LinkTarget_use_unpacked,$(1),dtoa)
$(call gb_LinkTarget_set_include,$(1),\
diff --git a/config_host.mk.in b/config_host.mk.in
index e42dfcf..705af6b 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -500,9 +500,6 @@ export PYTHON_VERSION=@PYTHON_VERSION@
export PYTHON_VERSION_MAJOR=@PYTHON_VERSION_MAJOR@
export PYTHON_VERSION_MINOR=@PYTHON_VERSION_MINOR@
export PYTHONWARNINGS=@PYTHONWARNINGS@
export ENABLE_QRCODEGEN=@ENABLE_QRCODEGEN@
export QRCODEGEN_CFLAGS=$(gb_SPACE)@QRCODEGEN_CFLAGS@
export QRCODEGEN_LIBS=$(gb_SPACE)@QRCODEGEN_LIBS@
export ENABLE_ZXING=@ENABLE_ZXING@
export ZXING_CFLAGS=$(gb_SPACE)@ZXING_CFLAGS@
export ZXING_LIBS=$(gb_SPACE)@ZXING_LIBS@
@@ -613,7 +610,6 @@ export SYSTEM_PAGEMAKER=@SYSTEM_PAGEMAKER@
export SYSTEM_POPPLER=@SYSTEM_POPPLER@
export SYSTEM_POSTGRESQL=@SYSTEM_POSTGRESQL@
export SYSTEM_PYTHON=@SYSTEM_PYTHON@
export SYSTEM_QRCODEGEN=@SYSTEM_QRCODEGEN@
export SYSTEM_ZXING=@SYSTEM_ZXING@
export SYSTEM_QXP=@SYSTEM_QXP@
export SYSTEM_REDLAND=@SYSTEM_REDLAND@
diff --git a/config_host/config_qrcodegen.h.in b/config_host/config_qrcodegen.h.in
deleted file mode 100644
index 6338865..0000000
--- a/config_host/config_qrcodegen.h.in
+++ /dev/null
@@ -1,17 +0,0 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
/*
* 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/.
*/
#ifndef INCLUDED_CONFIG_QRCODEGEN_H
#define INCLUDED_CONFIG_QRCODEGEN_H
#define ENABLE_QRCODEGEN 0
#endif
/* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/configure.ac b/configure.ac
index 8a79221..851a8af 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2238,19 +2238,10 @@ AC_ARG_WITH(system-hunspell,
[Use libhunspell already on system.]),,
[with_system_hunspell="$with_system_libs"])
libo_FUZZ_ARG_ENABLE(qrcodegen,
AS_HELP_STRING([--disable-qrcodegen],
[Disable use of qrcodegen external library.]))
libo_FUZZ_ARG_ENABLE(zxing,
AS_HELP_STRING([--disable-zxing],
[Disable use of zxing external library.]))
AC_ARG_WITH(system-qrcodegen,
AS_HELP_STRING([--with-system-qrcodegen],
[Use libqrcodegen already on system.]),,
[with_system_qrcodegen="$with_system_libs"])
AC_ARG_WITH(system-zxing,
AS_HELP_STRING([--with-system-zxing],
[Use libzxing already on system.]),,
@@ -10804,45 +10795,6 @@ AC_SUBST(HUNSPELL_CFLAGS)
AC_SUBST(HUNSPELL_LIBS)
dnl ===================================================================
dnl Check for system qrcodegen
dnl ===================================================================
AC_MSG_CHECKING([whether to use libqrcodegen])
if test "$enable_qrcodegen" = "no"; then
AC_MSG_RESULT([no])
ENABLE_QRCODEGEN=
SYSTEM_QRCODEGEN=
else
AC_MSG_RESULT([yes])
ENABLE_QRCODEGEN=TRUE
AC_MSG_CHECKING([which libqrcodegen to use])
if test "$with_system_qrcodegen" = "yes"; then
AC_MSG_RESULT([external])
SYSTEM_QRCODEGEN=TRUE
AC_LANG_PUSH([C++])
AC_CHECK_HEADER(qrcodegen/QrCode.hpp, [],
[AC_MSG_ERROR(qrcodegen headers not found.)], [#include <stdexcept>])
AC_CHECK_LIB([qrcodegencpp], [main], [:],
[ AC_MSG_ERROR(qrcodegen C++ library not found.) ], [])
QRCODEGEN_LIBS=-lqrcodegencpp
AC_LANG_POP([C++])
QRCODEGEN_CFLAGS=$(printf '%s' "$QRCODEGEN_CFLAGS" | sed -e "s/-I/${ISYSTEM?}/g")
FilterLibs "${QRCODEGEN_LIBS}"
QRCODEGEN_LIBS="${filteredlibs}"
else
AC_MSG_RESULT([internal])
SYSTEM_QRCODEGEN=
BUILD_TYPE="$BUILD_TYPE QRCODEGEN"
fi
if test "$ENABLE_QRCODEGEN" = TRUE; then
AC_DEFINE(ENABLE_QRCODEGEN)
fi
fi
AC_SUBST(SYSTEM_QRCODEGEN)
AC_SUBST(ENABLE_QRCODEGEN)
AC_SUBST(QRCODEGEN_CFLAGS)
AC_SUBST(QRCODEGEN_LIBS)
dnl ===================================================================
dnl Check for system zxing
dnl ===================================================================
AC_MSG_CHECKING([whether to use zxing])
@@ -14135,7 +14087,6 @@ AC_CONFIG_HEADERS([config_host/config_mpl.h])
AC_CONFIG_HEADERS([config_host/config_oox.h])
AC_CONFIG_HEADERS([config_host/config_options.h])
AC_CONFIG_HEADERS([config_host/config_options_calc.h])
AC_CONFIG_HEADERS([config_host/config_qrcodegen.h])
AC_CONFIG_HEADERS([config_host/config_zxing.h])
AC_CONFIG_HEADERS([config_host/config_skia.h])
AC_CONFIG_HEADERS([config_host/config_typesizes.h])
diff --git a/download.lst b/download.lst
index eca1650..7de2e67 100644
--- a/download.lst
+++ b/download.lst
@@ -224,8 +224,6 @@ export POSTGRESQL_SHA256SUM := 12345c83b89aa29808568977f5200d6da00f88a035517f925
export POSTGRESQL_TARBALL := postgresql-13.1.tar.bz2
export PYTHON_SHA256SUM := bd746ed1ad9ccfa9b2a8d13736a5c452025c3600913d000078e6ed1df3d767b6
export PYTHON_TARBALL := Python-3.8.8rc1.tar.xz
export QRCODEGEN_SHA256SUM := fcdf9fd69fde07ae4dca2351d84271a9de8093002f733b77c70f52f1630f6e4a
export QRCODEGEN_TARBALL := QR-Code-generator-1.4.0.tar.gz
export QXP_SHA256SUM := e137b6b110120a52c98edd02ebdc4095ee08d0d5295a94316a981750095a945c
export QXP_TARBALL := libqxp-0.0.2.tar.xz
export RAPTOR_SHA256SUM := ada7f0ba54787b33485d090d3d2680533520cd4426d2f7fb4782dd4a6a1480ed
diff --git a/external/Module_external.mk b/external/Module_external.mk
index a87ee85..ae54d6f 100644
--- a/external/Module_external.mk
+++ b/external/Module_external.mk
@@ -90,7 +90,6 @@ $(eval $(call gb_Module_add_moduledirs,external,\
$(call gb_Helper_optional,POSTGRESQL,postgresql) \
$(call gb_Helper_optional,PYTHON,python3) \
$(call gb_Helper_optional,QXP,libqxp) \
$(call gb_Helper_optional,QRCODEGEN,qrcodegen) \
$(call gb_Helper_optional,ZXING,zxing) \
$(call gb_Helper_optional,REDLAND,redland) \
$(call gb_Helper_optional,REVENGE,librevenge) \
diff --git a/external/qrcodegen/Makefile b/external/qrcodegen/Makefile
deleted file mode 100644
index e4968cf8..0000000
--- a/external/qrcodegen/Makefile
+++ /dev/null
@@ -1,7 +0,0 @@
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
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/qrcodegen/Module_qrcodegen.mk b/external/qrcodegen/Module_qrcodegen.mk
deleted file mode 100644
index 09c771d..0000000
--- a/external/qrcodegen/Module_qrcodegen.mk
+++ /dev/null
@@ -1,24 +0,0 @@
# -*- 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,qrcodegen))
$(eval $(call gb_Module_add_targets,qrcodegen,\
UnpackedTarball_qrcodegen \
))
ifeq ($(ENABLE_QRCODEGEN),TRUE)
$(eval $(call gb_Module_add_targets,qrcodegen,\
StaticLibrary_qrcodegen \
))
endif
# vim: set noet sw=4 ts=4:
diff --git a/external/qrcodegen/README b/external/qrcodegen/README
deleted file mode 100644
index d6f19ab..0000000
--- a/external/qrcodegen/README
+++ /dev/null
@@ -1,3 +0,0 @@
QR code generating library, available from [https://github.com/nayuki/QR-Code-generator/tree/master/cpp].
qrcodegenerator to make the QR code out of a link or text in libreoffice.
diff --git a/external/qrcodegen/StaticLibrary_qrcodegen.mk b/external/qrcodegen/StaticLibrary_qrcodegen.mk
deleted file mode 100644
index d4b2167..0000000
--- a/external/qrcodegen/StaticLibrary_qrcodegen.mk
+++ /dev/null
@@ -1,26 +0,0 @@
# -*- 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_StaticLibrary_StaticLibrary,qrcodegen))
$(eval $(call gb_StaticLibrary_use_unpacked,qrcodegen,qrcodegen))
$(eval $(call gb_StaticLibrary_set_generated_cxx_suffix,qrcodegen,cpp))
$(eval $(call gb_StaticLibrary_use_external,qrcodegen,icu_headers))
$(eval $(call gb_StaticLibrary_set_warnings_disabled,qrcodegen))
$(eval $(call gb_StaticLibrary_add_generated_exception_objects,qrcodegen,\
UnpackedTarball/qrcodegen/cpp/BitBuffer \
UnpackedTarball/qrcodegen/cpp/QrCode \
UnpackedTarball/qrcodegen/cpp/QrSegment \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/qrcodegen/UnpackedTarball_qrcodegen.mk b/external/qrcodegen/UnpackedTarball_qrcodegen.mk
deleted file mode 100644
index 1ddbc5b..0000000
--- a/external/qrcodegen/UnpackedTarball_qrcodegen.mk
+++ /dev/null
@@ -1,19 +0,0 @@
#-*- 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,qrcodegen))
$(eval $(call gb_UnpackedTarball_set_tarball,qrcodegen,$(QRCODEGEN_TARBALL)))
$(eval $(call gb_UnpackedTarball_set_patchlevel,qrcodegen,1))
$(eval $(call gb_UnpackedTarball_add_patches,qrcodegen, \
))
# vim: set noet sw=4 ts=4:
diff --git a/readlicense_oo/license/license.xml b/readlicense_oo/license/license.xml
index 2c45a12..f78a1a7 100644
--- a/readlicense_oo/license/license.xml
+++ b/readlicense_oo/license/license.xml
@@ -1823,32 +1823,6 @@
PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.</p>
</div>
<div class ="QRCODEGEN">
<h2>QR-Code-Generator</h2>
<p>The following software may be included in this product: QR Code Generator.</p>
<p>The libqrcodegen project code is covered by the MIT license:</p>
<blockquote>
<p> Copyright © 2019 Project Nayuki. (MIT License) [<a href="https://www.nayuki.io/page/qr-code-generator-library">https://www.nayuki.io/page/qr-code-generator-library</a>]</p>
<p>Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
the Software without restriction, including without limitation the rights to
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
the Software, and to permit persons to whom the Software is furnished to do so,
subject to the following conditions:</p>
<p>*The above copyright notice and this permission notice shall be included in
all copies or substantial portions of the Software.</p>
<p>*The Software is provided "as is", without warranty of any kind, express or
implied, including but not limited to the warranties of merchantability,
fitness for a particular purpose and noninfringement. In no event shall the
authors or copyright holders be liable for any claim, damages or other
liability, whether in an action of contract, tort or otherwise, arising from,
out of or in connection with the Software or the use or other dealings in the
Software.</p>
</blockquote>
</div>
<h2>dtoa</h2>
<p>The following software may be included in this product: dtoa.</p>
<p>dtoa code is covered by the MIT license:</p>
