diff --git a/.gitignore b/.gitignore index eff29a0..2714e75 100644 --- a/.gitignore +++ b/.gitignore @@ -94,3 +94,21 @@ qgis_1.5.0.tar.gz /qgis-3.28.2-vendor.tar.xz /qgis-3.28.3.tar.bz2 /qgis-3.28.3-vendor.tar.xz +/qgis-3.28.4.tar.bz2 +/qgis-3.28.4-vendor.tar.xz +/qgis-3.28.5.tar.bz2 +/qgis-3.28.5-vendor.tar.xz +/qgis-3.28.6.tar.bz2 +/qgis-3.28.6-vendor.tar.xz +/qgis-3.28.7.tar.bz2 +/qgis-3.28.7-vendor.tar.xz +/qgis-3.28.10.tar.bz2 +/qgis-3.28.10-vendor.tar.xz +/qgis-3.28.11.tar.bz2 +/qgis-3.28.11-vendor.tar.xz +/qgis-3.28.12.tar.bz2 +/qgis-3.28.12-vendor.tar.xz +/qgis-3.28.14.tar.bz2 +/qgis-3.28.14-vendor.tar.xz +/qgis-3.28.15-vendor.tar.xz +/qgis-3.28.15.tar.bz2 diff --git a/prepare_vendor.sh b/prepare_vendor.sh index 89ad343..c40de44 100755 --- a/prepare_vendor.sh +++ b/prepare_vendor.sh @@ -43,7 +43,7 @@ pushd $PKG_PATH export YARN_CACHE_FOLDER="$(pwd)/.package-cache" echo ">>>>>> Install npm modules" -yarn install --frozen-lockfile +yarn install --frozen-lockfile --ignore-engines if [ $? -ne 0 ]; then echo "ERROR: yarn install failed" cleanup_and_exit 1 @@ -92,7 +92,7 @@ if [ $? -ne 0 ]; then cleanup_and_exit 1 fi -yarn add license-checker +yarn add license-checker --ignore-engines yarn license-checker --summary | sed "s#$PKG_PATH#/tmp#g" > $PKG_DIR/${PKG_NAME}-${PKG_VERSION}-vendor-licenses.txt diff --git a/qgis-3.28.3-vendor-licenses.txt b/qgis-3.28.15-vendor-licenses.txt similarity index 97% rename from qgis-3.28.3-vendor-licenses.txt rename to qgis-3.28.15-vendor-licenses.txt index e6d02b9..fe50b1c 100644 --- a/qgis-3.28.3-vendor-licenses.txt +++ b/qgis-3.28.15-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.71s. +Done in 2.36s. diff --git a/qgis-gcc13.patch b/qgis-gcc13.patch index e30f16e..c14e386 100644 --- a/qgis-gcc13.patch +++ b/qgis-gcc13.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.28.3/external/lazperf/Extractor.hpp qgis-3.28.3-new/external/lazperf/Extractor.hpp ---- qgis-3.28.3/external/lazperf/Extractor.hpp 2023-01-27 13:04:06.000000000 +0100 -+++ qgis-3.28.3-new/external/lazperf/Extractor.hpp 2023-01-27 14:51:19.274996167 +0100 +diff -rupN --no-dereference qgis-3.28.14/external/lazperf/Extractor.hpp qgis-3.28.14-new/external/lazperf/Extractor.hpp +--- qgis-3.28.14/external/lazperf/Extractor.hpp 2023-12-22 13:04:30.000000000 +0100 ++++ qgis-3.28.14-new/external/lazperf/Extractor.hpp 2023-12-24 10:02:58.591757433 +0100 @@ -34,6 +34,7 @@ #pragma once @@ -8,10 +8,10 @@ diff -rupN --no-dereference qgis-3.28.3/external/lazperf/Extractor.hpp qgis-3.28 +#include #include #include - -diff -rupN --no-dereference qgis-3.28.3/external/untwine/api/QgisUntwine.hpp qgis-3.28.3-new/external/untwine/api/QgisUntwine.hpp ---- qgis-3.28.3/external/untwine/api/QgisUntwine.hpp 2023-01-27 13:04:06.000000000 +0100 -+++ qgis-3.28.3-new/external/untwine/api/QgisUntwine.hpp 2023-01-27 14:51:19.275996168 +0100 + #include +diff -rupN --no-dereference qgis-3.28.14/external/untwine/api/QgisUntwine.hpp qgis-3.28.14-new/external/untwine/api/QgisUntwine.hpp +--- qgis-3.28.14/external/untwine/api/QgisUntwine.hpp 2023-12-22 13:04:30.000000000 +0100 ++++ qgis-3.28.14-new/external/untwine/api/QgisUntwine.hpp 2023-12-24 10:02:58.596757383 +0100 @@ -1,5 +1,6 @@ #pragma once @@ -19,14 +19,3 @@ diff -rupN --no-dereference qgis-3.28.3/external/untwine/api/QgisUntwine.hpp qgi #include #include #include -diff -rupN --no-dereference qgis-3.28.3/external/untwine/untwine/VoxelKey.hpp qgis-3.28.3-new/external/untwine/untwine/VoxelKey.hpp ---- qgis-3.28.3/external/untwine/untwine/VoxelKey.hpp 2023-01-27 13:04:06.000000000 +0100 -+++ qgis-3.28.3-new/external/untwine/untwine/VoxelKey.hpp 2023-01-27 14:51:19.275996168 +0100 -@@ -12,6 +12,7 @@ - - #include - #include -+#include - - #pragma once - diff --git a/qgis-qwt.patch b/qgis-qwt.patch index ccc5810..be3bd66 100644 --- a/qgis-qwt.patch +++ b/qgis-qwt.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.28.3/cmake/FindQwtPolar.cmake qgis-3.28.3-new/cmake/FindQwtPolar.cmake ---- qgis-3.28.3/cmake/FindQwtPolar.cmake 2023-01-27 13:04:06.000000000 +0100 -+++ qgis-3.28.3-new/cmake/FindQwtPolar.cmake 2023-01-27 14:51:14.223989557 +0100 +diff -rupN --no-dereference qgis-3.28.14/cmake/FindQwtPolar.cmake qgis-3.28.14-new/cmake/FindQwtPolar.cmake +--- qgis-3.28.14/cmake/FindQwtPolar.cmake 2023-12-22 13:04:30.000000000 +0100 ++++ qgis-3.28.14-new/cmake/FindQwtPolar.cmake 2023-12-24 10:02:56.129782131 +0100 @@ -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.28.3/cmake/FindQwtPolar.cmake qgis-3.28.3-new ) IF (QWTPOLAR_INCLUDE_DIR AND QWTPOLAR_LIBRARY) -diff -rupN --no-dereference qgis-3.28.3/src/app/gps/qgsgpsinformationwidget.cpp qgis-3.28.3-new/src/app/gps/qgsgpsinformationwidget.cpp ---- qgis-3.28.3/src/app/gps/qgsgpsinformationwidget.cpp 2023-01-27 13:04:06.000000000 +0100 -+++ qgis-3.28.3-new/src/app/gps/qgsgpsinformationwidget.cpp 2023-01-27 14:51:14.224989558 +0100 +diff -rupN --no-dereference qgis-3.28.14/src/app/gps/qgsgpsinformationwidget.cpp qgis-3.28.14-new/src/app/gps/qgsgpsinformationwidget.cpp +--- qgis-3.28.14/src/app/gps/qgsgpsinformationwidget.cpp 2023-12-22 13:04:30.000000000 +0100 ++++ qgis-3.28.14-new/src/app/gps/qgsgpsinformationwidget.cpp 2023-12-24 10:02:56.132782100 +0100 @@ -825,7 +825,7 @@ void QgsGpsInformationWidget::displayGPS { #ifdef WITH_QWTPOLAR diff --git a/qgis-serverprefix.patch b/qgis-serverprefix.patch index 0f10e01..2fed3e2 100644 --- a/qgis-serverprefix.patch +++ b/qgis-serverprefix.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.28.3/src/core/qgsapplication.cpp qgis-3.28.3-new/src/core/qgsapplication.cpp ---- qgis-3.28.3/src/core/qgsapplication.cpp 2023-01-27 13:04:06.000000000 +0100 -+++ qgis-3.28.3-new/src/core/qgsapplication.cpp 2023-01-27 14:51:03.832975820 +0100 +diff -rupN --no-dereference qgis-3.28.14/src/core/qgsapplication.cpp qgis-3.28.14-new/src/core/qgsapplication.cpp +--- qgis-3.28.14/src/core/qgsapplication.cpp 2023-12-22 13:04:30.000000000 +0100 ++++ qgis-3.28.14-new/src/core/qgsapplication.cpp 2023-12-24 10:02:51.263830943 +0100 @@ -369,6 +369,11 @@ void QgsApplication::init( QString profi { myDir.cdUp(); diff --git a/qgis-yarn-offline.patch b/qgis-yarn-offline.patch index 82231b1..942c0f9 100644 --- a/qgis-yarn-offline.patch +++ b/qgis-yarn-offline.patch @@ -1,6 +1,6 @@ -diff -rupN --no-dereference qgis-3.28.3/resources/CMakeLists.txt qgis-3.28.3-new/resources/CMakeLists.txt ---- qgis-3.28.3/resources/CMakeLists.txt 2023-01-27 13:04:06.000000000 +0100 -+++ qgis-3.28.3-new/resources/CMakeLists.txt 2023-01-27 14:51:09.171982902 +0100 +diff -rupN --no-dereference qgis-3.28.14/resources/CMakeLists.txt qgis-3.28.14-new/resources/CMakeLists.txt +--- qgis-3.28.14/resources/CMakeLists.txt 2023-12-22 13:04:30.000000000 +0100 ++++ qgis-3.28.14-new/resources/CMakeLists.txt 2023-12-24 10:02:53.755805945 +0100 @@ -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 1f46e22..50d9de9 100644 --- a/qgis.spec +++ b/qgis.spec @@ -1,13 +1,13 @@ #TODO: Run test suite (see debian/rules) Name: qgis -Version: 3.28.3 +Version: 3.28.15 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: (GPLv3+ with exceptions) and (MIT and ISC and BSD and ASL 2.0 and CC-BY and Python and MPLv2.0) +# 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 URL: http://www.qgis.org Source0: http://qgis.org/downloads/%{name}-%{version}.tar.bz2 @@ -304,6 +304,36 @@ rm -f %{buildroot}%{_prefix}/lib/liboauth2authmethod_static.a %changelog +* Tue Jan 23 2024 Sandro Mani - 3.28.15-1 +- Update to 3.28.15 + +* Sun Dec 24 2023 Sandro Mani - 3.28.14-1 +- Update to 3.28.14 + +* Sat Oct 28 2023 Sandro Mani - 3.28.12-2 +- Rebuild (grass) + +* Sat Oct 28 2023 Sandro Mani - 3.28.12-1 +- Update to 3.28.12 + +* Mon Sep 18 2023 Sandro Mani - 3.28.11-1 +- Update to 3.28.11 + +* Sun Aug 20 2023 Sandro Mani - 3.28.10-1 +- Update to 3.28.10 + +* Sat May 27 2023 Sandro Mani - 3.28.7-1 +- Update to 3.28.7 + +* Sun Apr 30 2023 Sandro Mani - 3.28.6-1 +- Update to 3.28.6 + +* Wed Apr 05 2023 Sandro Mani - 3.28.5-1 +- Update to 3.28.5 + +* Sat Mar 04 2023 Sandro Mani - 3.28.4-1 +- Update to 3.28.4 + * Fri Jan 27 2023 Sandro Mani - 3.28.3-1 - Update to 3.28.3 diff --git a/sources b/sources index ebc6762..941ca31 100644 --- a/sources +++ b/sources @@ -1,2 +1,2 @@ -SHA512 (qgis-3.28.3.tar.bz2) = 04b082aaa913095a2789e847c71ef36f2d8ad2781b644f70b64369fd96e4cc896004e8ad63329e90dc742d2b82c131789037b91d1bc50b728e6b5928b9042580 -SHA512 (qgis-3.28.3-vendor.tar.xz) = 8c1249c6814ead1eb77d02eb4808b8a4bd3d267dde81f308e926213764ef3e52359841dbb71175f83ded4122d2c9b36c296a97aa7e0a48472d3239756bc0fab2 +SHA512 (qgis-3.28.15-vendor.tar.xz) = d95fdfcafb3c63d7c40e2ceef55f037135807107ed8c669a9e98fca54b2dd1adbfccd4cf1d9aa5c8034da410c706589f959e6f8e0bc7d96140627647fad0918f +SHA512 (qgis-3.28.15.tar.bz2) = 852eb5c36c1ca92f2e08cdf53574e82456b03e527a5abb0ba9cee92513a5c4c18903c49d9d3fc1899a07eb052a715db25c3e0de66cc67d0e3edd7c73425a622f