diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 05:55:35 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-04-15 05:55:35 +0000 |
| commit | 0e05dd0e4d67d88ca51780dafe4029744269e6fa (patch) | |
| tree | b49073fa569d8d4fbcc7002cf4df72fa840780c1 /debian/patches/do-not-abort-on-NON_APPLICATION_FONT_USE.diff | |
| parent | Adding upstream version 4:24.2.0. (diff) | |
| download | libreoffice-0e05dd0e4d67d88ca51780dafe4029744269e6fa.tar.xz libreoffice-0e05dd0e4d67d88ca51780dafe4029744269e6fa.zip | |
Adding debian version 4:24.2.0-1.debian/4%24.2.0-1
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'debian/patches/do-not-abort-on-NON_APPLICATION_FONT_USE.diff')
| -rw-r--r-- | debian/patches/do-not-abort-on-NON_APPLICATION_FONT_USE.diff | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/debian/patches/do-not-abort-on-NON_APPLICATION_FONT_USE.diff b/debian/patches/do-not-abort-on-NON_APPLICATION_FONT_USE.diff new file mode 100644 index 0000000000..bcacd737d8 --- /dev/null +++ b/debian/patches/do-not-abort-on-NON_APPLICATION_FONT_USE.diff @@ -0,0 +1,14 @@ +diff --git a/solenv/gbuild/CppunitTest.mk b/solenv/gbuild/CppunitTest.mk +index b16e3d0e5417..33bdde04b072 100644 +--- a/solenv/gbuild/CppunitTest.mk ++++ b/solenv/gbuild/CppunitTest.mk +@@ -132,9 +132,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)) \ |