configure.ac | 2 ++
external/neon/Library_neon.mk | 6 ++++++
2 files changed, 8 insertions(+)
New commits:
commit bfd905f9ccd8ffe630ad03040fb22ec44f57148f
Author: Jan-Marek Glogowski <jan-marek.glogow...@extern.cib.de>
AuthorDate: Fri Feb 7 10:05:27 2020 +0000
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Wed Jan 26 17:40:29 2022 +0100
neon: enable NE_DEBUG support for gb_ENABLE_DBGUTIL
This builds NEON with its debugging / logging facility, if
gb_ENABLE_DBGUTIL is set. This still has to be enabled in code by
calling something like ne_debug_init(stderr, NE_DBG_XML) to enable
and ne_debug_init(NULL, 0) to disable it again.
Change-Id: I85ea1cb2bd9586072d5a12a1cb809dd8c76b37d9
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88171
Tested-by: Jenkins
Reviewed-by: Jan-Marek Glogowski <glo...@fbihome.de>
(cherry picked from commit 5c89198f69f4487b1c872269ec6f2931490b3d02)
diff --git a/external/neon/Library_neon.mk b/external/neon/Library_neon.mk
index 2698fe8aeff0..43ee401d93fd 100644
--- a/external/neon/Library_neon.mk
+++ b/external/neon/Library_neon.mk
@@ -97,4 +97,10 @@ $(eval $(call gb_Library_add_libs,neon,\
))
endif
+ifneq (,$(gb_ENABLE_DBGUTIL))
+$(eval $(call gb_Library_add_cflags,neon,\
+ -DNE_DEBUGGING \
+))
+endif
+
# vim: set noet sw=4 ts=4:
commit 3f335f68f33dd57d4588aca85a5ee67c85e8e06a
Author: Stephan Bergmann <sberg...@redhat.com>
AuthorDate: Mon May 31 13:30:37 2021 +0200
Commit: Michael Stahl <michael.st...@allotropia.de>
CommitDate: Wed Jan 26 17:40:29 2022 +0100
Adapt to hamcrest-2.2-3.fc35.noarch.rpm
Change-Id: Ibddfc30a5f0828ab77235ec1155f1c2e1eef24ee
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/116506
Tested-by: Jenkins
Reviewed-by: Stephan Bergmann <sberg...@redhat.com>
(cherry picked from commit e6c25186c8584f68b5f8074004556bd855200fff)
diff --git a/configure.ac b/configure.ac
index 627e5ddba650..c50eabb784c0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -11815,6 +11815,8 @@ if test "$ENABLE_JAVA" != "" -a "$with_junit" != "no";
then
HAMCREST_JAR=/usr/share/lib/java/hamcrest.jar
elif test -e /usr/share/java/hamcrest/core.jar; then
HAMCREST_JAR=/usr/share/java/hamcrest/core.jar
+ elif test -e /usr/share/java/hamcrest/hamcrest.jar; then
+ HAMCREST_JAR=/usr/share/java/hamcrest/hamcrest.jar
else
HAMCREST_JAR=/usr/share/java/hamcrest.jar
fi
