From nobody Thu Nov 25 19:09:52 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 EDF8218B0EAE; Thu, 25 Nov 2021 19:09:53 +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 4J0S9r6TC5z4nPt; Thu, 25 Nov 2021 19:09:52 +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 9D926226F4; Thu, 25 Nov 2021 19:09:52 +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 1APJ9qPw055254; Thu, 25 Nov 2021 19:09:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1APJ9qaP055253; Thu, 25 Nov 2021 19:09:52 GMT (envelope-from git) Date: Thu, 25 Nov 2021 19:09:52 GMT Message-Id: <202111251909.1APJ9qaP055253@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Rainer Hurling Subject: git: 74992bc9668c - 2021Q4 - graphics/qgis-ltr: Fix broken patch naming 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/2021Q4 X-Git-Reftype: branch X-Git-Commit: 74992bc9668c5a9b73722b6f2a83da7045ab34b0 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637867393; 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=xXQZ/LGa4pWp2BkGHnF9rkKrH22yAtCaTmW4k6sOCks=; b=aW8qlWmtAEmE+GCi5oeJcBvIuSshcmvjjEcXRiPKEkMxNwa0MFJChlH83Wvi88pMGmL8Tc E4Lhs/Q73dxldvx7cYqOIS+ytk4hH5I6AaFCQ/plO98X4sKSQL0WH9XULUL+cSNfXj+yR7 mG2ouuE259DyjownhCW05LTFtJ2uWt8jtYG17l1zEIxWqqVNN8C3ZKjX/RV1nSZGGWjvdF ODHviDrzptigBCmDAhhu4K8zpzVzfuoKnjcdjeJCAy0BCN8O1wHYmjs4891+EwwFedd+eF r5ulUJx7kiRycS9DFh2zTJ6jxK5LN8WN+9TggJh6yDn5tHIl2HujA0lsGUp9LQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637867393; a=rsa-sha256; cv=none; b=Uz93GDaVmQWcHBHbljoZtTAoebbiX0LwCQQE3MkC8Uyk820zHZ8qdmR/z279ow5Sgb1h0m O0y3B2dJ1wfdbeZNR1n2lk8+Py2a8wmcM4kbd6Snuw7uvaVwLrlE7y27G9sS2k1/JxEnWt WCywsZMD+cXYzsRG/IvfLLbaE5wQTwJc6/9x+lN3nWvaBp/q7YuANkYS3m41KFct51DlxL KLsg6jAARq0bv2o/I79RAWR6ZcbS34Agy4VNeabLdiwL1DwQLiC/j/3YhrzQlGO9EnIBTQ 2DFmDuGFXHK8nWXbUV3GRyhaTf0FA+GME18cHRhVKsFnQxttU9HBG3shZ51yRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch 2021Q4 has been updated by rhurlin: URL: https://cgit.FreeBSD.org/ports/commit/?id=74992bc9668c5a9b73722b6f2a83da7045ab34b0 commit 74992bc9668c5a9b73722b6f2a83da7045ab34b0 Author: Rainer Hurling AuthorDate: 2021-11-25 18:58:56 +0000 Commit: Rainer Hurling CommitDate: 2021-11-25 19:09:09 +0000 graphics/qgis-ltr: Fix broken patch naming Accidentally, the patches in commit af60a61a9333df126249d5659c350c4a7b969a9a were named incorrectly. Reported by: pkg-fallout Fixes: af60a61a9333, Fix on CURRENT after llvm13 intro MFH: 2021Q4 (cherry picked from commit eca1a49f0e033e30ebc3848aa8e0f4f4a9a805b2) --- ...rutils.cpp => patch-src_core_providers_ogr_qgsogrprovider.cpp} | 8 ++++---- ...viderutils.h => patch-src_core_providers_ogr_qgsogrprovider.h} | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/graphics/qgis-ltr/files/patch-src_core_providers_ogr_qgsogrproviderutils.cpp b/graphics/qgis-ltr/files/patch-src_core_providers_ogr_qgsogrprovider.cpp similarity index 61% rename from graphics/qgis-ltr/files/patch-src_core_providers_ogr_qgsogrproviderutils.cpp rename to graphics/qgis-ltr/files/patch-src_core_providers_ogr_qgsogrprovider.cpp index 92563ca24ac9..bbde70a1a76c 100644 --- a/graphics/qgis-ltr/files/patch-src_core_providers_ogr_qgsogrproviderutils.cpp +++ b/graphics/qgis-ltr/files/patch-src_core_providers_ogr_qgsogrprovider.cpp @@ -1,6 +1,6 @@ ---- 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 +--- src/core/providers/ogr/qgsogrprovider.cpp.orig 2021-11-19 12:10:19 UTC ++++ src/core/providers/ogr/qgsogrprovider.cpp +@@ -5934,7 +5934,7 @@ void QgsOgrProviderUtils::release( QgsOgrLayer *&layer } @@ -9,7 +9,7 @@ { if ( !ds ) return; -@@ -2319,7 +2319,6 @@ void QgsOgrProviderUtils::releaseDataset( QgsOgrDatase +@@ -5942,7 +5942,6 @@ void QgsOgrProviderUtils::releaseDataset( QgsOgrDatase QMutexLocker locker( sGlobalMutex() ); releaseInternal( ds->mIdent, ds->mDs, true ); delete ds; diff --git a/graphics/qgis-ltr/files/patch-src_core_providers_ogr_qgsogrproviderutils.h b/graphics/qgis-ltr/files/patch-src_core_providers_ogr_qgsogrprovider.h similarity index 67% rename from graphics/qgis-ltr/files/patch-src_core_providers_ogr_qgsogrproviderutils.h rename to graphics/qgis-ltr/files/patch-src_core_providers_ogr_qgsogrprovider.h index 472ef5ed8c07..a4979c9e5a9b 100644 --- a/graphics/qgis-ltr/files/patch-src_core_providers_ogr_qgsogrproviderutils.h +++ b/graphics/qgis-ltr/files/patch-src_core_providers_ogr_qgsogrprovider.h @@ -1,6 +1,6 @@ ---- 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 +--- src/core/providers/ogr/qgsogrprovider.h.orig 2021-11-19 12:10:19 UTC ++++ src/core/providers/ogr/qgsogrprovider.h +@@ -503,7 +503,7 @@ class CORE_EXPORT QgsOgrProviderUtils static void release( QgsOgrLayer *&layer ); //! Release a QgsOgrDataset*