[pkgsrc/trunk]: pkgsrc/x11/wxGTK30 Fix build on SunOS by adding patch for mat...

[wiedi <wiedi%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7aba483033af
branches:  trunk
changeset: 644769:7aba483033af
user:      wiedi <wiedi%pkgsrc.org@localhost>
date:      Sat Jan 17 11:16:59 2015 +0000

description:
Fix build on SunOS by adding patch for math function ambiguity and disabling
xlocale detection on SunOS for now, as there is enough support to fool detection
on illumos but not enough to finish the build yet.

diffstat:

 x11/wxGTK30/Makefile                                       |   7 ++++-
 x11/wxGTK30/distinfo                                       |   3 +-
 x11/wxGTK30/patches/patch-src_stc_scintilla_src_Editor.cxx |  17 ++++++++++++++
 3 files changed, 25 insertions(+), 2 deletions(-)

diffs (61 lines):

diff -r 7e56aa3b88bf -r 7aba483033af x11/wxGTK30/Makefile
--- a/x11/wxGTK30/Makefile      Sat Jan 17 10:20:57 2015 +0000
+++ b/x11/wxGTK30/Makefile      Sat Jan 17 11:16:59 2015 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.7 2015/01/07 13:22:58 ryoon Exp $
+# $NetBSD: Makefile,v 1.8 2015/01/17 11:16:59 wiedi Exp $
 
 VERSION=       3.0.2
+PKGREVISION=   1
 DISTNAME=      wxWidgets-${VERSION}
 PKGNAME=       wxGTK30-${VERSION}
 CATEGORIES=    x11
@@ -59,6 +60,10 @@
 PLIST.notdarwin=       yes
 .endif
 
+.if ${OPSYS} == "SunOS"
+CONFIGURE_ARGS+=       --disable-xlocale
+.endif
+
 post-configure:
        echo 'install_qadll: install_xmldll' >> ${WRKSRC}/Makefile
 
diff -r 7e56aa3b88bf -r 7aba483033af x11/wxGTK30/distinfo
--- a/x11/wxGTK30/distinfo      Sat Jan 17 10:20:57 2015 +0000
+++ b/x11/wxGTK30/distinfo      Sat Jan 17 11:16:59 2015 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.3 2015/01/07 13:22:58 ryoon Exp $
+$NetBSD: distinfo,v 1.4 2015/01/17 11:16:59 wiedi Exp $
 
 SHA1 (wxWidgets-3.0.2-libtool.diff.bz2) = d0235d8d9ec9c05deefecf8b15ea3d919e82f1d0
 RMD160 (wxWidgets-3.0.2-libtool.diff.bz2) = c144c8484fabd7dcdc669d0618bcbc4af7f07b4a
@@ -9,6 +9,7 @@
 SHA1 (patch-build_aclocal_bakefile.m4) = 7d3d6fb1e6a72e370dc6147010fa5bf2c46f1206
 SHA1 (patch-configure) = 897f13daa5bc8246902d7d864096d621f2e54928
 SHA1 (patch-configure.in) = e49b9a83040201f01c22b3e1cbc4b331985f4e99
+SHA1 (patch-src_stc_scintilla_src_Editor.cxx) = 0b3fb6b8a6c3e72868a12d7b16ceebe295a599a8
 SHA1 (patch-src_tiff_configure) = e1c002f5b7d0bf2c0bec399dbb62d0146c14ec20
 SHA1 (patch-src_tiff_configure.ac) = 0d51a7c251f897aa00e58c3a7ec5f348b50d1821
 SHA1 (patch-src_unix_fswatcher__kqueue.cpp) = 49e142dbdd5c8b8f449ab19b4adbe403d515ab95
diff -r 7e56aa3b88bf -r 7aba483033af x11/wxGTK30/patches/patch-src_stc_scintilla_src_Editor.cxx
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/wxGTK30/patches/patch-src_stc_scintilla_src_Editor.cxx        Sat Jan 17 11:16:59 2015 +0000
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_stc_scintilla_src_Editor.cxx,v 1.1 2015/01/17 11:16:59 wiedi Exp $
+Avoid ambiguity on SunOS
+
+--- src/stc/scintilla/src/Editor.cxx.orig      2014-10-06 21:33:44.000000000 +0000
++++ src/stc/scintilla/src/Editor.cxx
+@@ -5841,9 +5841,9 @@ void Editor::GoToLine(int lineNo) {
+ }
+ 
+ static bool Close(Point pt1, Point pt2) {
+-      if (abs(pt1.x - pt2.x) > 3)
++      if (abs((long)(pt1.x - pt2.x)) > 3)
+               return false;
+-      if (abs(pt1.y - pt2.y) > 3)
++      if (abs((long)(pt1.y - pt2.y)) > 3)
+               return false;
+       return true;
+ }