media-gfx/librecad: Fix build with Qt 5.15
authorAndreas Sturmlechner <asturm@gentoo.org>
Wed, 20 May 2020 12:22:22 +0000 (14:22 +0200)
committerAndreas Sturmlechner <asturm@gentoo.org>
Wed, 20 May 2020 12:24:52 +0000 (14:24 +0200)
Bug: https://bugs.gentoo.org/699716
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
media-gfx/librecad/files/librecad-2.1.3-qt-5.15.patch [new file with mode: 0644]
media-gfx/librecad/librecad-2.1.3-r5.ebuild

diff --git a/media-gfx/librecad/files/librecad-2.1.3-qt-5.15.patch b/media-gfx/librecad/files/librecad-2.1.3-qt-5.15.patch
new file mode 100644 (file)
index 0000000..a1cfe62
--- /dev/null
@@ -0,0 +1,37 @@
+From 81741a875847c806c05f0f3a4610e69b3c3002aa Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 20 May 2020 14:12:15 +0200
+Subject: [PATCH] Fix build with Qt 5.15 (missing QPainterPath include)
+
+---
+ librecad/src/lib/engine/lc_splinepoints.cpp | 1 +
+ librecad/src/lib/gui/rs_painterqt.h         | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/librecad/src/lib/engine/lc_splinepoints.cpp b/librecad/src/lib/engine/lc_splinepoints.cpp
+index 5eaed81b..e6324ec1 100644
+--- a/librecad/src/lib/engine/lc_splinepoints.cpp
++++ b/librecad/src/lib/engine/lc_splinepoints.cpp
+@@ -21,6 +21,7 @@ along with this program; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+ **********************************************************************/
++#include <QPainterPath>
+ #include <QPolygonF>
+ #include "lc_splinepoints.h"
+diff --git a/librecad/src/lib/gui/rs_painterqt.h b/librecad/src/lib/gui/rs_painterqt.h
+index 878753cb..a0b432e0 100644
+--- a/librecad/src/lib/gui/rs_painterqt.h
++++ b/librecad/src/lib/gui/rs_painterqt.h
+@@ -29,6 +29,7 @@
+ #define RS_PAINTERQT_H
+ #include <QPainter>
++#include <QPainterPath>
+ #include "rs_painter.h"
+ #include "rs_pen.h"
+-- 
+2.26.2
+
index b9ce27bf50ede611766b3f47689f45cf44d752ab..1c3ced1015ef25e0287e55eb0a343a8e6a0e6b8c 100644 (file)
@@ -37,6 +37,7 @@ S="${WORKDIR}/LibreCAD-${PV}"
 PATCHES=(
        "${FILESDIR}/${P}-qt-5.11.patch"
        "${FILESDIR}/${P}-gcc-9.patch"
+       "${FILESDIR}/${P}-qt-5.15.patch" # pending upstream PR#1224
 )
 
 src_configure() {