Jonathan Grotelüschen pushed to branch main at Arch Linux / Packaging /
Packages / feishin
Commits:
a817524d by Jonathan Grotelüschen at 2026-05-28T16:43:56+02:00
Remove fix-asset-path.patch
The upstream PR was merged 🚀
- - - - -
4 changed files:
- .SRCINFO
- PKGBUILD
- REUSE.toml
- − fix-asset-path.patch
Changes:
=====================================
.SRCINFO
=====================================
@@ -15,10 +15,8 @@ pkgbase = feishin
source = git+https://github.com/jeffvli/feishin.git#tag=v1.12.1
source = feishin.sh
source = add-support-for-pnpm-v11.patch
- source = fix-asset-path.patch
sha256sums =
bf016028148d2a4d4bc917a62e990358a585127ecb4815ebad1500ea8c5d4b22
sha256sums =
4ac240aa9678f6a9c638e6e9d03bbdb77507c936c4594a20cdf223e15072697d
sha256sums =
7047a40ed4fde94e7456886179e1fcd536a7e21cf3c55d37eca48776ada8df38
- sha256sums =
9896c5d72d810924ced28e557098eea23c891706030b55e386cf2cefbb4c4022
pkgname = feishin
=====================================
PKGBUILD
=====================================
@@ -18,12 +18,10 @@ source=(
"git+$url.git#tag=v$pkgver"
"$pkgname.sh"
"add-support-for-pnpm-v11.patch"
- "fix-asset-path.patch"
)
sha256sums=('bf016028148d2a4d4bc917a62e990358a585127ecb4815ebad1500ea8c5d4b22'
'4ac240aa9678f6a9c638e6e9d03bbdb77507c936c4594a20cdf223e15072697d'
- '7047a40ed4fde94e7456886179e1fcd536a7e21cf3c55d37eca48776ada8df38'
- '9896c5d72d810924ced28e557098eea23c891706030b55e386cf2cefbb4c4022')
+ '7047a40ed4fde94e7456886179e1fcd536a7e21cf3c55d37eca48776ada8df38')
prepare() {
sed -i "s|@ELECTRON@|$_electron|" $pkgname.sh
=====================================
REUSE.toml
=====================================
@@ -21,8 +21,7 @@ path = [
"*.desktop",
"*.hook",
"feishin.sh",
- "pnpm-workspace.yaml",
- "fix-asset-path.patch"
+ "pnpm-workspace.yaml"
]
SPDX-FileCopyrightText = "Arch Linux contributors"
SPDX-License-Identifier = "0BSD"
=====================================
fix-asset-path.patch deleted
=====================================
@@ -1,28 +0,0 @@
-From 788454645497907864df818dcdd7e2fc51e3c7cf Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Jonathan=20Grotel=C3=BCschen?= <[email protected]>
-Date: Tue, 26 May 2026 16:52:42 +0200
-Subject: [PATCH] fix: set RESOURCES_PATH relative to app.getAppPath()
-
-When running the app with system electron, process.resourcesPath points
-to the resources folder of the system electron, not the one from
-feishin.
----
- src/main/index.ts | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/main/index.ts b/src/main/index.ts
-index 262f0046..65921dc3 100644
---- a/src/main/index.ts
-+++ b/src/main/index.ts
-@@ -335,7 +335,7 @@ if (isDevelopment) {
- }
-
- const RESOURCES_PATH = app.isPackaged
-- ? path.join(process.resourcesPath, 'assets')
-+ ? path.join(path.dirname(app.getAppPath()), 'assets')
- : path.join(__dirname, '../../assets');
-
- const getAssetPath = (...paths: string[]): string => {
---
-2.54.0
-
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/feishin/-/commit/a817524d6833d21fb346131f58cee4682cfb9b86
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/feishin/-/commit/a817524d6833d21fb346131f58cee4682cfb9b86
You're receiving this email because of your account on gitlab.archlinux.org.
Manage all notifications: https://gitlab.archlinux.org/-/profile/notifications
| Help: https://gitlab.archlinux.org/help
