do-not-abort-on-NON_APPLICATION_FONT_USE
authorDebian LibreOffice Maintainers <debian-openoffice@lists.debian.org>
Mon, 10 Feb 2025 16:55:43 +0000 (17:55 +0100)
committerRene Engelhard <rene@debian.org>
Mon, 10 Feb 2025 16:55:43 +0000 (17:55 +0100)
Gbp-Pq: Name do-not-abort-on-NON_APPLICATION_FONT_USE.diff

solenv/gbuild/CppunitTest.mk

index 17c1070dcb127d3c79e64dc7782f8b1c085a6c7d..ea5334e222d9319851ba608eae4e2df28bd74eaf 100644 (file)
@@ -143,9 +143,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)) \