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

[Ike Devolder]

    Date: Thursday, July 30, 2020 @ 19:18:24
  Author: idevolder
Revision: 665966

upgpkg: qcad 3.24.3.10-2

Added:
  qcad/trunk/RRulerQt.patch
Modified:
  qcad/trunk/PKGBUILD

----------------+
 PKGBUILD       |   10 +++++-----
 RRulerQt.patch |   20 ++++++++++++++++++++
 2 files changed, 25 insertions(+), 5 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2020-07-30 19:16:27 UTC (rev 665965)
+++ PKGBUILD	2020-07-30 19:18:24 UTC (rev 665966)
@@ -5,7 +5,7 @@
 # Contributor: Daniel J Griffiths <ghost1227 at archlinux.us>
 
 pkgname=qcad
-pkgver=3.24.3.8
+pkgver=3.24.3.10
 pkgrel=2
 pkgdesc='A 2D CAD package based upon Qt'
 arch=('x86_64')
@@ -14,9 +14,9 @@
 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"
-         qt5.15.patch)
-sha512sums=('2291b11dfade15d0a8f6702e65c1ef7f998279c90edb0271b31da3023f2c7aa1a66803473dd78a89e3ba4e9428922e0eda18f638234dc53105ab1b6c37af3305'
-            'e7bf6df5535c34836366110e2550d4a89210e14d86593c1dab498360d4f32e3e0e9c4f3c5f796e05d0dad1d39bded2ab74a8f679725f8c03798f1fbb15dd5d69')
+        "RRulerQt.patch")
+sha512sums=('04c625c3e4900f8c5e2f907b43e9be96ad4f08b553b3b05cd2acbc7e3d8131fb74702b9a6d448fb313dcfbb757aec561f5fcbfa7394ac9d39aa8735907e29135'
+            'bcb26699aab6d16f9d180553adc17b5698c8a41758fe45820d25c402f41c29543d9293571677165387ba1fb6293ece09ac1814f70972bcb79e1b43b8e092e1a7')
 
 prepare() {
   rm *.tar.gz
@@ -23,7 +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
+  patch -p1 -i "$srcdir/RRulerQt.patch"
 }
 
 build() {

Added: RRulerQt.patch
===================================================================
--- RRulerQt.patch	                        (rev 0)
+++ RRulerQt.patch	2020-07-30 19:18:24 UTC (rev 665966)
@@ -0,0 +1,20 @@
+diff --git a/src/gui/RRulerQt.h b/src/gui/RRulerQt.h
+index 5c1cdd910..48817da0b 100644
+--- a/src/gui/RRulerQt.h
++++ b/src/gui/RRulerQt.h
+@@ -1,6 +1,6 @@
+ /**
+  * Copyright (c) 2011-2018 by Andrew Mustun. All rights reserved.
+- * 
++ *
+  * This file is part of the QCAD project.
+  *
+  * QCAD is free software: you can redistribute it and/or modify
+@@ -24,6 +24,7 @@
+ 
+ #include <QFrame>
+ #include <QMetaType>
++#include <QPainterPath>
+ 
+ #include "RCoordinateListener.h"
+ #include "RRuler.h"