From 552bd8131210f34e8c23a32803077e85ab9f4bd1 Mon Sep 17 00:00:00 2001 From: Rainer Hurling Date: Sat, 19 Apr 2025 21:37:21 +0200 Subject: [PATCH] graphics/qgis: Update to 3.42.2 Changelog: https://github.com/qgis/QGIS/compare/final-3_42_1%5E...final-3_42_2 Reported by: Repology MFH: 2025Q2 --- graphics/qgis/Makefile | 3 +-- graphics/qgis/distinfo | 6 +++--- ...patch-src_server_qgsfcgiserverresponse.cpp | 19 ------------------- graphics/qgis/pkg-plist | 5 +++++ 4 files changed, 9 insertions(+), 24 deletions(-) delete mode 100644 graphics/qgis/files/patch-src_server_qgsfcgiserverresponse.cpp diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile index e6d66a933e9c..27be8ddcfd36 100644 --- a/graphics/qgis/Makefile +++ b/graphics/qgis/Makefile @@ -1,6 +1,5 @@ PORTNAME= qgis -DISTVERSION= 3.42.1 -PORTREVISION= 4 +DISTVERSION= 3.42.2 CATEGORIES= graphics geography MASTER_SITES= https://qgis.org/downloads/ diff --git a/graphics/qgis/distinfo b/graphics/qgis/distinfo index 4f081d73b777..d2bbd18ebdc1 100644 --- a/graphics/qgis/distinfo +++ b/graphics/qgis/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1742642193 -SHA256 (qgis-3.42.1.tar.bz2) = 9d6a01b24712140c4159842fd00cd9c7532da8bc13625d1a3bf09abedd42c1e9 -SIZE (qgis-3.42.1.tar.bz2) = 189358304 +TIMESTAMP = 1745050208 +SHA256 (qgis-3.42.2.tar.bz2) = ce63863990da409de09606651252a3811b1cbee017ce8e8fbf2fd20a64778883 +SIZE (qgis-3.42.2.tar.bz2) = 185264347 diff --git a/graphics/qgis/files/patch-src_server_qgsfcgiserverresponse.cpp b/graphics/qgis/files/patch-src_server_qgsfcgiserverresponse.cpp deleted file mode 100644 index b3b51509b523..000000000000 --- a/graphics/qgis/files/patch-src_server_qgsfcgiserverresponse.cpp +++ /dev/null @@ -1,19 +0,0 @@ ---- src/server/qgsfcgiserverresponse.cpp.orig 2025-03-21 12:35:59 UTC -+++ src/server/qgsfcgiserverresponse.cpp -@@ -23,6 +23,7 @@ - #include "qgsmessagelog.h" - #include - #include -+#include - - #include "qgslogger.h" - -@@ -114,7 +115,7 @@ void QgsSocketMonitoringThread::run() - } - - #if defined( Q_OS_UNIX ) && !defined( Q_OS_ANDROID ) -- const pid_t threadId = gettid(); -+ quint64 threadId = reinterpret_cast( QThread::currentThreadId() ); - - mShouldStop.store( false ); - char c; diff --git a/graphics/qgis/pkg-plist b/graphics/qgis/pkg-plist index 269994e8d7e0..69b8f43400c4 100644 --- a/graphics/qgis/pkg-plist +++ b/graphics/qgis/pkg-plist @@ -3811,9 +3811,12 @@ share/metainfo/org.qgis.qgis.appdata.xml %%DATADIR%%/i18n/qgis_cs.qm %%DATADIR%%/i18n/qgis_da.qm %%DATADIR%%/i18n/qgis_de.qm +%%DATADIR%%/i18n/qgis_el.qm %%DATADIR%%/i18n/qgis_en_US.qm %%DATADIR%%/i18n/qgis_es.qm +%%DATADIR%%/i18n/qgis_et.qm %%DATADIR%%/i18n/qgis_eu.qm +%%DATADIR%%/i18n/qgis_fa.qm %%DATADIR%%/i18n/qgis_fi.qm %%DATADIR%%/i18n/qgis_fr.qm %%DATADIR%%/i18n/qgis_gl.qm @@ -3822,7 +3825,9 @@ share/metainfo/org.qgis.qgis.appdata.xml %%DATADIR%%/i18n/qgis_it.qm %%DATADIR%%/i18n/qgis_ja.qm %%DATADIR%%/i18n/qgis_ko.qm +%%DATADIR%%/i18n/qgis_ky.qm %%DATADIR%%/i18n/qgis_lt.qm +%%DATADIR%%/i18n/qgis_lv.qm %%DATADIR%%/i18n/qgis_nb.qm %%DATADIR%%/i18n/qgis_nl.qm %%DATADIR%%/i18n/qgis_pl.qm