[packages/pulseview] - added qt patch (fixes build with recent Qt5)

qboosh qboosh at pld-linux.org
Fri Jul 31 18:31:07 CEST 2020


commit 3a49d9668ca4d5d8cd2948827f109eb4f155b9d2
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Fri Jul 31 18:32:57 2020 +0200

    - added qt patch (fixes build with recent Qt5)

 pulseview-qt.patch | 20 ++++++++++++++++++++
 pulseview.spec     |  2 ++
 2 files changed, 22 insertions(+)
---
diff --git a/pulseview.spec b/pulseview.spec
index efce963..a6d9850 100644
--- 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
diff --git a/pulseview-qt.patch b/pulseview-qt.patch
new file mode 100644
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;
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/pulseview.git/commitdiff/3a49d9668ca4d5d8cd2948827f109eb4f155b9d2



More information about the pld-cvs-commit mailing list