| 1 |
commit: fe716fe2fdb13e48223d8038c83fcf9878a896f7 |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Sep 15 13:27:13 2018 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Sep 15 13:42:45 2018 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe716fe2 |
| 7 |
|
| 8 |
sci-geosciences/qmapshack: Fix build with Qt 5.11 |
| 9 |
|
| 10 |
Doing it myself then. |
| 11 |
|
| 12 |
Closes: https://bugs.gentoo.org/665342 |
| 13 |
Package-Manager: Portage-2.3.49, Repoman-2.3.10 |
| 14 |
|
| 15 |
.../qmapshack/files/qmapshack-1.11.1-qt-5.11.patch | 19 +++++++++++++++++++ |
| 16 |
sci-geosciences/qmapshack/qmapshack-1.11.1-r1.ebuild | 2 ++ |
| 17 |
2 files changed, 21 insertions(+) |
| 18 |
|
| 19 |
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 |
| 20 |
new file mode 100644 |
| 21 |
index 00000000000..404f034176d |
| 22 |
--- /dev/null |
| 23 |
+++ b/sci-geosciences/qmapshack/files/qmapshack-1.11.1-qt-5.11.patch |
| 24 |
@@ -0,0 +1,19 @@ |
| 25 |
+# HG changeset patch |
| 26 |
+# User kiozen |
| 27 |
+# Date 1528899896 -7200 |
| 28 |
+# Node ID e9b47af61b0945acb74649bab30dec23ac42f375 |
| 29 |
+# Parent f52eedfb8f94ea218eb1c55bb8f2fa0c0503238f |
| 30 |
+[Issue #344 ] Building latest version of QMapShack fails after updating QT from 5.10.1 to 5.11.0 |
| 31 |
+ |
| 32 |
+diff --git a/src/qmapshack/helpers/CToolBarSetupDialog.cpp b/src/qmapshack/helpers/CToolBarSetupDialog.cpp |
| 33 |
+--- a/src/qmapshack/helpers/CToolBarSetupDialog.cpp |
| 34 |
++++ b/src/qmapshack/helpers/CToolBarSetupDialog.cpp |
| 35 |
+@@ -20,6 +20,8 @@ |
| 36 |
+ #include "helpers/CToolBarConfig.h" |
| 37 |
+ #include "helpers/CToolBarSetupDialog.h" |
| 38 |
+ |
| 39 |
++#include <QAction> |
| 40 |
++ |
| 41 |
+ bool CToolBarSetupDialog::CItemFilter::shouldBeMoved(QListWidgetItem *item) |
| 42 |
+ { |
| 43 |
+ CDialogItem * dialogItem = dynamic_cast<CDialogItem *>(item); |
| 44 |
|
| 45 |
diff --git a/sci-geosciences/qmapshack/qmapshack-1.11.1-r1.ebuild b/sci-geosciences/qmapshack/qmapshack-1.11.1-r1.ebuild |
| 46 |
index e49afba1831..a8ed47130b9 100644 |
| 47 |
--- a/sci-geosciences/qmapshack/qmapshack-1.11.1-r1.ebuild |
| 48 |
+++ b/sci-geosciences/qmapshack/qmapshack-1.11.1-r1.ebuild |
| 49 |
@@ -28,6 +28,8 @@ RDEPEND="dev-qt/qtwebkit:5 |
| 50 |
DEPEND="${RDEPEND} |
| 51 |
dev-qt/linguist-tools:5" |
| 52 |
|
| 53 |
+PATCHES=( "${FILESDIR}/${P}-qt-5.11.patch" ) |
| 54 |
+ |
| 55 |
pkg_postinst() { |
| 56 |
xdg_desktop_database_update |
| 57 |
xdg_mimeinfo_database_update |
Archives