[Git][libreoffice-team/libreoffice/libreoffice][master] 2 commits: Revert "temporarily use internal glm; configure check fails since the gcc 7.3…

[Rene Engelhard]

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


Commits:
947d6513 by Rene Engelhard at 2018-01-28T20:55:44+01:00
Revert "temporarily use internal glm; configure check fails since the gcc 7.3 upload" and bump libglm-dev build-depdendency to libglm-dev (>= 0.9.9~a2) when using gcc >= 7.3

This reverts commit 40c2c4d16219ca978d648c339021cb2be188be55.

- - - - -
25c4af24 by Rene Engelhard at 2018-01-28T20:55:44+01:00
fix build with glm 0.9.9

- - - - -


6 changed files:

- changelog
- control
- + patches/glm-0.9.9.diff
- patches/series
- rules
- source/include-binaries


Changes:

=====================================
changelog
=====================================
--- a/changelog
+++ b/changelog
@@ -1,9 +1,15 @@
 libreoffice (1:6.0.0~rc3-3) UNRELEASED; urgency=medium
 
+  * debian/patches/glm-0.9.9.diff: fix build with glm 0.9.9
+
   * merge from Ubuntu:
     - debian/patches/apparmor-fixes.diff: allow JVM execution
 
- -- Rene Engelhard <rene at debian.org>  Sun, 28 Jan 2018 11:33:38 +0000
+  * debian/rules:
+    - re-enable system-glm; bump libglm-dev build-depdendency to
+      libglm-dev (>= 0.9.9~a2) when using gcc >= 7.3
+
+ -- Rene Engelhard <rene at debian.org>  Sun, 28 Jan 2018 18:05:40 +0000
 
 libreoffice (1:6.0.0~rc3-2) experimental; urgency=medium
 
@@ -20,8 +26,6 @@ libreoffice (1:6.0.0~rc3-1) experimental; urgency=medium
     fixes. Also include X abstractions and allow .mozilla/firefox/** reading
   * debian/patches/apparmor-updates.diff: more gpg stuff: gpg(sm), .gnupg/*
   (both together closes: #887593)
-  * debian/rules, debian/source/include-binaries: temporarily use internal glm;
-    configure check fails since the gcc 7.3 upload
 
  -- Rene Engelhard <rene at debian.org>  Sat, 27 Jan 2018 11:36:59 +0100
 


=====================================
control
=====================================
--- a/control
+++ b/control
@@ -85,6 +85,7 @@ Build-Depends: ant (>= 1.7.0) [!hppa !ia64 !mips64 !s390 !sparc],
                libgirepository1.0-dev (>= 1.32),
                libgl1-mesa-dev,
                libglib2.0-dev (>= 2.38.0),
+               libglm-dev (>= 0.9.9~a2),
                libgpg-error-dev,
                libgpgme-dev,
                libgpgmepp-dev,


=====================================
patches/glm-0.9.9.diff
=====================================
--- /dev/null
+++ b/patches/glm-0.9.9.diff
@@ -0,0 +1,62 @@
+From 953c4add8fd76d88f49a81ae4c21a1fdcc007e57 Mon Sep 17 00:00:00 2001
+From: Rene Engelhard <rene at debian.org>
+Date: Sun, 28 Jan 2018 19:48:25 +0100
+Subject: fix build with glm 0.9.9
+
+In file included from /usr/include/glm/gtx/norm.hpp:18:0,
+                 from /data/rene/git/LibreOffice/master/vcl/inc/opengl/VertexUti
+ls.hxx:16,
+                 from /data/rene/git/LibreOffice/master/vcl/inc/opengl/LineRende
+rUtils.hxx:14,
+                 from /data/rene/git/LibreOffice/master/vcl/opengl/LineRenderUti
+ls.cxx:11:
+/usr/include/glm/gtx/quaternion.hpp:23:3: error: #error "GLM: GLM_GTX_quaternion
+ is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+ # error "GLM: GLM_GTX_quaternion is an experimental extension and may change in the future. Use #define GLM_ENABLE_EXPERIMENTAL before including it, if you really want to use it."
+   ^~~~~
+
+so just define it.
+
+Change-Id: I981bfb5fd944f32a3774b3f9b183989773bf235f
+---
+ chart2/Library_chartcore.mk | 6 ++++++
+ vcl/Library_vcl.mk          | 6 ++++++
+ 2 files changed, 12 insertions(+)
+
+diff --git a/chart2/Library_chartcore.mk b/chart2/Library_chartcore.mk
+index 28bc87b..69d4c05 100644
+--- a/chart2/Library_chartcore.mk
++++ b/chart2/Library_chartcore.mk
+@@ -23,6 +23,12 @@ $(eval $(call gb_Library_add_defs,chartcore,\
+     -DOOO_DLLIMPLEMENTATION_CHARTVIEW \
+ ))
+ 
++ifeq ($(SYSTEM_GLM),TRUE)
++$(eval $(call gb_Library_add_defs,chartcore,\
++        -DGLM_ENABLE_EXPERIMENTAL \
++))
++endif
++
+ $(eval $(call gb_Library_set_precompiled_header,chartcore,$(SRCDIR)/chart2/inc/pch/precompiled_chartcore))
+ 
+ $(eval $(call gb_Library_use_externals,chartcore,\
+diff --git a/vcl/Library_vcl.mk b/vcl/Library_vcl.mk
+index c1f3cc5..0b684c6 100644
+--- a/vcl/Library_vcl.mk
++++ b/vcl/Library_vcl.mk
+@@ -49,6 +49,12 @@ $(eval $(call gb_Library_add_defs,vcl,\
+ 	-DENABLE_MERGELIBS=$(if $(MERGELIBS),1,0) \
+ ))
+ 
++ifeq ($(SYSTEM_GLM),TRUE)
++$(eval $(call gb_Library_add_defs,vcl,\
++        -DGLM_ENABLE_EXPERIMENTAL \
++))
++endif
++
+ $(eval $(call gb_Library_use_sdk_api,vcl))
+ 
+ $(eval $(call gb_Library_use_custom_headers,vcl,\
+-- 
+cgit v1.1
+


=====================================
patches/series
=====================================
--- a/patches/series
+++ b/patches/series
@@ -40,3 +40,4 @@ apparmor-fixes.diff
 apparmor-updates.diff
 apparmor-complain.diff
 temporary-buildfix.diff
+glm-0.9.9.diff


=====================================
rules
=====================================
--- a/rules
+++ b/rules
@@ -522,7 +522,7 @@ ENABLE_EOT=y
 ifeq "$(ENABLE_EOT)" "y"
 SYSTEM_STUFF += libeot
 endif
-#SYSTEM_STUFF += glm
+SYSTEM_STUFF += glm
 BUILD_PPC64EL=y
 BUILD_ARM64=y
 SYSTEM_STUFF += gpgmepp


=====================================
source/include-binaries
=====================================
--- a/source/include-binaries
+++ b/source/include-binaries
@@ -5,4 +5,3 @@ tarballs/798b2ffdc8bcfe7bca2cf92b62caf685-rhino1_5R5.zip
 tarballs/35c94d2df8893241173de1d16b6034c0-swingExSrc.zip
 tarballs/a7983f859eafb2677d7ff386a023bc40-xsltml_2.1.2.zip
 tarballs/pdfium-3235.tar.bz2
-tarballs/bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip



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

---
View it on GitLab: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice/compare/4531c46bb6673b19b7087dbbbadf0fc239909d85...25c4af24b858087b3bd375ce8fad847b1affd484
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/7afe0e6e/attachment-0001.html>