From nobody Mon Mar 24 20:30:52 2025 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 4ZM4SY2DpSz5rQ8D; Mon, 24 Mar 2025 20:30: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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZM4SX2NW9z43Tk; Mon, 24 Mar 2025 20:30:52 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742848252; 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=1a2iN+bxPWhlnV/EInKSf4pSGSSmVSMJsWE/AnvoFPU=; b=kFJ3+Y4txTIfF8l9hkLmsR6ANrrhj9iBDsWJ3xO4ZcdXUjVDs9VSZmsuegel+3uQ6TjBwa uZqAVLXzgFyLsAOXND3dgIGHfbIS7UWTrqST3qPJOrRIFqe6eLdr3ebQAtHDFe73SS+r+D C7RMd63INpZFhgIMMoAvSfOFTgeJxi4rFwwITfENvfq12CIy5wgL0iajzuGO5h5ShQpm9w ZXLgprOKbTd1VXrqx9gK5YbGJDdLE/4+xsUONSVoAYQWT/oMIqZWCeTvJ5kCSa51+kRFZj 6uSUm4NpO/3MMo0JQjxKgxh3CIz7ndn1MSyFsQVXqo0CtT36jdZzfkFvc0XXog== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1742848252; a=rsa-sha256; cv=none; b=ombk7nDh4Us3x6ulpVOd9A7p9UyDAAvyyQrC/L6pL/SxZDHu+9S0dsqoy7kIy8XQ+80QWg 4rlFm8U77BOJoKo83k0DB8kKv4YC/Z6Erh+G+FXOuBh71tEVtrZpr/6y3Yvcw33JBbwuAm wOQfr2F48r1nSGbFmKtgFyC5sIU0NMmFDCRxP2G7dm7tO3b9LT3iIZzykNedt+F/LDnNLi eZN4cs1nCR5cJdRi3fzfXk6b3q+2xaMV765/n0w4l46/IGi7F0AoFau8TwnXbU7NfKv48H Wo/SvIEFUFS16vzXRCrkIKlpKF4SsMb/PWRnhjXM4FjS3sdJUFb8DgVz/EctSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1742848252; 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=1a2iN+bxPWhlnV/EInKSf4pSGSSmVSMJsWE/AnvoFPU=; b=Aesu2+HucLk5+TivJP6h/G5qSzmTD/LbpZJg5A+/MBwMPApW5KN1ykR74Nqm7EgpyvmvAp zCuLhT5qBDE3dkbyYpLcSfE0rRwMMJDIxcjqEzutCBzAm7Q9r573AyNe9EUEMjihWSIkK8 oBxmimK/mEhdxk2nmqwQxQxqcEF9mDTYbKtEbkiQ6DP1ch0vPw9FWBRCMSRw5wXAncD499 1cvb0eY7UAjlLi/mutjjk8Nv6pbEjQjn5PxncygW71oX6Y3BFMSvXpxQd1qYg2SpAcRLs6 UsX7FFrKkV+X3HibnbGMMaXwl3ydw90QVt2bGL49mPOP+Fv/aZZXuFDcmZ2qdQ== 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 4ZM4SX1y8Jz18Qr; Mon, 24 Mar 2025 20:30:52 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52OKUqox001360; Mon, 24 Mar 2025 20:30:52 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52OKUqC6001357; Mon, 24 Mar 2025 20:30:52 GMT (envelope-from git) Date: Mon, 24 Mar 2025 20:30:52 GMT Message-Id: <202503242030.52OKUqC6001357@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: dd79365119e0 - main - graphics/qgis: Use gettid patch from qgis project 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-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: dd79365119e0d84102e50a08887fb46655b1869e Auto-Submitted: auto-generated The branch main has been updated by rhurlin: URL: https://cgit.FreeBSD.org/ports/commit/?id=dd79365119e0d84102e50a08887fb46655b1869e commit dd79365119e0d84102e50a08887fb46655b1869e Author: Rainer Hurling AuthorDate: 2025-03-24 20:12:03 +0000 Commit: Rainer Hurling CommitDate: 2025-03-24 20:30:35 +0000 graphics/qgis: Use gettid patch from qgis project A few hours after the commit of v3.42.0 of the QGIS port, a suitable patch [1] was published in the main branch of the QGIS project, which represents a more general solution for the replacement of the linux-centric gettid(). [1] https://github.com/qgis/QGIS/commit/00c4fa69116bda5a40af1dfc2ed194f9aec08d52 --- graphics/qgis/Makefile | 1 + .../patch-src_server_qgsfcgiserverresponse.cpp | 23 +++++++++------------- 2 files changed, 10 insertions(+), 14 deletions(-) diff --git a/graphics/qgis/Makefile b/graphics/qgis/Makefile index 191ac5a4d28e..1b1c136ce4cf 100644 --- a/graphics/qgis/Makefile +++ b/graphics/qgis/Makefile @@ -1,5 +1,6 @@ PORTNAME= qgis DISTVERSION= 3.42.1 +PORTREVISION= 1 CATEGORIES= graphics geography MASTER_SITES= https://qgis.org/downloads/ diff --git a/graphics/qgis/files/patch-src_server_qgsfcgiserverresponse.cpp b/graphics/qgis/files/patch-src_server_qgsfcgiserverresponse.cpp index f937936314dc..b3b51509b523 100644 --- a/graphics/qgis/files/patch-src_server_qgsfcgiserverresponse.cpp +++ b/graphics/qgis/files/patch-src_server_qgsfcgiserverresponse.cpp @@ -1,24 +1,19 @@ --- src/server/qgsfcgiserverresponse.cpp.orig 2025-03-21 12:35:59 UTC +++ src/server/qgsfcgiserverresponse.cpp -@@ -31,6 +31,7 @@ - #include - #include - #include -+#include +@@ -23,6 +23,7 @@ + #include "qgsmessagelog.h" + #include + #include ++#include - // - // QgsFCGXStreamData copied from libfcgi FCGX_Stream_Data -@@ -114,7 +115,12 @@ void QgsSocketMonitoringThread::run() + #include "qgslogger.h" + +@@ -114,7 +115,7 @@ void QgsSocketMonitoringThread::run() } #if defined( Q_OS_UNIX ) && !defined( Q_OS_ANDROID ) - const pid_t threadId = gettid(); -+ // https://github.com/qgis/QGIS/commit/6ecc1c31c95894199b88b56f8023e74807743957 -+ #if !defined (__FreeBSD__) -+ const pid_t threadId = gettid(); -+ #else -+ const pid_t threadId = pthread_getthreadid_np(); -+ #endif ++ quint64 threadId = reinterpret_cast( QThread::currentThreadId() ); mShouldStop.store( false ); char c;