summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2020-05-20 14:22:22 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2020-05-20 14:24:52 +0200
commit778c32d5d85ee0f3240c3c77da0a1ba95fdb74f2 (patch)
tree902af5e519d56da1bc78e96f5404cf6fe9dc531c /media-gfx/librecad
parentmedia-gfx/librecad: Fix live ebuild by adding a release switch (diff)
downloadgentoo-778c32d5d85ee0f3240c3c77da0a1ba95fdb74f2.tar.gz
gentoo-778c32d5d85ee0f3240c3c77da0a1ba95fdb74f2.tar.bz2
gentoo-778c32d5d85ee0f3240c3c77da0a1ba95fdb74f2.zip
media-gfx/librecad: Fix build with Qt 5.15
Bug: https://bugs.gentoo.org/699716 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'media-gfx/librecad')
-rw-r--r--media-gfx/librecad/files/librecad-2.1.3-qt-5.15.patch37
-rw-r--r--media-gfx/librecad/librecad-2.1.3-r5.ebuild1
2 files changed, 38 insertions, 0 deletions
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
index 000000000000..a1cfe62408f9
--- /dev/null
+++ b/media-gfx/librecad/files/librecad-2.1.3-qt-5.15.patch
@@ -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
+
diff --git a/media-gfx/librecad/librecad-2.1.3-r5.ebuild b/media-gfx/librecad/librecad-2.1.3-r5.ebuild
index b9ce27bf50ed..1c3ced1015ef 100644
--- a/media-gfx/librecad/librecad-2.1.3-r5.ebuild
+++ b/media-gfx/librecad/librecad-2.1.3-r5.ebuild
@@ -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() {