summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2018-09-15 15:27:13 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2018-09-15 15:42:45 +0200
commitfe716fe2fdb13e48223d8038c83fcf9878a896f7 (patch)
tree9208b27195d8b325c45342ce51e4f1cadc1e05ec /sci-geosciences/qmapshack
parentsys-kernel/gentoo-sources: Linux patch 4.18.8 (diff)
downloadgentoo-fe716fe2fdb13e48223d8038c83fcf9878a896f7.tar.gz
gentoo-fe716fe2fdb13e48223d8038c83fcf9878a896f7.tar.bz2
gentoo-fe716fe2fdb13e48223d8038c83fcf9878a896f7.zip
sci-geosciences/qmapshack: Fix build with Qt 5.11
Doing it myself then. Closes: https://bugs.gentoo.org/665342 Package-Manager: Portage-2.3.49, Repoman-2.3.10
Diffstat (limited to 'sci-geosciences/qmapshack')
-rw-r--r--sci-geosciences/qmapshack/files/qmapshack-1.11.1-qt-5.11.patch19
-rw-r--r--sci-geosciences/qmapshack/qmapshack-1.11.1-r1.ebuild2
2 files changed, 21 insertions, 0 deletions
diff --git a/sci-geosciences/qmapshack/files/qmapshack-1.11.1-qt-5.11.patch b/sci-geosciences/qmapshack/files/qmapshack-1.11.1-qt-5.11.patch
new file mode 100644
index 00000000000..404f034176d
--- /dev/null
+++ b/sci-geosciences/qmapshack/files/qmapshack-1.11.1-qt-5.11.patch
@@ -0,0 +1,19 @@
+# HG changeset patch
+# User kiozen
+# Date 1528899896 -7200
+# Node ID e9b47af61b0945acb74649bab30dec23ac42f375
+# Parent f52eedfb8f94ea218eb1c55bb8f2fa0c0503238f
+[Issue #344 ] Building latest version of QMapShack fails after updating QT from 5.10.1 to 5.11.0
+
+diff --git a/src/qmapshack/helpers/CToolBarSetupDialog.cpp b/src/qmapshack/helpers/CToolBarSetupDialog.cpp
+--- a/src/qmapshack/helpers/CToolBarSetupDialog.cpp
++++ b/src/qmapshack/helpers/CToolBarSetupDialog.cpp
+@@ -20,6 +20,8 @@
+ #include "helpers/CToolBarConfig.h"
+ #include "helpers/CToolBarSetupDialog.h"
+
++#include <QAction>
++
+ bool CToolBarSetupDialog::CItemFilter::shouldBeMoved(QListWidgetItem *item)
+ {
+ CDialogItem * dialogItem = dynamic_cast<CDialogItem *>(item);
diff --git a/sci-geosciences/qmapshack/qmapshack-1.11.1-r1.ebuild b/sci-geosciences/qmapshack/qmapshack-1.11.1-r1.ebuild
index e49afba1831..a8ed47130b9 100644
--- a/sci-geosciences/qmapshack/qmapshack-1.11.1-r1.ebuild
+++ b/sci-geosciences/qmapshack/qmapshack-1.11.1-r1.ebuild
@@ -28,6 +28,8 @@ RDEPEND="dev-qt/qtwebkit:5
DEPEND="${RDEPEND}
dev-qt/linguist-tools:5"
+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" )
+
pkg_postinst() {
xdg_desktop_database_update
xdg_mimeinfo_database_update