Package: usbprog Version: 0.2.0-2 Severity: normal Tags: patch Dear maintainer,
We're aiming to migrate the archive to using wxwidgets3.0 instead of
wxwidgets2.8.
I've built and done some testing of your package (the UI seems to work
OK, but I don't have the hardware it seems to require) with the attached
patch to update it to build against wxwidgets3.0, and it all looks good.
I'm happy to NMU this change if you wish me to - just let me know.
Cheers,
Olly
diff -Nru usbprog-0.2.0/debian/changelog usbprog-0.2.0/debian/changelog --- usbprog-0.2.0/debian/changelog 2012-01-03 06:53:52.000000000 +1300 +++ usbprog-0.2.0/debian/changelog 2014-03-12 13:37:52.000000000 +1300 @@ -1,3 +1,10 @@ +usbprog (0.2.0-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Update to build with wxwidgets3.0. + + -- Olly Betts <o...@survex.com> Wed, 12 Mar 2014 13:37:31 +1300 + usbprog (0.2.0-2) unstable; urgency=low * Standards-Version: 3.9.2 (no changes required). diff -Nru usbprog-0.2.0/debian/control usbprog-0.2.0/debian/control --- usbprog-0.2.0/debian/control 2012-01-03 06:49:38.000000000 +1300 +++ usbprog-0.2.0/debian/control 2014-03-12 13:37:18.000000000 +1300 @@ -2,7 +2,7 @@ Section: embedded Priority: extra Maintainer: Uwe Hermann <u...@debian.org> -Build-Depends: cdbs, debhelper (>= 7.0.50~), autotools-dev, libusb-dev, libxml2-dev, libcurl4-gnutls-dev, libreadline-dev, libwxgtk2.8-dev, wx-common +Build-Depends: cdbs, debhelper (>= 7.0.50~), autotools-dev, libusb-dev, libxml2-dev, libcurl4-gnutls-dev, libreadline-dev, libwxgtk3.0-dev Standards-Version: 3.9.2 Homepage: http://developer.berlios.de/projects/usbprog/ diff -Nru usbprog-0.2.0/debian/patches/series usbprog-0.2.0/debian/patches/series --- usbprog-0.2.0/debian/patches/series 1970-01-01 12:00:00.000000000 +1200 +++ usbprog-0.2.0/debian/patches/series 2014-03-12 14:25:51.000000000 +1300 @@ -0,0 +1 @@ +wx3.0-compat.patch diff -Nru usbprog-0.2.0/debian/patches/wx3.0-compat.patch usbprog-0.2.0/debian/patches/wx3.0-compat.patch --- usbprog-0.2.0/debian/patches/wx3.0-compat.patch 1970-01-01 12:00:00.000000000 +1200 +++ usbprog-0.2.0/debian/patches/wx3.0-compat.patch 2014-03-12 14:26:29.000000000 +1300 @@ -0,0 +1,25 @@ +Description: Fix to build with wxWidgets 3.0 + This patch should also work with wxWidgets 2.8. +Author: Olly Betts <o...@survex.com> +Last-Update: 2014-03-12 + +--- usbprog-0.2.0.orig/gui/usbprogFrm.cc ++++ usbprog-0.2.0/gui/usbprogFrm.cc +@@ -296,7 +296,7 @@ void usbprogFrm::CreateGUIControls() + + // file dialog + m_fileDialog = new wxFileDialog(m_panel, wxT("Choose a file"), +- wxT(""), wxT(""), wxT("*.bin"), wxOPEN); ++ wxT(""), wxT(""), wxT("*.bin"), wxFD_OPEN); + + m_topBox->Add(topSizer, wxEXPAND, wxALL, 10); + +@@ -670,7 +670,7 @@ void usbprogFrm::enableDisableDebug(wxCo + dbg->setFileHandle(NULL); + } else { + wxFileDialog fdg(m_panel, wxT("Choose a file"), +- wxT(""), wxT(""), wxT("*.log"), wxSAVE); ++ wxT(""), wxT(""), wxT("*.log"), wxFD_SAVE); + if (fdg.ShowModal() != wxID_OK) + dbg->setFileHandle(stderr); + else {
signature.asc
Description: Digital signature
