| 1 |
commit: 42d09a765cb8ba8a11fe00b6d0084c71e30ec25f |
| 2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Feb 25 16:47:17 2016 +0000 |
| 4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Feb 25 16:47:51 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42d09a76 |
| 7 |
|
| 8 |
app-office/libreoffice: Fix build with Gentoo glibc-2.23, bug 575108 |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.27 |
| 11 |
|
| 12 |
.../files/libreoffice-5.1.0.3-isnan.patch | 23 ++++++++++++++++++++++ |
| 13 |
app-office/libreoffice/libreoffice-5.1.0.3.ebuild | 3 +++ |
| 14 |
app-office/libreoffice/libreoffice-5.1.9999.ebuild | 3 +++ |
| 15 |
3 files changed, 29 insertions(+) |
| 16 |
|
| 17 |
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 |
| 18 |
new file mode 100644 |
| 19 |
index 0000000..6a15da5 |
| 20 |
--- /dev/null |
| 21 |
+++ b/app-office/libreoffice/files/libreoffice-5.1.0.3-isnan.patch |
| 22 |
@@ -0,0 +1,23 @@ |
| 23 |
+From: Tomáš Chvátal <tchvatal@××××.com> |
| 24 |
+Date: Thu, 25 Feb 2016 16:16:19 +0000 (+0100) |
| 25 |
+Subject: Add std prefix to isnan check to fix build with glibc > 2.23 |
| 26 |
+X-Git-Url: https://gerrit.libreoffice.org/gitweb?p=core.git;a=commitdiff_plain;h=d7c64d6e430e9640c77c846006a13bbc78704c28 |
| 27 |
+ |
| 28 |
+Add std prefix to isnan check to fix build with glibc > 2.23 |
| 29 |
+ |
| 30 |
+Change-Id: I6321cd905152231bb013e25f7b268f85453fe917 |
| 31 |
+--- |
| 32 |
+ |
| 33 |
+diff --git a/xmloff/source/draw/ximp3dscene.cxx b/xmloff/source/draw/ximp3dscene.cxx |
| 34 |
+index 5cf205f..525e2fb 100644 |
| 35 |
+--- a/xmloff/source/draw/ximp3dscene.cxx |
| 36 |
++++ b/xmloff/source/draw/ximp3dscene.cxx |
| 37 |
+@@ -66,7 +66,7 @@ SdXML3DLightContext::SdXML3DLightContext( |
| 38 |
+ { |
| 39 |
+ ::basegfx::B3DVector aVal; |
| 40 |
+ SvXMLUnitConverter::convertB3DVector(aVal, sValue); |
| 41 |
+- if (!isnan(aVal.getX()) && !isnan(aVal.getY()) && !isnan(aVal.getZ())) |
| 42 |
++ if (!std::isnan(aVal.getX()) && !std::isnan(aVal.getY()) && !std::isnan(aVal.getZ())) |
| 43 |
+ { |
| 44 |
+ maDirection = aVal; |
| 45 |
+ } |
| 46 |
|
| 47 |
diff --git a/app-office/libreoffice/libreoffice-5.1.0.3.ebuild b/app-office/libreoffice/libreoffice-5.1.0.3.ebuild |
| 48 |
index 18d7177..fe6e54d 100644 |
| 49 |
--- a/app-office/libreoffice/libreoffice-5.1.0.3.ebuild |
| 50 |
+++ b/app-office/libreoffice/libreoffice-5.1.0.3.ebuild |
| 51 |
@@ -257,6 +257,9 @@ REQUIRED_USE=" |
| 52 |
" |
| 53 |
|
| 54 |
PATCHES=( |
| 55 |
+ # submitted upstream |
| 56 |
+ "${FILESDIR}/${PN}-5.1.0.3-isnan.patch" |
| 57 |
+ |
| 58 |
# not upstreamable stuff |
| 59 |
"${FILESDIR}/${PN}-4.4-system-pyuno.patch" |
| 60 |
) |
| 61 |
|
| 62 |
diff --git a/app-office/libreoffice/libreoffice-5.1.9999.ebuild b/app-office/libreoffice/libreoffice-5.1.9999.ebuild |
| 63 |
index 18d7177..fe6e54d 100644 |
| 64 |
--- a/app-office/libreoffice/libreoffice-5.1.9999.ebuild |
| 65 |
+++ b/app-office/libreoffice/libreoffice-5.1.9999.ebuild |
| 66 |
@@ -257,6 +257,9 @@ REQUIRED_USE=" |
| 67 |
" |
| 68 |
|
| 69 |
PATCHES=( |
| 70 |
+ # submitted upstream |
| 71 |
+ "${FILESDIR}/${PN}-5.1.0.3-isnan.patch" |
| 72 |
+ |
| 73 |
# not upstreamable stuff |
| 74 |
"${FILESDIR}/${PN}-4.4-system-pyuno.patch" |
| 75 |
) |
Archives