[arch-commits] Commit in qcad/trunk (PKGBUILD qt5.15.patch)

[Antonio Rojas]

    Date: Thursday, July 30, 2020 @ 19:00:05
  Author: arojas
Revision: 665962

Rebuild with Qt 5.15.0 (FS#67441)

Added:
  qcad/trunk/qt5.15.patch
Modified:
  qcad/trunk/PKGBUILD

--------------+
 PKGBUILD     |    9 ++++++---
 qt5.15.patch |   12 ++++++++++++
 2 files changed, 18 insertions(+), 3 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-30 18:57:56 UTC (rev 665961)
+++ PKGBUILD	2020-07-30 19:00:05 UTC (rev 665962)
@@ -6,7 +6,7 @@
 
 pkgname=qcad
 pkgver=3.24.3.8
-pkgrel=1
+pkgrel=2
 pkgdesc='A 2D CAD package based upon Qt'
 arch=('x86_64')
 url="https://www.qcad.org"
@@ -13,8 +13,10 @@
 license=('GPL3')
 depends=('qt5-script' 'qt5-svg' 'gcc-libs' 'qt5-xmlpatterns' 'qt5-tools')
 makedepends=('glu')
-source=("$pkgname-$pkgver.tar.gz::https://github.com/qcad/qcad/archive/v${pkgver}.tar.gz")
-sha512sums=('2291b11dfade15d0a8f6702e65c1ef7f998279c90edb0271b31da3023f2c7aa1a66803473dd78a89e3ba4e9428922e0eda18f638234dc53105ab1b6c37af3305')
+source=("$pkgname-$pkgver.tar.gz::https://github.com/qcad/qcad/archive/v${pkgver}.tar.gz"
+         qt5.15.patch)
+sha512sums=('2291b11dfade15d0a8f6702e65c1ef7f998279c90edb0271b31da3023f2c7aa1a66803473dd78a89e3ba4e9428922e0eda18f638234dc53105ab1b6c37af3305'
+            'e7bf6df5535c34836366110e2550d4a89210e14d86593c1dab498360d4f32e3e0e9c4f3c5f796e05d0dad1d39bded2ab74a8f679725f8c03798f1fbb15dd5d69')
 
 prepare() {
   rm *.tar.gz
@@ -21,6 +23,7 @@
   cd qcad-$pkgver
   sed -e 's|$${QT_VERSION}|5.5.0|g' \
       -i src/3rdparty/3rdparty.pro # Don't require specific Qt version
+  patch -p1 -i ../qt5.15.patch # Fix build with Qt 5.15
 }
 
 build() {

Added: qt5.15.patch
===================================================================
--- qt5.15.patch	                        (rev 0)
+++ qt5.15.patch	2020-07-30 19:00:05 UTC (rev 665962)
@@ -0,0 +1,12 @@
+diff --git a/src/gui/RRulerQt.h b/src/gui/RRulerQt.h
+index 5c1cdd910..8f250461c 100644
+--- a/src/gui/RRulerQt.h
++++ b/src/gui/RRulerQt.h
+@@ -24,6 +24,7 @@
+ 
+ #include <QFrame>
+ #include <QMetaType>
++#include <QPainterPath>
+ 
+ #include "RCoordinateListener.h"
+ #include "RRuler.h"