From nobody Tue May 9 20:00:56 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 4QG8D863Y1z49QVr; Tue, 9 May 2023 20:00:56 +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 4QG8D85DDBz3CYM; Tue, 9 May 2023 20:00:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683662456; 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=yygSRBUSfd2y/6SFoS71MiJG6jNgsfPPsmhE0xh0dlg=; b=Wysa+Q8aQITJxN+h/Co01B2+eGtj3ahCBk2boumJf3jgDiMRjDadyPnZ4JkErnFVvwy9Ka Yj4mns+jkGSnvAab06RDZVGV+c+01zGZTMiS4oS2U3AhGdrVydYswJl/AkfA/5QmF38N2p d/awnpkMSo3YlaiHlSjjuekdYZRMb78ILioehjuSoMUKFBo/Df4wUKvQ28RUq0HcXcL6Ls 3URs3Db9Mi5sHa1ltKqHsPp8AwRIMNVy9wIKmR7TBWNlDpXoM5ljeZ3zB9hzlTQlxgR/te KK56xA8rcZSXN02xilxnHQqnZMMIyTuqfJ4+XXDBqwo/3y31DRWYZFLOF7o+Rw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1683662456; 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=yygSRBUSfd2y/6SFoS71MiJG6jNgsfPPsmhE0xh0dlg=; b=RPfRzWp5tPVYnjsJ8cuoXxF/Gamt43gfmzdTumOaTgjSAQmBZ6qYzqadCHEOJfiMaFvCVv 494EIy41OLpOvJHEafEH4X9T3/ZcfHXpNi21IunBfU/nG77QAvAeoWxH5oTaNVRh7KbM2K XheC31ZK6YGBpyZZSgS3+nk/AQoiZTdpocPiW4kWX+uipbn1HWGvuH2Ch1jlKFkfT5U6ce RSmUf7xA4dze6BxY+VVZ8V0RsMFw8ZNQmCjJbqSUAGDQw1aS6hC0whxv2f9OYXeiiIgcRk dZKr8T2R8A1t6ACZFl0DHLOF+JqJEod4KI29xUSNTxEmG3AhTpMe2FsRaBOnPQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1683662456; a=rsa-sha256; cv=none; b=mR3Vs9kdMIjmo9bDvTRt7bx0ZDKZneb1SrEqfs0Oc7IADrxxO5NionxcBSgIN0w/HwNVlX dulahYslDfRf5e8DqT7/BxLnt4yimEooDeLT1CN8hZbHhn1T2p22FDimNmtJfK09VrduHf Ny4L8a6MfWYSfXzAVa70X/fOGK+y3yr6T2UIJfEULzKjZZuCfeVTMLvHMc97D+LMtc1Kpm dOc5idarmry/ZtZzh5j8xVUp5nq+untWxto4XysYn3PBVQVlepOAYHcaQmNXLVI/W8LsRe 4oUTssSeW9+YIfLmB6zNZ1lQh8iuReuUjttV+jEXYd7N7lp/3NOkObfsczerzQ== 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 4QG8D84CvMzhdj; Tue, 9 May 2023 20:00:56 +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 349K0ujv070716; Tue, 9 May 2023 20:00:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 349K0utU070715; Tue, 9 May 2023 20:00:56 GMT (envelope-from git) Date: Tue, 9 May 2023 20:00:56 GMT Message-Id: <202305092000.349K0utU070715@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Piotr Kubaj Subject: git: 3f3b8b8c42fd - main - x11/rlaunch: fix build on powerpc 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: pkubaj X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 3f3b8b8c42fd306069fecb7f5bd0779e9d75207e Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by pkubaj: URL: https://cgit.FreeBSD.org/ports/commit/?id=3f3b8b8c42fd306069fecb7f5bd0779e9d75207e commit 3f3b8b8c42fd306069fecb7f5bd0779e9d75207e Author: Piotr Kubaj AuthorDate: 2023-05-09 19:54:46 +0000 Commit: Piotr Kubaj CommitDate: 2023-05-09 19:54:46 +0000 x11/rlaunch: fix build on powerpc --- x11/rlaunch/Makefile | 3 +- x11/rlaunch/distinfo | 4 ++- x11/rlaunch/files/patch-powerpc | 62 +++++++++++++++++++++++++++++++++++++++++ 3 files changed, 67 insertions(+), 2 deletions(-) diff --git a/x11/rlaunch/Makefile b/x11/rlaunch/Makefile index b92f949e97a6..03e3a44a727a 100644 --- a/x11/rlaunch/Makefile +++ b/x11/rlaunch/Makefile @@ -4,7 +4,8 @@ PORTREVISION= 4 CATEGORIES= x11 PATCH_SITES= https://github.com/PonasKovas/rlaunch/commit/ -PATCHFILES= 2f73499553d4a14840ed4e092a0c93fe1e928c64.patch:-p1 +PATCHFILES= 2f73499553d4a14840ed4e092a0c93fe1e928c64.patch:-p1 \ + 8e3d22fa4e536cce10b02366b0ba9b47c9b00b81.patch:-p1 MAINTAINER= yuri@FreeBSD.org COMMENT= Fast, light-weight and modern application launcher for X11 diff --git a/x11/rlaunch/distinfo b/x11/rlaunch/distinfo index 0488c221edf5..87874bb12a74 100644 --- a/x11/rlaunch/distinfo +++ b/x11/rlaunch/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1673178400 +TIMESTAMP = 1683641416 SHA256 (rust/crates/ansi_term-0.11.0.crate) = ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b SIZE (rust/crates/ansi_term-0.11.0.crate) = 17087 SHA256 (rust/crates/atty-0.2.14.crate) = d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8 @@ -67,3 +67,5 @@ SHA256 (PonasKovas-rlaunch-1.3.13_GH0.tar.gz) = 2f0679dda503bf63b399bda8cde17f8e SIZE (PonasKovas-rlaunch-1.3.13_GH0.tar.gz) = 12417 SHA256 (2f73499553d4a14840ed4e092a0c93fe1e928c64.patch) = 13355f37e92b13b8d1b712882ba1969adc3b30511dec8006a3cdcca46ef664f3 SIZE (2f73499553d4a14840ed4e092a0c93fe1e928c64.patch) = 998 +SHA256 (8e3d22fa4e536cce10b02366b0ba9b47c9b00b81.patch) = a886c8d9d0d3429ed947daf4789814a2922f009e6808c4ec3480732e6fdcf293 +SIZE (8e3d22fa4e536cce10b02366b0ba9b47c9b00b81.patch) = 1570 diff --git a/x11/rlaunch/files/patch-powerpc b/x11/rlaunch/files/patch-powerpc new file mode 100644 index 000000000000..f8518c526705 --- /dev/null +++ b/x11/rlaunch/files/patch-powerpc @@ -0,0 +1,62 @@ +--- cargo-crates/libc-0.2.66/src/unix/bsd/freebsdlike/freebsd/mod.rs.orig 2020-03-17 20:35:43 UTC ++++ cargo-crates/libc-0.2.66/src/unix/bsd/freebsdlike/freebsd/mod.rs +@@ -1486,6 +1486,9 @@ cfg_if! { + } else if #[cfg(target_arch = "powerpc64")] { + mod powerpc64; + pub use self::powerpc64::*; ++ } else if #[cfg(target_arch = "powerpc")] { ++ mod powerpc; ++ pub use self::powerpc::*; + } else { + // Unknown target_arch + } +--- cargo-crates/libc-0.2.66/src/unix/bsd/freebsdlike/freebsd/powerpc.rs.orig 2021-06-23 22:40:24 UTC ++++ cargo-crates/libc-0.2.66/src/unix/bsd/freebsdlike/freebsd/powerpc.rs +@@ -0,0 +1,47 @@ ++pub type c_char = u8; ++pub type c_long = i32; ++pub type c_ulong = u32; ++pub type wchar_t = i32; ++pub type time_t = i64; ++pub type suseconds_t = i32; ++pub type register_t = i32; ++ ++s! { ++ pub struct stat { ++ pub st_dev: ::dev_t, ++ pub st_ino: ::ino_t, ++ pub st_mode: ::mode_t, ++ pub st_nlink: ::nlink_t, ++ pub st_uid: ::uid_t, ++ pub st_gid: ::gid_t, ++ pub st_rdev: ::dev_t, ++ pub st_atime: ::time_t, ++ pub st_atime_nsec: ::c_long, ++ pub st_mtime: ::time_t, ++ pub st_mtime_nsec: ::c_long, ++ pub st_ctime: ::time_t, ++ pub st_ctime_nsec: ::c_long, ++ pub st_size: ::off_t, ++ pub st_blocks: ::blkcnt_t, ++ pub st_blksize: ::blksize_t, ++ pub st_flags: ::fflags_t, ++ pub st_gen: u32, ++ pub st_lspare: i32, ++ pub st_birthtime: ::time_t, ++ pub st_birthtime_nsec: ::c_long, ++ } ++} ++ ++// should be pub(crate), but that requires Rust 1.18.0 ++cfg_if! { ++ if #[cfg(libc_const_size_of)] { ++ #[doc(hidden)] ++ pub const _ALIGNBYTES: usize = ::mem::size_of::<::c_int>() - 1; ++ } else { ++ #[doc(hidden)] ++ pub const _ALIGNBYTES: usize = 4 - 1; ++ } ++} ++ ++pub const MAP_32BIT: ::c_int = 0x00066000; ++pub const MINSIGSTKSZ: ::size_t = 2048; // 512 * 4