Add patch to build with wxWidgets 3

3 files changed, 77 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 49c3914475bd..25ffee245f4e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,14 +1,16 @@
 pkgbase = sim65
 	pkgdesc = 65c02 simulation system
 	pkgver = 1
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.wsxyz.net/sim65/
 	arch = i686
 	arch = x86_64
 	license = GPL
 	depends = wxgtk
 	source = http://www.wsxyz.net/sim65/sim65.tar.gz
+	source = wx3.patch
 	md5sums = b83a86302e55763e280638676715c391
+	md5sums = ba0b33c3e37c1c8a7d80ab135b7bdeb8
 
 pkgname = sim65
 
diff --git a/PKGBUILD b/PKGBUILD
index 0c0a4fbfc001..8998a1cb9cd9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,14 +2,21 @@
 
 pkgname=sim65
 pkgver=1
-pkgrel=1
+pkgrel=2
 pkgdesc="65c02 simulation system"
 arch=('i686' 'x86_64')
 url="http://www.wsxyz.net/sim65/"
 license=('GPL')
 depends=('wxgtk')
-source=(http://www.wsxyz.net/${pkgname}/${pkgname}.tar.gz)
-md5sums=('b83a86302e55763e280638676715c391')
+source=(http://www.wsxyz.net/${pkgname}/${pkgname}.tar.gz
+        wx3.patch)
+md5sums=('b83a86302e55763e280638676715c391'
+         'ba0b33c3e37c1c8a7d80ab135b7bdeb8')
+
+prepare() {
+  cd "${srcdir}/${pkgname}"
+  patch -p1 < "${srcdir}/wx3.patch"
+}
 
 build() {
   cd "${srcdir}/${pkgname}"
@@ -17,7 +24,7 @@ build() {
 }
 
 package() {
-  install -D -m755 "${srcdir}/${pkgname}/${pkgname}" "${pkgdir}/usr/bin/${pkgname}"
+  install -D -m755 "${srcdir}/${pkgname}/${pkgname}" "${pkgdir}/usr/bin/${pkgname}-system"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/wx3.patch b/wx3.patch
new file mode 100644
index 000000000000..d07f28d74963
--- /dev/null
+++ b/wx3.patch
@@ -0,0 +1,63 @@
+diff -aur sim65/Acia6551Frame.cpp sim65.wx3/Acia6551Frame.cpp
+--- sim65/Acia6551Frame.cpp	2010-08-23 20:18:27.000000000 -0500
++++ sim65.wx3/Acia6551Frame.cpp	2016-11-03 04:08:03.139857833 -0500
+@@ -11,7 +11,7 @@
+ EVT_CLOSE(Acia6551Frame::OnClose)
+ END_EVENT_TABLE()
+ 
+-#define NORESIZE_FRAME (wxDEFAULT_FRAME_STYLE & ~(wxRESIZE_BORDER | wxRESIZE_BOX | wxMAXIMIZE_BOX))
++#define NORESIZE_FRAME (wxDEFAULT_FRAME_STYLE & ~(wxRESIZE_BORDER | wxMAXIMIZE_BOX))
+ 
+ Acia6551Frame::~Acia6551Frame ()
+ {
+@@ -86,7 +86,7 @@
+   reg_sizer->Add(txdwin, 0, wxLEFT | wxRIGHT | wxBOTTOM | wxALIGN_RIGHT, prefs->BorderWidth());
+   reg_sizer->Add(rxdwin, 0, wxLEFT | wxRIGHT | wxBOTTOM | wxALIGN_RIGHT, prefs->BorderWidth());
+ 
+-  term = new wxTextCtrl(panel, -1, wxString::FromAscii(""), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE | wxTE_LINEWRAP | wxTE_READONLY);
++  term = new wxTextCtrl(panel, -1, wxString::FromAscii(""), wxDefaultPosition, wxDefaultSize, wxTE_MULTILINE | wxTE_CHARWRAP | wxTE_READONLY);
+   term->SetFont(font);
+   term->SetDefaultStyle(attr);
+   term->SetSize(40 * term->GetCharWidth(), 2 * term->GetCharHeight());
+diff -aur sim65/AddressDialog.cpp sim65.wx3/AddressDialog.cpp
+--- sim65/AddressDialog.cpp	2010-08-23 20:02:35.000000000 -0500
++++ sim65.wx3/AddressDialog.cpp	2016-11-03 04:05:52.985080506 -0500
+@@ -18,7 +18,7 @@
+ 
+ AddressDialog::AddressDialog(wxWindow *parent)
+   : wxDialog(parent, -1, wxString::FromAscii("Enter Load Address"), wxDefaultPosition,
+-	     wxDefaultSize, wxDEFAULT_DIALOG_STYLE | wxDIALOG_MODAL)
++	     wxDefaultSize, wxDEFAULT_DIALOG_STYLE)
+ {
+   m_value = wxString::FromAscii("");
+   wxString message = wxString::FromAscii("At what address do you want to load the image?");
+diff -aur sim65/SimFrame.cpp sim65.wx3/SimFrame.cpp
+--- sim65/SimFrame.cpp	2010-08-27 22:29:20.000000000 -0500
++++ sim65.wx3/SimFrame.cpp	2016-11-03 04:03:59.603390570 -0500
+@@ -15,7 +15,7 @@
+ #include "Acia6551.h"
+ #include "Acia6551Frame.h"
+ 
+-#define NORESIZE_FRAME (wxDEFAULT_FRAME_STYLE & ~(wxRESIZE_BORDER | wxRESIZE_BOX | wxMAXIMIZE_BOX))
++#define NORESIZE_FRAME (wxDEFAULT_FRAME_STYLE & ~(wxRESIZE_BORDER | wxMAXIMIZE_BOX | wxMAXIMIZE_BOX))
+ 
+ enum
+   {
+@@ -380,7 +380,7 @@
+ 				       wxString::FromAscii(""),
+ 				       wxString::FromAscii(""),
+ 				       wxString::FromAscii("*.*"),
+-				       wxOPEN | wxCHANGE_DIR);
++				       wxFD_OPEN | wxFD_CHANGE_DIR);
+ 
+   int result = fd->ShowModal();
+ 
+@@ -518,7 +518,7 @@
+ 					wxString::FromAscii(""),
+ 					wxString::FromAscii(""),
+ 					wxString::FromAscii("*.*"),
+-				       wxOPEN | wxCHANGE_DIR);
++				       wxFD_OPEN | wxFD_CHANGE_DIR);
+ 
+   int result = fd->ShowModal();
+