From fe716fe2fdb13e48223d8038c83fcf9878a896f7 Mon Sep 17 00:00:00 2001 From: Andreas Sturmlechner Date: Sat, 15 Sep 2018 15:27:13 +0200 Subject: 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 --- .../qmapshack/files/qmapshack-1.11.1-qt-5.11.patch | 19 +++++++++++++++++++ sci-geosciences/qmapshack/qmapshack-1.11.1-r1.ebuild | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 sci-geosciences/qmapshack/files/qmapshack-1.11.1-qt-5.11.patch 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 000000000000..404f034176df --- /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 ++ + bool CToolBarSetupDialog::CItemFilter::shouldBeMoved(QListWidgetItem *item) + { + CDialogItem * dialogItem = dynamic_cast(item); diff --git a/sci-geosciences/qmapshack/qmapshack-1.11.1-r1.ebuild b/sci-geosciences/qmapshack/qmapshack-1.11.1-r1.ebuild index e49afba1831d..a8ed47130b9a 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 -- cgit v1.2.3-65-gdbad