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 939C8138334 for ; Sun, 20 Oct 2019 14:21:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id DCB16E0AD0; Sun, 20 Oct 2019 14:21:05 +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 A9843E0ACC for ; Sun, 20 Oct 2019 14:21:05 +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 7D0CE34C0C3 for ; Sun, 20 Oct 2019 14:21:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 597C9894 for ; Sun, 20 Oct 2019 14:21:01 +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: <1571581174.05d9e933f30bf2b67ef447dd3703f177c13c04a1.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sci-geosciences/qgis/files/, sci-geosciences/qgis/ X-VCS-Repository: repo/gentoo X-VCS-Files: sci-geosciences/qgis/Manifest sci-geosciences/qgis/files/qgis-3.4.12-qt-5.13.patch sci-geosciences/qgis/qgis-3.4.12.ebuild sci-geosciences/qgis/qgis-9999.ebuild X-VCS-Directories: sci-geosciences/qgis/files/ sci-geosciences/qgis/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 05d9e933f30bf2b67ef447dd3703f177c13c04a1 X-VCS-Branch: master Date: Sun, 20 Oct 2019 14:21:01 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 6c3cc686-7bb3-42a8-94d9-49fe6cd9d869 X-Archives-Hash: b712ddf5a75082cb3deda3f3a6a820ff commit: 05d9e933f30bf2b67ef447dd3703f177c13c04a1 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Oct 20 08:45:46 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Oct 20 14:19:34 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=05d9e933 sci-geosciences/qgis: 3.4.12 version bump Fixes build with Qt 5.13 Fixes pyyaml usage (fixed upstream) Thanks-to: Marco Genasci gmail.com> Closes: https://bugs.gentoo.org/687292 Package-Manager: Portage-2.3.77, Repoman-2.3.17 Signed-off-by: Andreas Sturmlechner gentoo.org> sci-geosciences/qgis/Manifest | 1 + .../qgis/files/qgis-3.4.12-qt-5.13.patch | 22 ++++++++++++++++++++++ .../qgis/{qgis-9999.ebuild => qgis-3.4.12.ebuild} | 7 ++++--- sci-geosciences/qgis/qgis-9999.ebuild | 3 --- 4 files changed, 27 insertions(+), 6 deletions(-) diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest index 7619af99327..3c21f68de4e 100644 --- a/sci-geosciences/qgis/Manifest +++ b/sci-geosciences/qgis/Manifest @@ -1,3 +1,4 @@ DIST qgis-3.2.3.tar.bz2 71991789 BLAKE2B 656c0304cfc32d619a72f08185f76cf02aed7336fac8a4bf928c7f8b0e00df2e995e891a7ba757d8ce6acb5892c5c7425765608ee0441fa7eae8070a828734d4 SHA512 3366fce6232dd1b7657c0693debf742309d5594c7875017f464efd33e63bd4116eb062a0ebeb5b3108572a9658c3fb7d729e5a5db8fefb3ceae490ef1ec6bd22 +DIST qgis-3.4.12.tar.bz2 74738234 BLAKE2B 7b78dfc447cafb979dd86de2fd6d6a6248ecc5de8d82285ac22d44343bc2887f97574374ff3018da4fd74ed66b7ae55e20916b9fbb3c9d8745c22f0937d6d8b6 SHA512 c932357374b2b6c71188cc53ab8606bc056fac32147d8a267024bbe6787da524ce7b18ac6a166e3d5db1d5ca9f161ff3528e3eaa951cad1f764d98fde65f02a4 DIST qgis-3.4.7.tar.bz2 74373862 BLAKE2B 9b3a9987df406c703b0cdac36bc5267cca23b77e1c9f142e74b5170018c7c1ccdca738908412803a6703b0d2e64ef7733f2f4e986188cf90ce79a65e72113a55 SHA512 3977a49378ecaa27556ce76c6755281e477cea4a29a6a2ab496ef8e7b9b488cb31f9a124eece6f8a4974c98f0ae5396061e8c14fd577655bb4d428b818d1e1db DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d diff --git a/sci-geosciences/qgis/files/qgis-3.4.12-qt-5.13.patch b/sci-geosciences/qgis/files/qgis-3.4.12-qt-5.13.patch new file mode 100644 index 00000000000..9edb4427609 --- /dev/null +++ b/sci-geosciences/qgis/files/qgis-3.4.12-qt-5.13.patch @@ -0,0 +1,22 @@ +From ef8f06330f57882f740cfe7f8f3659b54b1bb1fb Mon Sep 17 00:00:00 2001 +From: Matthias Kuhn +Date: Sat, 22 Jun 2019 10:11:31 +0200 +Subject: [PATCH] Add missing include + +Fix https://github.com/qgis/QGIS/issues/30316 +--- + src/analysis/interpolation/qgsinterpolator.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/analysis/interpolation/qgsinterpolator.h b/src/analysis/interpolation/qgsinterpolator.h +index 35343ccdf7f..5d694418299 100644 +--- a/src/analysis/interpolation/qgsinterpolator.h ++++ b/src/analysis/interpolation/qgsinterpolator.h +@@ -19,6 +19,7 @@ + #define QGSINTERPOLATOR_H + + #include ++#include + #include "qgis_sip.h" + #include "qgis_analysis.h" + diff --git a/sci-geosciences/qgis/qgis-9999.ebuild b/sci-geosciences/qgis/qgis-3.4.12.ebuild similarity index 97% copy from sci-geosciences/qgis/qgis-9999.ebuild copy to sci-geosciences/qgis/qgis-3.4.12.ebuild index a541d6c46fd..dc087c07090 100644 --- a/sci-geosciences/qgis/qgis-9999.ebuild +++ b/sci-geosciences/qgis/qgis-3.4.12.ebuild @@ -106,6 +106,7 @@ RESTRICT="test" PATCHES=( # git master "${FILESDIR}/${PN}-2.18.12-cmake-lib-suffix.patch" + "${FILESDIR}/${P}-qt-5.13.patch" # TODO upstream "${FILESDIR}/${PN}-3.4.7-featuresummary.patch" "${FILESDIR}/${PN}-3.4.7-default-qmldir.patch" @@ -117,6 +118,9 @@ pkg_setup() { src_prepare() { cmake-utils_src_prepare + + sed -e "/FIND_PACKAGE(QtQmlTools/s/ REQUIRED//" \ + -i CMakeLists.txt || die # TODO fixed in master } src_configure() { @@ -207,9 +211,6 @@ pkg_postinst() { elog "If you do not need these plugins just disable them" elog "in the Plugins menu, else you need to set USE=\"postgres\"" fi - if has_version "