From nobody Mon Jan 16 19:05:21 2023 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 4NwhL9646wz2t6N8; Mon, 16 Jan 2023 19:05:21 +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 4NwhL95Qsxz3ncd; Mon, 16 Jan 2023 19:05:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673895921; 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=dds8zFVlwej4Xymhz6biazS12kMEV6A7HPLqCM7+35g=; b=kW7oXINpJH7rvtqbwKD1TyPjzZiB5ib3Lhe3x4Cl8hr/mIq7JWkdG6Onxuf1kKhFYayhAf ipGRmdB2MCF1FXWzanAJyclgb1nX3h714liU/BUjqKe5RMrBHFOr/yCujDiwPWq6Sb06oa e+p/JFUVRe91JUpzJuochUT4UVVkH7lKlHab119lSAidN9HGlYkJzEE7Vb1tAAYIMl+qTU OClK18Rta/4t27Q5vUucY8gcl8NXziTh0riYJsTkm6I5NzhYKC6VV+r9BM7TwPS0VLaPiY yqwNgmMXypxl9zFUPdERmlutFa6ddnTLHJynVG6jkkrkOIuGjLhgrfyJALEe9g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1673895921; 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=dds8zFVlwej4Xymhz6biazS12kMEV6A7HPLqCM7+35g=; b=l2Da13eOkiWQof50qK4ph3gEYSEI+uX5aXu+PpEJrMrilExZPxSJeQgpRsiq9YNS3dGw1y Dj9Nbho+BnY9F53wnGjpwMIkPVtuXaElcdZHONDE3nAqHzZ6/xrgj/TuZ9B+CLZEFAg+hS ko/qgYBOFTr5LKjg37eLgAmcOJvEgzV0cBWc6n9hy0juaK6/jGJuP2lzgY7y8Dkl8Tq0Zy 2E+BGMIL1kt6Pg5LYcr8GaKfHnYwuQZHLX79k8p4q6yJVMx8EmVbgnve6R2KVitr6TbecQ nItyxC0a4foTV3UlW6U8hY6FW9BZ1k1WoaEyxpCFXIbK3HWS4qP2iGEqXPE/Tw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1673895921; a=rsa-sha256; cv=none; b=IpPTnbtTBx9iKQw9FK9GrwBGrZ2Im0nlvWnYLYVXApI7T7vuNqpsQA9LzDv5XYT2VYPkFC YM/jPuAIMiRaOWlp46R8AztjpuajRXC7BYzqT5fWk7GaSFmrkWUvyBv81oYBPxIUPoMQ5H 6vWILJR9jSpnmw1r0Ko8G60rhuczt3uiHADzaYVviuWqWnokKZxUw7aFgovHVUsyEuwJee cRT9/qA4ZYizeCABgFVgNMLGSzoxdf9PI2Cqe2M0WUMk4OpAKdj9VsDijU/EXIRWBpsy2R UemMtY49FK8B0z9LwEZIPNcLjzaSF9vSPxIqJ8i+DvTJfaPPmG3Uadr1m/c9vg== 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 4NwhL94WQhz1HmJ; Mon, 16 Jan 2023 19:05:21 +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 30GJ5Lna036182; Mon, 16 Jan 2023 19:05:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30GJ5LSk036181; Mon, 16 Jan 2023 19:05:21 GMT (envelope-from git) Date: Mon, 16 Jan 2023 19:05:21 GMT Message-Id: <202301161905.30GJ5LSk036181@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dimitry Andric Subject: git: ca9de74ce4b1 - main - x11/mate-panel: fix build with clang 15 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: dim X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: ca9de74ce4b13b979ea5f24c88c111a2f9b24dfa Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by dim (src committer): URL: https://cgit.FreeBSD.org/ports/commit/?id=ca9de74ce4b13b979ea5f24c88c111a2f9b24dfa commit ca9de74ce4b13b979ea5f24c88c111a2f9b24dfa Author: Dimitry Andric AuthorDate: 2023-01-07 00:28:09 +0000 Commit: Dimitry Andric CommitDate: 2023-01-16 19:04:46 +0000 x11/mate-panel: fix build with clang 15 During an exp-run for llvm 15 (see bug 265425), it turned out that x11/mate-panel failed to build with clang 15: clock-location.c:454:22: error: incompatible pointer to integer conversion assigning to 'glong' (aka 'long') from 'char *(int, int)' [-Wint-conversion] sys_timezone = timezone; ^ ~~~~~~~~ clock-location.c:462:24: error: incompatible pointer to integer conversion assigning to 'glong' (aka 'long') from 'char *(int, int)' [-Wint-conversion] local_timezone = timezone; ^ ~~~~~~~~ This is because 'timezone' as a global external variable does not exist on FreeBSD: it is a glibc-ism. Use struct tm's tm_gmtoff field instead, which has its sign reversed from the glibc global. There is also no need to manually account for DST, as tm_gmtoff includes that. PR: 268795 Approved by: portmgr (tcberner) MFH: 2023Q1 --- .../files/patch-applets_clock_clock-location.c | 30 ++++++++++++++++++++++ 1 file changed, 30 insertions(+) diff --git a/x11/mate-panel/files/patch-applets_clock_clock-location.c b/x11/mate-panel/files/patch-applets_clock_clock-location.c new file mode 100644 index 000000000000..5f784e380463 --- /dev/null +++ b/x11/mate-panel/files/patch-applets_clock_clock-location.c @@ -0,0 +1,30 @@ +--- applets/clock/clock-location.c.orig 2022-01-26 15:27:16 UTC ++++ applets/clock/clock-location.c +@@ -451,19 +451,27 @@ clock_location_get_offset (ClockLocation *loc) + + unsetenv ("TZ"); + tm = localtime (&t); ++#ifdef __FreeBSD__ ++ sys_timezone = -tm->tm_gmtoff; ++#else + sys_timezone = timezone; + + if (tm->tm_isdst > 0) { + sys_timezone -= 3600; + } ++#endif + + setenv ("TZ", priv->timezone, 1); + tm = localtime (&t); ++#ifdef __FreeBSD__ ++ local_timezone = -tm->tm_gmtoff; ++#else + local_timezone = timezone; + + if (tm->tm_isdst > 0) { + local_timezone -= 3600; + } ++#endif + + offset = local_timezone - sys_timezone; +