[libwx-scintilla-perl] 01/06: Add patch from wxWidgets upstream Git for GCC-6 compatibility.

[gregor herrmann]

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

gregoa pushed a commit to branch master
in repository libwx-scintilla-perl.

commit da71bd99f0a5e70a29cf5f42cb331ca509d11db6
Author: gregor herrmann <gregoa at debian.org>
Date:   Thu Jun 30 16:32:42 2016 +0200

    Add patch from wxWidgets upstream Git for GCC-6 compatibility.
    
    Closes: #816571
---
 debian/patches/Fix_STC_compilation_with_GCC6.patch | 41 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 42 insertions(+)

diff --git a/debian/patches/Fix_STC_compilation_with_GCC6.patch b/debian/patches/Fix_STC_compilation_with_GCC6.patch
new file mode 100644
index 0000000..3e91f71
--- /dev/null
+++ b/debian/patches/Fix_STC_compilation_with_GCC6.patch
@@ -0,0 +1,41 @@
+From 73e9e18ea09ffffcaac50237def0d9728a213c02 Mon Sep 17 00:00:00 2001
+From: Scott Talbert <swt at techie.net>
+Date: Sat, 20 Feb 2016 00:08:14 -0500
+Subject: [PATCH] Fix STC compilation with GCC6
+
+Use std::abs() from <cmath> instead of abs() from <math.h> to avoid problems
+with ambiguous overloads.
+
+Closes #17147.
+
+Closes https://github.com/wxWidgets/wxWidgets/pull/222
+
+Bug-Debian: https://bugs.debian.org/816571
+Bug: https://rt.cpan.org/Public/Bug/Display.html?id=112742
+
+---
+ src/stc/scintilla/src/Editor.cxx | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+--- a/wx-scintilla/src/scintilla/src/Editor.cxx
++++ b/wx-scintilla/src/scintilla/src/Editor.cxx
+@@ -11,6 +11,7 @@
+ #include <ctype.h>
+ #include <assert.h>
+ 
++#include <cmath>
+ #include <string>
+ #include <vector>
+ #include <map>
+@@ -5868,9 +5869,9 @@
+ }
+ 
+ static bool Close(Point pt1, Point pt2) {
+-	if (abs(pt1.x - pt2.x) > 3)
++	if (std::abs(pt1.x - pt2.x) > 3)
+ 		return false;
+-	if (abs(pt1.y - pt2.y) > 3)
++	if (std::abs(pt1.y - pt2.y) > 3)
+ 		return false;
+ 	return true;
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 74bbe41..24d0a30 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 remove-uneeded-libs
 hardening-flags
 pod-spelling.patch
+Fix_STC_compilation_with_GCC6.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libwx-scintilla-perl.git