Date: Sun, 4 Feb 2024 01:00:21 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 5a0c29181856 - main - x11-wm/niri: switch 47132c04ee75 to upstream fix Message-ID: <202402040100.41410LEo076369@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=5a0c29181856e54a825c501b5ec6d2082567ce68 commit 5a0c29181856e54a825c501b5ec6d2082567ce68 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2024-02-04 00:55:04 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2024-02-04 01:00:16 +0000 x11-wm/niri: switch 47132c04ee75 to upstream fix --- 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<Kind: NonNegativeClockSource> From<Duration> for +@@ -119,8 +119,8 @@ impl<Kind> Ord for Time<Kind> { impl<Kind: NonNegativeClockSource> From<Duration> for Time<Kind> { 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<Kind> From<Timespec> for Time<Kind> { +@@ -138,7 +138,7 @@ impl<Kind> From<Timespec> for Time<Kind> { } } -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<Duration> { if let Some(mut secs) = lhs.tv_sec.checked_sub(rhs.tv_sec) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202402040100.41410LEo076369>