From nobody Thu Jun 27 03:16:26 2024 X-Original-To: dev-commits-ports-branches@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 4W8kHZ2rpDz5NNZ8; Thu, 27 Jun 2024 03:16:26 +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 4W8kHZ2L8cz40hf; Thu, 27 Jun 2024 03:16:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1719458186; 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=uOjpNU7QCblpTS1ieS1EJJ3OlesjFnCBPVq76dEoyFg=; b=C3u9xMUkJehojCFLoh6uC+3yZCJtoxFfKf/YkUyphC3DqRFyyREsJiCPCQyBG2fssH/0jZ wAYIJlXojPcaCgR/wgNSudUEcKYQ3/muTq4B4Wd4Ye2BLGTK03Kmt3jMBwPRw3jaWf1aun KIRr01X/rPl0z/Ho0WAHQYYjlJbBfNE4Z4m2G/QrZH/xpabW8Q2H34VB4DuaNdrAu70Oef AjlY+6RoVglimVQr8IW7RUMbcTNmSANi3LZM/znyVl9qU9DcsGeVssfN4x+76HuIEi/xHv 45iRXsuxMAlU0hflglBsv5wL4tm1331uM1ohf+lh1chq3wLmdn2CLSrYDfQRdw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1719458186; a=rsa-sha256; cv=none; b=fuNE86NgUauWxJHDroTmGeKAsoxN9qHznI4XkqI+YgFf49dN51R1dqvU/lArEIkTWDUcbN IF7R5BtoyPwFdIr+duO/xytXv7RkbehXDCWs9FN06SZlrVYtTP0QsFYGdOvzo0gYNlC/K+ DftGn6lZJUaGFChiYbnoyTL0U3e1bijYlzWJJATTj/9md0mp5LeejKHOWbPBoBGDHLNCfc iz7/MA28qA9MQeHaZCmVy25TZj+orlaWbNFw1bNMlcXQOSpqj0OsAj44vMK6x9yut47t1W Bp7i3ZP2tMnGTLn8Srf4QzL6ZS5KJ3GeK8TRuzBidOzIpLM6WPssyU9To3ZG6g== 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=1719458186; 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=uOjpNU7QCblpTS1ieS1EJJ3OlesjFnCBPVq76dEoyFg=; b=IiI7kmU+9eY3DDwaMUGGRr6XKpu/sZvvIutVk0Mo3gpjsNLNmylg7jVY61rQBxilYEdNDA +UeakuQ0mhkJsMKCZq0bcxMVefP7nbQdzDP2VdghXRAGVF1y9fcOSrnbAe1zh/2E5XBVHS omTxUAceQcottpuBePmppYq6Zf49Sw3EEJm1mbP8O+PLuVsky5R0tOLQJP1YreesYd9/pO 19Hrh3ri/iOxYa4h8oNNPHmwLkg7FWfjp0ESkpuCteTFFzGYlEQyDs9o1nrcI/Y8n0uACe 5bmYkTsLbUloxDMtjkdL1hsyjkMmB9psb+OHlScTxBBpgMVokCJEOVbhEGhTxw== 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 4W8kHZ1sZnz1B4n; Thu, 27 Jun 2024 03:16:26 +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 45R3GQTH036701; Thu, 27 Jun 2024 03:16:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 45R3GQ9C036698; Thu, 27 Jun 2024 03:16:26 GMT (envelope-from git) Date: Thu, 27 Jun 2024 03:16:26 GMT Message-Id: <202406270316.45R3GQ9C036698@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: ab28f4b0287c - 2024Q2 - games/veloren-weekly: unbreak patch after c749a57bff9a List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-branches@freebsd.org Sender: owner-dev-commits-ports-branches@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/2024Q2 X-Git-Reftype: branch X-Git-Commit: ab28f4b0287c4afb810795e737ecab452ff02f86 Auto-Submitted: auto-generated The branch 2024Q2 has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=ab28f4b0287c4afb810795e737ecab452ff02f86 commit ab28f4b0287c4afb810795e737ecab452ff02f86 Author: Jan Beich AuthorDate: 2024-06-27 03:15:00 +0000 Commit: Jan Beich CommitDate: 2024-06-27 03:15:00 +0000 games/veloren-weekly: unbreak patch after c749a57bff9a ===> Patching for veloren-weekly-s20240626 ===> Applying FreeBSD patches for veloren-weekly-s20240626 from /usr/ports/games/veloren-weekly/files 1 out of 1 hunks failed--saving rejects to Cargo.toml.rej ===> FAILED Applying FreeBSD patch-rust-1.77.0 ===> Cleanly applied FreeBSD patch(es) patch-gilrs patch-i386 patch-keyboard-keynames patch-nodebug ===> FAILED to apply cleanly FreeBSD patch(es) patch-rust-1.77.0 *** Error code 1 Reported by: pkg-fallout (direct commit to 2024Q2 as 7e86fe10e4c7 is missing on the branch) --- games/veloren-weekly/files/patch-rust-1.77.0 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/games/veloren-weekly/files/patch-rust-1.77.0 b/games/veloren-weekly/files/patch-rust-1.77.0 index 41b48a32d6ec..d06c478abc10 100644 --- a/games/veloren-weekly/files/patch-rust-1.77.0 +++ b/games/veloren-weekly/files/patch-rust-1.77.0 @@ -141,15 +141,15 @@ error[E0425]: cannot find function `without_provenance_mut` in module `core::ptr "veloren-common", "veloren-common-base", "veloren-common-dynlib", ---- Cargo.toml.orig 2024-05-20 18:26:00 UTC +--- Cargo.toml.orig 2024-06-26 12:12:15 UTC +++ Cargo.toml -@@ -145,7 +145,7 @@ num-traits = { version = "0.2" } - ordered-float = { version = "3", default-features = true } +@@ -149,7 +149,7 @@ num-traits = { version = "0.2" } + ordered-float = { version = "4.2", default-features = true } num = { version = "0.4" } num-traits = { version = "0.2" } -vek = { version = "0.17.0", features = ["serde"] } +vek = { version = "0.16.1", features = ["serde"] } - itertools = { version = "0.10" } + itertools = { version = "0.13" } serde = { version = "1.0.118", features = ["derive"] } --- cargo-crates/shred-0.16.1/src/meta.rs.orig 2006-07-24 01:21:28 UTC