From nobody Mon Dec 18 15:23:00 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 4Sv3VY3vsPz54dcT; Mon, 18 Dec 2023 15:23:01 +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 4Sv3VX6Vrbz4RmG; Mon, 18 Dec 2023 15:23:00 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1702912980; 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=Tz49/k7eYxXamJUijrrpSFb1tVCsHW20xkXm0x8pAEU=; b=jLD1xP2JEzMV1+bEhu2YNdyXmIvHRjrZjHdk6PZt6AY1kbvZnwH8pOWUqp9OQ5trVBfX4f yk2FuaulnlqmRm1uVR2mx+679w1ni6AjQR7hRD0dCVKxxGxkDVEW/mbIUUZKXw1k3oRpMk xCDteYeENx71jglzGsWs6Eq0JNAnsqqIIVJiZxs7k9z7AafoSL3w9JSa0pjTh4W3wRJuDF Q8rJ2O0wCPHiFLInKBVlVVjFo6zQjfcLpDN0XOWHpkllZEaY3y/6PHLXDHFCsNN28P57py L1ailDXSeyDTpe77kRn/dlZQoPnhs4drO8mNjTBsFaNVlGpOV5n+73KKUCFZCA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1702912981; a=rsa-sha256; cv=none; b=eIv3+ePk0D9gWOXX04VKVyMHxB0XRjUYm1DTQFFlvAAiXhYBw1sbdfhGx7K7u3652OT2M5 1g7Bw8I8e4m84RrBXdQHVzyGjk0AWUbWO9fcQiCeKstsowl+whShsxrmANFtIbD7NwcDKr 2wDnd6k6A6I4Fw/0LTDG2YIUrcqMFgM0nfnzFfSbe2joxdUDAFGks4iTi6Bhd7bmOJjTkf R7LtCs92+3uO+6j4xqgKzgaL1HK/kfsJ04K6LulSbMSvZXoUyOruCxGraPtHJfkJXJXzqo kbLYOOI1+c42fKOGcTeuYaAqbDKPQsZv0ekN2ANFExRAlYjRReT50oMRfGge2A== 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=1702912981; 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=Tz49/k7eYxXamJUijrrpSFb1tVCsHW20xkXm0x8pAEU=; b=Wyq9byofx4Cp83U2CKatHPLc5PsDpOMm4pxz0jF+CX8He3t7SbiHeratupPt7rgP1A1qiM DK2zYQtcC/xbvIsIJm4Ku3v7VjgG8AFna/JJdgjIRKG0Hs3LRUcCiv9Ds45Sz7KTyIyEjt 1tnjldmd7967OrSw0yuKeujyAwTj79G+Bnf3c8jUzQyXF2KsHPPf/UmotDLORaAN1Yq91m PGDhbV4Y+yAMLZ8FxJd+/9L9c5fe2dMJGzVVlnS6jZmjWoYEWoBllaYRz7CxPQsWWX3yUa fwIlU6IsNLqD0IO8/58vFbx6/oFIDIIwbhLC1FLB8Mg7MFHv84I/zC3dDkb1UQ== 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 4Sv3VX4Q5LzBSB; Mon, 18 Dec 2023 15:23:00 +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 3BIFN0kD004109; Mon, 18 Dec 2023 15:23:00 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3BIFN0uF004106; Mon, 18 Dec 2023 15:23:00 GMT (envelope-from git) Date: Mon, 18 Dec 2023 15:23:00 GMT Message-Id: <202312181523.3BIFN0uF004106@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Jan Beich Subject: git: 71003b09a9e1 - main - x11-wm/niri: switch to upstream libc fix 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: jbeich X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 71003b09a9e188d698ae57c89ff20990d85ea972 Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=71003b09a9e188d698ae57c89ff20990d85ea972 commit 71003b09a9e188d698ae57c89ff20990d85ea972 Author: Jan Beich AuthorDate: 2023-12-17 18:34:55 +0000 Commit: Jan Beich CommitDate: 2023-12-18 15:22:34 +0000 x11-wm/niri: switch to upstream libc fix --- x11-wm/niri/files/patch-libc-strftime | 65 ++++++++++++++++++++--------------- 1 file changed, 38 insertions(+), 27 deletions(-) diff --git a/x11-wm/niri/files/patch-libc-strftime b/x11-wm/niri/files/patch-libc-strftime index 10d9e80c8962..296be1dd4638 100644 --- a/x11-wm/niri/files/patch-libc-strftime +++ b/x11-wm/niri/files/patch-libc-strftime @@ -1,4 +1,4 @@ -https://github.com/rust-lang/libc/issues/3459 +https://github.com/rust-lang/libc/commit/aff5e66e5473 error[E0425]: cannot find function `strftime` in crate `libc` --> src/utils.rs:44:24 @@ -6,30 +6,41 @@ error[E0425]: cannot find function `strftime` in crate `libc` 44 | let rv = libc::strftime(buf.as_mut_ptr().cast(), buf.len(), format.as_ptr(), tm); | ^^^^^^^^ not found in `libc` ---- src/utils.rs.orig 2023-11-26 12:51:13 UTC -+++ src/utils.rs -@@ -9,6 +9,24 @@ use std::time::Duration; - use std::thread; - use std::time::Duration; - -+#[cfg(any( -+ target_os = "dragonfly", -+ target_os = "freebsd", -+ target_os = "netbsd", -+ target_os = "openbsd", -+))] -+mod libc { -+ pub use libc::*; -+ extern "C" { -+ pub fn strftime( -+ buf: *mut c_char, -+ maxsize: size_t, -+ format: *const c_char, -+ timeptr: *const tm, -+ ) -> size_t; -+ } -+} +--- cargo-crates/libc-0.2.150/src/unix/bsd/apple/mod.rs.orig 2006-07-24 01:21:28 UTC ++++ cargo-crates/libc-0.2.150/src/unix/bsd/apple/mod.rs +@@ -5602,12 +5602,6 @@ extern "C" { + pub fn asctime(tm: *const ::tm) -> *mut ::c_char; + pub fn ctime(clock: *const time_t) -> *mut ::c_char; + pub fn getdate(datestr: *const ::c_char) -> *mut ::tm; +- pub fn strftime( +- buf: *mut ::c_char, +- maxsize: ::size_t, +- format: *const ::c_char, +- timeptr: *const ::tm, +- ) -> ::size_t; + pub fn strptime( + buf: *const ::c_char, + format: *const ::c_char, +--- cargo-crates/libc-0.2.150/src/unix/bsd/mod.rs.orig 2006-07-24 01:21:28 UTC ++++ cargo-crates/libc-0.2.150/src/unix/bsd/mod.rs +@@ -899,6 +899,20 @@ extern "C" { + longopts: *const option, + longindex: *mut ::c_int, + ) -> ::c_int; + - use anyhow::{ensure, Context}; - use directories::UserDirs; - use smithay::reexports::rustix::time::{clock_gettime, ClockId}; ++ pub fn strftime( ++ buf: *mut ::c_char, ++ maxsize: ::size_t, ++ format: *const ::c_char, ++ timeptr: *const ::tm, ++ ) -> ::size_t; ++ pub fn strftime_l( ++ buf: *mut ::c_char, ++ maxsize: ::size_t, ++ format: *const ::c_char, ++ timeptr: *const ::tm, ++ locale: ::locale_t, ++ ) -> ::size_t; + } + + cfg_if! {