diff options
| author | Donald Carr | 2017-05-22 16:16:18 -0700 |
|---|---|---|
| committer | Donald Carr | 2017-05-22 16:18:00 -0700 |
| commit | bc0b2c64dce1a4fdb7a0938d3c5043b920a903a4 (patch) | |
| tree | 0f93420b9e15f7b6a8b49819810c1ef7aa9234b7 | |
| parent | 5b71a173254808652bd3d90f4f37170da43ca47a (diff) | |
| download | aur-bc0b2c64dce1a4fdb7a0938d3c5043b920a903a4.tar.gz | |
Always build the minimal spec for the Raspberry Pi 1
Disable the use of float due to widespread qreal!=float build errors
| -rw-r--r-- | 0001-Fix-build-with-qreal-as-float.patch | 32 | ||||
| -rw-r--r-- | PKGBUILD | 6 |
2 files changed, 36 insertions, 2 deletions
diff --git a/0001-Fix-build-with-qreal-as-float.patch b/0001-Fix-build-with-qreal-as-float.patch new file mode 100644 index 000000000000..d3f460afec50 --- /dev/null +++ b/0001-Fix-build-with-qreal-as-float.patch @@ -0,0 +1,32 @@ +From 7dbbe0deb80beb7c1d6539a1f1856803fcbf8957 Mon Sep 17 00:00:00 2001 +From: Donald Carr <d@chaos-reins.com> +Date: Mon, 22 May 2017 15:49:11 -0700 +Subject: [PATCH] Fix build with qreal as float + +Change-Id: I324c3805c953371c659903d7c4115caf7266b4ea +--- + src/plugins/scenegraph/openvg/qsgopenvghelpers.cpp | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/src/plugins/scenegraph/openvg/qsgopenvghelpers.cpp b/src/plugins/scenegraph/openvg/qsgopenvghelpers.cpp +index 6bc99d32a..ab5cfb48b 100644 +--- a/src/plugins/scenegraph/openvg/qsgopenvghelpers.cpp ++++ b/src/plugins/scenegraph/openvg/qsgopenvghelpers.cpp +@@ -220,10 +220,10 @@ void qDrawTiled(VGImage image, const QSize imageSize, const QRectF &targetRect, + void qDrawBorderImage(VGImage image, const QSizeF &textureSize, const QRectF &targetRect, const QRectF &innerTargetRect, const QRectF &subSourceRect) + { + // Create normalized margins +- QMarginsF margins(qMax(innerTargetRect.left() - targetRect.left(), 0.0), +- qMax(innerTargetRect.top() - targetRect.top(), 0.0), +- qMax(targetRect.right() - innerTargetRect.right(), 0.0), +- qMax(targetRect.bottom() - innerTargetRect.bottom(), 0.0)); ++ QMarginsF margins(qMax(innerTargetRect.left() - targetRect.left(), qreal(0.0)), ++ qMax(innerTargetRect.top() - targetRect.top(), qreal(0.0)), ++ qMax(targetRect.right() - innerTargetRect.right(), qreal(0.0)), ++ qMax(targetRect.bottom() - innerTargetRect.bottom(), qreal(0.0))); + + QRectF sourceRect(0, 0, textureSize.width(), textureSize.height()); + +-- +2.13.0 + @@ -90,7 +90,8 @@ case ${_piver} in 1) _toolchain_name=armv6-rpi-linux-gnueabihf _minimal=true - _float=true + # too problematic for me to care about + #_float=true ;; 2) _toolchain_name=armv7-rpi2-linux-gnueabihf @@ -288,6 +289,7 @@ if $_patching; then cd ${_declarativedir} #patch -p1 < ${startdir}/0001-Fix-crash-in-QQuickPixmapReader-friends.patch + #patch -p1 < ${startdir}/0001-Fix-build-with-qreal-as-float.patch cd ${_waylanddir} #patch -p1 < ${startdir}/0001-Fix-brcm-egl-build-by-correcting-commit-usage.patch @@ -297,7 +299,7 @@ if $_patching; then patch -p1 < ${startdir}/0001-Revert-Fully-qualify-libEGL.so.1-libEGLESv2.so.2-lib.patch # Work around our embarresing propensity to stomp on your own tailored build configuration - # sed -i "s/O[23]/Os/" ${_basedir}/mkspecs/common/gcc-base.conf || exit 1 + sed -i "s/O[23]/Os/" ${_basedir}/mkspecs/common/gcc-base.conf || exit 1 fi rm -Rf ${_bindir} |