From 5d49990b19ceec7f28f32ef64ccc9bd47b832beb Mon Sep 17 00:00:00 2001
From: Jakub Jirutka <jakub@jirutka.cz>
Date: Sun, 31 Mar 2024 17:49:06 +0200
Subject: [PATCH] community/yofi: upgrade to 0.2.2
---
community/yofi/APKBUILD | 24 +++++------------
community/yofi/bump-png.patch | 16 -----------
community/yofi/getrandom-0.2.10.patch | 38 ---------------------------
3 files changed, 7 insertions(+), 71 deletions(-)
delete mode 100644 community/yofi/bump-png.patch
delete mode 100644 community/yofi/getrandom-0.2.10.patch
diff --git a/community/yofi/APKBUILD b/community/yofi/APKBUILD
index ae0a352d7d58..418e95f1cd81 100644
--- a/community/yofi/APKBUILD
+++ b/community/yofi/APKBUILD
@@ -1,8 +1,8 @@
# Contributor: Jakub Jirutka <jakub@jirutka.cz>
# Maintainer: Jakub Jirutka <jakub@jirutka.cz>
pkgname=yofi
-pkgver=0.2.0
-pkgrel=2
+pkgver=0.2.2
+pkgrel=0
pkgdesc="A minimalistic menu for wayland"
url="https://github.com/l4l/yofi"
# riscv64: TEXTREL
@@ -14,29 +14,21 @@ makedepends="
cargo-auditable
fontconfig-dev
freetype-dev
+ libxkbcommon-dev
wayland-dev
"
-source="https://github.com/l4l/yofi/archive/$pkgver/yofi-$pkgver.tar.gz
- bump-png.patch
- getrandom-0.2.10.patch
- "
-
-# font-fontkit loads fonts via system libraries.
-_cargo_opts="--frozen --no-default-features --features=font-fontkit"
-
+source="https://github.com/l4l/yofi/archive/$pkgver/yofi-$pkgver.tar.gz"
prepare() {
cargo fetch --target="$CTARGET" --locked
- default_prepare
- cargo fetch --target="$CTARGET" # update after applying patches
}
build() {
- cargo auditable build $_cargo_opts --release
+ cargo auditable build --frozen --release
}
check() {
- cargo test $_cargo_opts
+ cargo test --frozen
}
package() {
@@ -44,7 +36,5 @@ package() {
}
sha512sums="
-d4f386252682e1990b637b31732eeea34f02296dd63199e58f637861fd8f33ef712400c536131a5069068c1096a89b5369688255b5cca391d6fbe4d35832ddf6 yofi-0.2.0.tar.gz
-b9f4fc2df6cd7f11e87cc8fb0cabaa97e421f97016bddddc9a00a4c5a7f417f8f70768b7f9a89587015bb81d04b12810f5241b533828d9dbac58affc5ede1194 bump-png.patch
-0542b9bec964c4e2f096a20257519ad212a3d0015e3a53522dd0f75760c6d98434d4537c489c02f77a81407d8f1fc6c2cb0141902d511deabd0daf11e148f549 getrandom-0.2.10.patch
+2854c9884aee083f213d6edf66ab8287d10d6eae21b1da2e93f6d0e9bcc655cd5078473b5fa9b5bfce28ab38a86fb870236a707281f6b87d529a71ee97bda0c8 yofi-0.2.2.tar.gz
"
diff --git a/community/yofi/bump-png.patch b/community/yofi/bump-png.patch
deleted file mode 100644
index 98e9720b29c4..000000000000
--- a/community/yofi/bump-png.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Patch-Source: https://github.com/l4l/yofi/pull/131
---
-From b1ca3181afcd7aa39186b3e358890cd03dd52082 Mon Sep 17 00:00:00 2001
-From: Jakub Jirutka <jakub@jirutka.cz>
-Date: Wed, 19 Oct 2022 21:58:36 +0200
-Subject: [PATCH] Bump png to 0.17.6
-
-The new version dropped dependency on a quite big encoding crate.
-
-diff --git a/Cargo.toml b/Cargo.toml
-index d9a1e64..7227979 100644
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -33 +33 @@ serde = { version = "1.0.131", features = ["derive"] }
--png = { version = "0.17.2", default-features = false }
-+png = { version = "0.17.6", default-features = false }
diff --git a/community/yofi/getrandom-0.2.10.patch b/community/yofi/getrandom-0.2.10.patch
deleted file mode 100644
index 9cd7a34979c3..000000000000
--- a/community/yofi/getrandom-0.2.10.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- a/Cargo.lock
-+++ b/Cargo.lock
-@@ -717,9 +717,9 @@
-
- [[package]]
- name = "getrandom"
--version = "0.2.4"
-+version = "0.2.10"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "418d37c8b1d42553c93648be529cb70f920d3baf8ef469b74b9638df426e0b4c"
-+checksum = "be4136b2a15dd319360be1c07d9933517ccf0be8f16bf62a3bee4f0d618df427"
- dependencies = [
- "cfg-if",
- "libc",
-@@ -824,9 +824,9 @@
-
- [[package]]
- name = "libc"
--version = "0.2.135"
-+version = "0.2.149"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "68783febc7782c6c5cb401fbda4de5a9898be1762314da0bb2c10ced61f18b0c"
-+checksum = "a08173bc88b7955d1b3145aa561539096c421ac8debde8cbc3612ec635fee29b"
-
- [[package]]
- name = "libloading"
-@@ -1860,9 +1860,9 @@
-
- [[package]]
- name = "wasi"
--version = "0.10.2+wasi-snapshot-preview1"
-+version = "0.11.0+wasi-snapshot-preview1"
- source = "registry+https://github.com/rust-lang/crates.io-index"
--checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6"
-+checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
-
- [[package]]
- name = "wayland-client"
--
GitLab