From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id AB036138334 for ; Sat, 15 Sep 2018 13:43:08 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8403FE0AD8; Sat, 15 Sep 2018 13:43:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 58DEDE0AD8 for ; Sat, 15 Sep 2018 13:43:07 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 78B73335CD5 for ; Sat, 15 Sep 2018 13:43:05 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A4E3E3C1 for ; Sat, 15 Sep 2018 13:43:03 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1537018965.fe716fe2fdb13e48223d8038c83fcf9878a896f7.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qmapshack/, sci-geosciences/qmapshack/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-geosciences/qmapshack/files/qmapshack-1.11.1-qt-5.11.patch sci-geosciences/qmapshack/qmapshack-1.11.1-r1.ebuild X-VCS-Directories: sci-geosciences/qmapshack/files/ sci-geosciences/qmapshack/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: fe716fe2fdb13e48223d8038c83fcf9878a896f7 X-VCS-Branch: master Date: Sat, 15 Sep 2018 13:43:03 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 5db860ca-3d05-4d87-9673-0531d16325b7 X-Archives-Hash: fd2753eb026fb7bcd4859c31b9da3596 commit: fe716fe2fdb13e48223d8038c83fcf9878a896f7 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sat Sep 15 13:27:13 2018 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sat Sep 15 13:42:45 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe716fe2 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(+) 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 ++ + 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 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