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

[Rene Engelhard]

Rene Engelhard pushed to branch debian-experimental-6.0 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

- - - - -
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

- - - - -
0bb5e5a0 by Rene Engelhard at 2018-01-28T20:21:48+00:00
fix cut'n'waste error

- - - - -
cd989dd8 by Rene Engelhard at 2018-01-29T07:24:11+01:00
Merge remote-tracking branch 'origin/master' into debian-experimental-6.0

- - - - -
bd4a8fe7 by Rene Engelhard at 2018-01-29T07:25:02+01:00
glm-0.9.9.diff is upstream

- - - - -


4 changed files:

- changelog
- control
- rules
- source/include-binaries


Changes:

=====================================
changelog
=====================================
--- a/changelog
+++ b/changelog
@@ -1,4 +1,4 @@
-libreoffice (1:6.0.1~rc1~git20180128-1) UNRELEASED; urgency=medium
+libreoffice (1:6.0.1~rc1~git20180129-1) UNRELEASED; urgency=medium
 
   * New upstream snapshot
 
@@ -6,10 +6,16 @@ libreoffice (1:6.0.1~rc1~git20180128-1) UNRELEASED; urgency=medium
 
 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
 
@@ -26,8 +32,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,


=====================================
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
@@ -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)))


=====================================
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/4b279a7032e564a2f23cf540eee99760619ae235...bd4a8fe75f4184266f418f37ee4d66106332aad2

---
View it on GitLab: https://salsa.debian.org/libreoffice-team/libreoffice/libreoffice/compare/4b279a7032e564a2f23cf540eee99760619ae235...bd4a8fe75f4184266f418f37ee4d66106332aad2
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/20180129/f9ded4a7/attachment-0001.html>