Update to 3.40.10

.gitignore

@@ -130,3 +130,5 @@ qgis_1.5.0.tar.gz
 /qgis-3.38.0-vendor.tar.xz
 /qgis-3.38.1.tar.bz2
 /qgis-3.38.1-vendor.tar.xz
+/qgis-3.40.10-vendor.tar.xz
+/qgis-3.40.10.tar.bz2

qgis-3.40.10-vendor-licenses.txt

@@ -1,20 +1,20 @@
 yarn run v1.22.22
 $ /tmpnode_modules/.bin/license-checker --summary
-├─ MIT: 1057
-├─ ISC: 75
-├─ BSD-3-Clause: 32
-├─ BSD-2-Clause: 28
+├─ MIT: 1077
+├─ ISC: 78
+├─ BSD-3-Clause: 33
+├─ BSD-2-Clause: 29
 ├─ Apache-2.0: 25
 ├─ MIT*: 4
 ├─ (MIT OR CC0-1.0): 4
 ├─ Unlicense: 3
 ├─ (MIT OR Apache-2.0): 2
+├─ CC-BY-4.0: 2
 ├─ CC0-1.0: 2
 ├─ (MIT AND CC-BY-3.0): 2
 ├─ 0BSD: 2
 ├─ UNLICENSED: 1
 ├─ Python-2.0: 1
-├─ CC-BY-4.0: 1
 ├─ BSD*: 1
 ├─ (BSD-3-Clause OR GPL-2.0): 1
 ├─ (WTFPL OR MIT): 1
@@ -23,4 +23,4 @@ $ /tmpnode_modules/.bin/license-checker --summary
 ├─ CC-BY-3.0: 1
 └─ MPL-2.0: 1
 
-Done in 2.05s.
+Done in 2.52s.

qgis-serverprefix.patch

@@ -1,7 +1,7 @@
-diff -rupN --no-dereference qgis-3.38.1/src/core/qgsapplication.cpp qgis-3.38.1-new/src/core/qgsapplication.cpp
---- qgis-3.38.1/src/core/qgsapplication.cpp	2024-07-19 14:05:41.000000000 +0200
-+++ qgis-3.38.1-new/src/core/qgsapplication.cpp	2024-07-20 23:43:38.434473886 +0200
-@@ -362,6 +362,11 @@ void QgsApplication::init( QString profi
+diff -rupN --no-dereference qgis-3.40.10/src/core/qgsapplication.cpp qgis-3.40.10-new/src/core/qgsapplication.cpp
+--- qgis-3.40.10/src/core/qgsapplication.cpp	2025-08-15 14:07:13.000000000 +0200
++++ qgis-3.40.10-new/src/core/qgsapplication.cpp	2025-12-03 11:40:18.895939361 +0100
+@@ -368,6 +368,11 @@ void QgsApplication::init( QString profi
          {
            myDir.cdUp();
          }

qgis-yarn-offline.patch

@@ -1,6 +1,6 @@
-diff -rupN --no-dereference qgis-3.38.1/resources/CMakeLists.txt qgis-3.38.1-new/resources/CMakeLists.txt
---- qgis-3.38.1/resources/CMakeLists.txt	2024-07-19 14:05:41.000000000 +0200
-+++ qgis-3.38.1-new/resources/CMakeLists.txt	2024-07-20 23:43:41.186474101 +0200
+diff -rupN --no-dereference qgis-3.40.10/resources/CMakeLists.txt qgis-3.40.10-new/resources/CMakeLists.txt
+--- qgis-3.40.10/resources/CMakeLists.txt	2025-08-15 14:07:13.000000000 +0200
++++ qgis-3.40.10-new/resources/CMakeLists.txt	2025-12-03 11:40:21.111612684 +0100
 @@ -51,7 +51,7 @@ if (WITH_SERVER_LANDINGPAGE_WEBAPP)
      ${CMAKE_CURRENT_SOURCE_DIR}/server/src/landingpage/
      ${LANDINGPAGE_OUTPUT_PATH}/

qgis.spec

@@ -1,13 +1,14 @@
 #TODO: Run test suite (see debian/rules)
 
 Name:           qgis
-Version:        3.38.1
+Version:        3.40.10
 Release:        1%{?dist}
 Summary:        A user friendly Open Source Geographic Information System
 
 # http://issues.qgis.org/issues/3789
 #               QGIS license         the bundled JS code (see %%{name}-%%{version}-vendor-licenses.txt)
-License:        GPL-2.0-or-later AND MIT AND ISC AND BSD-3-Clause AND BSD-2-Clause AND Apache-2.0 AND MIT AND (MIT OR CC0-1.0) AND Unlicense AND (MIT OR Apache-2.0) AND CC0-1.0 AND (MIT AND CC-BY-3.0) AND Python-2.0.1 AND CC-BY-4.0 AND (BSD-3-Clause OR GPL-2.0-only) AND (WTFPL OR MIT) AND (MIT AND BSD-3-Clause) AND CC-BY-3.0 AND MPL-2.0
+# bundled qwtpolar: LGPL-2.1-or-later WITH Qwt-exception-1.0
+License:        GPL-2.0-or-later AND MIT AND ISC AND BSD-3-Clause AND BSD-2-Clause AND Apache-2.0 AND MIT AND (MIT OR CC0-1.0) AND Unlicense AND (MIT OR Apache-2.0) AND CC0-1.0 AND (MIT AND CC-BY-3.0) AND Python-2.0.1 AND CC-BY-4.0 AND (BSD-3-Clause OR GPL-2.0-only) AND (WTFPL OR MIT) AND (MIT AND BSD-3-Clause) AND CC-BY-3.0 AND MPL-2.0 AND LGPL-2.1-or-later WITH Qwt-exception-1.0
 URL:            http://www.qgis.org
 
 Source0:        http://qgis.org/downloads/%{name}-%{version}.tar.bz2
@@ -26,8 +27,6 @@ Source5:        %{name}-mime.xml
 Patch0:         %{name}-serverprefix.patch
 # Pass --offline to yarn, plus replace deprecated md4 with sha256 in webpack sources
 Patch1:         %{name}-yarn-offline.patch
-# Fix build against qwt-6.2
-Patch2:         %{name}-qwt.patch
 
 BuildRequires:  cmake
 BuildRequires:  desktop-file-utils
@@ -88,6 +87,9 @@ Requires:       gpsbabel
 #TODO: Not picked up by build system? Relevant?
 Requires:       qca-qt5-ossl
 
+# qwt-qt5-devel in EPEL9 does not have qwt_polar.h -- presumably because it is too old(?)
+Provides:       bundled(qwtpolar) = 1.1.1
+
 # We don't want to provide private Python extension libs
 %global __provides_exclude_from ^(%{python3_sitearch}|%{_libdir}/%{name}/plugins)/.*\.so(\.%{version})?$
 
@@ -184,7 +186,7 @@ sed -i 's/"node": "8 || 9 || 10 || 11 || 12 || 13 || 14 || 15 || 16 || 17 || 18
       -D WITH_PDAL:BOOL=TRUE \
       -D WITH_QSPATIALITE:BOOL=TRUE \
       -D WITH_QWTPOLAR:BOOL=TRUE \
-      -D WITH_INTERNAL_QWTPOLAR:BOOL=FALSE \
+      -D WITH_INTERNAL_QWTPOLAR:BOOL=TRUE \
       -D WITH_SERVER:BOOL=TRUE \
       -D WITH_3D:BOOL=TRUE \
       -D WITH_QSPATIALITE:BOOL=TRUE \
@@ -304,6 +306,12 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a
 
 
 %changelog
+* Wed Dec 03 2025 Sandro Mani <manisandro@gmail.com> - 3.40.10-1
+- Update to 3.40.10
+
+* Tue Jun 24 2025 Orion Poplawski <orion@nwra.com> - 3.38.1-2
+- Rebuild for proj 9
+
 * Sat Jul 20 2024 Sandro Mani <manisandro@gmail.com> - 3.38.1-1
 - Update to 3.38.1
 

sources

@@ -1,2 +1,2 @@
-SHA512 (qgis-3.38.1.tar.bz2) = 059230a62b6ad6b68f1a4e173042d38ffa62862373d81e87a55c17bd631381725fb77e7af5822e7a8e6af672f2947ffce43bcaeb14c5e2e16d24ac31cc3a1ce0
-SHA512 (qgis-3.38.1-vendor.tar.xz) = 5306e396a55fbaf4dec1a907290f0ca9409cb082f3f8fdc9915a8738fc94420a4cc9d70c6c76bdf2a8828920b00921c12db8278e33a546101b71773c53fbd84c
+SHA512 (qgis-3.40.10-vendor.tar.xz) = 8068e45ef97d476eba122f9ab7a9f0bbe8b80b6b10164eb8fb2e8c5eb94f97b6c099cef98118ad07c06baaf332b34bfd95e8c1cd9d3eb6dba28279dd61de392b
+SHA512 (qgis-3.40.10.tar.bz2) = 97993a5622e4372aaba2dc8ca98ac647202eb994afe0a237f019963e9216d8e503a4ed19e72ab40800cd252860028fc8fc9efa261f640983027d8dcdab84711c