[openjfx] 05/10: Backported a fix for an ambiguous call to the pow() function in BoxShape

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository openjfx.

commit 8ee9cdbc6bc01bfa67b657c004ba19b7e41909ab
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sun Jan 22 00:36:23 2017 +0100

    Backported a fix for an ambiguous call to the pow() function in BoxShape
---
 debian/changelog                          |  1 +
 debian/patches/18-fix-ambiguous-pow.patch | 13 +++++++++++++
 debian/patches/series                     |  1 +
 3 files changed, 15 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e428141..d48c872 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ openjfx (8u121-b13-1) UNRELEASED; urgency=medium
     - New build dependency on cmake
     - Copy libicui18n.so, libicuuc.so, libicudata.so and libsqlite3.so in the
       modules/web/build/linux/import/lib directory to build JavaScriptCore
+    - Backported a fix for an ambiguous call to the pow() function in BoxShape
 
  -- Emmanuel Bourg <ebourg at apache.org>  Fri, 20 Jan 2017 11:58:13 +0100
 
diff --git a/debian/patches/18-fix-ambiguous-pow.patch b/debian/patches/18-fix-ambiguous-pow.patch
new file mode 100644
index 0000000..9d297b9
--- /dev/null
+++ b/debian/patches/18-fix-ambiguous-pow.patch
@@ -0,0 +1,13 @@
+Description: Fixes an ambiguous call to the pow() function
+Origin: backport, https://github.com/WebKit/webkit/commit/2931450725
+--- a/modules/web/src/main/native/Source/WebCore/rendering/shapes/BoxShape.cpp
++++ b/modules/web/src/main/native/Source/WebCore/rendering/shapes/BoxShape.cpp
+@@ -43,7 +43,7 @@
+ 
+     LayoutUnit ratio = radius / margin;
+     if (ratio < 1)
+-        return radius + (margin * (1 + pow(ratio - 1, 3)));
++        return radius + (margin * (1 + pow(ratio - 1, 3.0)));
+ 
+     return radius + margin;
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 9108461..e173c25 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@ fix-arm32-build.patch
 15-fix-javadoc-refererences.diff
 16-reproducible-build-timestamp.patch
 17-gcc-compatibility.patch
+18-fix-ambiguous-pow.patch

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