[libreoffice] 63/152: Fix build failure in xmloff, -subsequentcheckbase: Depend on default-jdk

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to tag libreoffice_3.5.0_rc3-0ubuntu2
in repository libreoffice.

commit 6e5e314d7c8d4422d338552f8db962da34f1bb01
Author: Matthias Klose <doko at ubuntu.com>
Date:   Mon Apr 4 23:02:36 2016 +0200

    Fix build failure in xmloff, -subsequentcheckbase: Depend on default-jdk
---
 changelog                      | 12 ++++++++++++
 control.subsequentcheckbase.in |  2 +-
 patches/build-fixes.diff       | 13 +++++++++++++
 patches/series                 |  1 +
 4 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/changelog b/changelog
index 7990658..1ab0139 100644
--- a/changelog
+++ b/changelog
@@ -1,3 +1,15 @@
+libreoffice (1:5.1.1-0ubuntu3) xenial; urgency=medium
+
+  * Fix build failure in xmloff.
+
+ -- Matthias Klose <doko at ubuntu.com>  Thu, 31 Mar 2016 18:33:49 +0200
+
+libreoffice (1:5.1.1-0ubuntu2) xenial; urgency=medium
+
+  * libreoffice-subsequentcheckbase: Depend on default-jdk.
+
+ -- Matthias Klose <doko at ubuntu.com>  Thu, 31 Mar 2016 17:17:30 +0200
+
 libreoffice (1:5.1.1-0ubuntu1) xenial; urgency=medium
 
   * upstream released an rc3 = final
diff --git a/control.subsequentcheckbase.in b/control.subsequentcheckbase.in
index a559fda..9851792 100644
--- a/control.subsequentcheckbase.in
+++ b/control.subsequentcheckbase.in
@@ -2,7 +2,7 @@ Package: libreoffice-subsequentcheckbase
 Section: libs
 Priority: extra
 Architecture: all
-Depends: libreoffice, libreoffice-sdbc-hsqldb, openjdk-7-jdk, build-essential, %BUILD_DEPS_ARCH_ALL%, ${misc:Depends}
+Depends: libreoffice, libreoffice-sdbc-hsqldb, default-jdk, build-essential, %BUILD_DEPS_ARCH_ALL%, ${misc:Depends}
 Description: LibreOffice java test libraries
  LibreOffice subsequentchecks integration test suite
 
diff --git a/patches/build-fixes.diff b/patches/build-fixes.diff
new file mode 100644
index 0000000..d3e2296
--- /dev/null
+++ b/patches/build-fixes.diff
@@ -0,0 +1,13 @@
+Index: b/xmloff/source/draw/ximp3dscene.cxx
+===================================================================
+--- a/xmloff/source/draw/ximp3dscene.cxx
++++ b/xmloff/source/draw/ximp3dscene.cxx
+@@ -66,7 +66,7 @@ SdXML3DLightContext::SdXML3DLightContext
+             {
+                 ::basegfx::B3DVector aVal;
+                 SvXMLUnitConverter::convertB3DVector(aVal, sValue);
+-                if (!isnan(aVal.getX()) && !isnan(aVal.getY()) && !isnan(aVal.getZ()))
++                if (!std::isnan(aVal.getX()) && !std::isnan(aVal.getY()) && !std::isnan(aVal.getZ()))
+                 {
+                     maDirection = aVal;
+                 }
diff --git a/patches/series b/patches/series
index 9428ccb..0f91ecc 100644
--- a/patches/series
+++ b/patches/series
@@ -31,3 +31,4 @@ lp-753627-readd-updated-Ubuntu-brand-palette-colors.diff
 integraltrans.diff
 unity-default-breeze.diff
 tdf-92067.diff
+build-fixes.diff

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git