From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 333051388C0 for ; Thu, 25 Feb 2016 16:51:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2A38421C005; Thu, 25 Feb 2016 16:50:59 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id B3EFD21C005 for ; Thu, 25 Feb 2016 16:50:58 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6EEBE340ADB for ; Thu, 25 Feb 2016 16:50:57 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6BB9CC6F for ; Thu, 25 Feb 2016 16:50:53 +0000 (UTC) From: "Andreas Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Hüttel" Message-ID: <1456418871.42d09a765cb8ba8a11fe00b6d0084c71e30ec25f.dilfridge@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-office/libreoffice/, app-office/libreoffice/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-office/libreoffice/files/libreoffice-5.1.0.3-isnan.patch app-office/libreoffice/libreoffice-5.1.0.3.ebuild app-office/libreoffice/libreoffice-5.1.9999.ebuild X-VCS-Directories: app-office/libreoffice/ app-office/libreoffice/files/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas Hüttel X-VCS-Revision: 42d09a765cb8ba8a11fe00b6d0084c71e30ec25f X-VCS-Branch: master Date: Thu, 25 Feb 2016 16:50:53 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 4b9c99a1-4ec1-497a-87e4-e50a014e5b7a X-Archives-Hash: 0017dabb22925a28f3e7c807dfc9fb57 commit: 42d09a765cb8ba8a11fe00b6d0084c71e30ec25f Author: Andreas K. Hüttel gentoo org> AuthorDate: Thu Feb 25 16:47:17 2016 +0000 Commit: Andreas Hüttel gentoo org> CommitDate: Thu Feb 25 16:47:51 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42d09a76 app-office/libreoffice: Fix build with Gentoo glibc-2.23, bug 575108 Package-Manager: portage-2.2.27 .../files/libreoffice-5.1.0.3-isnan.patch | 23 ++++++++++++++++++++++ app-office/libreoffice/libreoffice-5.1.0.3.ebuild | 3 +++ app-office/libreoffice/libreoffice-5.1.9999.ebuild | 3 +++ 3 files changed, 29 insertions(+) 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 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 +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 18d7177..fe6e54d 100644 --- 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 18d7177..fe6e54d 100644 --- 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" )