From: Debian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Date: Thu, 30 Nov 2023 18:47:03 +0000 (+0100)
Subject: do-not-abort-on-NON_APPLICATION_FONT_USE
X-Git-Tag: archive/raspbian/4%7.6.4_rc1-1+rpi1^2~5
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=af89c504d80786244f9ba3fea41cccb36a235a35;p=libreoffice.git

do-not-abort-on-NON_APPLICATION_FONT_USE


Gbp-Pq: Name do-not-abort-on-NON_APPLICATION_FONT_USE.diff
---

diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk
index a15c074cede..5fb97c6f5d7 100644
--- a/solenv/gbuild/CppunitTest.mk
+++ b/solenv/gbuild/CppunitTest.mk
@@ -142,9 +142,6 @@ else
 		$(if $(gb_CppunitTest__vcl_no_svp), \
 			$(filter-out SAL_USE_VCLPLUGIN=svp,$(gb_TEST_ENV_VARS)),$(gb_TEST_ENV_VARS)) \
 		$(EXTRA_ENV_VARS) \
-		$(if $(filter allow,$(NON_APPLICATION_FONT_USE)),, \
-			$(if $(filter abort,$(NON_APPLICATION_FONT_USE)),SAL_NON_APPLICATION_FONT_USE=abort, \
-			$(if $(filter deny,$(NON_APPLICATION_FONT_USE)),SAL_NON_APPLICATION_FONT_USE=deny))) \
 		$(if $(filter gdb,$(gb_CppunitTest_GDBTRACE)),,$(gb_CppunitTest_CPPTESTPRECOMMAND)) \
 		$(if $(G_SLICE),G_SLICE=$(G_SLICE)) \
 		$(if $(GLIBCXX_FORCE_NEW),GLIBCXX_FORCE_NEW=$(GLIBCXX_FORCE_NEW)) \