Merge pull request #327 from cmyk/update-flea-0.1.4
Update Flea to 0.1.4
This commit is contained in:
1 file changed
+18
-61
+18
-61
@@ -1,28 +1,37 @@
|
|||||||
# Maintainer: GM <gianmarcomorales@icloud.com>
|
# Maintainer: GM <gianmarcomorales@icloud.com>
|
||||||
|
|
||||||
pkgname=flea
|
pkgname=flea
|
||||||
pkgver=0.1.3
|
pkgver=0.1.4
|
||||||
pkgrel=1
|
pkgrel=1
|
||||||
pkgdesc='Fast, keyboard-first file manager for Omarchy'
|
pkgdesc='Fast, keyboard-first file manager for Omarchy'
|
||||||
arch=('x86_64')
|
arch=('x86_64' 'aarch64')
|
||||||
url='https://github.com/thisisgm/flea'
|
url='https://github.com/thisisgm/flea'
|
||||||
license=('MIT')
|
license=('MIT')
|
||||||
|
|
||||||
depends=(
|
depends=(
|
||||||
'bubblewrap'
|
'bubblewrap'
|
||||||
|
'expect'
|
||||||
'gcc-libs'
|
'gcc-libs'
|
||||||
'glib2'
|
'glib2'
|
||||||
'glibc'
|
'glibc'
|
||||||
|
'gvfs'
|
||||||
|
'gvfs-dnssd'
|
||||||
|
'gvfs-nfs'
|
||||||
|
'gvfs-smb'
|
||||||
'hicolor-icon-theme'
|
'hicolor-icon-theme'
|
||||||
'omarchy'
|
'omarchy'
|
||||||
|
'python-gobject'
|
||||||
'quickshell'
|
'quickshell'
|
||||||
'qt6-multimedia'
|
'qt6-multimedia'
|
||||||
'qt6-webengine'
|
'qt6-webengine'
|
||||||
'shared-mime-info'
|
'shared-mime-info'
|
||||||
'util-linux'
|
'util-linux'
|
||||||
|
'wl-clipboard'
|
||||||
|
'xdg-terminal-exec'
|
||||||
'xdg-utils'
|
'xdg-utils'
|
||||||
)
|
)
|
||||||
makedepends=('cargo')
|
makedepends=('cargo')
|
||||||
|
checkdepends=('python')
|
||||||
optdepends=(
|
optdepends=(
|
||||||
'7zip: 7z archive support'
|
'7zip: 7z archive support'
|
||||||
'dropbox-cli: Dropbox browsing and share links'
|
'dropbox-cli: Dropbox browsing and share links'
|
||||||
@@ -30,75 +39,17 @@ optdepends=(
|
|||||||
'imagemagick: image conversion'
|
'imagemagick: image conversion'
|
||||||
'libarchive: archive listing and extraction'
|
'libarchive: archive listing and extraction'
|
||||||
'tailscale: Taildrop sharing'
|
'tailscale: Taildrop sharing'
|
||||||
'wl-clipboard: copy Dropbox share links to the clipboard'
|
|
||||||
)
|
)
|
||||||
conflicts=('flea-git')
|
conflicts=('flea-git')
|
||||||
options=('!debug')
|
options=('!debug')
|
||||||
|
|
||||||
_security_patches=(
|
|
||||||
'2bd7cc207c110ae3b3ea61a4d4e42336f1815111'
|
|
||||||
'27d19ca4a38ef4a0a920fb78441ce662a0101327'
|
|
||||||
'23290ce1917b0d7f0392dd09d04bf2a7504ec93a'
|
|
||||||
'b4b7ee47244b52457eec2874e21a8656d8ace647'
|
|
||||||
)
|
|
||||||
source=(
|
source=(
|
||||||
"$pkgname-$pkgver.tar.gz::$url/archive/refs/tags/v$pkgver.tar.gz"
|
"$pkgname-$pkgver.tar.gz::$url/archive/refs/tags/v$pkgver.tar.gz"
|
||||||
"security-2bd7cc2.patch::$url/commit/${_security_patches[0]}.patch"
|
|
||||||
"security-27d19ca.patch::$url/commit/${_security_patches[1]}.patch"
|
|
||||||
"security-23290ce.patch::$url/commit/${_security_patches[2]}.patch"
|
|
||||||
"security-b4b7ee4.patch::$url/commit/${_security_patches[3]}.patch"
|
|
||||||
)
|
)
|
||||||
sha256sums=(
|
sha256sums=(
|
||||||
'3599ab76253c444dea027f1ebe85b32612d9a174e60eb8aca33ee21d9e2d6973'
|
'02ccb77929058862072b17a60b9dd08733e395faebfd4cbabd6e5c4be5362b8f'
|
||||||
'c610a9f44294b67341940203943c9c567003b65cc436d6013cd36754379183d8'
|
|
||||||
'e457ef17e26f70057b1184eeb938fccc5906f48a7c77f1df573d55d13a845425'
|
|
||||||
'f8381456a3b5f39d341cc6610bf27beb8354892b17a1c8c6d7882db4e40824c3'
|
|
||||||
'46bdbe43f135a052c893b1987f8b0928736445616a84b0c65d2181ee74b21b25'
|
|
||||||
)
|
)
|
||||||
|
|
||||||
prepare() {
|
|
||||||
cd "$pkgname-$pkgver"
|
|
||||||
|
|
||||||
security_patch_present() {
|
|
||||||
case "$1" in
|
|
||||||
2bd7cc207c110ae3b3ea61a4d4e42336f1815111)
|
|
||||||
grep -Fq 'a.push("--".to_string());' src/backend/archive.rs &&
|
|
||||||
grep -Fq 'let input = std::fs::canonicalize(input)' src/backend/archiveops.rs &&
|
|
||||||
grep -Fq 'if op != "compress" && op != "extract"' \
|
|
||||||
src/backend/run.rs src/backend/archivereq.rs
|
|
||||||
;;
|
|
||||||
27d19ca4a38ef4a0a920fb78441ce662a0101327)
|
|
||||||
grep -Fq 'the sandbox is unavailable: bwrap or prlimit is not on PATH' src/backend/archivework.rs &&
|
|
||||||
grep -Fq 'if !sandbox::available()' src/backend/mediaprobe.rs &&
|
|
||||||
grep -Fq 'if !sandbox::available()' src/backend/metareq.rs
|
|
||||||
;;
|
|
||||||
23290ce1917b0d7f0392dd09d04bf2a7504ec93a)
|
|
||||||
grep -Fq 'copyToClipboard.command = ["wl-copy", url]' ui/ShareLink.qml
|
|
||||||
;;
|
|
||||||
b4b7ee47244b52457eec2874e21a8656d8ace647)
|
|
||||||
grep -Fq '.custom_flags(O_NOFOLLOW)' src/backend/copyfile.rs
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
return 1
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
}
|
|
||||||
|
|
||||||
local commit patch_file
|
|
||||||
for commit in "${_security_patches[@]}"; do
|
|
||||||
patch_file="$srcdir/security-${commit:0:7}.patch"
|
|
||||||
|
|
||||||
if patch --batch --forward --dry-run -Np1 -i "$patch_file" >/dev/null 2>&1; then
|
|
||||||
patch --batch --forward -Np1 -i "$patch_file"
|
|
||||||
elif security_patch_present "$commit"; then
|
|
||||||
printf 'Security patch %s is already present upstream\n' "$commit"
|
|
||||||
else
|
|
||||||
printf 'Security patch %s no longer applies and is not present upstream\n' "$commit" >&2
|
|
||||||
return 1
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
build() {
|
build() {
|
||||||
cd "$pkgname-$pkgver"
|
cd "$pkgname-$pkgver"
|
||||||
|
|
||||||
@@ -150,6 +101,12 @@ package() {
|
|||||||
cd "$pkgname-$pkgver"
|
cd "$pkgname-$pkgver"
|
||||||
|
|
||||||
install -Dm755 target/release/flea "$pkgdir/usr/bin/flea"
|
install -Dm755 target/release/flea "$pkgdir/usr/bin/flea"
|
||||||
|
install -Dm755 tools/flea-gio-auth "$pkgdir/usr/lib/flea/flea-gio-auth"
|
||||||
|
install -Dm755 tools/flea-portal "$pkgdir/usr/lib/flea/flea-portal"
|
||||||
|
install -Dm644 packaging/flea.portal \
|
||||||
|
"$pkgdir/usr/share/xdg-desktop-portal/portals/flea.portal"
|
||||||
|
install -Dm644 packaging/org.freedesktop.impl.portal.desktop.flea.service \
|
||||||
|
"$pkgdir/usr/share/dbus-1/services/org.freedesktop.impl.portal.desktop.flea.service"
|
||||||
install -Dm644 packaging/com.thisisgm.flea.desktop \
|
install -Dm644 packaging/com.thisisgm.flea.desktop \
|
||||||
"$pkgdir/usr/share/applications/com.thisisgm.flea.desktop"
|
"$pkgdir/usr/share/applications/com.thisisgm.flea.desktop"
|
||||||
install -Dm644 packaging/com.thisisgm.flea.svg \
|
install -Dm644 packaging/com.thisisgm.flea.svg \
|
||||||
|
|||||||
Reference in new issue
Block a user