diff --git a/.gitignore b/.gitignore index 502fb91..4cf3ee1 100644 --- a/.gitignore +++ b/.gitignore @@ -118,3 +118,19 @@ qgis_1.5.0.tar.gz /qgis-3.34.2.tar.bz2 /qgis-3.34.3.tar.bz2 /qgis-3.34.3-vendor.tar.xz +/qgis-3.34.4-vendor.tar.xz +/qgis-3.34.4.tar.bz2 +/qgis-3.34.5.tar.bz2 +/qgis-3.34.5-vendor.tar.xz +/qgis-3.34.6.tar.bz2 +/qgis-3.34.6-vendor.tar.xz +/qgis-3.34.7.tar.bz2 +/qgis-3.34.7-vendor.tar.xz +/qgis-3.34.8.tar.bz2 +/qgis-3.34.8-vendor.tar.xz +/qgis-3.34.9.tar.bz2 +/qgis-3.34.9-vendor.tar.xz +/qgis-3.34.10.tar.bz2 +/qgis-3.34.10-vendor.tar.xz +/qgis-3.34.11.tar.bz2 +/qgis-3.34.11-vendor.tar.xz diff --git a/qgis-3.34.3-vendor-licenses.txt b/qgis-3.34.11-vendor-licenses.txt similarity index 94% rename from qgis-3.34.3-vendor-licenses.txt rename to qgis-3.34.11-vendor-licenses.txt index 0d8291f..4987010 100644 --- a/qgis-3.34.3-vendor-licenses.txt +++ b/qgis-3.34.11-vendor-licenses.txt @@ -1,4 +1,4 @@ -yarn run v1.22.19 +yarn run v1.22.22 $ /tmpnode_modules/.bin/license-checker --summary ├─ MIT: 1054 ├─ ISC: 75 @@ -23,4 +23,4 @@ $ /tmpnode_modules/.bin/license-checker --summary ├─ CC-BY-3.0: 1 └─ MPL-2.0: 1 -Done in 2.36s. +Done in 2.82s. diff --git a/qgis-gcc13.patch b/qgis-gcc13.patch deleted file mode 100644 index 123f889..0000000 --- a/qgis-gcc13.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -rupN --no-dereference qgis-3.34.3/external/lazperf/Extractor.hpp qgis-3.34.3-new/external/lazperf/Extractor.hpp ---- qgis-3.34.3/external/lazperf/Extractor.hpp 2024-01-19 13:02:20.000000000 +0100 -+++ qgis-3.34.3-new/external/lazperf/Extractor.hpp 2024-01-21 09:48:11.849030445 +0100 -@@ -34,6 +34,7 @@ - - #pragma once - -+#include - #include - #include - #include -diff -rupN --no-dereference qgis-3.34.3/external/untwine/api/QgisUntwine.hpp qgis-3.34.3-new/external/untwine/api/QgisUntwine.hpp ---- qgis-3.34.3/external/untwine/api/QgisUntwine.hpp 2024-01-19 13:02:20.000000000 +0100 -+++ qgis-3.34.3-new/external/untwine/api/QgisUntwine.hpp 2024-01-21 09:48:11.853030364 +0100 -@@ -1,5 +1,6 @@ - #pragma once - -+#include - #include - #include - #include -diff -rupN --no-dereference qgis-3.34.3/external/untwine/untwine/VoxelKey.hpp qgis-3.34.3-new/external/untwine/untwine/VoxelKey.hpp ---- qgis-3.34.3/external/untwine/untwine/VoxelKey.hpp 2024-01-19 13:02:20.000000000 +0100 -+++ qgis-3.34.3-new/external/untwine/untwine/VoxelKey.hpp 2024-01-21 09:48:11.857030283 +0100 -@@ -13,6 +13,7 @@ - #include - #include - #include -+#include - - #pragma once - diff --git a/qgis-qwt.patch b/qgis-qwt.patch index 069311b..c92e90b 100644 --- a/qgis-qwt.patch +++ b/qgis-qwt.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.34.3/cmake/FindQwtPolar.cmake qgis-3.34.3-new/cmake/FindQwtPolar.cmake ---- qgis-3.34.3/cmake/FindQwtPolar.cmake 2024-01-19 13:02:20.000000000 +0100 -+++ qgis-3.34.3-new/cmake/FindQwtPolar.cmake 2024-01-21 09:48:09.462078801 +0100 +diff -rupN --no-dereference qgis-3.34.11/cmake/FindQwtPolar.cmake qgis-3.34.11-new/cmake/FindQwtPolar.cmake +--- qgis-3.34.11/cmake/FindQwtPolar.cmake 2024-09-13 14:01:54.000000000 +0200 ++++ qgis-3.34.11-new/cmake/FindQwtPolar.cmake 2024-09-15 11:55:53.767163662 +0200 @@ -5,18 +5,18 @@ # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. @@ -35,9 +35,9 @@ diff -rupN --no-dereference qgis-3.34.3/cmake/FindQwtPolar.cmake qgis-3.34.3-new ) IF (QWTPOLAR_INCLUDE_DIR AND QWTPOLAR_LIBRARY) -diff -rupN --no-dereference qgis-3.34.3/src/app/gps/qgsgpsinformationwidget.cpp qgis-3.34.3-new/src/app/gps/qgsgpsinformationwidget.cpp ---- qgis-3.34.3/src/app/gps/qgsgpsinformationwidget.cpp 2024-01-19 13:02:20.000000000 +0100 -+++ qgis-3.34.3-new/src/app/gps/qgsgpsinformationwidget.cpp 2024-01-21 09:48:09.467078699 +0100 +diff -rupN --no-dereference qgis-3.34.11/src/app/gps/qgsgpsinformationwidget.cpp qgis-3.34.11-new/src/app/gps/qgsgpsinformationwidget.cpp +--- qgis-3.34.11/src/app/gps/qgsgpsinformationwidget.cpp 2024-09-13 14:01:54.000000000 +0200 ++++ qgis-3.34.11-new/src/app/gps/qgsgpsinformationwidget.cpp 2024-09-15 11:55:53.767163662 +0200 @@ -408,7 +408,7 @@ void QgsGpsInformationWidget::displayGPS { #ifdef WITH_QWTPOLAR diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch index 82f5eae..26586e3 100644 --- a/qgis-serverprefix.patch +++ b/qgis-serverprefix.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.34.3/src/core/qgsapplication.cpp qgis-3.34.3-new/src/core/qgsapplication.cpp ---- qgis-3.34.3/src/core/qgsapplication.cpp 2024-01-19 13:02:20.000000000 +0100 -+++ qgis-3.34.3-new/src/core/qgsapplication.cpp 2024-01-21 09:48:04.646176228 +0100 +diff -rupN --no-dereference qgis-3.34.11/src/core/qgsapplication.cpp qgis-3.34.11-new/src/core/qgsapplication.cpp +--- qgis-3.34.11/src/core/qgsapplication.cpp 2024-09-13 14:01:54.000000000 +0200 ++++ qgis-3.34.11-new/src/core/qgsapplication.cpp 2024-09-15 11:55:48.196226111 +0200 @@ -357,6 +357,11 @@ void QgsApplication::init( QString profi { myDir.cdUp(); diff --git a/qgis-yarn-offline.patch b/qgis-yarn-offline.patch index 4d2414e..e68d83f 100644 --- a/qgis-yarn-offline.patch +++ b/qgis-yarn-offline.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.34.3/resources/CMakeLists.txt qgis-3.34.3-new/resources/CMakeLists.txt ---- qgis-3.34.3/resources/CMakeLists.txt 2024-01-19 13:02:20.000000000 +0100 -+++ qgis-3.34.3-new/resources/CMakeLists.txt 2024-01-21 09:48:07.008128468 +0100 +diff -rupN --no-dereference qgis-3.34.11/resources/CMakeLists.txt qgis-3.34.11-new/resources/CMakeLists.txt +--- qgis-3.34.11/resources/CMakeLists.txt 2024-09-13 14:01:54.000000000 +0200 ++++ qgis-3.34.11-new/resources/CMakeLists.txt 2024-09-15 11:55:51.030193908 +0200 @@ -51,7 +51,7 @@ if (WITH_SERVER_LANDINGPAGE_WEBAPP) ${CMAKE_CURRENT_SOURCE_DIR}/server/src/landingpage/ ${LANDINGPAGE_OUTPUT_PATH}/ diff --git a/qgis.spec b/qgis.spec index 457deaf..0b09260 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,8 +1,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.34.3 -Release: 2%{?dist} +Version: 3.34.11 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -28,8 +28,6 @@ Patch0: %{name}-serverprefix.patch Patch1: %{name}-yarn-offline.patch # Fix build against qwt-6.2 Patch2: %{name}-qwt.patch -# Fix GCC13 FTBFS -Patch3: %{name}-gcc13.patch BuildRequires: cmake BuildRequires: desktop-file-utils @@ -310,6 +308,33 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Sun Sep 15 2024 Sandro Mani - 3.34.11-1 +- Update to 3.34.11 + +* Sun Aug 18 2024 Sandro Mani - 3.34.10-1 +- Update to 3.34.10 + +* Tue Jul 30 2024 Sandro Mani - 3.34.9-2 +- Rebuild (grass) + +* Sun Jul 21 2024 Sandro Mani - 3.34.9-1 +- Update to 3.34.9 + +* Sun Jun 23 2024 Sandro Mani - 3.34.8-1 +- Update to 3.34.8 + +* Tue May 21 2024 Sandro Mani - 3.34.7-1 +- Update to 3.34.7 + +* Wed Apr 24 2024 Sandro Mani - 3.34.6-1 +- Update to 3.34.6 + +* Sat Mar 23 2024 Sandro Mani - 3.34.5-1 +- Update to 3.34.5 + +* Sat Feb 24 2024 Sandro Mani - 3.34.4-1 +- Update to 3.34.4 + * Tue Jan 23 2024 Sandro Mani - 3.34.3-2 - Rebuild (libdraco) diff --git a/sources b/sources index 0607a21..e00627a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qgis-3.34.3.tar.bz2) = eb9f6844264092eb20b816f5ffdd0ce6d45f3ae7ff8e2c2c2f6d27772a3c82cbc581591057148fb7f9b641902cdd04eb2b4a9cd82b9d62dc0596ee050334dd5e -SHA512 (qgis-3.34.3-vendor.tar.xz) = cfafc2750a2cfe90e13a2a890eda348f30799a1789e9bb8bf04971a2ab0ca43a87ce184685e988a012e64376bfe76da1fdd91d53ae91cbf86dad9d966c58ea2f +SHA512 (qgis-3.34.11.tar.bz2) = e261c6ee01bafedc0b8987ccadd2614adcf262668b78eadfd63af950e832ccd528de09757c8def8898c8758787385a5a21cb5a9e34713aab8b35ae5ebb0d03d5 +SHA512 (qgis-3.34.11-vendor.tar.xz) = 4c4a732f27ff0850cf6800daf402d65b05f2cc390315b49ceb53d6adda1c44294a4e809499d241937ea9df0d054a805d2789e584a81924620dc7170e47245ebf