Skip to content

Commit ab504c6

Browse files
committed
updpatch: neovide 0.12.0-1
- Remove unneeded depends - Remove ring 0.16 patch as upstream updated to 0.17 - Bump `rust-skia` to self-forked `0.68.0` [1] to catch up upstream [2]. This fix: ``` warning: Patch `SOMETHING` was not used in the crate graph. Check that the patched package version and available features are compatible with the dependency requirements ``` - Backport rust-skia/rust-skia#916 to fix rust-skia/rust-skia#913 - Remaining relevant pr/issue: - google/skia#146 - https://gitlab.archlinux.org/archlinux/packaging/packages/neovide/-/issues/1 [1]: https://github.com/aimixsaka/rust-skia/tree/riscv-skia-bindings-0.68.0 [2]: https://github.com/neovide/neovide/blob/af9869bd6d8d3434b187e29f85032ee74e40b536/Cargo.toml#L59C68-L59C68
1 parent e570acd commit ab504c6

File tree

1 file changed

+8
-19
lines changed

1 file changed

+8
-19
lines changed

neovide/riscv64.patch

Lines changed: 8 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,8 @@
11
--- PKGBUILD
22
+++ PKGBUILD
3-
@@ -15,23 +15,31 @@ depends=(gcc-libs
4-
hicolor-icon-theme
5-
libglvnd
3+
@@ -18,17 +18,26 @@ depends=(gcc-libs
64
neovim
7-
- sndio)
8-
+ sndio
9-
+ libz.so
10-
+ libexpat.so
11-
+ libpng16.so
12-
+ libjpeg.so)
5+
sndio)
136
makedepends=(cargo
147
- cmake)
158
+ cmake
@@ -22,25 +15,21 @@
2215
'libxkbcommon-x11: run on X11 (not needed for wayland)')
2316
_archive=("$pkgname-$pkgver")
2417
source=("$url/archive/$pkgver/$_archive.tar.gz")
25-
sha256sums=('62e973a5407a6bfc731ce78e0495d2ed10930d33b22fe94cfe23acccbf789ae9')
18+
sha256sums=('8770dd6977605f9bafa990a60cf8f2ebeba7df16417dab2e8c5583d279ec86ef')
2619
+options=(!lto)
2720

2821
prepare() {
2922
cd "$_archive"
30-
- sed -r -i \
31-
- -e '/^incremental/a opt-level = 3' \
32-
- -e '/wayland/s/\]/, "embed-icudtl"]/g' \
33-
- -e '/wayland/a no-default-features = true' \
34-
- Cargo.toml
23+
sed -r -i -e '/^incremental/a opt-level = 3' Cargo.toml
3524
- cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
36-
+ sed -i -e '/^incremental/a opt-level = 3' Cargo.toml
37-
+ echo -e "\n[patch.crates-io]\nskia-bindings = { git = 'https://github.com/hack3ric/rust-skia', branch = 'archrv-0.62.0' }\nring = { git = 'https://github.com/felixonmars/ring', branch = '0.16.20' }" >> Cargo.toml
38-
+ cargo update -p skia-bindings -p ring
25+
+ echo -e "\n[patch.crates-io]\nskia-bindings = { git = 'https://github.com/aimixsaka/rust-skia', branch = 'riscv-skia-bindings-0.68.0' }" >> Cargo.toml
26+
+
27+
+ cargo update -p skia-bindings
3928
+ cargo fetch --locked
4029
}
4130

4231
build() {
43-
@@ -42,6 +50,9 @@ build() {
32+
@@ -39,6 +48,9 @@ build() {
4433
export CXXFLAGS="${CXXFLAGS/_FORTIFY_SOURCE=3/_FORTIFY_SOURCE=2}"
4534
CFLAGS+=' -ffat-lto-objects'
4635
export SKIA_USE_SYSTEM_LIBRARIES=true

0 commit comments

Comments
 (0)