Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update proj, spatialindex, lapack, armadillo, boost and 6 more modules #707

Merged
merged 5 commits into from
Jan 28, 2025
Merged

Update proj, spatialindex, lapack, armadillo, boost and 6 more modules #707

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
4c9ab84
Update runtime
aleixpol Jan 27, 2025
601250b
Remove clang again
aleixpol Jan 27, 2025
36892bf
Fix gdal build with poppler
aleixpol Jan 27, 2025
66e4ce8
Update proj, spatialindex, lapack, armadillo, boost and 6 more modules
flathubbot Jan 8, 2025
84bc81c
Fix build
aleixpol Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 28 additions & 0 deletions fix_build_with_poppler_24.12.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
From 19ba2562b506f628e0f023774fdb52ada656f95b Mon Sep 17 00:00:00 2001
From: Even Rouault <[email protected]>
Date: Mon, 9 Dec 2024 18:18:31 +0100
Subject: [PATCH] PDF: fix build issue on CondaForge build infrastructure (gcc
13.3)

Cf https://github.com/conda-forge/gdal-feedstock/pull/1019#issuecomment-2528710051
---
frmts/pdf/pdfsdk_headers_poppler.h | 5 +++++
1 file changed, 5 insertions(+)

diff --git a/frmts/pdf/pdfsdk_headers_poppler.h b/frmts/pdf/pdfsdk_headers_poppler.h
index 00cc4067fe5b..d2a3a449d124 100644
--- a/frmts/pdf/pdfsdk_headers_poppler.h
+++ b/frmts/pdf/pdfsdk_headers_poppler.h
@@ -19,6 +19,11 @@

#ifdef HAVE_POPPLER

+// The "#define private public" hacks we do below do not play well with the
+// sstream header.
+// Cf https://github.com/conda-forge/gdal-feedstock/pull/1019#issuecomment-2528710051
+#include <sstream>
+
/* Horrible hack because there's a conflict between struct FlateDecode of */
/* include/poppler/Stream.h and the FlateDecode() function of */
/* pdfium/core/include/fpdfapi/fpdf_parser.h. */

88 changes: 47 additions & 41 deletions org.qgis.qgis.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
{
"id": "org.qgis.qgis",
"base": "com.riverbankcomputing.PyQt.BaseApp",
"base-version": "5.15-23.08",
"base-version": "5.15-24.08",
"runtime": "org.kde.Platform",
"runtime-version": "5.15-23.08",
"runtime-version": "5.15-24.08",
"sdk": "org.kde.Sdk",
"command": "qgis",
"rename-icon": "qgis",
"sdk-extensions": [
"org.freedesktop.Sdk.Extension.llvm18"
],
"finish-args": [
"--env=LD_LIBRARY_PATH=/app/lib:/app/grass83/lib",
"--env=PROJ_LIB=/app/share/proj/",
Expand All @@ -22,10 +19,8 @@
],
"separate-locales": false,
"build-options": {
"append-path": "/usr/lib/sdk/llvm18/bin",
"prepend-ld-library-path": "/usr/lib/sdk/llvm18/lib",
"env": {
"PYTHONPATH": "/app/lib/python3.11/site-packages:/usr/lib/python3.11/site-packages"
"PYTHONPATH": "/app/lib/python3.12/site-packages:/usr/lib/python3.12/site-packages"
}
},
"cleanup": [
Expand Down Expand Up @@ -57,8 +52,6 @@
}
],
"config-opts": [
"-DCMAKE_C_COMPILER=clang",
"-DCMAKE_CXX_COMPILER=clang++",
"-DENABLE_TESTS=FALSE",
"-DWITH_3D=TRUE",
"-DGRASS_PREFIX8=/app/grass83",
Expand All @@ -72,7 +65,7 @@
"-DHAS_KDE_QT5_PDF_TRANSFORM_FIX=TRUE",
"-DHAS_KDE_QT5_SMALL_CAPS_FIX=TRUE",
"-DHAS_KDE_QT5_FONT_STRETCH_FIX=TRUE",
"-DSIP_BUILD_EXTRA_OPTIONS=--target-dir=/app/lib/python3.11/site-packages"
"-DSIP_BUILD_EXTRA_OPTIONS=--target-dir=/app/lib/python3.12/site-packages"
],
"modules": [
{
Expand All @@ -85,17 +78,18 @@
{
"type": "git",
"url": "https://github.com/OSGeo/PROJ.git",
"tag": "9.5.0",
"tag": "9.5.1",
"x-checker-data": {
"type": "git",
"tag-pattern": "^([0-9.]+)$"
},
"commit": "0a407325fbb5bf42407a7dc5d4f948be9707e302"
"commit": "41f79ccfe107d3951dac6826f289b55d17cc3b81"
}
]
},
{
"name": "geos",
"buildsystem": "cmake-ninja",
"sources": [
{
"type": "archive",
Expand All @@ -120,8 +114,8 @@
{
"type": "git",
"url": "https://github.com/libspatialindex/libspatialindex.git",
"commit": "4a3bd449b9f2858d31a4619ba60bae6d1d30b77d",
"tag": "2.0.0",
"commit": "175b56a9541e76982d13dbbf0c9b8f0b8d752619",
"tag": "2.1.0",
"x-checker-data": {
"type": "git"
}
Expand Down Expand Up @@ -354,6 +348,10 @@
"url-template": "https://download.osgeo.org/gdal/$version/gdal-$version.tar.xz",
"stable-only": true
}
},
{
"type": "patch",
"path": "fix_build_with_poppler_24.12.patch"
}
],
"modules": [
Expand Down Expand Up @@ -490,8 +488,8 @@
"sources": [
{
"type": "archive",
"url": "https://sourceforge.net/projects/arma/files/armadillo-14.2.1.tar.xz",
"sha256": "2495815cf9d130f70fffb6a12733d0dcaf86cbaac51e8b4b82ad25183eda1dd5",
"url": "https://sourceforge.net/projects/arma/files/armadillo-14.2.2.tar.xz",
"sha256": "3054c8e63db3abdf1a5c8f9fdb7e6b4ad833f9bcfb58324c0ff86de0784c70e0",
"x-checker-data": {
"type": "anitya",
"project-id": 7006,
Expand All @@ -517,11 +515,11 @@
{
"type": "git",
"url": "https://github.com/Reference-LAPACK/lapack.git",
"tag": "v3.12.0",
"tag": "v3.12.1",
"x-checker-data": {
"type": "git"
},
"commit": "04b044e020a3560ccfa9988c8a80a1fb7083fc2e"
"commit": "6ec7f2bc4ecf4c4a93496aa2fa519575bc0e39ca"
}
],
"cleanup": [
Expand Down Expand Up @@ -561,8 +559,8 @@
"sources": [
{
"type": "archive",
"url": "https://downloads.sourceforge.net/project/boost/boost/1.86.0/boost_1_86_0.tar.bz2",
"sha256": "1bed88e40401b2cb7a1f76d4bab499e352fa4d0c5f31c0dbae64e24d34d7513b",
"url": "https://downloads.sourceforge.net/project/boost/boost/1.87.0/boost_1_87_0.tar.bz2",
"sha256": "af57be25cb4c4f4b413ed692fe378affb4352ea50fbe294a11ef548f4d527d89",
"x-checker-data": {
"type": "html",
"url": "https://www.boost.org/feed/downloads.rss",
Expand Down Expand Up @@ -671,8 +669,8 @@
"sources": [
{
"type": "archive",
"url": "https://poppler.freedesktop.org/poppler-24.11.0.tar.xz",
"sha256": "7723d880565211740c13649d24a300257b86ddd7fa2d208187ff7e5cc8dfbd58",
"url": "https://poppler.freedesktop.org/poppler-25.01.0.tar.xz",
"sha256": "7eefc122207bbbd72a303c5e0743f4941e8ae861e24dcf0501e18ce1d1414112",
"x-checker-data": {
"type": "anitya",
"project-id": 3686,
Expand Down Expand Up @@ -969,8 +967,7 @@
"builddir": true,
"buildsystem": "cmake-ninja",
"config-opts": [
"-DCMAKE_C_COMPILER=clang",
"-DCMAKE_CXX_COMPILER=clang++"
"-DCMAKE_COMPILE_WARNING_AS_ERROR=OFF"
],
"sources": [
{
Expand Down Expand Up @@ -1021,8 +1018,8 @@
"sources": [
{
"type": "archive",
"url": "https://github.com/PDAL/PDAL/releases/download/2.8.1/PDAL-2.8.1-src.tar.bz2",
"sha256": "0e8d7deabe721f806b275dda6cf5630a8e43dc7210299b57c91f46fadcc34b31",
"url": "https://github.com/PDAL/PDAL/releases/download/2.8.3/PDAL-2.8.3-src.tar.bz2",
"sha256": "13dfdb0d634bdd568b351fd535aaa03f7611df4c2cdb8be938117751355ad09b",
"x-checker-data": {
"type": "anitya",
"project-id": 138228,
Expand Down Expand Up @@ -1150,7 +1147,7 @@
"sed -e 's|\\(qsci.path\\) = .*|\\1 = /app/share/qt|' -i src/qscintilla.pro",
"sed -e 's|\\(features.path\\) = .*|\\1 = /app/lib/qt/mkspecs/features|' -i src/qscintilla.pro",
"cd src/ && QMAKEFEATURES=$PWD/src/features/ qmake && qmake -set prefix /app && make -j ${FLATPAK_BUILDER_N_JOBS:-`nproc`} && PREFIX=/app DESTDIR=/banana make install",
"cd Python && mv pyproject{-qt5,}.toml && sip-build --no-make --qsci-features-dir ../src/features --qsci-include-dir ../src --qsci-library-dir ../src --api-dir /app/share/qt/qsci/api/python --target-dir=/app/lib/python3.11/site-packages && make -C build -j ${FLATPAK_BUILDER_N_JOBS:-`nproc`} && make -C build install"
"cd Python && mv pyproject{-qt5,}.toml && sip-build --no-make --qsci-features-dir ../src/features --qsci-include-dir ../src --qsci-library-dir ../src --api-dir /app/share/qt/qsci/api/python --target-dir=/app/lib/python3.12/site-packages && make -C build -j ${FLATPAK_BUILDER_N_JOBS:-`nproc`} && make -C build install"
]
},
{
Expand Down Expand Up @@ -1200,11 +1197,11 @@
{
"type": "git",
"url": "https://github.com/pypa/setuptools.git",
"tag": "v75.6.0",
"tag": "v75.7.0",
"x-checker-data": {
"type": "git"
},
"commit": "bf2ced2a61833915a307c73405da99b6408154c7"
"commit": "4e82e8b75c8bd8cba1232a107dc171b4fd2c588c"
}
]
},
Expand All @@ -1219,7 +1216,10 @@
{
"type": "git",
"url": "https://github.com/pyproj4/pyproj.git",
"tag": "3.4.0"
"tag": "3.7.0",
"x-checker-data": {
"type": "git"
}
}
]
},
Expand All @@ -1232,8 +1232,13 @@
"sources": [
{
"type": "archive",
"url": "https://files.pythonhosted.org/packages/36/2b/61d51a2c4f25ef062ae3f74576b01638bebad5e045f747ff12643df63844/PyYAML-6.0.tar.gz",
"sha256": "68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2"
"url": "https://files.pythonhosted.org/packages/54/ed/79a089b6be93607fa5cdaedf301d7dfb23af5f25c398d5ead2525b063e17/pyyaml-6.0.2.tar.gz",
"sha256": "d584d9ec91ad65861cc08d42e834324ef890a082e591037abe114850ff7bbc3e",
"x-checker-data": {
"type": "pypi",
"name": "PyYAML",
"packagetype": "sdist"
}
}
]
},
Expand All @@ -1254,7 +1259,7 @@
"pip3 install --prefix=/app certifi-*",
"pip3 install --prefix=/app charset_normalizer-*",
"pip3 install --prefix=/app requests-*",
"pip3 install --verbose --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"lxml\" --no-build-isolation",
"pip3 install --exists-action=i --no-index --find-links=\"file://${PWD}\" --prefix=${FLATPAK_DEST} \"lxml\" --no-build-isolation",
"pip3 install --prefix=/app owslib*"
],
"sources": [
Expand Down Expand Up @@ -1298,11 +1303,12 @@
},
{
"type": "file",
"url": "https://files.pythonhosted.org/packages/f2/4f/e1808dc01273379acc506d18f1504eb2d299bd4131743b9fc54d7be4df1e/charset_normalizer-3.4.0.tar.gz",
"sha256": "223217c3d4f82c3ac5e29032b3f1c2eb0fb591b72161f86d93f5719079dae93e",
"url": "https://files.pythonhosted.org/packages/0e/f6/65ecc6878a89bb1c23a086ea335ad4bf21a588990c3f535a227b9eea9108/charset_normalizer-3.4.1-py3-none-any.whl",
"sha256": "d98b1668f06378c6dbefec3b92299716b931cd4e6061f3c875a71ced1780ab85",
"x-checker-data": {
"type": "pypi",
"name": "charset-normalizer"
"name": "charset-normalizer",
"packagetype": "bdist_wheel"
}
},
{
Expand All @@ -1327,8 +1333,8 @@
},
{
"type": "file",
"url": "https://files.pythonhosted.org/packages/35/35/5055ab8d215af853d07bbff1a74edf48f91ed308f037380a5ca52dd73348/trove_classifiers-2024.10.21.16-py3-none-any.whl",
"sha256": "0fb11f1e995a757807a8ef1c03829fbd4998d817319abcef1f33165750f103be",
"url": "https://files.pythonhosted.org/packages/3b/e4/5bd91cb201c80bbccd8514f6e63f51b15f46b9f692723519aab155b32836/trove_classifiers-2025.1.7.14-py3-none-any.whl",
"sha256": "969b4ea1ef4e5e91b0398b60ae3a5e94027a50a65d5410badc920b2fc3de7ebb",
"x-checker-data": {
"type": "pypi",
"name": "trove-classifiers",
Expand Down Expand Up @@ -1537,8 +1543,8 @@
{
"type": "git",
"url": "https://github.com/protocolbuffers/protobuf.git",
"tag": "v28.3",
"commit": "5fda5abda3dee5f7a102c85860594bff8d8610bd",
"tag": "v29.2",
"commit": "233098326bc268fc03b28725c941519fc77703e6",
"x-checker-data": {
"type": "git"
}
Expand Down