- added qt patch (fixes build with recent Qt5)

diff --git a/pulseview-qt.patch b/pulseview-qt.patch
new file mode 100644 (file)
index 0000000..7daf742
--- /dev/null
+++ b/pulseview-qt.patch
@@ -0,0 +1,20 @@
+--- pulseview-0.4.2/pv/util.cpp.orig   2020-03-31 22:41:18.000000000 +0200
++++ pulseview-0.4.2/pv/util.cpp        2020-07-31 07:46:22.032912830 +0200
+@@ -137,7 +137,7 @@
+       QString s;
+       QTextStream ts(&s);
+       if (sign && !v.is_zero())
+-              ts << forcesign;
++              ts << Qt::forcesign;
+       ts << qSetRealNumberPrecision(precision) << (v * multiplier);
+       ts << ' ' << prefix << unit;
+ 
+@@ -175,7 +175,7 @@
+       QString s;
+       QTextStream ts(&s);
+       if (sign && (v != 0))
+-              ts << forcesign;
++              ts << Qt::forcesign;
+       ts.setRealNumberNotation(QTextStream::FixedNotation);
+       ts.setRealNumberPrecision(precision);
+       ts << (v * multiplier) << ' ' << prefix << unit;

diff --git a/pulseview.spec b/pulseview.spec
index efce96388b294c8d56ad1c499354baade808c2c2..a6d9850f2b6937054e0810e9dddb3efee5079439 100644 (file)
--- a/pulseview.spec
+++ b/pulseview.spec
@@ -12,6 +12,7 @@ License:      GPL v3+
 Group:         X11/Applications/Graphics
 Source0:       https://sigrok.org/download/source/pulseview/%{name}-%{version}.tar.gz
 # Source0-md5: 108a5f095f06a9485d31a0349ea38243
+Patch0:                %{name}-qt.patch
 URL:           https://sigrok.org/wiki/PulseView
 BuildRequires: Qt5Core-devel >= 5.3
 BuildRequires: Qt5Gui-devel >= 5.3
@@ -50,6 +51,7 @@ sigrok.
 
 %prep
 %setup -q
+%patch0 -p1
 
 %build
 install -d build