From b40e699ed492e822c42a49ca8f3f8cbf9d50cd84 Mon Sep 17 00:00:00 2001 From: Takuya Wakazono Date: Fri, 29 Nov 2024 20:45:59 +0900 Subject: [PATCH] gui-apps/lemurs: fix build with rust-1.81 Closes: https://bugs.gentoo.org/942191 Signed-off-by: Takuya Wakazono --- gui-apps/lemurs/files/lemurs-0.3.2-rust-1.81.patch | 14 ++++++++++++++ gui-apps/lemurs/lemurs-0.3.2.ebuild | 7 ++++++- 2 files changed, 20 insertions(+), 1 deletion(-) create mode 100644 gui-apps/lemurs/files/lemurs-0.3.2-rust-1.81.patch diff --git a/gui-apps/lemurs/files/lemurs-0.3.2-rust-1.81.patch b/gui-apps/lemurs/files/lemurs-0.3.2-rust-1.81.patch new file mode 100644 index 0000000000..c751a838b1 --- /dev/null +++ b/gui-apps/lemurs/files/lemurs-0.3.2-rust-1.81.patch @@ -0,0 +1,14 @@ +Fix build with rust-1.81. +https://bugs.gentoo.org/942191 +https://github.com/coastalwhite/lemurs/commit/09003a830400250ec7745939399fc942c505e6c6 +--- a/src/config.rs ++++ b/src/config.rs +@@ -645,7 +645,7 @@ struct Variable<'a> { + } + + impl<'a> Variable<'a> { +- const START_SYMBOL: &str = "$"; ++ const START_SYMBOL: &'static str = "$"; + + fn span(&self) -> std::ops::Range { + self.start..self.start + Self::START_SYMBOL.len() + self.ident.len() diff --git a/gui-apps/lemurs/lemurs-0.3.2.ebuild b/gui-apps/lemurs/lemurs-0.3.2.ebuild index 358d4f8c79..205701d68a 100644 --- a/gui-apps/lemurs/lemurs-0.3.2.ebuild +++ b/gui-apps/lemurs/lemurs-0.3.2.ebuild @@ -79,10 +79,15 @@ RDEPEND="${DEPEND} !systemd? ( sys-apps/kbd ) " +PATCHES=( + # bug #942191 + "${FILESDIR}/${P}-rust-1.81.patch" +) + QA_FLAGS_IGNORED="usr/bin/lemurs" src_prepare() { - eapply_user + default # Run lemurs on tty7 so it doesn't conflict with agetty # And replace systemd's reboot and shutdown commands if ! use systemd ; then