app-office/libreoffice: Fix build with Gentoo glibc-2.23, bug 575108

Package-Manager: portage-2.2.27

diff --git a/app-office/libreoffice/files/libreoffice-5.1.0.3-isnan.patch b/app-office/libreoffice/files/libreoffice-5.1.0.3-isnan.patch
new file mode 100644 (file)
index 0000000..6a15da5
--- /dev/null
+++ b/app-office/libreoffice/files/libreoffice-5.1.0.3-isnan.patch
@@ -0,0 +1,23 @@
+From: Tomáš Chvátal <tchvatal@suse.com>
+Date: Thu, 25 Feb 2016 16:16:19 +0000 (+0100)
+Subject: Add std prefix to isnan check to fix build with glibc > 2.23
+X-Git-Url: https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff_plain;h=d7c64d6e430e9640c77c846006a13bbc78704c28
+
+Add std prefix to isnan check to fix build with glibc > 2.23
+
+Change-Id: I6321cd905152231bb013e25f7b268f85453fe917
+---
+
+diff --git a/xmloff/source/draw/ximp3dscene.cxx b/xmloff/source/draw/ximp3dscene.cxx
+index 5cf205f..525e2fb 100644
+--- 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/app-office/libreoffice/libreoffice-5.1.0.3.ebuild b/app-office/libreoffice/libreoffice-5.1.0.3.ebuild
index 18d7177985f94e252f17d53766aa52f44ed399d0..fe6e54d1362ae9e0a7a768a02a3737836a721457 100644 (file)
--- a/app-office/libreoffice/libreoffice-5.1.0.3.ebuild
+++ b/app-office/libreoffice/libreoffice-5.1.0.3.ebuild
@@ -257,6 +257,9 @@ REQUIRED_USE="
 "
 
 PATCHES=(
+       # submitted upstream
+       "${FILESDIR}/${PN}-5.1.0.3-isnan.patch"
+
        # not upstreamable stuff
        "${FILESDIR}/${PN}-4.4-system-pyuno.patch"
 )

diff --git a/app-office/libreoffice/libreoffice-5.1.9999.ebuild b/app-office/libreoffice/libreoffice-5.1.9999.ebuild
index 18d7177985f94e252f17d53766aa52f44ed399d0..fe6e54d1362ae9e0a7a768a02a3737836a721457 100644 (file)
--- a/app-office/libreoffice/libreoffice-5.1.9999.ebuild
+++ b/app-office/libreoffice/libreoffice-5.1.9999.ebuild
@@ -257,6 +257,9 @@ REQUIRED_USE="
 "
 
 PATCHES=(
+       # submitted upstream
+       "${FILESDIR}/${PN}-5.1.0.3-isnan.patch"
+
        # not upstreamable stuff
        "${FILESDIR}/${PN}-4.4-system-pyuno.patch"
 )