From nobody Thu Dec 02 14:12:45 2021 X-Original-To: dev-commits-ports-branches@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 4419A18C0144; Thu, 2 Dec 2021 14:12:46 +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 4J4dFn4JHRz4sCD; Thu, 2 Dec 2021 14:12:45 +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 68E151ED28; Thu, 2 Dec 2021 14:12:45 +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 1B2ECjg1008520; Thu, 2 Dec 2021 14:12:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1B2ECjgZ008519; Thu, 2 Dec 2021 14:12:45 GMT (envelope-from git) Date: Thu, 2 Dec 2021 14:12:45 GMT Message-Id: <202112021412.1B2ECjgZ008519@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: 95de1b454625 - 2021Q4 - graphics/qgis: Fix broken patch naming List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@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: 95de1b454625c8c251fe0ee8109391efe26de43f Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1638454365; 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=zD5r0aST6tx/Y7ElyiuzAXETJd6G5srbtN3nDux8be4=; b=YswwGBgrqwqhNu7QquzAlXADV+KlBv4owow0KJa4taFIRbrLQO/ETEEovLEw55TZVNrWj5 BV4S7wzMRL2BD2ME/7FR9b4RF8e0xEE3zTyUFylvPTsowkMCsWF+jspaqe5PZtAzQ1hFdD 6EdFUMGxwiAFMhKRW4V2uMXn1hG0sQgqpg6I0EpSufN2kB4Ilyo0ZcRe1D4ycmVQbQVcxq r0ec9TuhNJlZO7fgijXbipTdmUpdxxux2LIeMXn6bJvgAxCLSgcQIbUVT2Szm3uyxICnRf bA3EAoc5n+Q6ywGPqmZwH4yZDaGayHpmD48VMJgW0fJQxr88ZF1IH+uIIpAhnw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1638454365; a=rsa-sha256; cv=none; b=WrkRoCapq7j+9orbzLtapB9C48YNN+Dw2ujgmCyVF4EWvLcLeIf3OvL8JE6fx8BwyEK+6N qgif0Kv/1p+MrVv02A4PQTW3mq8//diP2Cxn12IkXda1PNYeqpfsXg8rZY7fW52NaVQcho i+2LnrYiEiTctwNcFJ/aJq18E4++oCyCndKZZAMPcH9bZ/qSeau7/QMBpaEwyLceH/u0hB XHNcCF9Drx0jUYJ+e6djZ52vuHLvMD3PtCGV7MiiKgBbk1Sshrw2PymBr43DBF9kwDkUz2 qDdi+d4lT6r8x14+ikoDVdshG3Hf5ufCNF7P5KIdC/layLBTJXZzpjnOa1HK2Q== 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=95de1b454625c8c251fe0ee8109391efe26de43f commit 95de1b454625c8c251fe0ee8109391efe26de43f Author: Rainer Hurling AuthorDate: 2021-12-02 14:06:05 +0000 Commit: Rainer Hurling CommitDate: 2021-12-02 14:06:05 +0000 graphics/qgis: Fix broken patch naming Accidentally, the patches in commit 75007752abec044026edbb53aa0742cc47b49a89 were named incorrectly. Reported by: pkg-fallout Fixes: 75007752abec, Fix on CURRENT after llvm13 intro --- ...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/files/patch-src_core_providers_ogr_qgsogrproviderutils.cpp b/graphics/qgis/files/patch-src_core_providers_ogr_qgsogrprovider.cpp similarity index 61% rename from graphics/qgis/files/patch-src_core_providers_ogr_qgsogrproviderutils.cpp rename to graphics/qgis/files/patch-src_core_providers_ogr_qgsogrprovider.cpp index 92563ca24ac9..bbde70a1a76c 100644 --- a/graphics/qgis/files/patch-src_core_providers_ogr_qgsogrproviderutils.cpp +++ b/graphics/qgis/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/files/patch-src_core_providers_ogr_qgsogrproviderutils.h b/graphics/qgis/files/patch-src_core_providers_ogr_qgsogrprovider.h similarity index 67% rename from graphics/qgis/files/patch-src_core_providers_ogr_qgsogrproviderutils.h rename to graphics/qgis/files/patch-src_core_providers_ogr_qgsogrprovider.h index 472ef5ed8c07..a4979c9e5a9b 100644 --- a/graphics/qgis/files/patch-src_core_providers_ogr_qgsogrproviderutils.h +++ b/graphics/qgis/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*