geography/qgis: Update to 3.22.4

This is a micro along a stable branch and upstream changes are
bugfixes and minor improvements.  Tested on netbsd-9 amd64.

4 files changed, 8 insertions, 26 deletions

diff --git a/geography/qgis/Makefile b/geography/qgis/Makefile
index 7ee0bd94732..1d0f3a6a16c 100644
--- a/geography/qgis/Makefile
+++ b/geography/qgis/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.137 2022/02/15 12:59:21 gdt Exp $
+# $NetBSD: Makefile,v 1.138 2022/03/17 22:23:16 gdt Exp $
 
 # This is intentionally 3.22 Long Term Release.  Please do not update
 # to later branches, and instead discuss whether/how we want multiple
 # versions.
-DISTNAME=	qgis-3.22.3
+DISTNAME=	qgis-3.22.4
 CATEGORIES=	geography
 MASTER_SITES=	https://qgis.org/downloads/
 EXTRACT_SUFX=	.tar.bz2
diff --git a/geography/qgis/PLIST b/geography/qgis/PLIST
index 88722316495..b35ac53cc48 100644
--- a/geography/qgis/PLIST
+++ b/geography/qgis/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2022/02/15 12:59:21 gdt Exp $
+@comment $NetBSD: PLIST,v 1.19 2022/03/17 22:23:16 gdt Exp $
 bin/qgis
 bin/qgis_bench
 bin/qgis_process
@@ -1774,6 +1774,7 @@ share/qgis/i18n/qgis_cs.qm
 share/qgis/i18n/qgis_da.qm
 share/qgis/i18n/qgis_de.qm
 share/qgis/i18n/qgis_el.qm
+share/qgis/i18n/qgis_en_US.qm
 share/qgis/i18n/qgis_es.qm
 share/qgis/i18n/qgis_et.qm
 share/qgis/i18n/qgis_eu.qm
diff --git a/geography/qgis/distinfo b/geography/qgis/distinfo
index 473a5b18c2a..5c9050b246e 100644
--- a/geography/qgis/distinfo
+++ b/geography/qgis/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.36 2022/02/15 12:59:21 gdt Exp $
+$NetBSD: distinfo,v 1.37 2022/03/17 22:23:16 gdt Exp $
 
-BLAKE2s (qgis-3.22.3.tar.bz2) = 235b8aabd3c2b42c0f8c0c2f74e0c18d0c8864d1ccebb5dc791dd4503fa69f6e
-SHA512 (qgis-3.22.3.tar.bz2) = 8918ee725f4f8d12c4cab009c446e137513b931583bf843356238122e22267211fffee9fd20382fbcb9b613be6d7af22bc0250d9e166ba53dd621e827aafda28
-Size (qgis-3.22.3.tar.bz2) = 136876983 bytes
+BLAKE2s (qgis-3.22.4.tar.bz2) = b68b8866d93b885802d6e96636265a2b0f98d94466caec11f368f475f0c33e20
+SHA512 (qgis-3.22.4.tar.bz2) = 423ba679618876fd4e3d308ad47903b47bfe758e78c01160e9d490121a863b83f5a60f6210fbfea090fb6dac9e42749d2b92777fa2756938bb6ab41fe75377e5
+Size (qgis-3.22.4.tar.bz2) = 137701974 bytes
 SHA1 (patch-cmake_FindQwt.cmake) = e6999791328ea54cd0e457ade13f4e608df3d903
 SHA1 (patch-external_laz-perf_portable__endian.hpp) = 25b6f1b8d51d663d302e0fd03134e1fb583f1b38
 SHA1 (patch-mac_CMakeLists.txt) = 7967c0fa4eed8dc2ce24192bdbec8ae8a336be1c
@@ -10,4 +10,3 @@ SHA1 (patch-mac_cmake_1qt.cmake.in) = d74f7201849ef6dd83f39251e466eb04c791c0e6
 SHA1 (patch-src_core_CMakeLists.txt) = e5b85509023f0b91deea747f30af17f77595c469
 SHA1 (patch-src_core_qgsapplication.cpp) = 54bba734969cd9fd90a2317d8c1531da2827d145
 SHA1 (patch-src_crssync_CMakeLists.txt) = a751be3f55b57a3d039e07c441a4ac81ba735e60
-SHA1 (patch-tests_src_gui_testqgsexternalresourcewidgetwrapper.cpp) = 9d87dcc49ad20219dc4999d09209f4f7c87d6157
diff --git a/geography/qgis/patches/patch-tests_src_gui_testqgsexternalresourcewidgetwrapper.cpp b/geography/qgis/patches/patch-tests_src_gui_testqgsexternalresourcewidgetwrapper.cpp
deleted file mode 100644
index 4d7fe6c95f1..00000000000
--- a/geography/qgis/patches/patch-tests_src_gui_testqgsexternalresourcewidgetwrapper.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-tests_src_gui_testqgsexternalresourcewidgetwrapper.cpp,v 1.2 2022/02/15 12:59:21 gdt Exp $
-
-Fix a test that should have been guarded on WITH_QTWEKBIT.
-
-Not yet reported upstream.
-
---- tests/src/gui/testqgsexternalresourcewidgetwrapper.cpp.orig	2022-01-14 12:06:34.000000000 +0000
-+++ tests/src/gui/testqgsexternalresourcewidgetwrapper.cpp
-@@ -1258,7 +1258,9 @@ void TestQgsExternalResourceWidgetWrappe
- 
-   // content still null, fetching in progress...
-   QVERIFY( !ww.mQgsWidget->mPixmapLabel->isVisible() );
-+#ifdef WITH_QTWEBKIT
-   QVERIFY( !ww.mQgsWidget->mWebView->isVisible() );
-+#endif
-   QVERIFY( ww.mQgsWidget->mLoadingLabel->isVisible() );
-   QVERIFY( ww.mQgsWidget->mLoadingMovie->state() == QMovie::Running );
-   QVERIFY( !ww.mQgsWidget->mErrorLabel->isVisible() );