[Git][libreoffice-team/libreoffice/libreoffice][master] 2 commits: update patches/glm-0.9.9.diff

[Rene Engelhard]

Rene Engelhard pushed to branch master at Debian LibreOffice Maintainers / libreoffice / libreoffice


Commits:
3847f83b by Rene Engelhard at 2018-01-28T20:09:19+00:00
update patches/glm-0.9.9.diff

- - - - -
4f5c8843 by Rene Engelhard at 2018-01-28T20:09:19+00:00
readd lost ifeq

- - - - -


2 changed files:

- patches/glm-0.9.9.diff
- rules


Changes:

=====================================
patches/glm-0.9.9.diff
=====================================
--- a/patches/glm-0.9.9.diff
+++ b/patches/glm-0.9.9.diff
@@ -60,3 +60,32 @@ index c1f3cc5..0b684c6 100644
 -- 
 cgit v1.1
 
+From 7c13aa5b37dcf1ca586de78c2dea91733822bd22 Mon Sep 17 00:00:00 2001
+From: Rene Engelhard <rene at debian.org>
+Date: Sun, 28 Jan 2018 21:01:56 +0100
+Subject: chart2/Library_chartopengl.mk also needs -DGLM_ENABLE_EXPERIMENTAL
+
+Change-Id: I49852a541545cef587318a8bec38bfa7b9ba8fb0
+---
+ chart2/Library_chartopengl.mk | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/chart2/Library_chartopengl.mk b/chart2/Library_chartopengl.mk
+index f999f94..4c7b26a 100644
+--- a/chart2/Library_chartopengl.mk
++++ b/chart2/Library_chartopengl.mk
+@@ -54,5 +54,11 @@ $(eval $(call gb_Library_add_exception_objects,chartopengl,\
+     chart2/source/view/main/DummyXShape \
+     chart2/source/view/main/OpenGLRender \
+ ))
++
++ifeq ($(SYSTEM_GLM),TRUE)
++$(eval $(call gb_Library_add_defs,chartcore,\
++        -DGLM_ENABLE_EXPERIMENTAL \
++))
++endif
+  
+ # vim: set noet sw=4 ts=4:
+-- 
+cgit v1.1
+


=====================================
rules
=====================================
--- a/rules
+++ b/rules
@@ -1538,7 +1538,11 @@ else
 	BUILD_DEPS += , libegl1-mesa-dev
 endif
 ifneq (,$(filter glm, $(SYSTEM_STUFF)))
+  ifeq "$(shell dpkg --compare-versions $(SYSTEM_GCC_VERSION) ge 7.3 && echo true)" "true"
+	BUILD_DEPS += , libglm-dev (>= 0.9.9~a2)
+  else
 	BUILD_DEPS += , libglm-dev (>= 0.9.6.3)
+  endif
 endif
 
 ifneq (,$(filter gpgmepp, $(SYSTEM_STUFF)))



View it on GitLab: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice/compare/25c4af24b858087b3bd375ce8fad847b1affd484...4f5c8843a8ae768311eca5a075d14826b9824365

---
View it on GitLab: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice/compare/25c4af24b858087b3bd375ce8fad847b1affd484...4f5c8843a8ae768311eca5a075d14826b9824365
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.alioth.debian.org/pipermail/pkg-openoffice-commits/attachments/20180128/9e686768/attachment-0001.html>