Hello community, here is the log from the commit of package pulseview for openSUSE:Factory checked in at 2020-06-23 21:05:53 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/pulseview (Old) and /work/SRC/openSUSE:Factory/.pulseview.new.2956 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "pulseview" Tue Jun 23 21:05:53 2020 rev:11 rq:816453 version:0.4.2 Changes: -------- --- /work/SRC/openSUSE:Factory/pulseview/pulseview.changes 2020-04-02 17:43:16.765392497 +0200 +++ /work/SRC/openSUSE:Factory/.pulseview.new.2956/pulseview.changes 2020-06-23 21:06:21.182183112 +0200 @@ -1,0 +2,5 @@ +Mon Jun 22 18:36:42 UTC 2020 - Stefan Brüns <stefan.bru...@rwth-aachen.de> + +- Fix build, add 0001-Fix-building-with-Qt-5.15.patch + +------------------------------------------------------------------- @@ -4 +9 @@ -- Update to version 0.4.1 +- Update to version 0.4.2 New: ---- 0001-Fix-building-with-Qt-5.15.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ pulseview.spec ++++++ --- /var/tmp/diff_new_pack.wpqlp8/_old 2020-06-23 21:06:21.790185076 +0200 +++ /var/tmp/diff_new_pack.wpqlp8/_new 2020-06-23 21:06:21.794185089 +0200 @@ -24,6 +24,8 @@ 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 @@ %prep %setup -q +%patch0 -p1 %build export CXXFLAGS="%{optflags} -fpermissive" %cmake -DDISABLE_WERROR=TRUE .. -make %{?_smp_mflags} +%cmake_build %install %cmake_install ++++++ 0001-Fix-building-with-Qt-5.15.patch ++++++ >From fecfc3ff03168681f08dabec807ad9b8ab2c3057 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20Br=C3=BCns?= <stefan.bru...@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
