git: 5ed4c6d33aef - main - x11/sirula: Unbreak build
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Mon, 01 Jan 2024 18:08:56 UTC
The branch main has been updated by mikael:
URL: https://cgit.FreeBSD.org/ports/commit/?id=5ed4c6d33aef515c44eb35a27f2cc89ade1d3ec0
commit 5ed4c6d33aef515c44eb35a27f2cc89ade1d3ec0
Author: Mikael Urankar <mikael@FreeBSD.org>
AuthorDate: 2024-01-01 15:27:58 +0000
Commit: Mikael Urankar <mikael@FreeBSD.org>
CommitDate: 2024-01-01 18:08:35 +0000
x11/sirula: Unbreak build
Fix typo:
error: expected one of `(`, `.`, `::`, `;`, `?`, `}`, or an operator, found `:`
--> /build/cargo-vendor-dir/osstrtools-0.2.2/src/lib.rs:754:42
|
754 | unsafe { (bytes as *const _).cast:() }
| ^ expected one of 7 possible tokens
error: could not compile `osstrtools` (lib) due to previous error
Typo was added in https://github.com/rabite0/osstrtools/commit/1179a979dbf22209547a74ce98d84745d1e54ef4
Approved by: portmgr (build fix blanket)
---
x11/sirula/Makefile | 2 --
x11/sirula/files/patch-osstrtools | 11 +++++++++++
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/x11/sirula/Makefile b/x11/sirula/Makefile
index 6760dbe031c0..405833ecafc0 100644
--- a/x11/sirula/Makefile
+++ b/x11/sirula/Makefile
@@ -11,8 +11,6 @@ WWW= https://github.com/DorianRudolph/sirula
LICENSE= GPLv3+
LICENSE_FILE= ${WRKSRC}/COPYING
-BROKEN= could not compile osstrtools
-
LIB_DEPENDS= libgtk-layer-shell.so:x11-toolkits/gtk-layer-shell
USES= cargo gnome
diff --git a/x11/sirula/files/patch-osstrtools b/x11/sirula/files/patch-osstrtools
new file mode 100644
index 000000000000..3b367d97416b
--- /dev/null
+++ b/x11/sirula/files/patch-osstrtools
@@ -0,0 +1,11 @@
+--- cargo-crates/osstrtools-0.2.2/src/lib.rs.orig 2024-01-01 16:19:06 UTC
++++ cargo-crates/osstrtools-0.2.2/src/lib.rs
+@@ -751,7 +751,7 @@ impl WinOsStr for OsStr {
+
+ fn as_bytes<'s>(&'s self) -> &'s [u8] {
+ // This should be fine in any case, as OsStr is just a &[u8]
+- unsafe { (bytes as *const _).cast:() }
++ unsafe { (bytes as *const _).cast() }
+ }
+ }
+