From nobody Tue Nov 23 17:11:18 2021 X-Original-To: dev-commits-ports-main@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 32FF418A36FA; Tue, 23 Nov 2021 17:11:19 +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 4Hz9dy4tBWz4Tt2; Tue, 23 Nov 2021 17:11:18 +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 884B51A561; Tue, 23 Nov 2021 17:11:18 +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 1ANHBIQt053183; Tue, 23 Nov 2021 17:11:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1ANHBILI053182; Tue, 23 Nov 2021 17:11:18 GMT (envelope-from git) Date: Tue, 23 Nov 2021 17:11:18 GMT Message-Id: <202111231711.1ANHBILI053182@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: eacf34a1cf4b - main - graphics/qgis: Fix on CURRENT after llvm13 intro List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: eacf34a1cf4b6b81e54d4fe74ad931ee93d1d8ef Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637687478; 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=mckdFkMbsJrBiS/k95i4Bdys4XcG3bNLhjf/b968LHo=; b=Qir6g2AqH+Guyn2m2TZmHMNQBM+6ugfvNwtigXLaB92/JCrehtCFNbLQjmCQFfnENH1EBl +eXgfiY4cEzrny5D8+/AtJcXrTaOpu9lkOu3ByfIJbuob5uDIJb/P3Y2MomvG7HHyVhOC1 s/tc5NPvL0q8AM2vRHC56dvnsPIl+j4+PA7gpVk5IC98V/qkcYAEekClaUjiZwV8IAYkBp AAc3vUHWEY3Yp9TtFgLMTDSNeFMBMeDUi0GNrmA+0WCoTkXW19VANJJj04HOGtwWa8wMxf w2K728njv3Sewl4ty2CAMkyxRuOh5ohCuUx2R1v0X7prynbE1bseeqaygY4UjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637687478; a=rsa-sha256; cv=none; b=YBIiW7dSl56j/Dzk1VJcimW8VINPGjytaZJPMpdiGkbPqRAae7jsO4vjM3D7Fm1f5dke00 ia+MGFLaqVW5FM1dA9XdxKdhQBZ8OWRXt46LwpDsniU/ZctjkPeSDqPz/21h5ng2Wt7wM0 MEOoRbaky4DX/7X/cqDaFDI4K6OQnwB8nh2h9m3AjK7yLMCHf6MxI0SbPg+DecpHHgBWQX 7NLrsr/5IIWtcwCZBi7EzBiv1JWu4xsLiSg6FfVd0WRQult3LMqKwW1DiJnI38KJif6paT dSjhlAh2t4SAlon/rGdlkmhSenn5u+3rkJt4xZ/vD6z5Q2HSCckAWHaXLI6P3A== 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=eacf34a1cf4b6b81e54d4fe74ad931ee93d1d8ef commit eacf34a1cf4b6b81e54d4fe74ad931ee93d1d8ef Author: Dimitry Andric AuthorDate: 2021-11-23 17:08:01 +0000 Commit: Rainer Hurling CommitDate: 2021-11-23 17:08:01 +0000 graphics/qgis: Fix on CURRENT after llvm13 intro Right after replacing llvm12 with llvm13 in base (commits b61bce17f346d79cecfd8f195a64b10f77be43b1 to 397a8ba05313cc3815d219c9d1b2de1372fcb561) graphics/qgis was broken on 14.0-CURRENT with /usr/ports/graphics/qgis/work/QGIS-final-3_22_1/src/core/providers/ogr/qgsogrproviderutils.cpp:2595:34: error: no matching constructor for initialization of 'QgsOgrDatasetSharedPtr' (aka 'shared_ptr') QgsOgrDatasetSharedPtr dsRet = QgsOgrDatasetSharedPtr( new QgsOgrDataset(), QgsOgrProviderUtils::releaseDataset ); Thanks to dim@ for the analysis and solution. Much appreciated! PR: 259967 --- ...tch-src_core_providers_ogr_qgsogrproviderutils.cpp | 19 +++++++++++++++++++ ...patch-src_core_providers_ogr_qgsogrproviderutils.h | 11 +++++++++++ 2 files changed, 30 insertions(+) diff --git a/graphics/qgis/files/patch-src_core_providers_ogr_qgsogrproviderutils.cpp b/graphics/qgis/files/patch-src_core_providers_ogr_qgsogrproviderutils.cpp new file mode 100644 index 000000000000..92563ca24ac9 --- /dev/null +++ b/graphics/qgis/files/patch-src_core_providers_ogr_qgsogrproviderutils.cpp @@ -0,0 +1,19 @@ +--- 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 new file mode 100644 index 000000000000..472ef5ed8c07 --- /dev/null +++ b/graphics/qgis/files/patch-src_core_providers_ogr_qgsogrproviderutils.h @@ -0,0 +1,11 @@ +--- 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 );