From nobody Wed Aug 16 05:11:47 2023 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 4RQbpW36Vmz4qDNl; Wed, 16 Aug 2023 05:11:47 +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 4RQbpW2HPmz3DLN; Wed, 16 Aug 2023 05:11:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692162707; 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=vIJfpOLWfjmJltVb+PlIqT6V5rX6WVggf0czZi2ZI30=; b=yI80KSgrm8JXH7dyluc/Z0PmdInsEGspCl2GjYzOTWNvYAmM4/E3Skon32FlarGNOGQSzS /MKBoYVwO7mZyoH722bBWKGqo8A6MWDqmzyQ5e1LY31Vr7nFgjq9Buwaj5tSopA4hWxRoR iu2GqPQv2iagk/ziysl3J1LG9HKO5JKc6ve0fm3sY9LLe/CR345QxfLo450OiZiLh6zi/w Y62HgYTANl+AEKPZIj8+0kIcz9NJASqoIXty1rL7hbAj8/d+4Y2DbK5lMtLcOwAqt8Xn0Q HGe2QG54/Gl17LwMcVHGCNkyOcH6t157LPElz5vyPt54M38xudjMp8P92+calg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1692162707; 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=vIJfpOLWfjmJltVb+PlIqT6V5rX6WVggf0czZi2ZI30=; b=jEoyj1DI0p4qoUaArPLRlBcQM1a+KyYLt6omNYQXFzublRIDibXUMLStsxhftOnvr02+/M zmPxY31akMGvFrbaOOifoDglf4V1A/aM03hYba00RrGO6zTTcNYX9n2ROhaUbe0+9kfiWt z053aoh/WA8G7V2i7qfZCj5p40+k3mFtzUhXfX80d9zZ4ASqDB6fpZOdj1I8IHJ5HYjbej 1ZouBvEipIwesfH8AcODU8VSy4f+h0fc56uhWWeIt777CFcn5sfG5xaXYtvQZbhZ6MS5eq q/FZci+MA2tI9RE+IERGauZUdNFn5GBktpmwJ1w20OE/KpRolB8IhuF9NqOMGQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1692162707; a=rsa-sha256; cv=none; b=OBRzM9LG2NT3gCu8DrmWUB7GNzz5pQ+XfTWku8zJGLCWWzIwwZCrQsU+1q0wD4Fun/MJLf m6AVqqca+9cwiLXuWOdic29UA/RAuMHcop9gfstxV2O4DYQYL+8cwWV+adETWeIJX4EEj4 WY26Ewzk0qMlv+DJWsb0kbc3dbw74rEQgEywnI3CT/HwKJWzdBCcMxHjt/zMRUnv99/b/J Y7wAjeSGpcI2gyq8AmtpUTOEIyXT05Nya/hNt6flGoUhakpekAwR8vhBTuATnrHXfCf1tI yJM/83vNscRYEVpLDZrgUbiuMTtKDlNUy017Jb8ynrtQermaiXXGmOFAzIf3dw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none 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 4RQbpW1KnGzfXk; Wed, 16 Aug 2023 05:11:47 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 37G5Blg0084905; Wed, 16 Aug 2023 05:11:47 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 37G5BlLm084902; Wed, 16 Aug 2023 05:11:47 GMT (envelope-from git) Date: Wed, 16 Aug 2023 05:11:47 GMT Message-Id: <202308160511.37G5BlLm084902@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Alexey Dokuchaev Subject: git: 44a8d7d3005f - main - audio/rezound: improve (and shorten!) one of the patch files 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: danfe X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 44a8d7d3005f3b3ede09de481d76698bdce5403e Auto-Submitted: auto-generated The branch main has been updated by danfe: URL: https://cgit.FreeBSD.org/ports/commit/?id=44a8d7d3005f3b3ede09de481d76698bdce5403e commit 44a8d7d3005f3b3ede09de481d76698bdce5403e Author: Alexey Dokuchaev AuthorDate: 2023-08-16 05:10:44 +0000 Commit: Alexey Dokuchaev CommitDate: 2023-08-16 05:10:44 +0000 audio/rezound: improve (and shorten!) one of the patch files Provide get_timezone_offset() implementation for FreeBSD next to the glibc-specific code rather than deleting and replacing the latter. --- audio/rezound/files/patch-src_misc_clocks.cpp | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) diff --git a/audio/rezound/files/patch-src_misc_clocks.cpp b/audio/rezound/files/patch-src_misc_clocks.cpp index df1c2e5e29bd..974d872d776e 100644 --- a/audio/rezound/files/patch-src_misc_clocks.cpp +++ b/audio/rezound/files/patch-src_misc_clocks.cpp @@ -1,23 +1,12 @@ --- src/misc/clocks.cpp.orig 2013-02-10 06:35:02 UTC +++ src/misc/clocks.cpp -@@ -304,18 +304,8 @@ int get_timezone_offset() +@@ -303,6 +303,9 @@ int get_timezone_offset() + { #ifdef __APPLE__ int ret = [[NSTimeZone localTimeZone] secondsFromGMT]; - #else -- tzset(); -- -- // ::timezone's manpage says "Seconds West of GMT", but I found this not to be the case -- // ::timezone is in the range [-12*3600, 12*3600], but it's sign is opposite what we expect: -- // Central Time is +6 hours -- // We want to return -6 hours for Central, so we translate the range and ensure it's min and max value -- -- -- int ret = ::timezone; -- -- // invert sign for our purposes -- ret = -ret; ++#elif defined(__FreeBSD__) + time_t date = time(NULL); + int ret = localtime(&date)->tm_gmtoff; - #endif - - // "clamp-and-shift" to convert values outside the appropriate + #else + tzset(); +