From nobody Fri May 24 14:13:38 2024 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 4Vm6TZ6PTXz5L69w; Fri, 24 May 2024 14:13:38 +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 4Vm6TZ5JjTz4kkJ; Fri, 24 May 2024 14:13:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716560018; 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=NUoVMqVWPwK+Cl5wbhvdcs+Ab/b/iGvttk+gfqbPuck=; b=KTovspXK6+v8f+N60yoWsJFPFFTGxRrzsbvjc2SlXTfXwQgaEtGEMIzF9DWsnfGmO+Z05f Ab4mP9Mqt8vVr3y4A/pyAu1Bn2xIfyUA+fYqkARnoExuI3eM9nxksT9xRFKQp7OVcAKxZb TX1YZ6ZsYZzACzhOWIu+qOs7bWCOCr0detDOerYSThrvc3zpUNaX0zcF8WdZnznuZxg0ov C1zUDMrl8KCPVD/TZHPBweocqThtODd2llJYKxqJ9Zoz5AMigYkdHrYO74B5oV2h0QG4C8 EsAzCpyJCcNkgG8IJVMfk48TQ8Mry2RwiAiBmnzC+dnUnu/JdTLqFcxCOuhMjQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716560018; a=rsa-sha256; cv=none; b=Mf6Mxtl29k6mobbCfoOUEJWGsuVo7G5Nxd2Ip6v54sjXNi8EnnYh0naBpL4AZcTEWs8xcN a25CYZHCgfVsDrG6b3L3+UA8GcCmyqle63Cn6fIZnctc1XIZ4ZGPA09Lf0bUe8F+04CQS5 7e/bE03SM1UMtEoNlEipA8QORfZrFKLu16O/wsLouf2qfuo3hjBIzVY5WUvzsH2fIBv27G /QH4jCJSVhbNt86mwfTaDC4SU0QvE74ba7hB9nQtinPNp8vUGjfasE6j3CW+tkgbiT/5Ub /8lSqyDuPlNhWaddO0cZ9qBPYbWQgX7s7kiGa3OCGoYbEQ/Uty/BngeT7ZUMPw== 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=1716560018; 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=NUoVMqVWPwK+Cl5wbhvdcs+Ab/b/iGvttk+gfqbPuck=; b=GDomF93jXxyZJoPzNhw5pLs5p3L4pkdL1iEsm5bl5Rj834IKB+v1ndvPZlLNiCFCxWNZuO tq6IeYVdYc5eYnTwQVZ9q7cyFwqTFEFgSorweSAJZWFOCSfwEaVbASMOEDvYJ+FtNZRJuk FtWlUZCcnK56W4I/IGYqDAQ+k1ow3oTdcgFQB7q01DhaX2NVS5eTDBJZQveNpVn0pXu4mF 0wkSJqD3CdB6OGkpoD/O1MAWynXcIY2dxDY9P5BdOSjJyVp2X9B6MhIcVq367fq9puhf8m qkF3c4xm9ijYD55o/kTxn7Sb3bOiBGdDL+94cdF+2Y07GQPNFUV65EFrnDzeNQ== 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 4Vm6TZ4w93zcKV; Fri, 24 May 2024 14:13:38 +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 44OEDcWm063772; Fri, 24 May 2024 14:13:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44OEDcfl063769; Fri, 24 May 2024 14:13:38 GMT (envelope-from git) Date: Fri, 24 May 2024 14:13:38 GMT Message-Id: <202405241413.44OEDcfl063769@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: 94d5f5d859e7 - main - x11/xwayland-satellite: switch to upstream 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-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: 94d5f5d859e7d6af4bd7c08ee31aeba71b876c3c Auto-Submitted: auto-generated The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=94d5f5d859e7d6af4bd7c08ee31aeba71b876c3c commit 94d5f5d859e7d6af4bd7c08ee31aeba71b876c3c Author: Jan Beich AuthorDate: 2024-05-24 14:08:44 +0000 Commit: Jan Beich CommitDate: 2024-05-24 14:12:55 +0000 x11/xwayland-satellite: switch to upstream fix --- x11/xwayland-satellite/Makefile | 3 --- x11/xwayland-satellite/files/patch-xcb-cursor | 32 +++++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 3 deletions(-) diff --git a/x11/xwayland-satellite/Makefile b/x11/xwayland-satellite/Makefile index f52c5fb421c3..b10c8efd66e9 100644 --- a/x11/xwayland-satellite/Makefile +++ b/x11/xwayland-satellite/Makefile @@ -19,9 +19,6 @@ USE_XORG= xcb GH_ACCOUNT= Supreeeme PLIST_FILES= bin/${PORTNAME} -# https://github.com/juliuskreutz/xcb-util-cursor-rs/issues/1 -CARGO_ENV+= CPATH="${LOCALBASE}/include" - post-patch: @${REINPLACE_CMD} -e 's,"llvm-config,"${LLVM_CONFIG},' \ ${WRKSRC_crate_clang-sys}/build/common.rs \ diff --git a/x11/xwayland-satellite/files/patch-xcb-cursor b/x11/xwayland-satellite/files/patch-xcb-cursor new file mode 100644 index 000000000000..db0c2a37c248 --- /dev/null +++ b/x11/xwayland-satellite/files/patch-xcb-cursor @@ -0,0 +1,32 @@ +https://github.com/juliuskreutz/xcb-util-cursor-rs/commit/c79704ec2aba + +--- cargo-crates/xcb-util-cursor-sys-0.1.3/Cargo.toml.orig 1970-01-01 00:00:01 UTC ++++ cargo-crates/xcb-util-cursor-sys-0.1.3/Cargo.toml +@@ -29,3 +29,6 @@ version = "0.64.0" + + [build-dependencies.bindgen] + version = "0.64.0" ++ ++[build-dependencies.pkg-config] ++version = "0.3.30" +--- cargo-crates/xcb-util-cursor-sys-0.1.3/build.rs.orig 1970-01-01 00:00:01 UTC ++++ cargo-crates/xcb-util-cursor-sys-0.1.3/build.rs +@@ -4,9 +4,18 @@ fn main() { + println!("cargo:rustc-link-lib=xcb-cursor"); + println!("cargo:rerun-if-changed=wrapper.h"); + ++ let library = pkg_config::probe_library("xcb-cursor") ++ .expect("Error using pkg-config to find xcb-cursor library"); ++ + let bindings = bindgen::Builder::default() + .header("wrapper.h") + .parse_callbacks(Box::new(bindgen::CargoCallbacks)) ++ .clang_args( ++ library ++ .include_paths ++ .iter() ++ .map(|path| format!("-I{}", path.to_string_lossy())), ++ ) + .allowlist_function("xcb_cursor_.*") + .allowlist_type("xcb_cursor_.*") + .generate()