gnu/packages/patches/libreoffice-glm.patch

   1 Fix build with GLM 0.9.9.
   2
   3 This patch is an amalgamation of these upstream commits:
   4
   5 https://github.com/LibreOffice/core/commit/953c4add8fd76d88f49a81ae4c21a1fdcc007e57
   6 https://github.com/LibreOffice/core/commit/5f1bf6598b5725ad1e50ae9f7ec7524cc8a834fa
   7
   8 diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk
   9 index 28bc87b89057..69d4c0552636 100644
  10 --- a/chart2/Library_chartcore.mk
  11 +++ b/chart2/Library_chartcore.mk
  12 @@ -23,6 +23,12 @@ $(eval $(call gb_Library_add_defs,chartcore,\
  13      -DOOO_DLLIMPLEMENTATION_CHARTVIEW \
  14  ))
  15
  16 +ifeq ($(SYSTEM_GLM),TRUE)
  17 +$(eval $(call gb_Library_add_defs,chartcore,\
  18 +        -DGLM_ENABLE_EXPERIMENTAL \
  19 +))
  20 +endif
  21 +
  22  $(eval $(call gb_Library_set_precompiled_header,chartcore,$(SRCDIR)/chart2/inc/pch/precompiled_chartcore))
  23
  24  $(eval $(call gb_Library_use_externals,chartcore,\
  25 diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
  26 index c1f3cc5324e7..0b684c6185a9 100644
  27 --- a/vcl/Library_vcl.mk
  28 +++ b/vcl/Library_vcl.mk
  29 @@ -49,6 +49,12 @@ $(eval $(call gb_Library_add_defs,vcl,\
  30         -DENABLE_MERGELIBS=$(if $(MERGELIBS),1,0) \
  31  ))
  32
  33 +ifeq ($(SYSTEM_GLM),TRUE)
  34 +$(eval $(call gb_Library_add_defs,vcl,\
  35 +        -DGLM_ENABLE_EXPERIMENTAL \
  36 +))
  37 +endif
  38 +
  39  $(eval $(call gb_Library_use_sdk_api,vcl))
  40
  41  $(eval $(call gb_Library_use_custom_headers,vcl,\
  42 diff --git a/vcl/Executable_icontest.mk b/vcl/Executable_icontest.mk
  43 index ce163303f8a4..8c917b71cd0e 100644
  44 --- a/vcl/Executable_icontest.mk
  45 +++ b/vcl/Executable_icontest.mk
  46 @@ -19,6 +19,12 @@ $(eval $(call gb_Executable_use_externals,icontest,\
  47  ))
  48  endif
  49
  50 +ifeq ($(SYSTEM_GLM),TRUE)
  51 +$(eval $(call gb_Executable_add_defs,icontest,\
  52 +    -DGLM_ENABLE_EXPERIMENTAL \
  53 +))
  54 +endif
  55 +
  56  $(eval $(call gb_Executable_use_api,icontest,\
  57      offapi \
  58      udkapi \