leyoda/cosmic-edit
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Patch: Use updated onig crate

Browse source 
This patch fixes building with GCC 15, as the bundled C oniguruma library had to be updated in rust-onig. The upstream rust-onig project haven't tagged a new release yet.

Signed-off-by: Ryan Brue <ryanbrue.dev@gmail.com>
This commit is contained in:
Ryan Brue 2025-03-25 19:19:09 +00:00
parent 08cab645a5
commit fe3b8d7fa9
2 changed files with 10 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Cargo.lock generated
View file

@ -4456,8 +4456,7 @@ dependencies = [
[[package]] [[package]]
name = "onig_sys" name = "onig_sys"
version = "69.8.1" version = "69.8.1"
source = "registry+https://github.com/rust-lang/crates.io-index" source = "git+https://github.com/rust-onig/rust-onig.git?branch=main#c4378abcbf30d58cf5f230c0d2e6375f2be05a47"
checksum = "7b829e3d7e9cc74c7e315ee8edb185bf4190da5acde74afd7fc59c35b1f086e7"
dependencies = [ dependencies = [
"cc", "cc",
"pkg-config", "pkg-config",
@ -7923,3 +7922,8 @@ dependencies = [
"quote", "quote",
"syn 2.0.98", "syn 2.0.98",
] ]
[[patch.unused]]
name = "onig"
version = "6.5.0"
source = "git+https://github.com/rust-onig/rust-onig.git?branch=main#c4378abcbf30d58cf5f230c0d2e6375f2be05a47"

4
Cargo.toml
View file

@ -59,6 +59,10 @@ wgpu = ["libcosmic/wgpu", "cosmic-files/wgpu"]
inherits = "release" inherits = "release"
debug = true debug = true
[patch.crates-io]
onig = { git = "https://github.com/rust-onig/rust-onig.git", branch = "main" }
onig_sys = { git = "https://github.com/rust-onig/rust-onig.git", branch = "main" }
# [patch.'https://github.com/pop-os/libcosmic'] # [patch.'https://github.com/pop-os/libcosmic']
# libcosmic = { path = "../libcosmic" } # libcosmic = { path = "../libcosmic" }
# cosmic-config = { path = "../libcosmic/cosmic-config" } # cosmic-config = { path = "../libcosmic/cosmic-config" }