summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Peukert2021-07-11 11:37:42 +0200
committerDaniel Peukert2021-07-11 11:37:42 +0200
commit853d3c8b48f86f5df5035352adf1407442089f65 (patch)
tree6034d4a929f217a98dc51cb173b8df80643cebdf
parent36ff2b10f11930d27fa24b08e0f4efd5c24ba4f1 (diff)
downloadaur-853d3c8b48f86f5df5035352adf1407442089f65.tar.gz
Fix @meetfranz/theme error in ferdi-git
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD9
-rw-r--r--remove-meetfranz-unpack.diff9
3 files changed, 19 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4b938bae5219..2f1df0e61809 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = ferdi-git
pkgdesc = A messaging browser that allows you to combine your favorite messaging services into one application - git version
- pkgver = 5.6.0.beta.5.r380.gaf194dcc
+ pkgver = 5.6.0.beta.5.r392.g86c3ed64
pkgrel = 1
url = https://getferdi.com
arch = x86_64
@@ -21,9 +21,11 @@ pkgbase = ferdi-git
source = ferdi-git-recipes::git+https://github.com/getferdi/recipes
source = ferdi-git-internal-server::git+https://github.com/getferdi/internal-server
source = fix-autostart-path.diff
+ source = remove-meetfranz-unpack.diff
sha256sums = SKIP
sha256sums = SKIP
sha256sums = SKIP
sha256sums = e7b1441d47b2bc62bcca35ee111f1cf876285739bf6298740dfe513d383f47ce
+ sha256sums = aa06840b98231a7fa3ece7239ba721459f5c6ecd4148d7e0ec4deb716c61ab48
pkgname = ferdi-git
diff --git a/PKGBUILD b/PKGBUILD
index 8acffe1b9166..a5aa982c21ed 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
# Contributor: Pieter Goetschalckx <3.14.e.ter <at> gmail <dot> com>
_pkgname='ferdi'
pkgname="$_pkgname-git"
-pkgver='5.6.0.beta.5.r380.gaf194dcc'
+pkgver='5.6.0.beta.5.r392.g86c3ed64'
pkgrel='1'
pkgdesc='A messaging browser that allows you to combine your favorite messaging services into one application - git version'
arch=('x86_64' 'i686' 'armv7h' 'aarch64')
@@ -20,11 +20,13 @@ source=(
"$pkgname-recipes::git+https://github.com/get$_pkgname/recipes"
"$pkgname-internal-server::git+https://github.com/get$_pkgname/internal-server"
'fix-autostart-path.diff'
+ 'remove-meetfranz-unpack.diff'
)
sha256sums=('SKIP'
'SKIP'
'SKIP'
- 'e7b1441d47b2bc62bcca35ee111f1cf876285739bf6298740dfe513d383f47ce')
+ 'e7b1441d47b2bc62bcca35ee111f1cf876285739bf6298740dfe513d383f47ce'
+ 'aa06840b98231a7fa3ece7239ba721459f5c6ecd4148d7e0ec4deb716c61ab48')
_sourcedirectory="$pkgname"
_homedirectory="$pkgname-home"
@@ -62,6 +64,9 @@ prepare() {
# Specify path for autostart file
patch --forward -p1 < '../fix-autostart-path.diff'
+ # Remove asarUnpack rule for @meetfranz packages
+ patch --forward -p1 < '../remove-meetfranz-unpack.diff'
+
# Build recipe archives
cd "$srcdir/$_sourcedirectory/recipes/"
HOME="$srcdir/$_homedirectory" npm install
diff --git a/remove-meetfranz-unpack.diff b/remove-meetfranz-unpack.diff
new file mode 100644
index 000000000000..387550e10d9f
--- /dev/null
+++ b/remove-meetfranz-unpack.diff
@@ -0,0 +1,9 @@
+diff --git a/electron-builder.yml b/electron-builder.yml
+index 48b3c476..3dbd5d53 100644
+--- a/electron-builder.yml
++++ b/electron-builder.yml
+@@ -71,4 +71,3 @@ protocols:
+ asarUnpack:
+ - ./recipes
+ - ./assets/images/taskbar
+- - ./node_modules/@meetfranz