summaryrefslogtreecommitdiff
path: root/sci-geosciences/qgis
diff options
context:
space:
mode:
authorV3n3RiX <venerix@redcorelinux.org>2020-12-25 23:06:25 +0000
committerV3n3RiX <venerix@redcorelinux.org>2020-12-25 23:06:25 +0000
commit441d1370330332b7d78f238d2f5e13f7aed5e4e0 (patch)
tree6a5171dd615dfeee62a45044144c66e864738fb0 /sci-geosciences/qgis
parentab3da91fb6c91a9df52fff8f991570f456fd3c7a (diff)
gentoo christmass resync : 25.12.2020
Diffstat (limited to 'sci-geosciences/qgis')
-rw-r--r--sci-geosciences/qgis/Manifest5
-rw-r--r--sci-geosciences/qgis/files/qgis-3.16.1-find-qt5linguisttools.patch27
-rw-r--r--sci-geosciences/qgis/qgis-3.16.2.ebuild (renamed from sci-geosciences/qgis/qgis-3.16.1.ebuild)5
3 files changed, 4 insertions, 33 deletions
diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest
index 5a3e569f77f6..0c69a59171d4 100644
--- a/sci-geosciences/qgis/Manifest
+++ b/sci-geosciences/qgis/Manifest
@@ -1,13 +1,12 @@
AUX qgis-3.16.0-cmake-lib-suffix.patch 507 BLAKE2B 0a8943fe06f4065d5c0b1cf7797ecedb9fed40616121cbfd9f0c97568dd7da0b7c3e6a526b9408b6268b20988fe7a216d94cc394c01a693fcac6b321f7c7ca01 SHA512 5014fb01e7caa56f5fcb8a7f6b81e1f99acac50e7edff524071808f2b145f87dd440ce8c4897b7c781cb8e30c5ee3a873a6d977c6ecd65a54dc3157de8b0bfd1
AUX qgis-3.16.1-default-qmldir.patch 899 BLAKE2B b5f573445c80cf991864320d80644aacdfc28095f3657839dec0c084544d44405857a2cf1f644c8a47ac271cf51953f861cde285f37e30c490623fbbf96f7470 SHA512 4d794cdc730c55d59163bce7d1c23cab7ab3c384e09dccfe3b541d12ef365a180035fd51d998128c59c493b6039fff13dafe392c5935bbdedb39c22c05748a5c
AUX qgis-3.16.1-featuresummary.patch 905 BLAKE2B 318239edfc14562cccf0a0c79e330fc24c03f8468d4df3a3ece0286f2448df275d117afc0ed63f8d7c682cebef84a62fda3a992a9e4746f37fe1e8b52e82ecf7 SHA512 c3b563fcfac199756f4f8212cf1f0ceb301c7d4cc751d2b9b1b6f3f8d69d88ae1d6cab33c952a2ff15bdbe33a4151f93eaf9308a486ca330fd45c533f9fa3b36
-AUX qgis-3.16.1-find-qt5linguisttools.patch 923 BLAKE2B 2753e58338432736be05e6ac64a46638d417db2145f084a97b8c3371752ecb8d639df6ec0dd519533ec39444f098cf43716a8f1b4c516681fe2be34f73affef3 SHA512 b42de8f7c23fb0010e77ae873fb88304b3f70506317203d0aee170a7340ef9244ea0c4e39cd850ef57f2324e0c125a7c6c77f84e3835e5f59f2bdcb3f6a78612
AUX qgis-3.4.7-default-qmldir.patch 862 BLAKE2B 6b56317dc738004451c827b577125716eda662437a4d8469c055483b0e8c0014d0bc35e071b50a6e1a23138e8b6822df226d4d80b18f789976ff922a35311200 SHA512 59fee5497129856a15bf573d2682a4c837df044ccb44bc914fb64ad6e27d321251723131ae3ab5ffffdce876be954f2fd4db52931cd3fb6fbeb2f38a41419133
AUX qgis-3.4.7-featuresummary.patch 865 BLAKE2B 6a875895f355c17232458e1d2e33613dd40637aeb3dd3bf3c47f30497b9c15a1e4f7c377d57ed4fefbd20b02245bb701f20ebc2a5c604df5dee600050a35edba SHA512 718dd5aca408ca34da3b5478b5d6788a1c4737304c64b8b4ac212a28fbcf1c55373fcc31a2901802461d7298935c507229c1208d0fa242a5dc5d474f3d0a292f
DIST qgis-3.16.0.tar.bz2 113238659 BLAKE2B 42bdf8d0d69b28c20aa0decd79883c3b83d2ff9aa9d7633866b6c7d624ad20cb602beeca0e22585077c3d0ceba791e51b81ba221bc305c9bd2ebff71a4ea4bd4 SHA512 c87959a6412f85b6e4d30d4677e0e0914fd9a1009348c8bfe6063d7e1a9416f0a33ae63ded15273d8edde26ae0e6c32ba4d62d83c33c2c6251c444360dc47d10
-DIST qgis-3.16.1.tar.bz2 113943328 BLAKE2B 0c0f9c0a038e87d7f16e66a00cd6844db27b9238ef4f42cf2504a5e498843d4f93bde42542cf7bedcc7f58303daa4fdc7d9cb9e1954958a0de29e294e502a461 SHA512 2df53731468b734c95ad32cd8ecc930dd113b1084c4d3971aba2aaf58b473dc8e0dd204d979b74ee79d443cd95e4f91c51d071eb645254142a76d7a4d0bc3dc8
+DIST qgis-3.16.2.tar.bz2 114086615 BLAKE2B 85196072b792b5731dcbc85cfaaae1768e91d16bfdaa2190cfb6063753953b6ab0e8b17b0d3f5334259dffd5b8fb5be6b54a28ca9856dc4fc4079dee483888f6 SHA512 93582e54ff403ea05672a81be9e866b8f1fa9335e467723a087615511b8403c4a1d8447d5a433d0799c382b6cc99fb2f18cc9c6685ed6dc83cabb4d13a00f033
DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d
EBUILD qgis-3.16.0-r1.ebuild 5355 BLAKE2B b6a9239578ab1f6363dfdd78ac5141a0890a70902bd4ac76f58311a8f57fed841bee5f85368ec620902e17e88cd46dc734d49b722db9522c81de46329c81ccf0 SHA512 c11682d7c7555ba9078344aa3d9cf0624f173dcc151395ae2ae9c765d4baebedbe90d15bcecde01bd48a80d74a4e3609f33dd28bf572b097e5f317ad220cc2de
-EBUILD qgis-3.16.1.ebuild 5399 BLAKE2B 1a5e4ce95087ac6642dce7a90820485aa3c70339a63b3630c7bb6c9d90afff7f2d2637cfb5e5af32c99d95c7fc7c193b9d6c5cd672f91f7349c1ecca0fc7c5f0 SHA512 1da717908534b7cf47c04f4fbbdd848731b35ee1320d7a5419f3597bd0169b4f7d03155917bb77d5c69868cb1d0024b45baa0b0657fcfff269ee33de90f2315c
+EBUILD qgis-3.16.2.ebuild 5367 BLAKE2B 0deb1db585db8c6fbd7077449f5e93588433622b4f6ea01eefa609abf7eb88af77de371e446003301bd665f231a456f6a60d6d2c1bc0a211dc43df1219007dd7 SHA512 7418323687ea5230a18eeffc8426caaa35123531e36ff0110f1bc6d2db13aea82873e18614a02b722ce221e46b8ad7bbc5bf78fb21ceb438f120f75083f2ca58
EBUILD qgis-9999.ebuild 5291 BLAKE2B 8efe5c7bef0d5136907571d17737b8a721fc12c7cbcd6328fe44d9232b0f25c3cc89670f0fd55e9b620803bb82692466d9e2b230bdcdf0a0dd1d6cce6c1638c1 SHA512 c721f235aeabb56cb4b5c03d5a35f269cd949665443ac0633f59fac7c29f44acb744cbc37855a700c857c7e1dcc62876283d2c2c23bb1f19cb4f959cbec9f675
MISC metadata.xml 1386 BLAKE2B f5e9142fe248a2482ca29fe1b03aa585fb5b2eb4f0e1a1f0bf8d4a643034fffb9d37c3595170c9fea7b3b2dc0dcbec0e94dcc0bef2af6ea2da29a48d6880a7c3 SHA512 0ef09ee19b881d9ecc04884bc568e17013cb6794c666e75993031f798dca5f80b60b3c9ecded1183e0ac004a65ab0cf4f5af973132991e0b5a51674a6daab0ce
diff --git a/sci-geosciences/qgis/files/qgis-3.16.1-find-qt5linguisttools.patch b/sci-geosciences/qgis/files/qgis-3.16.1-find-qt5linguisttools.patch
deleted file mode 100644
index 01f602694395..000000000000
--- a/sci-geosciences/qgis/files/qgis-3.16.1-find-qt5linguisttools.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From db2fee6c199a34507e5742b2360d594a5bf67b18 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Mon, 23 Nov 2020 22:04:50 +0100
-Subject: [PATCH] Fix Qt5LinguistTools detection/lrelease binary location
-
-Correctly find the Qt5 module that provides the path to Qt5-based lrelease.
-Available since >= Qt-5.3.1 which is well below the current minimum for QGIS.
-
-Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
----
- i18n/CMakeLists.txt | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/i18n/CMakeLists.txt b/i18n/CMakeLists.txt
-index a836e5cae5..7d7f79da89 100644
---- a/i18n/CMakeLists.txt
-+++ b/i18n/CMakeLists.txt
-@@ -1,4 +1,5 @@
--find_program(QT_LRELEASE_EXECUTABLE NAMES lrelease-qt5 lrelease)
-+find_package(Qt5LinguistTools REQUIRED)
-+set(QT_LRELEASE_EXECUTABLE Qt5::lrelease)
-
- macro(ADD_TRANSLATION_FILES _sources )
- foreach (_current_FILE ${ARGN})
---
-2.29.2
-
diff --git a/sci-geosciences/qgis/qgis-3.16.1.ebuild b/sci-geosciences/qgis/qgis-3.16.2.ebuild
index 2bc3ef993a96..c27cdfcd10c6 100644
--- a/sci-geosciences/qgis/qgis-3.16.1.ebuild
+++ b/sci-geosciences/qgis/qgis-3.16.2.ebuild
@@ -107,9 +107,8 @@ PATCHES=(
# git master
"${FILESDIR}/${PN}-3.16.0-cmake-lib-suffix.patch"
# TODO upstream
- "${FILESDIR}/${P}-featuresummary.patch"
- "${FILESDIR}/${P}-default-qmldir.patch"
- "${FILESDIR}/${P}-find-qt5linguisttools.patch"
+ "${FILESDIR}/${PN}-3.16.1-featuresummary.patch"
+ "${FILESDIR}/${PN}-3.16.1-default-qmldir.patch"
)
pkg_setup() {