summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD21
-rw-r--r--element-web-reskindex.patch13
3 files changed, 33 insertions, 11 deletions
diff --git a/.SRCINFO b/.SRCINFO
index eee8e9b6423..a0043be10df 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = element-desktop-git
pkgdesc = A glossy Matrix collaboration client for the desktop.
- pkgver = v1.7.12.r0.gcc7e6437
+ pkgver = v1.7.14.rc.1.r0.g0ed6c550
pkgrel = 1
url = https://element.io
arch = x86_64
@@ -17,14 +17,16 @@ pkgbase = element-desktop-git
depends = electron
provides = element-desktop
backup = etc/element/config.json
- source = element-web::git://github.com/vector-im/riot-web.git#tag=v1.7.12
- source = element-desktop::git://github.com/vector-im/riot-desktop.git#tag=v1.7.12
+ source = element-web::git://github.com/vector-im/element-web#tag=v1.7.14-rc.1
+ source = element-desktop::git://github.com/vector-im/element-desktop.git#tag=v1.7.14-rc.1
source = element-desktop.desktop
source = element-desktop.sh
+ source = element-web-reskindex.patch
sha256sums = SKIP
sha256sums = SKIP
sha256sums = 81354e663e354bd66b3f2bb303314b790bdf6d61c3d8e2df7407eb500885647d
sha256sums = e4965abefbd609cf88349437b811bc4433d671f5ec5cd51992fd6179d483925f
+ sha256sums = f4497e40fecb224ca8f1af5187250f77000e5ff9f811d24390b18d37851b4460
pkgname = element-web-git
pkgdesc = Glossy Matrix collaboration client for the web.
@@ -33,7 +35,7 @@ pkgname = element-web-git
pkgname = element-desktop-git
pkgdesc = Glossy Matrix collaboration client for the desktop.
- depends = element-web-git=v1.7.12.r0.gcc7e6437
+ depends = element-web-git=v1.7.14.rc.1.r0.g0ed6c550
depends = electron
depends = sqlcipher
backup = etc/element/config.json
diff --git a/PKGBUILD b/PKGBUILD
index 2e5a0677156..46918dee014 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,8 @@
+# Maintainer: jaltek <post@ezod.de>
# Owner: Daniel Mason (idanoo) <daniel@m2.nz>
pkgbase=element-desktop-git
-_vers=v1.7.12
-pkgver=v1.7.12.r0.gcc7e6437
+_vers=v1.7.14-rc.1
+pkgver=v1.7.14.rc.1.r0.g0ed6c550
pkgrel=1
pkgname=(element-web-git element-desktop-git)
pkgdesc="A glossy Matrix collaboration client for the desktop."
@@ -13,14 +14,17 @@ makedepends=('git' 'nodejs' 'jq' 'yarn' 'npm' 'python' 'rust' 'sqlcipher' 'elect
provides=('element-desktop')
backup=("etc/element/config.json")
_giturl='git://github.com/vector-im'
-source=("element-web::${_giturl}/riot-web.git#tag=${_vers}"
- "element-desktop::${_giturl}/riot-desktop.git#tag=${_vers}"
+source=("element-web::${_giturl}/element-web#tag=${_vers}"
+ "element-desktop::${_giturl}/element-desktop.git#tag=${_vers}"
"element-desktop.desktop"
- "element-desktop.sh")
+ "element-desktop.sh"
+ "element-web-reskindex.patch")
sha256sums=('SKIP'
'SKIP'
'81354e663e354bd66b3f2bb303314b790bdf6d61c3d8e2df7407eb500885647d'
- 'e4965abefbd609cf88349437b811bc4433d671f5ec5cd51992fd6179d483925f')
+ 'e4965abefbd609cf88349437b811bc4433d671f5ec5cd51992fd6179d483925f'
+ 'f4497e40fecb224ca8f1af5187250f77000e5ff9f811d24390b18d37851b4460')
+
pkgver() {
cd "$srcdir/element-web"
@@ -37,11 +41,14 @@ prepare() {
sed -i 's/"target": "deb"/"target": "dir"/g' package.json
sed -i 's@"https://packages.riot.im/desktop/update/"@null@g' element.io/release/config.json
yarn install
-
+
cd ../element-web
# Disable auto updating
sed -i 's@"https://packages.riot.im/desktop/update/"@null@g' element.io/app/config.json
+ #Patch for reskindex: https://github.com/vector-im/element-web/issues/15751#issuecomment-731247116
+ patch --forward --strip=1 --input="${srcdir}/element-web-reskindex.patch"
+
yarn install
}
diff --git a/element-web-reskindex.patch b/element-web-reskindex.patch
new file mode 100644
index 00000000000..5d99c33b86c
--- /dev/null
+++ b/element-web-reskindex.patch
@@ -0,0 +1,13 @@
+diff --git a/package.json b/package.json
+index b5b896b4..bc0c29e2 100644
+--- a/package.json
++++ b/package.json
+@@ -31,7 +31,7 @@
+ "i18n": "matrix-gen-i18n",
+ "prunei18n": "matrix-prune-i18n",
+ "diff-i18n": "cp src/i18n/strings/en_EN.json src/i18n/strings/en_EN_orig.json && yarn i18n && node scripts/compare-file.js src/i18n/strings/en_EN_orig.json src/i18n/strings/en_EN.json",
+- "reskindex": "reskindex -h src/header",
++ "reskindex": "reskindex -h src/header; reskindex -h src/header",
+ "reskindex:watch": "reskindex -h src/header -w",
+ "reskindex:watch-react": "node scripts/yarn-sub.js matrix-react-sdk reskindex:watch",
+ "clean": "rimraf lib webapp",