From nobody Sun Dec 19 09:37:13 2021 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 0E71E18FEE3C; Sun, 19 Dec 2021 09:37:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JGyL15Xksz3lwH; Sun, 19 Dec 2021 09:37:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 9DFCE202E5; Sun, 19 Dec 2021 09:37:13 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1BJ9bDT9059980; Sun, 19 Dec 2021 09:37:13 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1BJ9bDpV059979; Sun, 19 Dec 2021 09:37:13 GMT (envelope-from git) Date: Sun, 19 Dec 2021 09:37:13 GMT Message-Id: <202112190937.1BJ9bDpV059979@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Rainer Hurling Subject: git: 5936dd19952e - main - graphics/qgis: 3.22.2 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: rhurlin X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5936dd19952ed39374c46a8e8b3085af8004bdcb Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1639906633; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=OgwF1ZUK/V5TrByVNQIlfJ9YDU+EGBEjvyUvWm2jHMw=; b=hYsJoic7lXBL+ZNwmCN/b21h6fNoDLYYdS6IB0NBEruSVVStn+4xIgEJmMn1VarGiyJA4z 60HcuFTqTJhss2aIlChUBgvLBWIoLForu7t7ylPXSefcDw693BXVI/B0gvXDzGVseY4QYv Sn7cKX6ZvJrBhAnSMn3BgbQ34RlP86+x/SQJaU0Dsvv+y7k4SZv64y1oO3YAeBnGcb2h8j K/MzOxz9hFonHsg84CT7Xep8V8FDOtNda2xWm3DlY3Cqtm8A8YMW8V/eeXXo+MBlx9SLnr buPIAvOYjlYhzdDDS2lsebSfqDfhHItlnR9RoEI3Ae4tO1FBTBW4w6y2jLJzaQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1639906633; a=rsa-sha256; cv=none; b=popIc8RRsJblCDVXodPlEMmIOfbzQLUUs/P4QRp/0YoAQzsC8WeDvRie7uAf85dtNafSjO qdaN3VBbZZYqlLCPWjJ9NpMmHLV8be3Gd+ofSBQ81DmtEnRja9KiFugqkqnhvpTIJsbrcl FjGTViBr2RZNtpch7SAIlqcqbwZVZaGW+QfhmzcZdckZ755OTHQ+odnUld15vnmxPGyeJy 4Ll//5sKJ8NY69rkgRZ6gJPJxG3zg4VZEapJyAAvyQBFTf9C3NVpOjM/kYxeuBoVP4jjjb 4bgBqj7VLz5EJ1s6gAzK8xvt/gWGuOMBLecgruDCWJj8KMuO7Ky7V2QGrFTgeQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by rhurlin: URL: https://cgit.FreeBSD.org/ports/commit/?id=5936dd19952ed39374c46a8e8b3085af8004bdcb commit 5936dd19952ed39374c46a8e8b3085af8004bdcb Author: Rainer Hurling AuthorDate: 2021-12-19 08:21:17 +0000 Commit: Rainer Hurling CommitDate: 2021-12-19 09:36:57 +0000 graphics/qgis: 3.22.2 Patches for qgsogrproviderutils not necessary any more, since committed upstream. Changelog: https://github.com/qgis/QGIS/compare/final-3_22_1%5E...final-3_22_2 Reported by: Repology --- graphics/qgis/Makefile | 4 ++-- graphics/qgis/distinfo | 6 +++--- ...tch-src_core_providers_ogr_qgsogrproviderutils.cpp | 19 ------------------- ...patch-src_core_providers_ogr_qgsogrproviderutils.h | 11 ----------- 4 files changed, 5 insertions(+), 35 deletions(-) diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile index 1efaa86b44e0..1281c0b5b9e6 100644 --- a/graphics/qgis/Makefile +++ b/graphics/qgis/Makefile @@ -2,7 +2,7 @@ PORTNAME= qgis DISTVERSIONPREFIX= final- -DISTVERSION= 3_22_1 +DISTVERSION= 3_22_2 CATEGORIES= graphics geography PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ @@ -79,7 +79,7 @@ RUN_DEPENDS= astyle:devel/astyle \ ${PYTHON_PKGNAMEPREFIX}nbformat>=5.0.7:devel/py-nbformat@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}networkx>=2.1:math/py-networkx@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}nltk>=3.4.1:textproc/py-nltk@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}numpy>=1.16.6:math/py-numpy@${PY_FLAVOR} \ + ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}OWSLib>=0.18.0:graphics/py-OWSLib@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pandas>=0.24.2:math/py-pandas@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pbr>=3.1.1:devel/py-pbr@${PY_FLAVOR} \ diff --git a/graphics/qgis/distinfo b/graphics/qgis/distinfo index 033669f4e754..8b513cff4a67 100644 --- a/graphics/qgis/distinfo +++ b/graphics/qgis/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1637394887 -SHA256 (qgis-QGIS-final-3_22_1_GH0.tar.gz) = ab85a83b30954c08faece0fe0bde9cd8dd767a67c7aa892174c5319b85025fc3 -SIZE (qgis-QGIS-final-3_22_1_GH0.tar.gz) = 159867816 +TIMESTAMP = 1639834513 +SHA256 (qgis-QGIS-final-3_22_2_GH0.tar.gz) = e3268d13cc2947e67bcb61c5ffafee7e56272eb082be8afc9605ccfcf44d453e +SIZE (qgis-QGIS-final-3_22_2_GH0.tar.gz) = 159914025 diff --git a/graphics/qgis/files/patch-src_core_providers_ogr_qgsogrproviderutils.cpp b/graphics/qgis/files/patch-src_core_providers_ogr_qgsogrproviderutils.cpp deleted file mode 100644 index 92563ca24ac9..000000000000 --- a/graphics/qgis/files/patch-src_core_providers_ogr_qgsogrproviderutils.cpp +++ /dev/null @@ -1,19 +0,0 @@ ---- src/core/providers/ogr/qgsogrproviderutils.cpp.orig 2021-11-19 12:08:37 UTC -+++ src/core/providers/ogr/qgsogrproviderutils.cpp -@@ -2311,7 +2311,7 @@ void QgsOgrProviderUtils::release( QgsOgrLayer *&layer - } - - --void QgsOgrProviderUtils::releaseDataset( QgsOgrDataset *&ds ) -+void QgsOgrProviderUtils::releaseDataset( QgsOgrDataset *ds ) - { - if ( !ds ) - return; -@@ -2319,7 +2319,6 @@ void QgsOgrProviderUtils::releaseDataset( QgsOgrDatase - QMutexLocker locker( sGlobalMutex() ); - releaseInternal( ds->mIdent, ds->mDs, true ); - delete ds; -- ds = nullptr; - } - - bool QgsOgrProviderUtils::canDriverShareSameDatasetAmongLayers( const QString &driverName ) diff --git a/graphics/qgis/files/patch-src_core_providers_ogr_qgsogrproviderutils.h b/graphics/qgis/files/patch-src_core_providers_ogr_qgsogrproviderutils.h deleted file mode 100644 index 472ef5ed8c07..000000000000 --- a/graphics/qgis/files/patch-src_core_providers_ogr_qgsogrproviderutils.h +++ /dev/null @@ -1,11 +0,0 @@ ---- src/core/providers/ogr/qgsogrproviderutils.h.orig 2021-11-19 12:08:37 UTC -+++ src/core/providers/ogr/qgsogrproviderutils.h -@@ -216,7 +216,7 @@ class CORE_EXPORT QgsOgrProviderUtils - static void release( QgsOgrLayer *&layer ); - - //! Release a QgsOgrDataset* -- static void releaseDataset( QgsOgrDataset *&ds ); -+ static void releaseDataset( QgsOgrDataset *ds ); - - //! Make sure that the existing pool of opened datasets on dsName is not accessible for new getLayer() attempts - static void invalidateCachedDatasets( const QString &dsName );