git: a68b9ed90b5c - main - x11-wm/cosmic-comp: drop rust < 1.80 workaround after bc4fedc1fec0

From: Jan Beich <jbeich_at_FreeBSD.org>
Date: Tue, 27 Aug 2024 00:56:34 UTC
The branch main has been updated by jbeich:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a68b9ed90b5c7d47fa6c8f84cf15612dfaf5fca7

commit a68b9ed90b5c7d47fa6c8f84cf15612dfaf5fca7
Author:     Jan Beich <jbeich@FreeBSD.org>
AuthorDate: 2024-08-27 00:45:50 +0000
Commit:     Jan Beich <jbeich@FreeBSD.org>
CommitDate: 2024-08-27 00:48:05 +0000

    x11-wm/cosmic-comp: drop rust < 1.80 workaround after bc4fedc1fec0
---
 x11-wm/cosmic-comp/Makefile              |  1 -
 x11-wm/cosmic-comp/files/patch-rust-1.79 | 44 --------------------------------
 2 files changed, 45 deletions(-)

diff --git a/x11-wm/cosmic-comp/Makefile b/x11-wm/cosmic-comp/Makefile
index f95e18861439..ca8c041b55d3 100644
--- a/x11-wm/cosmic-comp/Makefile
+++ b/x11-wm/cosmic-comp/Makefile
@@ -25,7 +25,6 @@ USE_XORG=	pixman
 GH_ACCOUNT=	pop-os
 GH_TAGNAME=	epoch-1.0.0-alpha.1-19-gca6f05c
 GH_TUPLE=	pop-os:iced:0.4.2-2011-ge31e29e9:iced/../${WRKSRC_crate_iced:T}/iced
-CARGO_ENV=	RUSTC_BOOTSTRAP=cosmic # files/patch-rust-1.79
 CARGO_FEATURES=	--no-default-features # disable systemd
 PLIST_FILES=	bin/${PORTNAME} \
 		share/cosmic/com.system76.CosmicSettings.Shortcuts/v1/defaults/keybindings.ron \
diff --git a/x11-wm/cosmic-comp/files/patch-rust-1.79 b/x11-wm/cosmic-comp/files/patch-rust-1.79
deleted file mode 100644
index fe8ad1fc19ec..000000000000
--- a/x11-wm/cosmic-comp/files/patch-rust-1.79
+++ /dev/null
@@ -1,44 +0,0 @@
-Drop after lang/rust >= 1.80 update
-
-error[E0658]: use of unstable library feature 'lazy_cell'
- --> ../libcosmic-b40839638ab0e1d96de3f817eded647e6952db40/src/config/mod.rs:9:17
-  |
-9 | use std::sync::{LazyLock, Mutex};
-  |                 ^^^^^^^^
-  |
-  = note: see issue #109736 <https://github.com/rust-lang/rust/issues/109736> for more information
-
-error[E0658]: use of unstable library feature 'lazy_cell'
-  --> ../libcosmic-b40839638ab0e1d96de3f817eded647e6952db40/src/config/mod.rs:14:23
-   |
-14 | pub static COSMIC_TK: LazyLock<Mutex<CosmicTk>> = LazyLock::new(|| {
-   |                       ^^^^^^^^^^^^^^^^^^^^^^^^^
-   |
-   = note: see issue #109736 <https://github.com/rust-lang/rust/issues/109736> for more information
-
-error[E0658]: use of unstable library feature 'lazy_cell'
-  --> ../libcosmic-b40839638ab0e1d96de3f817eded647e6952db40/src/config/mod.rs:14:51
-   |
-14 | pub static COSMIC_TK: LazyLock<Mutex<CosmicTk>> = LazyLock::new(|| {
-   |                                                   ^^^^^^^^
-   |
-   = note: see issue #109736 <https://github.com/rust-lang/rust/issues/109736> for more information
-
-error[E0658]: use of unstable library feature 'lazy_cell'
-  --> ../libcosmic-b40839638ab0e1d96de3f817eded647e6952db40/src/config/mod.rs:14:51
-   |
-14 | pub static COSMIC_TK: LazyLock<Mutex<CosmicTk>> = LazyLock::new(|| {
-   |                                                   ^^^^^^^^^^^^^
-   |
-   = note: see issue #109736 <https://github.com/rust-lang/rust/issues/109736> for more information
-
---- ../libcosmic-b40839638ab0e1d96de3f817eded647e6952db40/src/lib.rs.orig	2024-08-02 18:27:08 UTC
-+++ ../libcosmic-b40839638ab0e1d96de3f817eded647e6952db40/src/lib.rs
-@@ -2,6 +2,7 @@
- // SPDX-License-Identifier: MPL-2.0
- 
- #![allow(clippy::module_name_repetitions)]
-+#![feature(lazy_cell)]
- 
- #[cfg(all(feature = "wayland", feature = "winit"))]
- compile_error!("cannot use `wayland` feature with `winit`");