Accepting request 816453 from electronics

OBS-URL: https://build.opensuse.org/request/show/816453
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/pulseview?expand=0&rev=11

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?= <stefan.bruens@rwth-aachen.de>
+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
+

pulseview.changes

@@ -1,7 +1,12 @@
+-------------------------------------------------------------------
+Mon Jun 22 18:36:42 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
+
+- Fix build, add 0001-Fix-building-with-Qt-5.15.patch
+
 -------------------------------------------------------------------
 Wed Apr  1 17:02:33 UTC 2020 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
 
-- 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

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