Compare commits

...
Sign in to create a new pull request.

9 commits

Author SHA1 Message Date
Sandro Mani
ee4e4d839f Update to 3.34.11 2024-09-15 12:17:06 +02:00
Sandro Mani
94fb96b04d Update to 3.34.10 2024-08-18 10:33:02 +02:00
Sandro Mani
c68d8baebf Rebuild (grass) 2024-07-30 09:33:02 +02:00
Sandro Mani
b8bc9494b5 Update to 3.34.9 2024-07-22 00:03:56 +02:00
Sandro Mani
a070218380 Update to 3.34.8 2024-06-24 09:50:29 +02:00
Sandro Mani
35e000d6f0 Update to 3.34.7 2024-05-21 14:15:46 +02:00
Sandro Mani
cd1bfd21e0 Update to 3.34.5 2024-04-24 10:05:47 +02:00
Sandro Mani
09b634bf49 Update to 3.34.5 2024-03-23 17:03:23 +01:00
Sandro Mani
35bade6253 Update to 3.34.4 2024-02-24 19:18:02 +01:00
8 changed files with 61 additions and 52 deletions

16
.gitignore vendored
View file

@ -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

View file

@ -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.

View file

@ -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 <cstdint>
#include <cstring>
#include <vector>
#include <cstdint>
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 <cstdint>
#include <map>
#include <string>
#include <vector>
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 <string>
#include <cstdint>
#include <algorithm>
+#include <cstdint>
#pragma once

View file

@ -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

View file

@ -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();

View file

@ -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}/

View file

@ -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 <manisandro@gmail.com> - 3.34.11-1
- Update to 3.34.11
* Sun Aug 18 2024 Sandro Mani <manisandro@gmail.com> - 3.34.10-1
- Update to 3.34.10
* Tue Jul 30 2024 Sandro Mani <manisandro@gmail.com> - 3.34.9-2
- Rebuild (grass)
* Sun Jul 21 2024 Sandro Mani <manisandro@gmail.com> - 3.34.9-1
- Update to 3.34.9
* Sun Jun 23 2024 Sandro Mani <manisandro@gmail.com> - 3.34.8-1
- Update to 3.34.8
* Tue May 21 2024 Sandro Mani <manisandro@gmail.com> - 3.34.7-1
- Update to 3.34.7
* Wed Apr 24 2024 Sandro Mani <manisandro@gmail.com> - 3.34.6-1
- Update to 3.34.6
* Sat Mar 23 2024 Sandro Mani <manisandro@gmail.com> - 3.34.5-1
- Update to 3.34.5
* Sat Feb 24 2024 Sandro Mani <manisandro@gmail.com> - 3.34.4-1
- Update to 3.34.4
* Tue Jan 23 2024 Sandro Mani <manisandro@gmail.com> - 3.34.3-2
- Rebuild (libdraco)

View file

@ -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