git: 1b1166b915c8 - main - graphics/qgis: Update to 3.42.1
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 23 Mar 2025 09:45:03 UTC
The branch main has been updated by rhurlin:
URL: https://cgit.FreeBSD.org/ports/commit/?id=1b1166b915c8f9ad58a1b49b6b4f81dce014ceeb
commit 1b1166b915c8f9ad58a1b49b6b4f81dce014ceeb
Author: Rainer Hurling <rhurlin@FreeBSD.org>
AuthorDate: 2025-03-23 08:58:40 +0000
Commit: Rainer Hurling <rhurlin@FreeBSD.org>
CommitDate: 2025-03-23 09:43:58 +0000
graphics/qgis: Update to 3.42.1
Changelog: https://github.com/qgis/QGIS/compare/final-3_42_0%5E...final-3_42_1
Reported by: portscout, Repology
---
graphics/qgis/Makefile | 5 ++---
graphics/qgis/distinfo | 6 +++---
.../patch-src_server_qgsfcgiserverresponse.cpp | 24 ++++++++++++++++++++++
graphics/qgis/pkg-plist | 2 --
4 files changed, 29 insertions(+), 8 deletions(-)
diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile
index f4e5885c668a..191ac5a4d28e 100644
--- a/graphics/qgis/Makefile
+++ b/graphics/qgis/Makefile
@@ -1,6 +1,5 @@
PORTNAME= qgis
-DISTVERSION= 3.42.0
-PORTREVISION= 5
+DISTVERSION= 3.42.1
CATEGORIES= graphics geography
MASTER_SITES= https://qgis.org/downloads/
@@ -114,7 +113,7 @@ USES= bison cmake compiler:features desktop-file-utils \
USE_GL= gl
USE_GNOME= libxml2
USE_LDCONFIG= yes
-USE_PYQT= pyqt5 pysip qscintilla2 qtbuilder:build sip:build
+USE_PYQT= pyqt5 pysip qscintilla2 qtbuilder:build sip:build webengine
USE_QT= 3d buildtools:build core concurrent dbus declarative \
designer:build qdoc:build gamepad gui linguist:build location \
multimedia network printsupport qmake:build script serialport \
diff --git a/graphics/qgis/distinfo b/graphics/qgis/distinfo
index 1942e07d8f57..4f081d73b777 100644
--- a/graphics/qgis/distinfo
+++ b/graphics/qgis/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1740232263
-SHA256 (qgis-3.42.0.tar.bz2) = 04b743397ee2375a1a0521578131fc514752f84db2f86225a9551d1f87e704e8
-SIZE (qgis-3.42.0.tar.bz2) = 185525665
+TIMESTAMP = 1742642193
+SHA256 (qgis-3.42.1.tar.bz2) = 9d6a01b24712140c4159842fd00cd9c7532da8bc13625d1a3bf09abedd42c1e9
+SIZE (qgis-3.42.1.tar.bz2) = 189358304
diff --git a/graphics/qgis/files/patch-src_server_qgsfcgiserverresponse.cpp b/graphics/qgis/files/patch-src_server_qgsfcgiserverresponse.cpp
new file mode 100644
index 000000000000..f937936314dc
--- /dev/null
+++ b/graphics/qgis/files/patch-src_server_qgsfcgiserverresponse.cpp
@@ -0,0 +1,24 @@
+--- src/server/qgsfcgiserverresponse.cpp.orig 2025-03-21 12:35:59 UTC
++++ src/server/qgsfcgiserverresponse.cpp
+@@ -31,6 +31,7 @@
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <chrono>
++#include <pthread_np.h>
+
+ //
+ // QgsFCGXStreamData copied from libfcgi FCGX_Stream_Data
+@@ -114,7 +115,12 @@ void QgsSocketMonitoringThread::run()
+ }
+
+ #if defined( Q_OS_UNIX ) && !defined( Q_OS_ANDROID )
+- const pid_t threadId = gettid();
++ // https://github.com/qgis/QGIS/commit/6ecc1c31c95894199b88b56f8023e74807743957
++ #if !defined (__FreeBSD__)
++ const pid_t threadId = gettid();
++ #else
++ const pid_t threadId = pthread_getthreadid_np();
++ #endif
+
+ mShouldStop.store( false );
+ char c;
diff --git a/graphics/qgis/pkg-plist b/graphics/qgis/pkg-plist
index dd4aff242a6a..269994e8d7e0 100644
--- a/graphics/qgis/pkg-plist
+++ b/graphics/qgis/pkg-plist
@@ -3813,7 +3813,6 @@ share/metainfo/org.qgis.qgis.appdata.xml
%%DATADIR%%/i18n/qgis_de.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_fi.qm
%%DATADIR%%/i18n/qgis_fr.qm
@@ -3824,7 +3823,6 @@ share/metainfo/org.qgis.qgis.appdata.xml
%%DATADIR%%/i18n/qgis_ja.qm
%%DATADIR%%/i18n/qgis_ko.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