commit: 01727aded881cef40ea414af7eee3e043eebbd03 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Sat Sep 20 22:48:37 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Sat Sep 20 22:48:37 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01727ade
sci-geosciences/qgis: fix build w/ sip-6.11 Closes: https://bugs.gentoo.org/957156 Signed-off-by: Sam James <sam <AT> gentoo.org> sci-geosciences/qgis/Manifest | 1 + sci-geosciences/qgis/qgis-3.42.3.ebuild | 9 +++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/sci-geosciences/qgis/Manifest b/sci-geosciences/qgis/Manifest index 0b6c7a0f3700..ccb26a0e491d 100644 --- a/sci-geosciences/qgis/Manifest +++ b/sci-geosciences/qgis/Manifest @@ -1,2 +1,3 @@ +DIST qgis-3.42.3-sip-6.11.patch.xz 7528 BLAKE2B 9823faf1e848df3aedba5503da46abd64f193c28bc9a3948c8dcb7c4a976b188c5ffa26d0e1d3f4c1e6e3fb59c2e50b5414c37a91442bc5d9624fa8c980588e1 SHA512 23dac575d5d483a78af27062eafa1c7f3a29b1660ef7ef754ca533e25fa74c7ffa2fae3075ce8f94734b32d64ed4ab148ebd63d4f0c1511ea8bd7da60eee6867 DIST qgis-3.42.3.tar.bz2 188579717 BLAKE2B 9bf3fa1d6a616b60cc1447d1e46e031f30ec397fcfff5362135917269448766eea2d8fca9ecc94acdc6f1b9ec58c23de081abcc964737df08343204d73c57fc3 SHA512 d1f027d78f807f032b11035ddef40f31c18a7ee74771775a4898f4dbc1aa4cda55d9df1f547fa06c2740532194f71bdf4c8f8bf8415ee7fe74c68d09802a64af DIST qgis_sample_data-2.8.14.tar.gz 22119181 BLAKE2B 2d0565e91ec8119382bc9ab8e262dc04227fe8289146794891759ff5a32012245270614ba1119a6329fc45cf56852830c2079589309aa3467873f71f5c608eac SHA512 6b2653d5b57ffc2c2317639dac212429840984ac917ca3e452b39aabb99ea106d1a77c1c1dd967244ef16ede9deae751b170affdf08b72239eafed5b8977da3d diff --git a/sci-geosciences/qgis/qgis-3.42.3.ebuild b/sci-geosciences/qgis/qgis-3.42.3.ebuild index 7fa86708a273..480831871126 100644 --- a/sci-geosciences/qgis/qgis-3.42.3.ebuild +++ b/sci-geosciences/qgis/qgis-3.42.3.ebuild @@ -16,8 +16,12 @@ if [[ ${PV} == *9999* ]]; then EGIT_REPO_URI="https://github.com/${PN}/${PN^^}.git"; inherit git-r3 else - SRC_URI="https://qgis.org/downloads/${P}.tar.bz2 - examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz )" + SRC_URI=" + https://qgis.org/downloads/${P}.tar.bz2 + examples? ( https://qgis.org/downloads/data/qgis_sample_data.tar.gz -> qgis_sample_data-2.8.14.tar.gz ) + " + # bug #957156 + SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${PN}-3.42.3-sip-6.11.patch.xz"; KEYWORDS="~amd64" fi inherit cmake flag-o-matic python-single-r1 xdg @@ -125,6 +129,7 @@ PATCHES=( # Fixes pulled from upstream branches, see bug #955031 "${FILESDIR}/${P}-fix-qt6-heatmap.patch" "${FILESDIR}/${P}-fix-qt6-qgsserver-getmap.patch" + "${WORKDIR}/${PN}-3.42.3-sip-6.11.patch" ) src_prepare() {
