CVS commit: pkgsrc/x11/p5-Wx

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Thu Sep 27 22:32:28 UTC 2018

Modified Files:
        pkgsrc/x11/p5-Wx: distinfo
Added Files:
        pkgsrc/x11/p5-Wx/patches: patch-XS_Colour.xs
            patch-ext_propgrid_XS_PGProperty.xsp

Log Message:
p5-Wx: build fix


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/x11/p5-Wx/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/x11/p5-Wx/patches/patch-XS_Colour.xs \
    pkgsrc/x11/p5-Wx/patches/patch-ext_propgrid_XS_PGProperty.xsp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/p5-Wx/distinfo
diff -u pkgsrc/x11/p5-Wx/distinfo:1.11 pkgsrc/x11/p5-Wx/distinfo:1.12
--- pkgsrc/x11/p5-Wx/distinfo:1.11      Wed Jun 14 13:19:26 2017
+++ pkgsrc/x11/p5-Wx/distinfo   Thu Sep 27 22:32:28 2018
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.11 2017/06/14 13:19:26 jperkin Exp $
+$NetBSD: distinfo,v 1.12 2018/09/27 22:32:28 tnn Exp $
 
 SHA1 (Wx-0.9932.tar.gz) = 5e288fc2f32c58df32c3c8be27c0cc509c1de6ed
 RMD160 (Wx-0.9932.tar.gz) = 5abb796f4998bc2cf49380271060082cbd4d4c16
 SHA512 (Wx-0.9932.tar.gz) = 49f9a32bcd65ad4f2017f322e45ddaad741cdc0f0245489425771dda917553c354945fa949521c18730d27e78444a79d0d56374d462bcd92a96c0e76a4471c0e
 Size (Wx-0.9932.tar.gz) = 486326 bytes
+SHA1 (patch-XS_Colour.xs) = cffaa6c6b777260f05258a83d242c51cf944d93a
 SHA1 (patch-build_Wx_build_MakeMaker.pm) = c700f49085a9542ceb4555f351d491a9e6893612
+SHA1 (patch-ext_propgrid_XS_PGProperty.xsp) = 80d0cdc5d3d323d8f427e0ca1488072dac2dc37d

Added files:

Index: pkgsrc/x11/p5-Wx/patches/patch-XS_Colour.xs
diff -u /dev/null pkgsrc/x11/p5-Wx/patches/patch-XS_Colour.xs:1.1
--- /dev/null   Thu Sep 27 22:32:28 2018
+++ pkgsrc/x11/p5-Wx/patches/patch-XS_Colour.xs Thu Sep 27 22:32:28 2018
@@ -0,0 +1,15 @@
+$NetBSD: patch-XS_Colour.xs,v 1.1 2018/09/27 22:32:28 tnn Exp $
+
+GetPixel() not supported with GTK3
+
+--- XS/Colour.xs.orig  2014-03-08 13:01:15.000000000 +0000
++++ XS/Colour.xs
+@@ -114,7 +114,7 @@ wxColour::GetAsString( long flags )
+ 
+ #endif
+ 
+-#if !defined(__WXMAC__)
++#if 0
+ 
+ long
+ wxColour::GetPixel()
Index: pkgsrc/x11/p5-Wx/patches/patch-ext_propgrid_XS_PGProperty.xsp
diff -u /dev/null pkgsrc/x11/p5-Wx/patches/patch-ext_propgrid_XS_PGProperty.xsp:1.1
--- /dev/null   Thu Sep 27 22:32:28 2018
+++ pkgsrc/x11/p5-Wx/patches/patch-ext_propgrid_XS_PGProperty.xsp       Thu Sep 27 22:32:28 2018
@@ -0,0 +1,15 @@
+$NetBSD: patch-ext_propgrid_XS_PGProperty.xsp,v 1.1 2018/09/27 22:32:28 tnn Exp $
+
+PropertyGrid.c:27130:49: error: call of overloaded 'wxVariant(wxColour&)' is ambiguous
+
+--- ext/propgrid/XS/PGProperty.xsp.orig        2014-03-08 13:01:20.000000000 +0000
++++ ext/propgrid/XS/PGProperty.xsp
+@@ -1148,7 +1148,7 @@ public:
+     bool SetPlValue( wxColour* col, int flags = wxPG_SETVAL_REFRESH_EDITOR )
+       %code{%
+             if( col->IsOk() ) {
+-                wxVariant value = wxVariant(*col);
++                wxVariant value = wxVariant((const wxAny&)*col);
+                 THIS->SetValue(value, NULL, flags );
+                 RETVAL = true;
+             } else {