From 35bade62536c1921a5bdcf2dc5d79de6638d9b00 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 24 Feb 2024 19:18:02 +0100 Subject: [PATCH 1/9] Update to 3.34.4 --- .gitignore | 2 ++ ...ses.txt => qgis-3.34.4-vendor-licenses.txt | 4 +-- qgis-gcc13.patch | 32 ------------------- qgis.spec | 9 +++--- sources | 4 +-- 5 files changed, 11 insertions(+), 40 deletions(-) rename qgis-3.34.3-vendor-licenses.txt => qgis-3.34.4-vendor-licenses.txt (94%) delete mode 100644 qgis-gcc13.patch diff --git a/.gitignore b/.gitignore index 502fb91..f2ff962 100644 --- a/.gitignore +++ b/.gitignore @@ -118,3 +118,5 @@ 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 diff --git a/qgis-3.34.3-vendor-licenses.txt b/qgis-3.34.4-vendor-licenses.txt similarity index 94% rename from qgis-3.34.3-vendor-licenses.txt rename to qgis-3.34.4-vendor-licenses.txt index 0d8291f..5a5a480 100644 --- a/qgis-3.34.3-vendor-licenses.txt +++ b/qgis-3.34.4-vendor-licenses.txt @@ -1,4 +1,4 @@ -yarn run v1.22.19 +yarn run v1.22.21 $ /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.32s. 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.spec b/qgis.spec index 457deaf..bb235cd 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.4 +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,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* 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..2609522 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.4-vendor.tar.xz) = 873647853c5de89ac53354c9a786b078bd77a5c9a8e1dfd961131721054821a50f6081547f2ed038a964867014b65c17bbbf171baf03b4b33f8031e0d2a2c9a7 +SHA512 (qgis-3.34.4.tar.bz2) = aee91662cc50f3e4275c930faefeed04dc4cc40497aeb12292926f0d521ca8270880f135efa8181463dcc8f0e8bb4735c230467eed3e37cec3116930e62b7dc6 From 09b634bf495cd34c53c9d0161b2b250fc349c137 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sat, 23 Mar 2024 17:03:23 +0100 Subject: [PATCH 2/9] Update to 3.34.5 --- .gitignore | 2 ++ ....4-vendor-licenses.txt => qgis-3.34.5-vendor-licenses.txt | 4 ++-- qgis.spec | 5 ++++- sources | 4 ++-- 4 files changed, 10 insertions(+), 5 deletions(-) rename qgis-3.34.4-vendor-licenses.txt => qgis-3.34.5-vendor-licenses.txt (94%) diff --git a/.gitignore b/.gitignore index f2ff962..75699f4 100644 --- a/.gitignore +++ b/.gitignore @@ -120,3 +120,5 @@ qgis_1.5.0.tar.gz /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 diff --git a/qgis-3.34.4-vendor-licenses.txt b/qgis-3.34.5-vendor-licenses.txt similarity index 94% rename from qgis-3.34.4-vendor-licenses.txt rename to qgis-3.34.5-vendor-licenses.txt index 5a5a480..1e20843 100644 --- a/qgis-3.34.4-vendor-licenses.txt +++ b/qgis-3.34.5-vendor-licenses.txt @@ -1,4 +1,4 @@ -yarn run v1.22.21 +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.32s. +Done in 2.44s. diff --git a/qgis.spec b/qgis.spec index bb235cd..a575706 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,7 +1,7 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.34.4 +Version: 3.34.5 Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System @@ -308,6 +308,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* 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 diff --git a/sources b/sources index 2609522..8dd3ac8 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qgis-3.34.4-vendor.tar.xz) = 873647853c5de89ac53354c9a786b078bd77a5c9a8e1dfd961131721054821a50f6081547f2ed038a964867014b65c17bbbf171baf03b4b33f8031e0d2a2c9a7 -SHA512 (qgis-3.34.4.tar.bz2) = aee91662cc50f3e4275c930faefeed04dc4cc40497aeb12292926f0d521ca8270880f135efa8181463dcc8f0e8bb4735c230467eed3e37cec3116930e62b7dc6 +SHA512 (qgis-3.34.5.tar.bz2) = e891a48587588fc9e1eb81b654e5e7974477f6cede211ffb65688f3ee86f80418c0495faa613f2813aee439aefc0720f952628838cafd093772a77764e7c61af +SHA512 (qgis-3.34.5-vendor.tar.xz) = e01fbb592d71099501c864000b82d293433a98770249241e5d468abe741e02fd1202f52c35871eb3e0397ff0928de38f1987ce13124773bc905094a466e77e11 From cd1bfd21e04c9449b0b929d7dcc777ab82415ad8 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Wed, 24 Apr 2024 10:05:47 +0200 Subject: [PATCH 3/9] Update to 3.34.5 --- .gitignore | 2 ++ ...r-licenses.txt => qgis-3.34.6-vendor-licenses.txt | 2 +- qgis-qwt.patch | 12 ++++++------ qgis-serverprefix.patch | 6 +++--- qgis-yarn-offline.patch | 6 +++--- qgis.spec | 5 ++++- sources | 4 ++-- 7 files changed, 21 insertions(+), 16 deletions(-) rename qgis-3.34.5-vendor-licenses.txt => qgis-3.34.6-vendor-licenses.txt (97%) diff --git a/.gitignore b/.gitignore index 75699f4..ce5938c 100644 --- a/.gitignore +++ b/.gitignore @@ -122,3 +122,5 @@ qgis_1.5.0.tar.gz /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 diff --git a/qgis-3.34.5-vendor-licenses.txt b/qgis-3.34.6-vendor-licenses.txt similarity index 97% rename from qgis-3.34.5-vendor-licenses.txt rename to qgis-3.34.6-vendor-licenses.txt index 1e20843..ba30e84 100644 --- a/qgis-3.34.5-vendor-licenses.txt +++ b/qgis-3.34.6-vendor-licenses.txt @@ -23,4 +23,4 @@ $ /tmpnode_modules/.bin/license-checker --summary ├─ CC-BY-3.0: 1 └─ MPL-2.0: 1 -Done in 2.44s. +Done in 2.32s. diff --git a/qgis-qwt.patch b/qgis-qwt.patch index 069311b..bdf071f 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.6/cmake/FindQwtPolar.cmake qgis-3.34.6-new/cmake/FindQwtPolar.cmake +--- qgis-3.34.6/cmake/FindQwtPolar.cmake 2024-04-19 14:01:44.000000000 +0200 ++++ qgis-3.34.6-new/cmake/FindQwtPolar.cmake 2024-04-24 08:55:41.843793470 +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.6/src/app/gps/qgsgpsinformationwidget.cpp qgis-3.34.6-new/src/app/gps/qgsgpsinformationwidget.cpp +--- qgis-3.34.6/src/app/gps/qgsgpsinformationwidget.cpp 2024-04-19 14:01:44.000000000 +0200 ++++ qgis-3.34.6-new/src/app/gps/qgsgpsinformationwidget.cpp 2024-04-24 08:55:41.846793472 +0200 @@ -408,7 +408,7 @@ void QgsGpsInformationWidget::displayGPS { #ifdef WITH_QWTPOLAR diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch index 82f5eae..fdfca8f 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.6/src/core/qgsapplication.cpp qgis-3.34.6-new/src/core/qgsapplication.cpp +--- qgis-3.34.6/src/core/qgsapplication.cpp 2024-04-19 14:01:44.000000000 +0200 ++++ qgis-3.34.6-new/src/core/qgsapplication.cpp 2024-04-24 08:55:36.922790263 +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..fcc1300 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.6/resources/CMakeLists.txt qgis-3.34.6-new/resources/CMakeLists.txt +--- qgis-3.34.6/resources/CMakeLists.txt 2024-04-19 14:01:44.000000000 +0200 ++++ qgis-3.34.6-new/resources/CMakeLists.txt 2024-04-24 08:55:39.372791865 +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 a575706..df32435 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,7 +1,7 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.34.5 +Version: 3.34.6 Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System @@ -308,6 +308,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* 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 diff --git a/sources b/sources index 8dd3ac8..b38a721 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qgis-3.34.5.tar.bz2) = e891a48587588fc9e1eb81b654e5e7974477f6cede211ffb65688f3ee86f80418c0495faa613f2813aee439aefc0720f952628838cafd093772a77764e7c61af -SHA512 (qgis-3.34.5-vendor.tar.xz) = e01fbb592d71099501c864000b82d293433a98770249241e5d468abe741e02fd1202f52c35871eb3e0397ff0928de38f1987ce13124773bc905094a466e77e11 +SHA512 (qgis-3.34.6.tar.bz2) = 80a30b38f20ae5d8fa43990af941253faed99fe449e58815c8de2b72c3adf54ba7cf1e189bee7cc539fa3c40523347fb5ba4d5cf4c0a7aa60896a37aa18e4ed6 +SHA512 (qgis-3.34.6-vendor.tar.xz) = a13ae3ec69b2fd20725db5bffcba006f0aae164fd57ceb7387af91c94ce4e96c00f714d40714858bab0bb2ca1e6177132c72055d2acaf79a66c22c3d0edc85df From 35e000d6f0d57aaa7a7734a0fee25b8484421f79 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 21 May 2024 14:15:46 +0200 Subject: [PATCH 4/9] Update to 3.34.7 --- .gitignore | 2 ++ ....6-vendor-licenses.txt => qgis-3.34.7-vendor-licenses.txt | 2 +- qgis.spec | 5 ++++- sources | 4 ++-- 4 files changed, 9 insertions(+), 4 deletions(-) rename qgis-3.34.6-vendor-licenses.txt => qgis-3.34.7-vendor-licenses.txt (97%) diff --git a/.gitignore b/.gitignore index ce5938c..0b84cbf 100644 --- a/.gitignore +++ b/.gitignore @@ -124,3 +124,5 @@ qgis_1.5.0.tar.gz /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 diff --git a/qgis-3.34.6-vendor-licenses.txt b/qgis-3.34.7-vendor-licenses.txt similarity index 97% rename from qgis-3.34.6-vendor-licenses.txt rename to qgis-3.34.7-vendor-licenses.txt index ba30e84..b904d92 100644 --- a/qgis-3.34.6-vendor-licenses.txt +++ b/qgis-3.34.7-vendor-licenses.txt @@ -23,4 +23,4 @@ $ /tmpnode_modules/.bin/license-checker --summary ├─ CC-BY-3.0: 1 └─ MPL-2.0: 1 -Done in 2.32s. +Done in 2.84s. diff --git a/qgis.spec b/qgis.spec index df32435..7b3a803 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,7 +1,7 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.34.6 +Version: 3.34.7 Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System @@ -308,6 +308,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* 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 diff --git a/sources b/sources index b38a721..1747daf 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qgis-3.34.6.tar.bz2) = 80a30b38f20ae5d8fa43990af941253faed99fe449e58815c8de2b72c3adf54ba7cf1e189bee7cc539fa3c40523347fb5ba4d5cf4c0a7aa60896a37aa18e4ed6 -SHA512 (qgis-3.34.6-vendor.tar.xz) = a13ae3ec69b2fd20725db5bffcba006f0aae164fd57ceb7387af91c94ce4e96c00f714d40714858bab0bb2ca1e6177132c72055d2acaf79a66c22c3d0edc85df +SHA512 (qgis-3.34.7.tar.bz2) = af97754c3c872f2d647532d136bba0e51bd8a9e254ac0f1cf8b0a45419b9b212fd21b719b95b896cc468670bc6760bb5ae139c95acc5bf48d670592c12d017a8 +SHA512 (qgis-3.34.7-vendor.tar.xz) = 18674c091e85259b4e029239b1869349a473b5a79717e13194737c794f4b7e20e44fb3a9ce73a65698e36484240036ec9d51c91ab2b6f22b84118e6b4c5491f5 From a070218380c26cd396115d04dfd99cbf96056a13 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 24 Jun 2024 09:50:29 +0200 Subject: [PATCH 5/9] Update to 3.34.8 --- .gitignore | 2 ++ ....7-vendor-licenses.txt => qgis-3.34.8-vendor-licenses.txt | 2 +- qgis.spec | 5 ++++- sources | 4 ++-- 4 files changed, 9 insertions(+), 4 deletions(-) rename qgis-3.34.7-vendor-licenses.txt => qgis-3.34.8-vendor-licenses.txt (97%) diff --git a/.gitignore b/.gitignore index 0b84cbf..92ea410 100644 --- a/.gitignore +++ b/.gitignore @@ -126,3 +126,5 @@ qgis_1.5.0.tar.gz /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 diff --git a/qgis-3.34.7-vendor-licenses.txt b/qgis-3.34.8-vendor-licenses.txt similarity index 97% rename from qgis-3.34.7-vendor-licenses.txt rename to qgis-3.34.8-vendor-licenses.txt index b904d92..b2eb9d5 100644 --- a/qgis-3.34.7-vendor-licenses.txt +++ b/qgis-3.34.8-vendor-licenses.txt @@ -23,4 +23,4 @@ $ /tmpnode_modules/.bin/license-checker --summary ├─ CC-BY-3.0: 1 └─ MPL-2.0: 1 -Done in 2.84s. +Done in 2.07s. diff --git a/qgis.spec b/qgis.spec index 7b3a803..ee92e0a 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,7 +1,7 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.34.7 +Version: 3.34.8 Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System @@ -308,6 +308,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* 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 diff --git a/sources b/sources index 1747daf..cc45866 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qgis-3.34.7.tar.bz2) = af97754c3c872f2d647532d136bba0e51bd8a9e254ac0f1cf8b0a45419b9b212fd21b719b95b896cc468670bc6760bb5ae139c95acc5bf48d670592c12d017a8 -SHA512 (qgis-3.34.7-vendor.tar.xz) = 18674c091e85259b4e029239b1869349a473b5a79717e13194737c794f4b7e20e44fb3a9ce73a65698e36484240036ec9d51c91ab2b6f22b84118e6b4c5491f5 +SHA512 (qgis-3.34.8.tar.bz2) = 51886300f1045a8cdbed4a5a4ac2520eef659f81ccdead58fda5e47a1ccead58bf020ac0847d7aa0981ccb598f9a5dd28a4771b97acb5a2ef6c5120c082e167d +SHA512 (qgis-3.34.8-vendor.tar.xz) = 4cff09a1e71ccccb1afb614c1bc6f5276bd475a095fd29a97a7d1a71d2c56a4d1deefd331adc2832c6099edbae81b8fe8dc6e3ec1b56d33c104e65f2fe563b34 From b8bc9494b5b6d05a69b856be5630aa528476e715 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Mon, 22 Jul 2024 00:03:56 +0200 Subject: [PATCH 6/9] Update to 3.34.9 --- .gitignore | 2 ++ ...r-licenses.txt => qgis-3.34.9-vendor-licenses.txt | 2 +- qgis-qwt.patch | 12 ++++++------ qgis-serverprefix.patch | 6 +++--- qgis-yarn-offline.patch | 6 +++--- qgis.spec | 5 ++++- sources | 4 ++-- 7 files changed, 21 insertions(+), 16 deletions(-) rename qgis-3.34.8-vendor-licenses.txt => qgis-3.34.9-vendor-licenses.txt (97%) diff --git a/.gitignore b/.gitignore index 92ea410..d1182fa 100644 --- a/.gitignore +++ b/.gitignore @@ -128,3 +128,5 @@ qgis_1.5.0.tar.gz /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 diff --git a/qgis-3.34.8-vendor-licenses.txt b/qgis-3.34.9-vendor-licenses.txt similarity index 97% rename from qgis-3.34.8-vendor-licenses.txt rename to qgis-3.34.9-vendor-licenses.txt index b2eb9d5..038e2ed 100644 --- a/qgis-3.34.8-vendor-licenses.txt +++ b/qgis-3.34.9-vendor-licenses.txt @@ -23,4 +23,4 @@ $ /tmpnode_modules/.bin/license-checker --summary ├─ CC-BY-3.0: 1 └─ MPL-2.0: 1 -Done in 2.07s. +Done in 3.64s. diff --git a/qgis-qwt.patch b/qgis-qwt.patch index bdf071f..11148a8 100644 --- a/qgis-qwt.patch +++ b/qgis-qwt.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.34.6/cmake/FindQwtPolar.cmake qgis-3.34.6-new/cmake/FindQwtPolar.cmake ---- qgis-3.34.6/cmake/FindQwtPolar.cmake 2024-04-19 14:01:44.000000000 +0200 -+++ qgis-3.34.6-new/cmake/FindQwtPolar.cmake 2024-04-24 08:55:41.843793470 +0200 +diff -rupN --no-dereference qgis-3.34.9/cmake/FindQwtPolar.cmake qgis-3.34.9-new/cmake/FindQwtPolar.cmake +--- qgis-3.34.9/cmake/FindQwtPolar.cmake 2024-07-19 14:05:58.000000000 +0200 ++++ qgis-3.34.9-new/cmake/FindQwtPolar.cmake 2024-07-22 00:03:23.309115072 +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.6/cmake/FindQwtPolar.cmake qgis-3.34.6-new ) IF (QWTPOLAR_INCLUDE_DIR AND QWTPOLAR_LIBRARY) -diff -rupN --no-dereference qgis-3.34.6/src/app/gps/qgsgpsinformationwidget.cpp qgis-3.34.6-new/src/app/gps/qgsgpsinformationwidget.cpp ---- qgis-3.34.6/src/app/gps/qgsgpsinformationwidget.cpp 2024-04-19 14:01:44.000000000 +0200 -+++ qgis-3.34.6-new/src/app/gps/qgsgpsinformationwidget.cpp 2024-04-24 08:55:41.846793472 +0200 +diff -rupN --no-dereference qgis-3.34.9/src/app/gps/qgsgpsinformationwidget.cpp qgis-3.34.9-new/src/app/gps/qgsgpsinformationwidget.cpp +--- qgis-3.34.9/src/app/gps/qgsgpsinformationwidget.cpp 2024-07-19 14:05:58.000000000 +0200 ++++ qgis-3.34.9-new/src/app/gps/qgsgpsinformationwidget.cpp 2024-07-22 00:03:23.310115071 +0200 @@ -408,7 +408,7 @@ void QgsGpsInformationWidget::displayGPS { #ifdef WITH_QWTPOLAR diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch index fdfca8f..2289ef7 100644 --- a/qgis-serverprefix.patch +++ b/qgis-serverprefix.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.34.6/src/core/qgsapplication.cpp qgis-3.34.6-new/src/core/qgsapplication.cpp ---- qgis-3.34.6/src/core/qgsapplication.cpp 2024-04-19 14:01:44.000000000 +0200 -+++ qgis-3.34.6-new/src/core/qgsapplication.cpp 2024-04-24 08:55:36.922790263 +0200 +diff -rupN --no-dereference qgis-3.34.9/src/core/qgsapplication.cpp qgis-3.34.9-new/src/core/qgsapplication.cpp +--- qgis-3.34.9/src/core/qgsapplication.cpp 2024-07-19 14:05:58.000000000 +0200 ++++ qgis-3.34.9-new/src/core/qgsapplication.cpp 2024-07-22 00:03:11.581127132 +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 fcc1300..a47ca58 100644 --- a/qgis-yarn-offline.patch +++ b/qgis-yarn-offline.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.34.6/resources/CMakeLists.txt qgis-3.34.6-new/resources/CMakeLists.txt ---- qgis-3.34.6/resources/CMakeLists.txt 2024-04-19 14:01:44.000000000 +0200 -+++ qgis-3.34.6-new/resources/CMakeLists.txt 2024-04-24 08:55:39.372791865 +0200 +diff -rupN --no-dereference qgis-3.34.9/resources/CMakeLists.txt qgis-3.34.9-new/resources/CMakeLists.txt +--- qgis-3.34.9/resources/CMakeLists.txt 2024-07-19 14:05:58.000000000 +0200 ++++ qgis-3.34.9-new/resources/CMakeLists.txt 2024-07-22 00:03:17.467120953 +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 ee92e0a..d1539d3 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,7 +1,7 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.34.8 +Version: 3.34.9 Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System @@ -308,6 +308,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* 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 diff --git a/sources b/sources index cc45866..6e91199 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qgis-3.34.8.tar.bz2) = 51886300f1045a8cdbed4a5a4ac2520eef659f81ccdead58fda5e47a1ccead58bf020ac0847d7aa0981ccb598f9a5dd28a4771b97acb5a2ef6c5120c082e167d -SHA512 (qgis-3.34.8-vendor.tar.xz) = 4cff09a1e71ccccb1afb614c1bc6f5276bd475a095fd29a97a7d1a71d2c56a4d1deefd331adc2832c6099edbae81b8fe8dc6e3ec1b56d33c104e65f2fe563b34 +SHA512 (qgis-3.34.9.tar.bz2) = ecf27b8a0ad75dafdabde8e3ff8c938806aadb53bff7455b08b16e4bc37d67506ea3cd13374f52036100dec0f9b7c35892a866d938206531c653fe0df386b677 +SHA512 (qgis-3.34.9-vendor.tar.xz) = 0997747b8b8b32f778c820db6e7dfb25b03246a3818ae753b005d72537e94df67e5ae78246c6c2aacca47612606931fe65b032a7e690ecb4cf27865beaba758a From c68d8baebffd6f1705ffd24354c6a2b32491ffe9 Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Tue, 30 Jul 2024 09:33:02 +0200 Subject: [PATCH 7/9] Rebuild (grass) --- qgis.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qgis.spec b/qgis.spec index d1539d3..373c2e3 100644 --- a/qgis.spec +++ b/qgis.spec @@ -2,7 +2,7 @@ Name: qgis Version: 3.34.9 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -308,6 +308,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* 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 From 94fb96b04d6ce1d3b5dd1191f13cd154a57e0d1a Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 18 Aug 2024 10:33:02 +0200 Subject: [PATCH 8/9] Update to 3.34.10 --- .gitignore | 2 ++ ...vendor-licenses.txt => qgis-3.34.10-vendor-licenses.txt | 2 +- qgis.spec | 7 +++++-- sources | 4 ++-- 4 files changed, 10 insertions(+), 5 deletions(-) rename qgis-3.34.9-vendor-licenses.txt => qgis-3.34.10-vendor-licenses.txt (97%) diff --git a/.gitignore b/.gitignore index d1182fa..f5ab077 100644 --- a/.gitignore +++ b/.gitignore @@ -130,3 +130,5 @@ qgis_1.5.0.tar.gz /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 diff --git a/qgis-3.34.9-vendor-licenses.txt b/qgis-3.34.10-vendor-licenses.txt similarity index 97% rename from qgis-3.34.9-vendor-licenses.txt rename to qgis-3.34.10-vendor-licenses.txt index 038e2ed..a0ffd2c 100644 --- a/qgis-3.34.9-vendor-licenses.txt +++ b/qgis-3.34.10-vendor-licenses.txt @@ -23,4 +23,4 @@ $ /tmpnode_modules/.bin/license-checker --summary ├─ CC-BY-3.0: 1 └─ MPL-2.0: 1 -Done in 3.64s. +Done in 2.15s. diff --git a/qgis.spec b/qgis.spec index 373c2e3..c2a88dd 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,8 +1,8 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.34.9 -Release: 2%{?dist} +Version: 3.34.10 +Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System # http://issues.qgis.org/issues/3789 @@ -308,6 +308,9 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* 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) diff --git a/sources b/sources index 6e91199..7bb0446 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qgis-3.34.9.tar.bz2) = ecf27b8a0ad75dafdabde8e3ff8c938806aadb53bff7455b08b16e4bc37d67506ea3cd13374f52036100dec0f9b7c35892a866d938206531c653fe0df386b677 -SHA512 (qgis-3.34.9-vendor.tar.xz) = 0997747b8b8b32f778c820db6e7dfb25b03246a3818ae753b005d72537e94df67e5ae78246c6c2aacca47612606931fe65b032a7e690ecb4cf27865beaba758a +SHA512 (qgis-3.34.10.tar.bz2) = d2ba91fb807af05e666fa88f2fb2181e3cdc7343ebcebbf6ae73d68812b6a5f9531eeb8108aa18d62520f5fcbeb28eb03d16326fd8efc7886a926a7d79236f66 +SHA512 (qgis-3.34.10-vendor.tar.xz) = cee3a9a6b89f93c859b28cc4ab9f33fd73f91be8adc711c76fce7c7afc011d4d26385b242724709700929b1e06e4c7725138c8e18ad1f0334a104d900770c5bb From ee4e4d839f49ddc4726388a6fba33d94e2f0484e Mon Sep 17 00:00:00 2001 From: Sandro Mani Date: Sun, 15 Sep 2024 12:17:06 +0200 Subject: [PATCH 9/9] Update to 3.34.11 --- .gitignore | 2 ++ ...-licenses.txt => qgis-3.34.11-vendor-licenses.txt | 2 +- qgis-qwt.patch | 12 ++++++------ qgis-serverprefix.patch | 6 +++--- qgis-yarn-offline.patch | 6 +++--- qgis.spec | 5 ++++- sources | 4 ++-- 7 files changed, 21 insertions(+), 16 deletions(-) rename qgis-3.34.10-vendor-licenses.txt => qgis-3.34.11-vendor-licenses.txt (97%) diff --git a/.gitignore b/.gitignore index f5ab077..4cf3ee1 100644 --- a/.gitignore +++ b/.gitignore @@ -132,3 +132,5 @@ qgis_1.5.0.tar.gz /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.10-vendor-licenses.txt b/qgis-3.34.11-vendor-licenses.txt similarity index 97% rename from qgis-3.34.10-vendor-licenses.txt rename to qgis-3.34.11-vendor-licenses.txt index a0ffd2c..4987010 100644 --- a/qgis-3.34.10-vendor-licenses.txt +++ b/qgis-3.34.11-vendor-licenses.txt @@ -23,4 +23,4 @@ $ /tmpnode_modules/.bin/license-checker --summary ├─ CC-BY-3.0: 1 └─ MPL-2.0: 1 -Done in 2.15s. +Done in 2.82s. diff --git a/qgis-qwt.patch b/qgis-qwt.patch index 11148a8..c92e90b 100644 --- a/qgis-qwt.patch +++ b/qgis-qwt.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.34.9/cmake/FindQwtPolar.cmake qgis-3.34.9-new/cmake/FindQwtPolar.cmake ---- qgis-3.34.9/cmake/FindQwtPolar.cmake 2024-07-19 14:05:58.000000000 +0200 -+++ qgis-3.34.9-new/cmake/FindQwtPolar.cmake 2024-07-22 00:03:23.309115072 +0200 +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.9/cmake/FindQwtPolar.cmake qgis-3.34.9-new ) IF (QWTPOLAR_INCLUDE_DIR AND QWTPOLAR_LIBRARY) -diff -rupN --no-dereference qgis-3.34.9/src/app/gps/qgsgpsinformationwidget.cpp qgis-3.34.9-new/src/app/gps/qgsgpsinformationwidget.cpp ---- qgis-3.34.9/src/app/gps/qgsgpsinformationwidget.cpp 2024-07-19 14:05:58.000000000 +0200 -+++ qgis-3.34.9-new/src/app/gps/qgsgpsinformationwidget.cpp 2024-07-22 00:03:23.310115071 +0200 +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 2289ef7..26586e3 100644 --- a/qgis-serverprefix.patch +++ b/qgis-serverprefix.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.34.9/src/core/qgsapplication.cpp qgis-3.34.9-new/src/core/qgsapplication.cpp ---- qgis-3.34.9/src/core/qgsapplication.cpp 2024-07-19 14:05:58.000000000 +0200 -+++ qgis-3.34.9-new/src/core/qgsapplication.cpp 2024-07-22 00:03:11.581127132 +0200 +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 a47ca58..e68d83f 100644 --- a/qgis-yarn-offline.patch +++ b/qgis-yarn-offline.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.34.9/resources/CMakeLists.txt qgis-3.34.9-new/resources/CMakeLists.txt ---- qgis-3.34.9/resources/CMakeLists.txt 2024-07-19 14:05:58.000000000 +0200 -+++ qgis-3.34.9-new/resources/CMakeLists.txt 2024-07-22 00:03:17.467120953 +0200 +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 c2a88dd..0b09260 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,7 +1,7 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.34.10 +Version: 3.34.11 Release: 1%{?dist} Summary: A user friendly Open Source Geographic Information System @@ -308,6 +308,9 @@ 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 diff --git a/sources b/sources index 7bb0446..e00627a 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qgis-3.34.10.tar.bz2) = d2ba91fb807af05e666fa88f2fb2181e3cdc7343ebcebbf6ae73d68812b6a5f9531eeb8108aa18d62520f5fcbeb28eb03d16326fd8efc7886a926a7d79236f66 -SHA512 (qgis-3.34.10-vendor.tar.xz) = cee3a9a6b89f93c859b28cc4ab9f33fd73f91be8adc711c76fce7c7afc011d4d26385b242724709700929b1e06e4c7725138c8e18ad1f0334a104d900770c5bb +SHA512 (qgis-3.34.11.tar.bz2) = e261c6ee01bafedc0b8987ccadd2614adcf262668b78eadfd63af950e832ccd528de09757c8def8898c8758787385a5a21cb5a9e34713aab8b35ae5ebb0d03d5 +SHA512 (qgis-3.34.11-vendor.tar.xz) = 4c4a732f27ff0850cf6800daf402d65b05f2cc390315b49ceb53d6adda1c44294a4e809499d241937ea9df0d054a805d2789e584a81924620dc7170e47245ebf