From 7169acc62c8ace6cdc4e6d76836a5057dd95b1ab367d64fb04520a441f5aaa7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= Date: Mon, 22 Jun 2020 19:56:22 +0000 Subject: [PATCH] Accepting request 816452 from home:StefanBruens:branches:electronics MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Fix build, add 0001-Fix-building-with-Qt-5.15.patch - Update to version 0.4.2 * PulseView session setups can now be saved/restored to and from *.pvs files. * Translation support was added to the GUI elements (and a first translation, German, is available). Please check the wiki for details on how you can contribute further translations. * There's a new protocol decoder selection subwindow with filtering capabilities, browing by decoder tags, auto-stacking of decoders where required, and more. * A new decoder "binary" output subwindow can show/save "OUTPUT_BINARY" type decoder data in various (decoder-specific) formats (WAV, PCAP, PNG, and many others). This also features a simple "hex view" for the data. * It is now possible to show/hide individual decoder annotation rows, and individual annotation classes. This is very handy when you're debugging a specific issue and only want to see certain classes of decoder annotations, e.g. "show me only CRC errors", "show me only parity errors and frame errors", or "show me only I²C NACKs" etc. etc. * Lots of UI and functionality improvements regarding cursors and markers. * Various new handy key shortcuts for zooming, moving around in the data, placing cursors, etc. * Various drawing and decoder/annotation performance improvements. - This requires libsigrok >= 0.5.2 (already released for some time) - Explicitly BuildRequire: libboost_system-devel, required since Boost 1.69 - Update to version 0.4.1 * Snapping cursors to signal edges * New command-line switches, see manpage * Converting analog channels to digital/logic channels * Theme support * UI improvements * Protocol decoder annotations can be exported * Improved channel name auto-mapping * Performance and memory usage improvements * Huge amount of fixes See https://www.sigrok.org/blog/pulseview-041-released for details - Update to version 0.4.0 * Add the concepts of sessions and views to PulseView: - Sessions represent individual files/device instances. Each session is represented as a tab in PulseView. - Views are different data representations of one specific session. For example, different views of a session can have different zoom levels, can be scrolled to different positions, etc. etc. Each view is a dock window within the respective session's tab. - The view docks can be repositioned, resized and extracted out into their own individual windows. * Add support for saving analog data to .sr files. * Lots of fixes and improvements - use individual libboost-*-devel packages instead of boost-devel - Add org.sigrok.Pulseview.appdata.xml - Install desktop file and icons for pulseview, register pulseview as handler for application/x-sigrok-dump mimetype - Add -fext-numeric-literals compiler flag as workaround for boo#1004168 - Update to version 0.3.0 * Support for vertical scaling of analog or logic traces * A "Save selection range as..." feature * Some settings now survive a restart (last open/save directory location, window size/position, last used device) * Pinch-zoom support, always-zoom-to-fit support, "sticky scrolling" support, etc. * Trace group support (for dragging multiple traces around as a group) * ...and many, many more GUI and usability improvements... - Track GIT version - Remove redefined cmake macros - Sync .spec with the one from rmax - Update to version 0.2.0 * Support for protocol decoding (via libsigrokdecode) has been added, including support for annotation rows, multiple decoders in the same GUI window, support for stacking protocol decoders (e.g. I²C -> RTC8564, UART -> MIDI, or SPI -> SDcard) and lots more. * Support for loading and saving sigrok session (*.sr) files has been added. * Initial support for analog data sources (specifically oscilloscopes, e.g. the Rigol DS1052E) has been added. - Upstream adopted pulseview-pthread.patch - Disable -Werror to fix build. - Explicitly link against libpthread (pulseview-pthread.patch). - Initial build from git snapshot. OBS-URL: https://build.opensuse.org/request/show/816452 OBS-URL: https://build.opensuse.org/package/show/electronics/pulseview?expand=0&rev=22 --- 0001-Fix-building-with-Qt-5.15.patch | 34 ++++++++++++++++++++++++++++ pulseview.changes | 7 +++++- pulseview.spec | 5 +++- 3 files changed, 44 insertions(+), 2 deletions(-) create mode 100644 0001-Fix-building-with-Qt-5.15.patch diff --git a/0001-Fix-building-with-Qt-5.15.patch b/0001-Fix-building-with-Qt-5.15.patch new file mode 100644 index 0000000..830238e --- /dev/null +++ b/0001-Fix-building-with-Qt-5.15.patch @@ -0,0 +1,34 @@ +From fecfc3ff03168681f08dabec807ad9b8ab2c3057 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Stefan=20Br=C3=BCns?= +Date: Mon, 22 Jun 2020 20:33:02 +0200 +Subject: [PATCH] Fix building with Qt 5.15 + +--- + pv/util.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pv/util.cpp b/pv/util.cpp +index 9a9a5065..afc54597 100644 +--- a/pv/util.cpp ++++ b/pv/util.cpp +@@ -137,7 +137,7 @@ QString format_time_si(const Timestamp& v, SIPrefix prefix, + QString s; + QTextStream ts(&s); + if (sign && !v.is_zero()) +- ts << forcesign; ++ ts.setNumberFlags(ts.numberFlags() | QTextStream::ForceSign); + ts << qSetRealNumberPrecision(precision) << (v * multiplier); + ts << ' ' << prefix << unit; + +@@ -175,7 +175,7 @@ QString format_value_si(double v, SIPrefix prefix, unsigned precision, + QString s; + QTextStream ts(&s); + if (sign && (v != 0)) +- ts << forcesign; ++ ts.setNumberFlags(ts.numberFlags() | QTextStream::ForceSign); + ts.setRealNumberNotation(QTextStream::FixedNotation); + ts.setRealNumberPrecision(precision); + ts << (v * multiplier) << ' ' << prefix << unit; +-- +2.27.0 + diff --git a/pulseview.changes b/pulseview.changes index 2192cae..1c5450c 100644 --- a/pulseview.changes +++ b/pulseview.changes @@ -1,7 +1,12 @@ +------------------------------------------------------------------- +Mon Jun 22 18:36:42 UTC 2020 - Stefan Brüns + +- Fix build, add 0001-Fix-building-with-Qt-5.15.patch + ------------------------------------------------------------------- Wed Apr 1 17:02:33 UTC 2020 - Stefan Brüns -- Update to version 0.4.1 +- Update to version 0.4.2 * PulseView session setups can now be saved/restored to and from *.pvs files. * Translation support was added to the GUI elements (and a first diff --git a/pulseview.spec b/pulseview.spec index 901cb7a..814db52 100644 --- a/pulseview.spec +++ b/pulseview.spec @@ -24,6 +24,8 @@ License: GPL-3.0-or-later Group: Productivity/Scientific/Electronics URL: https://sigrok.org Source0: https://sigrok.org/download/source/pulseview/%{name}-%{version}.tar.gz +# PATCH-FIX-OPENSUSE +Patch0: 0001-Fix-building-with-Qt-5.15.patch BuildRequires: cmake BuildRequires: glib2-devel BuildRequires: libboost_filesystem-devel @@ -48,11 +50,12 @@ PulseView is a Qt-based GUI for sigrok. %prep %setup -q +%patch0 -p1 %build export CXXFLAGS="%{optflags} -fpermissive" %cmake -DDISABLE_WERROR=TRUE .. -make %{?_smp_mflags} +%cmake_build %install %cmake_install