[Libreoffice-commits] core.git: Branch 'libreoffice-6-0' - 5 commits - bridges/source configure.ac download.lst external/libwps filter/source RepositoryExternal.mk solenv/flatpak-manifest.in writerperfect/qa xmlsecurity/Library_xsec_xmlsec.mk
David Tardon
dtardon at redhat.com
Thu Nov 30 11:37:14 UTC 2017
RepositoryExternal.mk | 14 +++++
bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx | 2
bridges/source/cpp_uno/gcc3_linux_aarch64/callvirtualfunction.cxx | 2
bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx | 2
bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx | 4 -
configure.ac | 2
download.lst | 4 -
external/libwps/0001-Lotus-.123-do-no-assume-that-a-file-containing-a-fdc.patch.1 | 27 ++++++++++
external/libwps/0001-drop-unneeded-include.patch.1 | 24 ++++++++
external/libwps/0001-try-to-fix-build-with-older-clang.patch.1 | 27 ----------
external/libwps/Library_wps.mk | 9 +++
external/libwps/UnpackedTarball_libwps.mk | 5 +
external/libwps/libwps-bundled-soname.patch.0 | 4 -
filter/source/config/fragments/types/calc_WPS_QPro_Document.xcu | 2
solenv/flatpak-manifest.in | 6 +-
writerperfect/qa/unit/WpftCalcFilterTest.cxx | 1
writerperfect/qa/unit/data/calc/libwps/pass/QuattroPro.wb1 |binary
xmlsecurity/Library_xsec_xmlsec.mk | 6 --
18 files changed, 93 insertions(+), 48 deletions(-)
New commits:
commit 804f9278451b50daae82618cacbeb8931e773caa
Author: David Tardon <dtardon at redhat.com>
Date: Tue Nov 28 11:51:38 2017 +0100
tdf#114000 always use user-selected charset
Change-Id: I45b9632724f46deb97bc79e364bf775aaaf0b85f
(cherry picked from commit 54ec0aec1308bbbb8c9ab36fc76fe993bb23e5fb)
Signed-off-by: David Tardon <dtardon at redhat.com>
diff --git a/external/libwps/0001-Lotus-.123-do-no-assume-that-a-file-containing-a-fdc.patch.1 b/external/libwps/0001-Lotus-.123-do-no-assume-that-a-file-containing-a-fdc.patch.1
new file mode 100644
index 000000000000..40c929ab8ea0
--- /dev/null
+++ b/external/libwps/0001-Lotus-.123-do-no-assume-that-a-file-containing-a-fdc.patch.1
@@ -0,0 +1,27 @@
+From 2a3465442d1305c7fec55e986c9793a86e571baa Mon Sep 17 00:00:00 2001
+From: osnola <alonso at loria.fr>
+Date: Fri, 24 Nov 2017 12:32:30 +0100
+Subject: [PATCH] Lotus .123: do no assume that a file containing a fdc's
+ structure is a Mac file :-~
+
+---
+ src/lib/Lotus.cpp | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/src/lib/Lotus.cpp b/src/lib/Lotus.cpp
+index d145014..514faad 100644
+--- a/src/lib/Lotus.cpp
++++ b/src/lib/Lotus.cpp
+@@ -3046,8 +3046,7 @@ bool LotusParser::readMacFontName(std::shared_ptr<WPSStream> stream, long endPos
+ }
+ else if (nameOk && !name.empty())
+ {
+- auto encoding=name!="Symbol" ? libwps_tools_win::Font::MAC_ROMAN : libwps_tools_win::Font::MAC_SYMBOL;
+- LotusParserInternal::Font font(encoding);
++ LotusParserInternal::Font font(getDefaultFontType());
+ font.m_name=name;
+ m_state->m_fontsMap.insert(std::map<int, LotusParserInternal::Font>::value_type(id,font));
+ }
+--
+2.14.3
+
diff --git a/external/libwps/UnpackedTarball_libwps.mk b/external/libwps/UnpackedTarball_libwps.mk
index 58c3710d9e03..742392b2b346 100644
--- a/external/libwps/UnpackedTarball_libwps.mk
+++ b/external/libwps/UnpackedTarball_libwps.mk
@@ -37,6 +37,7 @@ endif
$(eval $(call gb_UnpackedTarball_add_patches,libwps,\
external/libwps/0001-drop-unneeded-include.patch.1 \
+ external/libwps/0001-Lotus-.123-do-no-assume-that-a-file-containing-a-fdc.patch.1 \
))
# vim: set noet sw=4 ts=4:
commit e95cfd12f0c1edfbe88f0b5aa50bb689b7ed520b
Author: David Tardon <dtardon at redhat.com>
Date: Tue Nov 28 08:51:38 2017 +0100
drop executable bit from test files
Change-Id: I72329d6ce5aac146a3e7014ad4a8bf7c20472b2f
(cherry picked from commit 746b26525b09274832ab17358be843a703129b30)
Signed-off-by: David Tardon <dtardon at redhat.com>
diff --git a/writerperfect/qa/unit/data/calc/libwps/pass/Lotus123_3.123 b/writerperfect/qa/unit/data/calc/libwps/pass/Lotus123_3.123
old mode 100755
new mode 100644
diff --git a/writerperfect/qa/unit/data/calc/libwps/pass/Lotus123_98.123 b/writerperfect/qa/unit/data/calc/libwps/pass/Lotus123_98.123
old mode 100755
new mode 100644
diff --git a/writerperfect/qa/unit/data/calc/libwps/pass/QuattroPro.wb1 b/writerperfect/qa/unit/data/calc/libwps/pass/QuattroPro.wb1
old mode 100755
new mode 100644
diff --git a/writerperfect/qa/unit/data/impress/libmwaw/pass/PowerPoint_2.ppt b/writerperfect/qa/unit/data/impress/libmwaw/pass/PowerPoint_2.ppt
old mode 100755
new mode 100644
diff --git a/writerperfect/qa/unit/data/impress/libmwaw/pass/PowerPoint_4.ppt b/writerperfect/qa/unit/data/impress/libmwaw/pass/PowerPoint_4.ppt
old mode 100755
new mode 100644
diff --git a/writerperfect/qa/unit/data/impress/libmwaw/pass/PowerPoint_7.ppt b/writerperfect/qa/unit/data/impress/libmwaw/pass/PowerPoint_7.ppt
old mode 100755
new mode 100644
commit b0be91d6e514a450b2383075d5fd18143a3dfc0a
Author: David Tardon <dtardon at redhat.com>
Date: Mon Nov 27 10:16:07 2017 +0100
upload libwps 0.4.8
Change-Id: Ib285c227cd935987311be40df3745316943a54e0
Reviewed-on: https://gerrit.libreoffice.org/45331
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: David Tardon <dtardon at redhat.com>
(cherry picked from commit 8d0e8d5d291cbb98de6964eab2f629a405c7e813)
Signed-off-by: David Tardon <dtardon at redhat.com>
diff --git a/configure.ac b/configure.ac
index c5adc3aa5aa9..20a730cb8678 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7699,7 +7699,7 @@ libo_CHECK_SYSTEM_MODULE([libwpd],[WPD],[libwpd-0.10],["-I${WORKDIR}/UnpackedTar
libo_CHECK_SYSTEM_MODULE([libwpg],[WPG],[libwpg-0.3])
libo_CHECK_SYSTEM_MODULE([libwps],[WPS],[libwps-0.4])
-libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.7])
+libo_PKG_VERSION([WPS], [libwps-0.4], [0.4.8])
libo_CHECK_SYSTEM_MODULE([libvisio],[VISIO],[libvisio-0.1])
diff --git a/download.lst b/download.lst
index 447cab9164b5..983dffde299d 100644
--- a/download.lst
+++ b/download.lst
@@ -230,8 +230,8 @@ export WPD_TARBALL := libwpd-0.10.$(WPD_VERSION_MICRO).tar.xz
export WPG_SHA256SUM := 57faf1ab97d63d57383ac5d7875e992a3d190436732f4083310c0471e72f8c33
export WPG_VERSION_MICRO := 2
export WPG_TARBALL := libwpg-0.3.$(WPG_VERSION_MICRO).tar.xz
-export WPS_SHA256SUM := 2f2cab630bceace24f9dbb7d187cd6cd1f4c9f8a7b682c5f7e49c1e2cb58b217
-export WPS_VERSION_MICRO := 7
+export WPS_SHA256SUM := e478e825ef33f6a434a19ff902c5469c9da7acc866ea0d8ab610a8b2aa94177e
+export WPS_VERSION_MICRO := 8
export WPS_TARBALL := libwps-0.4.$(WPS_VERSION_MICRO).tar.xz
export XSLTML_SHA256SUM := 75823776fb51a9c526af904f1503a7afaaab900fba83eda64f8a41073724c870
export XSLTML_TARBALL := a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
diff --git a/external/libwps/0001-drop-unneeded-include.patch.1 b/external/libwps/0001-drop-unneeded-include.patch.1
new file mode 100644
index 000000000000..4d7b5a494530
--- /dev/null
+++ b/external/libwps/0001-drop-unneeded-include.patch.1
@@ -0,0 +1,24 @@
+From cec7e4b57b0e10139d5a5dcede9027b0ea85e07d Mon Sep 17 00:00:00 2001
+From: David Tardon <dtardon at redhat.com>
+Date: Mon, 27 Nov 2017 19:32:53 +0100
+Subject: [PATCH] drop unneeded include
+
+---
+ src/lib/QuattroSpreadsheet.cpp | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/src/lib/QuattroSpreadsheet.cpp b/src/lib/QuattroSpreadsheet.cpp
+index 8d7e1c0..bc35bdf 100644
+--- a/src/lib/QuattroSpreadsheet.cpp
++++ b/src/lib/QuattroSpreadsheet.cpp
+@@ -21,7 +21,6 @@
+
+ #include <stdlib.h>
+ #include <string.h>
+-#include <strings.h>
+
+ #include <algorithm>
+ #include <cctype>
+--
+2.14.3
+
diff --git a/external/libwps/0001-try-to-fix-build-with-older-clang.patch.1 b/external/libwps/0001-try-to-fix-build-with-older-clang.patch.1
deleted file mode 100644
index c5aca0e7d380..000000000000
--- a/external/libwps/0001-try-to-fix-build-with-older-clang.patch.1
+++ /dev/null
@@ -1,27 +0,0 @@
-From 01d2ef67b9076fd82ecc6937bdbb306b489fd29e Mon Sep 17 00:00:00 2001
-From: David Tardon <dtardon at redhat.com>
-Date: Mon, 17 Jul 2017 14:34:12 +0200
-Subject: [PATCH] try to fix build with older clang
-
----
- src/lib/libwps_internal.h | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/lib/libwps_internal.h b/src/lib/libwps_internal.h
-index 8e91806..8a5fccc 100644
---- a/src/lib/libwps_internal.h
-+++ b/src/lib/libwps_internal.h
-@@ -85,8 +85,8 @@ struct WPS_shared_ptr_noop_deleter
-
- /** fall through attributes */
- #define WPS_FALLTHROUGH
--#if defined(__clang__)
--# if defined(__has_cpp_attribute) && __has_cpp_attribute(clang::fallthrough)
-+#if defined(__clang__) && defined(__has_cpp_attribute)
-+# if __has_cpp_attribute(clang::fallthrough)
- # undef WPS_FALLTHROUGH
- # define WPS_FALLTHROUGH [[clang::fallthrough]]
- # endif
---
-2.13.0
-
diff --git a/external/libwps/Library_wps.mk b/external/libwps/Library_wps.mk
index 4089c8b244bb..d1525ecdeb11 100644
--- a/external/libwps/Library_wps.mk
+++ b/external/libwps/Library_wps.mk
@@ -34,15 +34,22 @@ $(eval $(call gb_Library_set_generated_cxx_suffix,wps,cpp))
$(eval $(call gb_Library_add_generated_exception_objects,wps,\
UnpackedTarball/libwps/src/lib/DosWord \
UnpackedTarball/libwps/src/lib/Lotus \
+ UnpackedTarball/libwps/src/lib/LotusChart \
UnpackedTarball/libwps/src/lib/LotusGraph \
UnpackedTarball/libwps/src/lib/LotusSpreadsheet \
UnpackedTarball/libwps/src/lib/LotusStyleManager \
UnpackedTarball/libwps/src/lib/MSWrite \
UnpackedTarball/libwps/src/lib/Quattro \
+ UnpackedTarball/libwps/src/lib/QuattroDos \
+ UnpackedTarball/libwps/src/lib/QuattroDosChart \
+ UnpackedTarball/libwps/src/lib/QuattroDosSpreadsheet \
+ UnpackedTarball/libwps/src/lib/QuattroGraph \
UnpackedTarball/libwps/src/lib/QuattroSpreadsheet \
UnpackedTarball/libwps/src/lib/WKS4 \
+ UnpackedTarball/libwps/src/lib/WKS4Chart \
UnpackedTarball/libwps/src/lib/WKS4Format \
UnpackedTarball/libwps/src/lib/WKS4Spreadsheet \
+ UnpackedTarball/libwps/src/lib/WKSChart \
UnpackedTarball/libwps/src/lib/WKSContentListener \
UnpackedTarball/libwps/src/lib/WKSParser \
UnpackedTarball/libwps/src/lib/WKSSubDocument \
@@ -65,7 +72,9 @@ $(eval $(call gb_Library_add_generated_exception_objects,wps,\
UnpackedTarball/libwps/src/lib/WPSHeader \
UnpackedTarball/libwps/src/lib/WPSList \
UnpackedTarball/libwps/src/lib/WPSOLE1Parser \
+ UnpackedTarball/libwps/src/lib/WPSOLEObject \
UnpackedTarball/libwps/src/lib/WPSOLEParser \
+ UnpackedTarball/libwps/src/lib/WPSOLEStream \
UnpackedTarball/libwps/src/lib/WPSPageSpan \
UnpackedTarball/libwps/src/lib/WPSParagraph \
UnpackedTarball/libwps/src/lib/WPSParser \
diff --git a/external/libwps/UnpackedTarball_libwps.mk b/external/libwps/UnpackedTarball_libwps.mk
index 3aa0251a7bd5..58c3710d9e03 100644
--- a/external/libwps/UnpackedTarball_libwps.mk
+++ b/external/libwps/UnpackedTarball_libwps.mk
@@ -35,8 +35,8 @@ $(eval $(call gb_UnpackedTarball_add_patches,libwps, \
endif
endif
-$(eval $(call gb_UnpackedTarball_add_patches,libwps, \
- external/libwps/0001-try-to-fix-build-with-older-clang.patch.1 \
+$(eval $(call gb_UnpackedTarball_add_patches,libwps,\
+ external/libwps/0001-drop-unneeded-include.patch.1 \
))
# vim: set noet sw=4 ts=4:
diff --git a/external/libwps/libwps-bundled-soname.patch.0 b/external/libwps/libwps-bundled-soname.patch.0
index 734cdc670d18..013ba7a88b9e 100644
--- a/external/libwps/libwps-bundled-soname.patch.0
+++ b/external/libwps/libwps-bundled-soname.patch.0
@@ -7,5 +7,5 @@
-libwps_ at WPS_MAJOR_VERSION@_ at WPS_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined
+libwps_ at WPS_MAJOR_VERSION@_ at WPS_MINOR_VERSION@_la_LDFLAGS = $(version_info) -export-dynamic -no-undefined -release lo
libwps_ at WPS_MAJOR_VERSION@_ at WPS_MINOR_VERSION@_la_SOURCES = \
- libwps_internal.cpp \
- libwps_tools_win.h \
+ libwps_internal.cpp \
+ libwps_tools_win.h \
diff --git a/filter/source/config/fragments/types/calc_WPS_QPro_Document.xcu b/filter/source/config/fragments/types/calc_WPS_QPro_Document.xcu
index a335004bd8cc..2c8529db0936 100644
--- a/filter/source/config/fragments/types/calc_WPS_QPro_Document.xcu
+++ b/filter/source/config/fragments/types/calc_WPS_QPro_Document.xcu
@@ -18,7 +18,7 @@
<node oor:name="calc_WPS_QPro_Document" oor:op="replace" >
<prop oor:name="DetectService"><value>com.sun.star.comp.Calc.MSWorksCalcImportFilter</value></prop>
<prop oor:name="URLPattern"/>
- <prop oor:name="Extensions"><value>wq1 wq2</value></prop>
+ <prop oor:name="Extensions"><value>wb1 wb2 wq1 wq2</value></prop>
<prop oor:name="MediaType"></prop>
<prop oor:name="Preferred"><value>true</value></prop>
<prop oor:name="PreferredFilter"><value>WPS_QPro_Calc</value></prop>
diff --git a/solenv/flatpak-manifest.in b/solenv/flatpak-manifest.in
index 6e4bc2b2ce81..f316d143843f 100644
--- a/solenv/flatpak-manifest.in
+++ b/solenv/flatpak-manifest.in
@@ -280,10 +280,10 @@
"dest-filename": "external/tarballs/libwpg-0.3.2.tar.xz"
},
{
- "url": "https://dev-www.libreoffice.org/src/libwps-0.4.7.tar.xz",
- "sha256": "2f2cab630bceace24f9dbb7d187cd6cd1f4c9f8a7b682c5f7e49c1e2cb58b217",
+ "url": "https://dev-www.libreoffice.org/src/libwps-0.4.8.tar.xz",
+ "sha256": "e478e825ef33f6a434a19ff902c5469c9da7acc866ea0d8ab610a8b2aa94177e",
"type": "file",
- "dest-filename": "external/tarballs/libwps-0.4.7.tar.xz"
+ "dest-filename": "external/tarballs/libwps-0.4.8.tar.xz"
},
{
"url": "https://dev-www.libreoffice.org/src/libzmf-0.0.2.tar.xz",
diff --git a/writerperfect/qa/unit/WpftCalcFilterTest.cxx b/writerperfect/qa/unit/WpftCalcFilterTest.cxx
index 7a7dc531826c..0e5584e1ff85 100644
--- a/writerperfect/qa/unit/WpftCalcFilterTest.cxx
+++ b/writerperfect/qa/unit/WpftCalcFilterTest.cxx
@@ -39,6 +39,7 @@ void WpftCalcFilterTest::test()
{
{"Lotus123_3.123", REQUIRE_WPS_VERSION(0, 4, 5)},
{"Lotus123_98.123", REQUIRE_WPS_VERSION(0, 4, 6)},
+ {"QuattroPro.wb1", REQUIRE_WPS_VERSION(0, 4, 8)},
};
doTest("com.sun.star.comp.Calc.MWAWCalcImportFilter", "/writerperfect/qa/unit/data/calc/libmwaw/");
diff --git a/writerperfect/qa/unit/data/calc/libwps/pass/QuattroPro.wb1 b/writerperfect/qa/unit/data/calc/libwps/pass/QuattroPro.wb1
new file mode 100755
index 000000000000..95a6331c9c3d
Binary files /dev/null and b/writerperfect/qa/unit/data/calc/libwps/pass/QuattroPro.wb1 differ
commit 932c54811bcf224e45e75ee6460c06075e74f324
Author: David Tardon <dtardon at redhat.com>
Date: Sun Nov 26 16:04:25 2017 +0100
fix includes in aarch64 bridge
Change-Id: Ia27f15483c27bc43a3cd3a74432f15fa928ad6da
(cherry picked from commit 897c07bda2d116bcc2fa4a64c1eb75a52651c991)
Signed-off-by: David Tardon <dtardon at redhat.com>
diff --git a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
index fa6ffebfbc17..da22eb436b8f 100644
--- a/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_aarch64/abi.cxx
@@ -38,7 +38,7 @@
#include <uno/any2.h>
#include <uno/mapping.h>
-#include <abi.hxx>
+#include "abi.hxx"
#include <osl/mutex.hxx>
#include <unordered_map>
diff --git a/bridges/source/cpp_uno/gcc3_linux_aarch64/callvirtualfunction.cxx b/bridges/source/cpp_uno/gcc3_linux_aarch64/callvirtualfunction.cxx
index 09f7696cfb4a..2f7188ea4f99 100644
--- a/bridges/source/cpp_uno/gcc3_linux_aarch64/callvirtualfunction.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_aarch64/callvirtualfunction.cxx
@@ -24,7 +24,7 @@
#include <sal/types.h>
#include <sal/alloca.h>
-#include <callvirtualfunction.hxx>
+#include "callvirtualfunction.hxx"
void callVirtualFunction(
unsigned long function, unsigned long * gpr, unsigned long * fpr,
diff --git a/bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx b/bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx
index 3d8eea4503e9..d867a04dd299 100644
--- a/bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_aarch64/cpp2uno.cxx
@@ -40,7 +40,7 @@
#include <types.hxx>
#include <vtablefactory.hxx>
-#include <abi.hxx>
+#include "abi.hxx"
extern "C" void vtableSlotCall_();
diff --git a/bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx b/bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx
index 4e7d69b0a871..8faccbf3edaf 100644
--- a/bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx
+++ b/bridges/source/cpp_uno/gcc3_linux_aarch64/uno2cpp.cxx
@@ -42,8 +42,8 @@
#include <uno/any2.h>
#include <uno/data.h>
-#include <abi.hxx>
-#include <callvirtualfunction.hxx>
+#include "abi.hxx"
+#include "callvirtualfunction.hxx"
namespace {
commit 50fa8e10e44080f8b29b4e6ff9aab5e85a8942fe
Author: David Tardon <dtardon at redhat.com>
Date: Fri Nov 24 10:44:42 2017 +0100
move conditional stuff to RepositoryExternal.mk
Change-Id: I33e299277c53e8e2b8ab7e4cdf52d2487f90b51b
Reviewed-on: https://gerrit.libreoffice.org/45211
Tested-by: Jenkins <ci at libreoffice.org>
Reviewed-by: David Tardon <dtardon at redhat.com>
(cherry picked from commit 7c77ff5dd2d0573a56f8b59dc9113c23e0ea29c9)
Signed-off-by: David Tardon <dtardon at redhat.com>
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk
index bb3c9b6895e0..bdc5d65a2d81 100644
--- a/RepositoryExternal.mk
+++ b/RepositoryExternal.mk
@@ -3451,6 +3451,8 @@ endef
endif # ENABLE_BREAKPAD
+ifeq ($(ENABLE_GPGMEPP),TRUE)
+
ifneq ($(SYSTEM_GPGMEPP),)
gb_ExternalProject__use_gpgmepp:=
@@ -3567,6 +3569,18 @@ endif
endif
+else # !ENABLE_GPGMEPP
+
+gb_ExternalProject__use_gpgmepp :=
+gb_ExternalProject__use_libassuan :=
+gb_ExternalProject__use_libgpg-error :=
+
+gb_LinkTarget__use_gpgmepp :=
+gb_LinkTarget__use_libassuan :=
+gb_LinkTarget__use_libgpg-error :=
+
+endif # ENABLE_GPGMEPP
+
define gb_LinkTarget__use_dconf
$(call gb_LinkTarget_add_defs,$(1),$(DCONF_CFLAGS))
$(call gb_LinkTarget_add_libs,$(1),$(DCONF_LIBS))
diff --git a/xmlsecurity/Library_xsec_xmlsec.mk b/xmlsecurity/Library_xsec_xmlsec.mk
index ee2f9da7bb1b..1ef27dbc6602 100644
--- a/xmlsecurity/Library_xsec_xmlsec.mk
+++ b/xmlsecurity/Library_xsec_xmlsec.mk
@@ -55,14 +55,10 @@ endif
$(eval $(call gb_Library_use_externals,xsec_xmlsec,\
boost_headers \
+ gpgmepp \
libxml2 \
xmlsec \
))
-ifeq ($(ENABLE_GPGMEPP),TRUE)
-$(eval $(call gb_Library_use_externals,xsec_xmlsec,\
- gpgmepp \
-))
-endif
$(eval $(call gb_Library_add_exception_objects,xsec_xmlsec,\
xmlsecurity/source/xmlsec/biginteger \
More information about the Libreoffice-commits
mailing list