pulseview: fix build with qt 5.15
This commit is contained in:
parent
b17153d4a5
commit
22c1165128
2 changed files with 21 additions and 5 deletions
20
srcpkgs/pulseview/patches/qt-5.15.patch
Normal file
20
srcpkgs/pulseview/patches/qt-5.15.patch
Normal file
|
@ -0,0 +1,20 @@
|
||||||
|
--- pv/util.cpp.orig 2020-11-21 15:56:56.690899190 +0700
|
||||||
|
+++ pv/util.cpp 2020-11-21 16:00:40.981375801 +0700
|
||||||
|
@@ -137,7 +137,7 @@
|
||||||
|
QString s;
|
||||||
|
QTextStream ts(&s);
|
||||||
|
if (sign && !v.is_zero())
|
||||||
|
- ts << forcesign;
|
||||||
|
+ Qt::forcesign(ts);
|
||||||
|
ts << qSetRealNumberPrecision(precision) << (v * multiplier);
|
||||||
|
ts << ' ' << prefix << unit;
|
||||||
|
|
||||||
|
@@ -175,7 +175,7 @@
|
||||||
|
QString s;
|
||||||
|
QTextStream ts(&s);
|
||||||
|
if (sign && (v != 0))
|
||||||
|
- ts << forcesign;
|
||||||
|
+ Qt::forcesign(ts);
|
||||||
|
ts.setRealNumberNotation(QTextStream::FixedNotation);
|
||||||
|
ts.setRealNumberPrecision(precision);
|
||||||
|
ts << (v * multiplier) << ' ' << prefix << unit;
|
|
@ -4,7 +4,7 @@ version=0.4.2
|
||||||
revision=1
|
revision=1
|
||||||
build_style=cmake
|
build_style=cmake
|
||||||
configure_args="-DDISABLE_WERROR=TRUE"
|
configure_args="-DDISABLE_WERROR=TRUE"
|
||||||
hostmakedepends="pkg-config qt5-qmake"
|
hostmakedepends="pkg-config qt5-qmake qt5-host-tools"
|
||||||
makedepends="glib-devel libzip-devel glibmm-devel qt5-devel
|
makedepends="glib-devel libzip-devel glibmm-devel qt5-devel
|
||||||
qt5-svg-devel qt5-tools-devel boost-devel libsigrok-devel
|
qt5-svg-devel qt5-tools-devel boost-devel libsigrok-devel
|
||||||
libsigrokdecode-devel"
|
libsigrokdecode-devel"
|
||||||
|
@ -16,8 +16,4 @@ homepage="https://sigrok.org/"
|
||||||
distfiles="https://sigrok.org/download/source/${pkgname}/${pkgname}-${version}.tar.gz"
|
distfiles="https://sigrok.org/download/source/${pkgname}/${pkgname}-${version}.tar.gz"
|
||||||
checksum=f042f77a3e1b35bf30666330e36ec38fab8d248c3693c37b7e35d401c3bfabcb
|
checksum=f042f77a3e1b35bf30666330e36ec38fab8d248c3693c37b7e35d401c3bfabcb
|
||||||
|
|
||||||
if [ "$CROSS_BUILD" ]; then
|
|
||||||
hostmakedepends+=" qt5-host-tools qt5-devel"
|
|
||||||
fi
|
|
||||||
|
|
||||||
CXXFLAGS+=" -fext-numeric-literals"
|
CXXFLAGS+=" -fext-numeric-literals"
|
||||||
|
|
Loading…
Reference in a new issue