[Git][libreoffice-team/libreoffice/libreoffice][debian-experimental-5.4] 4 commits: bump libglm-dev build-depdendency to libglm-dev (>= 0.9.9~a2) when using gcc >= 7.3

Rene Engelhard rene at debian.org
Sun Jan 28 21:18:14 UTC 2018 

Rene Engelhard pushed to branch debian-experimental-5.4 at Debian LibreOffice Maintainers / libreoffice / libreoffice


Commits:
1a2a0646 by Rene Engelhard at 2018-01-28T19:10:53+01:00
bump libglm-dev build-depdendency to libglm-dev (>= 0.9.9~a2) when using gcc >= 7.3

- - - - -
17235726 by Rene Engelhard at 2018-01-28T20:23:31+01:00
fix build with glm 0.9.9

- - - - -
d4f5e993 by Rene Engelhard at 2018-01-28T20:24:26+01:00
merge changelogs, there won't be a 5.4.4-2 I guess...

- - - - -
eae70da9 by Rene Engelhard at 2018-01-28T21:23:45+01:00
actually add glm-0.9.9.diff

- - - - -


5 changed files:

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


Changes:

=====================================
changelog
=====================================
--- a/changelog
+++ b/changelog
@@ -1,24 +1,23 @@
-libreoffice (1:5.4.5~rc1~git20171228-1) UNRELEASED; urgency=medium
+libreoffice (1:5.4.5~rc1~git20171228-1) unstable; urgency=medium
 
   * New upstream snapshot
     - fixes Glue points in Draw (closes: #883989)
 
+  * debian/patches/poppler-0.62.diff: backport from master to fix build with
+    poppler 0.62
+  * debian/patches/glm-0.9.9.diff: fix build with glm 0.9.9
+
   * debian/rules:
     - rename 30_opensymbol.conf to 30-opensymbol.conf for consistency
+    - bump libglm-dev build-depdendency to libglm-dev (>= 0.9.9~a2) when
+      using gcc >= 7.3
   * debian/control.in:
     - recommend both fonts-liberation (LO ships 2 + Narrow from 1)
   * debian/rules, debian/control.in: recommend and build-depend against
     fonts-liberation2 instead of fonts-liberation since that is actually
     what LO upstream ships (see above)
 
- -- Rene Engelhard <rene at debian.org>  Tue, 12 Dec 2017 19:10:51 +0100
-
-libreoffice (1:5.4.4-2) UNRELEASED; urgency=medium
-
-  * debian/patches/poppler-0.62.diff: backport from master to fix build with
-    poppler 0.62
-
- -- Rene Engelhard <rene at debian.org>  Mon, 08 Jan 2018 22:44:59 +0100
+ -- Rene Engelhard <rene at debian.org>  Sun, 28 Jan 2018 20:23:59 +0100
 
 libreoffice (1:5.4.4-1) unstable; urgency=medium
 


=====================================
control
=====================================
--- a/control
+++ b/control
@@ -83,7 +83,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.6.3),
+               libglm-dev (>= 0.9.9~a2),
                libgltf-dev (>= 0.1.0),
                libgpg-error-dev,
                libgpgme-dev,


=====================================
patches/glm-0.9.9.diff
=====================================
--- /dev/null
+++ b/patches/glm-0.9.9.diff
@@ -0,0 +1,91 @@
+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
+
+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,chartopengl,\
++        -DGLM_ENABLE_EXPERIMENTAL \
++))
++endif
+  
+ # vim: set noet sw=4 ts=4:
+-- 
+cgit v1.1
+


=====================================
patches/series
=====================================
--- a/patches/series
+++ b/patches/series
@@ -40,3 +40,4 @@ icu-60.diff
 apparmor-complain.diff
 apparmor-usrmerge.diff
 poppler-0.62.diff
+glm-0.9.9.diff


=====================================
rules
=====================================
--- a/rules
+++ b/rules
@@ -1549,7 +1549,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/fadb0acfe5b238978ff8a9e6c1d8c24b9b03246d...eae70da97e120fea57aa176a85781dd0dd0c1d0a

---
View it on GitLab: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice/compare/fadb0acfe5b238978ff8a9e6c1d8c24b9b03246d...eae70da97e120fea57aa176a85781dd0dd0c1d0a
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/8a51236f/attachment-0001.html>

More information about the Pkg-openoffice-commits mailing list