Hello community, here is the log from the commit of package limesuite for openSUSE:Factory checked in at 2020-09-07 21:33:50 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/limesuite (Old) and /work/SRC/openSUSE:Factory/.limesuite.new.3399 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "limesuite" Mon Sep 7 21:33:50 2020 rev:13 rq:832589 version:20.07.2 Changes: -------- --- /work/SRC/openSUSE:Factory/limesuite/limesuite.changes 2020-08-10 15:00:40.144085099 +0200 +++ /work/SRC/openSUSE:Factory/.limesuite.new.3399/limesuite.changes 2020-09-07 21:34:18.705351743 +0200 @@ -1,0 +2,8 @@ +Sun Sep 6 00:13:04 UTC 2020 - Stefan Brüns <[email protected]> + +- Use wxGTK3 instead of wxWidgets (GTK2), allow building with + STL variant: + * 0001-Allow-compilation-with-wxWidgets-STL-build.patch +- Remove irrelevant dependencies: i2c-tools, sqlite3 + +------------------------------------------------------------------- New: ---- 0001-Allow-compilation-with-wxWidgets-STL-build.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ limesuite.spec ++++++ --- /var/tmp/diff_new_pack.1JM9xv/_old 2020-09-07 21:34:19.401352062 +0200 +++ /var/tmp/diff_new_pack.1JM9xv/_new 2020-09-07 21:34:19.405352064 +0200 @@ -29,15 +29,15 @@ URL: https://myriadrf.org/projects/lime-suite/ #Git-Clone: https://github.com/myriadrf/LimeSuite.git Source: https://github.com/myriadrf/LimeSuite/archive/v%{version}.tar.gz#/%{name}-%{version}.tar.xz +# PATCH-FIX-UPSTREAM -- https://github.com/myriadrf/LimeSuite/pull/316 +Patch0: 0001-Allow-compilation-with-wxWidgets-STL-build.patch BuildRequires: cmake BuildRequires: gcc-c++ BuildRequires: gnuplot -BuildRequires: i2c-tools BuildRequires: pkgconfig -BuildRequires: wxWidgets-3_0-nostl-devel +BuildRequires: wxGTK3-devel BuildRequires: pkgconfig(SoapySDR) >= %{soapy_modver} BuildRequires: pkgconfig(libusb-1.0) -BuildRequires: pkgconfig(sqlite3) BuildRequires: pkgconfig(udev) %description @@ -83,6 +83,7 @@ %prep %setup -q -n LimeSuite-%{version} +%patch0 -p1 # HACK: set udev permissions to 666 sed -i 's|MODE="660"|MODE="666"|g' udev-rules/64-limesuite.rules ++++++ 0001-Allow-compilation-with-wxWidgets-STL-build.patch ++++++ >From 4cd125baf55aba3a7483ca50aa99cbcbeaf617bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <[email protected]> Date: Sun, 6 Sep 2020 01:39:42 +0200 Subject: [PATCH] Allow compilation with wxWidgets STL build wxString may not be implicitly convertible to const char*, so add an overload. --- src/limeRFE/limeRFE_wxgui.cpp | 7 +++++-- src/limeRFE/limeRFE_wxgui.h | 1 + 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/limeRFE/limeRFE_wxgui.cpp b/src/limeRFE/limeRFE_wxgui.cpp index eec270dc..8a9cad7b 100644 --- a/src/limeRFE/limeRFE_wxgui.cpp +++ b/src/limeRFE/limeRFE_wxgui.cpp @@ -126,7 +126,10 @@ void limeRFE_wxgui::OnbtnClosePort(wxCommandEvent& event) { void limeRFE_wxgui::AddMssg(const char* mssg) { wxString s(mssg, wxConvUTF8); + AddMssg(s); +} +void limeRFE_wxgui::AddMssg(const wxString& mssg) { time_t rawtime; struct tm * timeinfo; char buffer[80]; @@ -134,7 +137,7 @@ void limeRFE_wxgui::AddMssg(const char* mssg) { time(&rawtime); timeinfo = localtime(&rawtime); strftime(buffer, 80, "%H:%M:%S", timeinfo); - wxString line(wxString::Format("[%s] %s", buffer, s)); + wxString line(wxString::Format("[%s] %s", buffer, mssg)); txtMessageField->AppendText(line + _("\n")); } @@ -1114,4 +1117,4 @@ void limeRFE_wxgui::OncbEnableSWR(wxCommandEvent& event) { void limeRFE_wxgui::OnbtnClearMessages(wxCommandEvent& event) { txtMessageField->Clear(); -} \ No newline at end of file +} diff --git a/src/limeRFE/limeRFE_wxgui.h b/src/limeRFE/limeRFE_wxgui.h index 95cd4176..623ad469 100644 --- a/src/limeRFE/limeRFE_wxgui.h +++ b/src/limeRFE/limeRFE_wxgui.h @@ -25,6 +25,7 @@ class limeRFE_wxgui : public limeRFE_view void OnbtnOpenPort(wxCommandEvent& event); void OnbtnClosePort(wxCommandEvent& event); void AddMssg(const char* mssg); + void AddMssg(const wxString& mssg); void ReadPorts(); void OnbtnRefreshPorts(wxCommandEvent& event); void OnbtnReset(wxCommandEvent& event); -- 2.28.0
