summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2020-06-14 20:32:28 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2020-06-14 23:51:38 +0200
commit28576a104421552310e2d9c6d0be75a4795d1307 (patch)
tree06d1becb1ef96d180e34f36a7d53317b8193065c /x11-misc
parentx11-misc/qtfm: Fix EAPI-7, local mycmakeargs, improve DESCRIPTION (diff)
downloadgentoo-28576a104421552310e2d9c6d0be75a4795d1307.tar.gz
gentoo-28576a104421552310e2d9c6d0be75a4795d1307.tar.bz2
gentoo-28576a104421552310e2d9c6d0be75a4795d1307.zip
x11-misc/qtfm: Fix build with Qt 5.15
Closes: https://bugs.gentoo.org/728246 Package-Manager: Portage-2.3.100, Repoman-2.3.22 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'x11-misc')
-rw-r--r--x11-misc/qtfm/files/qtfm-6.2.0-qt-5.15.patch38
-rw-r--r--x11-misc/qtfm/qtfm-6.2.0.ebuild2
2 files changed, 40 insertions, 0 deletions
diff --git a/x11-misc/qtfm/files/qtfm-6.2.0-qt-5.15.patch b/x11-misc/qtfm/files/qtfm-6.2.0-qt-5.15.patch
new file mode 100644
index 000000000000..783d33d42328
--- /dev/null
+++ b/x11-misc/qtfm/files/qtfm-6.2.0-qt-5.15.patch
@@ -0,0 +1,38 @@
+From c80a7f7e89f5810fab889dc2660d078438727c05 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Sun, 14 Jun 2020 20:25:46 +0200
+Subject: [PATCH] Fix build with Qt 5.15 (missing QPainterPath include)
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ libfm/iconlist.cpp | 2 ++
+ libfm/iconview.cpp | 2 ++
+ 2 files changed, 4 insertions(+)
+
+diff --git a/libfm/iconlist.cpp b/libfm/iconlist.cpp
+index ca72f2e..9b25dd2 100644
+--- a/libfm/iconlist.cpp
++++ b/libfm/iconlist.cpp
+@@ -1,5 +1,7 @@
+ #include "iconlist.h"
+
++#include <QPainterPath>
++
+ QSize IconListDelegate::sizeHint(const QStyleOptionViewItem &option,
+ const QModelIndex &index) const
+ {
+diff --git a/libfm/iconview.cpp b/libfm/iconview.cpp
+index 7b72bfb..f1abbd2 100644
+--- a/libfm/iconview.cpp
++++ b/libfm/iconview.cpp
+@@ -1,5 +1,7 @@
+ #include "iconview.h"
+
++#include <QPainterPath>
++
+ bool IconViewDelegate::eventFilter(QObject *object,
+ QEvent *event)
+ {
+--
+2.27.0
+
diff --git a/x11-misc/qtfm/qtfm-6.2.0.ebuild b/x11-misc/qtfm/qtfm-6.2.0.ebuild
index 44a474694690..2701a220c7e8 100644
--- a/x11-misc/qtfm/qtfm-6.2.0.ebuild
+++ b/x11-misc/qtfm/qtfm-6.2.0.ebuild
@@ -29,6 +29,8 @@ RDEPEND="
"
DEPEND="${RDEPEND}"
+PATCHES=( "${FILESDIR}"/${P}-qt-5.15.patch )
+
src_configure() {
eqmake5 \
$(usex dbus '' 'CONFIG+=no_dbus CONFIG+=no_tray') \