From 586819755b4dbfdffdc8a725ab7c0f86095b8489 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 15 Sep 2018 17:37:09 +0100 Subject: gentoo resync : 15.09.2018 --- sci-geosciences/qmapshack/Manifest | 5 ++- .../qmapshack/files/qmapshack-1.11.1-qt-5.11.patch | 19 ++++++++++ .../qmapshack/qmapshack-1.11.1-r1.ebuild | 2 ++ sci-geosciences/qmapshack/qmapshack-1.12.0.ebuild | 41 ++++++++++++++++++++++ 4 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 sci-geosciences/qmapshack/files/qmapshack-1.11.1-qt-5.11.patch create mode 100644 sci-geosciences/qmapshack/qmapshack-1.12.0.ebuild (limited to 'sci-geosciences/qmapshack') diff --git a/sci-geosciences/qmapshack/Manifest b/sci-geosciences/qmapshack/Manifest index 3e8ff9c4f80e..68360b14abbd 100644 --- a/sci-geosciences/qmapshack/Manifest +++ b/sci-geosciences/qmapshack/Manifest @@ -1,5 +1,8 @@ +AUX qmapshack-1.11.1-qt-5.11.patch 738 BLAKE2B f67a505ae4c63f7aac616c6dab7c6b0d96ac63a15267c1be50d5f45b6cc0c7f0c8ca98d0f6c92f6970758ba0a5fa062d9f32615dca4eb7ed26878965fd068198 SHA512 7793e38cea40c692893934fbd33d7f60a1f456ca80612a2ec00fc0144717f34fd8eab01ef66b697b1cec52ec56e69d1197932f574d03dbed707c1dfc686fa36d DIST qmapshack-1.11.1.tar.gz 11446871 BLAKE2B fa92b93787306d23110112fd851f0ee02418ac7b27316f57b4045efc4ae726e36c4014682d1ee32879f8894bab7dcac70852384f8b158e01026d7782f67b5ede SHA512 43e1b587bd3f4901b155ea6d1d520cf303681640c1bd521b30ef7f23aaf49b2fffe9b764e5dd3fcaef360b0d32b360b76eb8d737ec5e186aa75362ff2507956e +DIST qmapshack-1.12.0.tar.gz 12030329 BLAKE2B af641e76b00ee7dc7d964fd9f4ba75e51d7d6bcc4b33e020129181655371cda91f8ddffdcfd489f55228c22fc63416e6e5c8f4b1755a6a07e5832895a921afc7 SHA512 dac6081b37eab39431221acdd48a3e61876ff40e4f76aac7eed9232e839cabc69a099cb2e9e29fcc23cf439eaa8a3d1522be17e24c71e2b6d3f332eb3127efb5 DIST qmapshack-1.6.3.tar.gz 5181205 BLAKE2B 89e7a638f35e0e555b237a000992f48b1a126ed9de5c2892ee8e147060866656b87abbc46937cc5187e473681b71a2dfb250160d4847824df4989c352afd676b SHA512 6e9efdd35ebf3980011aea0cefdbcc433e4f0d333cbeff72e70880a41bff972cc27f4517e243f4990b5e04112a50af2651d99cb5c1c6e542341db30e5e000133 -EBUILD qmapshack-1.11.1-r1.ebuild 896 BLAKE2B 2a497d2f61f009b152f993c21df672ec59accfc9b9e4c23099f3b455f28ea176c0d7402784307b8da1fa06d8d887475526fed2328d10874f4caa92b60f8da45f SHA512 a778c772f11caa24027a9963709bdc466a53e2088f8001ee19fcfcba1538472c4be2a821c0b11e315f1b72e168929abf9776a525ebe49867910b26e741d7faa8 +EBUILD qmapshack-1.11.1-r1.ebuild 942 BLAKE2B e999f8e50a37ee1bd4381417d11d1522c58070235779525b3b9b8482801429188fe6b099d006229f626f4b4e43a7cbba84b90ac0786091a0ccb702eafd65ae2e SHA512 c4be5e1ebe57f1143d464e1327b347f988666a58e95c6dcfd6f6ec6b7855db0551c8fe7a378e59d73a1e2a3a46491f1ab92b260ef4c685fe5b077062bfd44fe5 +EBUILD qmapshack-1.12.0.ebuild 922 BLAKE2B fc3b1c8317a13af3a85c85225df00470cc0ea4a2a0968cd843f827e23d0c4dd2f1c078df3c4dc3664b10e0f3e2165d1f92c1447175e2e53d60e78da68016948e SHA512 a146801935f9816c3e3abb09f88468cfd5e2d89881f6130325f17fa58d55705cbb6dfadd93340a531e4efe5b6eae7751bca741f1a20c153f45786385212fc623 EBUILD qmapshack-1.6.3.ebuild 594 BLAKE2B 47fca8a961fe1e76d41cfee2ae99c4716bb3897a596e4ed29cc872e0296eee06fbc47188f84e423b28cf0c2d725f8e0fd5dc8e903761a1fafc4f2eedc481a4c3 SHA512 d6ba2f2fb68520668a89240021ab195477c94648b8fcf50040e671922a19f35d9107a8f0b56d33077bbb4b85f36787e995b26f54462ce8b62247d2fc4d118092 MISC metadata.xml 772 BLAKE2B b1bd146b3ae624d365dd366cef81f3eaf37c8220ddd4eeb1f64916275f6520f3bd2d458a339bdea85d0f13cde14b3038d98c32f6265204e3aa1e22424f9dbfd2 SHA512 03cd1cf6d4e0b5a420b4301ffb1077f2dda9e023572dedd1c56ba4574ab4460c125d63bb5c7475b66b023ff15dc0b9c4cfc8479218366c935108e89850ed5d4d 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 diff --git a/sci-geosciences/qmapshack/qmapshack-1.12.0.ebuild b/sci-geosciences/qmapshack/qmapshack-1.12.0.ebuild new file mode 100644 index 000000000000..6921f476c72e --- /dev/null +++ b/sci-geosciences/qmapshack/qmapshack-1.12.0.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit cmake-utils xdg-utils gnome2-utils + +DESCRIPTION="GPS mapping utility" +HOMEPAGE="https://bitbucket.org/maproom/qmapshack/wiki/Home" +SRC_URI="https://bitbucket.org/maproom/${PN}/downloads/${P}.tar.gz" +LICENSE="GPL-3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" +RDEPEND="dev-qt/qtwebengine:5[widgets] + dev-qt/qtdeclarative:5[widgets] + dev-qt/qtprintsupport:5 + dev-qt/qtdbus:5 + dev-qt/qttest:5 + dev-qt/designer:5 + dev-qt/qtnetwork:5[ssl] + dev-qt/qtsql:5 + dev-libs/quazip + >=sci-geosciences/routino-3.1.1 + sci-libs/gdal + sci-libs/proj + sci-libs/alglib" +DEPEND="${RDEPEND} + dev-qt/linguist-tools:5" + +pkg_postinst() { + xdg_desktop_database_update + xdg_mimeinfo_database_update + gnome2_icon_cache_update +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_mimeinfo_database_update + gnome2_icon_cache_update +} -- cgit v1.2.3