From nobody Sun Feb 04 01:01:04 2024 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 4TSB5s0ZlRz58px2; Sun, 4 Feb 2024 01:01:05 +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 4TSB5r5dRnz4YKV; Sun, 4 Feb 2024 01:01:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707008464; 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=C2HMHngZa11N86WjMWKGMVL2Vqn70Vloj8xjll8GNKM=; b=TSMmT922RS8xQPfuNLhKcmys6ralJc1UNBSdr2Stk7vTWOo7//x8VSbjTAD5e6rCn6GiGR N2ey95FJ/lhZcE14lMmEpS1/toKITfO5Cj4298xb04OmDY424B9LhagDLfrQ3VpAGSaFI6 GOrd380bWwjspGIVWnh9dAE4QQz5TZ8kgItXyQQQwbglJjtcOwfE5j11qtY8D0km4VL0xn JSNebuJL7uUb6fPwKmKI3YYyrRjVLbeUYPj1hhEMdGfcrhUpA43QdvgsRWYWH8nl5EcQe6 N1ru9mFZHs+I5kKlfaXarZGqhKCH6p222MEMW5pixfi5vEjiiJ+HJKAaDYejIg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707008464; 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=C2HMHngZa11N86WjMWKGMVL2Vqn70Vloj8xjll8GNKM=; b=yQwXbkA8e5fXUpDJD6/rIvKVPluIjs7PsnGP3NDyBvtWjywI/AxP1+TJ8gppS+gU4YKPIP tQv6XYTCrZWM5xQOrOYe4TDaSS5NAETXLcXtIbIDM8Lrj3q2x8oqevbixjWQuyqAbdCJng POExcNcgSaNIqNTu2vpR3kKgAeP0mwrOVMwU3iU0QwEbW9RK7yGvHk06NUvpQZo9w9ZnHu xtV59fNNvSIXpa3ctA/zCUvQ5MTg1FnTzNlLH+QiM+xdHmbrE9OUZwD5V9LXsHJmOZbh6O zaAjY6eE33Hs3fVzyMRVThAJY2KwSZa2+b54DIpucWzfSJxxxER0Q13XaIBg7g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707008464; a=rsa-sha256; cv=none; b=mVol0jsVXdxx375v3dh5d3TGsWPOxUl8mHy81dlzRayj6VqpwXNwV/25jEf6dA5Bf1yxqi 0/m+lC9Bfb4kh8yFUMADtZi9rKc9/DKPHGcayEgkkQF0EahjZsnbvoqtOuNZnvNjHnnFMB KTKkp1w8fe/NJCGxEA+fiV2VETVdVWLSZbTLZkOp/qAlZTYwDvOljk0zHSel3vS7Vyn3yV AFmnF5XhDnxKSxSlHutHCNRfmv6dKa6IVmYAHieHnppmPNnrA33e/zGZGXj7qla4ePezyw vbYTXtU30sO50UvpPUXQ+4qgnvcgDPJoudhFv1e8YWeCRJhiHVe0XoO7hSo23g== 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 4TSB5r2vcrzbxS; Sun, 4 Feb 2024 01:01:04 +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 4141149S076627; Sun, 4 Feb 2024 01:01:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 414114lQ076624; Sun, 4 Feb 2024 01:01:04 GMT (envelope-from git) Date: Sun, 4 Feb 2024 01:01:04 GMT Message-Id: <202402040101.414114lQ076624@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Jan Beich Subject: git: d61282ef6393 - 2024Q1 - x11-wm/niri: switch 47132c04ee75 to upstream fix 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: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q1 X-Git-Reftype: branch X-Git-Commit: d61282ef639308dbf643fd12f52ca7521296ea2c Auto-Submitted: auto-generated The branch 2024Q1 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=d61282ef639308dbf643fd12f52ca7521296ea2c commit d61282ef639308dbf643fd12f52ca7521296ea2c Author: Jan Beich AuthorDate: 2024-02-04 00:55:04 +0000 Commit: Jan Beich CommitDate: 2024-02-04 01:01:01 +0000 x11-wm/niri: switch 47132c04ee75 to upstream fix (cherry picked from commit 5a0c29181856e54a825c501b5ec6d2082567ce68) --- x11-wm/niri/files/patch-smithay-i386 | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/x11-wm/niri/files/patch-smithay-i386 b/x11-wm/niri/files/patch-smithay-i386 index 1abbea186ed0..5bfa5ef82cb5 100644 --- a/x11-wm/niri/files/patch-smithay-i386 +++ b/x11-wm/niri/files/patch-smithay-i386 @@ -1,31 +1,24 @@ -https://github.com/Smithay/smithay/issues/1315 +https://github.com/Smithay/smithay/pull/1316 --- ../smithay-0eac415ba2d9409cbc201955dc0fd306c116ae05/src/utils/clock.rs.orig 2024-02-02 09:18:10 UTC +++ ../smithay-0eac415ba2d9409cbc201955dc0fd306c116ae05/src/utils/clock.rs -@@ -119,8 +119,11 @@ impl From for +@@ -119,8 +119,8 @@ impl Ord for Time { impl From for Time { fn from(tp: Duration) -> Self { let tp = Timespec { - tv_sec: tp.as_secs() as std::os::raw::c_longlong, - tv_nsec: tp.subsec_nanos() as std::os::raw::c_longlong, -+ tv_sec: tp.as_secs() as libc::time_t, -+ #[cfg(all(target_arch = "x86_64", target_pointer_width = "32"))] -+ tv_nsec: tp.subsec_nanos() as i64, -+ #[cfg(not(all(target_arch = "x86_64", target_pointer_width = "32")))] -+ tv_nsec: tp.subsec_nanos() as std::os::raw::c_long, ++ tv_sec: tp.as_secs() as rustix::time::Secs, ++ tv_nsec: tp.subsec_nanos() as rustix::time::Nsecs, }; Time { tp, -@@ -138,7 +141,11 @@ impl From for Time { +@@ -138,7 +138,7 @@ impl From for Time { } } -const NANOS_PER_SEC: std::os::raw::c_longlong = 1_000_000_000; -+#[cfg(all(target_arch = "x86_64", target_pointer_width = "32"))] -+const NANOS_PER_SEC: i64 = 1_000_000_000; -+ -+#[cfg(not(all(target_arch = "x86_64", target_pointer_width = "32")))] -+const NANOS_PER_SEC: std::os::raw::c_long = 1_000_000_000; ++const NANOS_PER_SEC: rustix::time::Nsecs = 1_000_000_000; fn saturating_sub_timespec(lhs: Timespec, rhs: Timespec) -> Option { if let Some(mut secs) = lhs.tv_sec.checked_sub(rhs.tv_sec) {