From nobody Tue Mar 11 13:21:53 2025 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 4ZBvYY1wL6z5qYNL; Tue, 11 Mar 2025 13:21: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 4ZBvYY1LKgz3Xth; Tue, 11 Mar 2025 13:21:53 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1741699313; 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=LtoxF8pRL+dfE1TQZCdVVRYe/TeVP76HpDc0vE1dZRg=; b=HSqXw7oisCOodDnjOgg5SEizIDFNbCgFrxBIdfZYcT57NsJ5OKnmD3q04wcOfBR4V8o11/ Xj9Y5M6hrXeE2qlQhOTIspyCz3ekCJ5wf1xuap072Xe7CcsN1jHXtehZ3Asap7Iv62Mpxd LTFYf12AK0/SFjrAZSKSnke2Rn1zAkuHeeaTwmjF6HKAiOnhTKaPtS+0tLpEQGO33YVLQ/ 6FuQybfV5hDoWlZjAp7LbbWdxG4EBfKFAajNGhh58H3GXA+3sGJx4gQ5etA2x0kd3DtWPY tr/ASPO4Dfl5U/lbTBdnPSiHfOnallnQlw2DdHhHFH7YqL6UHfsHATpNqh1VoA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1741699313; a=rsa-sha256; cv=none; b=Sy6KewUmkDP8eC4bQaRsjnodZEnUqX9u8CWDT2WCiNhK9w5m+7pmEpex/FaaxWe0+Y3jo7 VfQcf32vGWln2ekUC3+58pAI96tNiskLal4k2S0IcQDquGVkDr/f3gAgwqRLM3/fEaL/DV DBeGUr1sXqexhkZ+S03Rgyzc2qlJVuTQWZO3HTWlAVpCZAr2qEZj7evYVWJv+bedxxLuft jVUFu4KIRc2bSW/A8M802RwCZq0AdJRkf7aI2yAz2G/rcFS0zoaAdqEaIxtarimcu9LbJF sLMZOcV+MTujnQN8P0Cvrcq0lXXRSsi2q0E0D+Ky1jGpMV9rBZz7VI1EoU6BFQ== 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=1741699313; 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=LtoxF8pRL+dfE1TQZCdVVRYe/TeVP76HpDc0vE1dZRg=; b=I3yC1YvHqaWPvBxVnL86hDslEMTxvQ070xdlOlRkuwAfRInJs9jOAZnqKTkOFvrybFMWNJ +t16X/NPmtL2HHUCl6EvrQ6bihuywwj4pAbeeHlITS4vGtb2ns76uL4Clkl44HQJGjmYUq qFGsYdfy/pMuSPUzHUdjH0oN//b1yEUdbcUn4Z5b8jfk4qzWJLXvyDvVvz5Ih1k1OhnJ6D 3yoyxMCnZcTdx/R2Fwa/BXXatW2GQXOxommOPZnViiE7sh9VDjtEJRPGFDmddpFxxqwsNH aBXClB4jKZCMktD3wFbQ1hL51exJ9pg1PLqVDJcvTo5cpr9JnwNEJzWUcwK5sQ== 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 4ZBvYY0vrLzCCN; Tue, 11 Mar 2025 13:21:53 +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 52BDLrtI051279; Tue, 11 Mar 2025 13:21:53 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52BDLrpG051276; Tue, 11 Mar 2025 13:21:53 GMT (envelope-from git) Date: Tue, 11 Mar 2025 13:21:53 GMT Message-Id: <202503111321.52BDLrpG051276@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Adriaan de Groot Subject: git: 058327d15649 - main - devel/qt6-base: repair timezone-loading 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: adridg X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 058327d15649593fcb4758ad7cf3a4c722bede7c Auto-Submitted: auto-generated The branch main has been updated by adridg: URL: https://cgit.FreeBSD.org/ports/commit/?id=058327d15649593fcb4758ad7cf3a4c722bede7c commit 058327d15649593fcb4758ad7cf3a4c722bede7c Author: Adriaan de Groot AuthorDate: 2025-03-11 13:18:07 +0000 Commit: Adriaan de Groot CommitDate: 2025-03-11 13:21:51 +0000 devel/qt6-base: repair timezone-loading This is basically the same patch as in devel/qt5-core, but written anew and a little more compact. On FreeBSD, prefer reading from /var/db/zoneinfo which contains the name of the system timezone. (And /etc/localtime is a complete tzinfo file, not suitable for finding the name in a way suitable for this bit of code). Reported-by: Martin Birgmeier PR: 285244 --- devel/qt6-base/Makefile | 2 +- .../patch-src_corelib_time_qtimezoneprivate__tz.cpp | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/devel/qt6-base/Makefile b/devel/qt6-base/Makefile index 08996d70549f..b305993db175 100644 --- a/devel/qt6-base/Makefile +++ b/devel/qt6-base/Makefile @@ -1,6 +1,6 @@ PORTNAME= base DISTVERSION= ${QT6_VERSION} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= devel PKGNAMEPREFIX= qt6- diff --git a/devel/qt6-base/files/patch-src_corelib_time_qtimezoneprivate__tz.cpp b/devel/qt6-base/files/patch-src_corelib_time_qtimezoneprivate__tz.cpp new file mode 100644 index 000000000000..e77da3e4be7a --- /dev/null +++ b/devel/qt6-base/files/patch-src_corelib_time_qtimezoneprivate__tz.cpp @@ -0,0 +1,20 @@ +--- src/corelib/time/qtimezoneprivate_tz.cpp.orig 2025-03-11 12:45:59 UTC ++++ src/corelib/time/qtimezoneprivate_tz.cpp +@@ -1312,8 +1312,16 @@ class ZoneNameReader (public) + const StatIdent local = identify("/etc/localtime"); + const StatIdent tz = identify("/etc/TZ"); + const StatIdent timezone = identify("/etc/timezone"); ++ const StatIdent db_zoneinfo = identify("/var/db/zoneinfo"); + if (!m_name.isEmpty() && m_last.isValid() +- && (m_last == local || m_last == tz || m_last == timezone)) { ++ && (m_last == local || m_last == tz || m_last == timezone || m_last == db_zoneinfo)) { ++ return m_name; ++ } ++ ++ // FreeBSD usually has /var/db/zoneinfo with the name of the TZ ++ m_name = etcContent(QStringLiteral("/var/db/zoneinfo")); ++ if (!m_name.isEmpty()) { ++ m_last = db_zoneinfo; + return m_name; + } +