Hello community, here is the log from the commit of package usbprog for openSUSE:Factory checked in at 2016-11-04 21:00:39 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/usbprog (Old) and /work/SRC/openSUSE:Factory/.usbprog.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "usbprog" Changes: -------- --- /work/SRC/openSUSE:Factory/usbprog/usbprog.changes 2013-05-16 11:43:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.usbprog.new/usbprog.changes 2016-11-04 21:00:40.000000000 +0100 @@ -1,0 +2,16 @@ +Wed Oct 5 09:18:27 UTC 2016 - [email protected] + +- Add patch ubsprog-wxwidgets-3.0.patch to port usbprog to + wxWidgets 3.0; patch taken from upstream. + +------------------------------------------------------------------- +Wed Oct 5 09:16:39 UTC 2016 - [email protected] + +- Drop outdated macros "%define __find_requires %wx_requires" and + "%define _use_internal_dependency_generator 0"; no longer + required and causes build failures. +- Drop conditionals intended to support openSUSE versions that are + now old and unmaintained. +- Switch to pkgconfig based BuildRequires. + +------------------------------------------------------------------- New: ---- ubsprog-wxwidgets-3.0.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ usbprog.spec ++++++ --- /var/tmp/diff_new_pack.VXaw2Q/_old 2016-11-04 21:00:41.000000000 +0100 +++ /var/tmp/diff_new_pack.VXaw2Q/_new 2016-11-04 21:00:41.000000000 +0100 @@ -49,41 +49,22 @@ Source0: %{name}-%{version}.tar.bz2 Source1: README.distribution Patch0: usbprog-wxwidgets-2.4.diff +Patch1: ubsprog-wxwidgets-3.0.patch Summary: Programmer for the USBprog hardware License: GPL-2.0+ and CC-BY-SA-3.0 Group: Development/Tools/Other BuildRequires: gcc-c++ -BuildRequires: libusb-devel -BuildRequires: libxml2-devel +BuildRequires: pkgconfig(libusb) +BuildRequires: pkgconfig(libxml-2.0) BuildRequires: readline-devel BuildRequires: pkgconfig(udev) %if %{build_gui} -%if 0%{?suse_version} > 1130 -BuildRequires: python-wxWidgets -BuildRequires: wxWidgets-devel -%else -BuildRequires: python-wxGTK -BuildRequires: wxGTK-devel +BuildRequires: python-wxWidgets-3_0 +BuildRequires: wxWidgets-3_0-nostl-devel %endif -%endif - -%if 0%{?suse_version} >= 1030 -BuildRequires: libcurl-devel -%else -BuildRequires: curl-devel -%endif - -%if 0%{?suse_version} >= 1010 +BuildRequires: pkgconfig(libcurl) BuildRequires: pkg-config -%else -BuildRequires: pkgconfig -%endif - -%if 0%{?suse_version} > 1130 -%define _use_internal_dependency_generator 0 -%define __find_requires %wx_requires -%endif %define _udevdir %(pkg-config --variable=udevdir udev) %define _udevrulesdir %{_udevdir}/rules.d @@ -140,6 +121,7 @@ %prep %setup -q %patch0 -p1 +%patch1 -p1 %build %configure ++++++ ubsprog-wxwidgets-3.0.patch ++++++ Description: Fix to build with wxWidgets 3.0 This patch should also work with wxWidgets 2.8. Author: Olly Betts <[email protected]> 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 {
