diff options
| author | teutat3s | 2021-04-18 17:06:27 +0200 |
|---|---|---|
| committer | teutat3s | 2021-04-18 17:15:56 +0200 |
| commit | 1cff434af22e2bb97555228ddf3dabdcef6f44b6 (patch) | |
| tree | 7088d53ae60b4ada67702c27a62cef1e7edeaabb | |
| parent | 4d74990b125a75e98cb4e004ffc820fa470f25d3 (diff) | |
| download | aur-1cff434af22e2bb97555228ddf3dabdcef6f44b6.tar.gz | |
Track git develop branch, remove reskindex patch,
add 'conflicts=' field, single to double quotes
Add workaround for reskindex problem and recent
lockfile changes
Update .SRCINFO
| -rw-r--r-- | .SRCINFO | 13 | ||||
| -rw-r--r-- | PKGBUILD | 47 | ||||
| -rw-r--r-- | element-web-reskindex.patch | 13 |
3 files changed, 30 insertions, 43 deletions
@@ -1,6 +1,6 @@ pkgbase = element-desktop-git - pkgdesc = A glossy Matrix collaboration client for the desktop. - pkgver = 1.7.24.r0.gac15f2755 + pkgdesc = A glossy Matrix collaboration client for desktop. + pkgver = 1.7.25.r21.ge4c9444fe pkgrel = 1 url = https://element.io arch = x86_64 @@ -16,17 +16,16 @@ pkgbase = element-desktop-git makedepends = electron depends = electron provides = element-desktop + conflicts = element-desktop backup = etc/element/config.json - source = element-web::git://github.com/vector-im/element-web#tag=v1.7.24 - source = element-desktop::git://github.com/vector-im/element-desktop.git#tag=v1.7.24 + source = element-web::git+https://github.com/vector-im/element-web.git + source = element-desktop::git+https://github.com/vector-im/element-desktop.git 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. @@ -35,7 +34,7 @@ pkgname = element-web-git pkgname = element-desktop-git pkgdesc = Glossy Matrix collaboration client for the desktop. - depends = element-web-git=1.7.24.r0.gac15f2755 + depends = element-web-git=1.7.25.r21.ge4c9444fe depends = electron depends = sqlcipher provides = element-desktop @@ -2,29 +2,27 @@ # Contributor: jaltek <post@ezod.de> # Contributor: Daniel Mason (idanoo) <daniel@m2.nz> pkgbase=element-desktop-git -_vers=v1.7.24 -pkgver=1.7.24.r0.gac15f2755 +pkgver=1.7.25.r21.ge4c9444fe pkgrel=1 -pkgname=('element-web-git' 'element-desktop-git') -pkgdesc="A glossy Matrix collaboration client for the desktop." -arch=('x86_64') +pkgname=("element-web-git" "element-desktop-git") +pkgdesc="A glossy Matrix collaboration client for desktop." +arch=("x86_64") url="https://element.io" -license=('Apache') -depends=('electron') -makedepends=('git' 'nodejs' 'jq' 'yarn' 'npm' 'python' 'rust' 'sqlcipher' 'electron') -provides=('element-desktop') +license=("Apache") +depends=("electron") +makedepends=("git" "nodejs" "jq" "yarn" "npm" "python" "rust" "sqlcipher" "electron") +provides=("${pkgbase%-git}") +conflicts=("${pkgbase%-git}") backup=("etc/element/config.json") -_giturl='git://github.com/vector-im' -source=("element-web::${_giturl}/element-web#tag=${_vers}" - "element-desktop::${_giturl}/element-desktop.git#tag=${_vers}" +_giturl="git+https://github.com/vector-im" +source=("element-web::${_giturl}/element-web.git" + "element-desktop::${_giturl}/element-desktop.git" "element-desktop.desktop" - "element-desktop.sh" - "element-web-reskindex.patch") -sha256sums=('SKIP' - 'SKIP' - '81354e663e354bd66b3f2bb303314b790bdf6d61c3d8e2df7407eb500885647d' - 'e4965abefbd609cf88349437b811bc4433d671f5ec5cd51992fd6179d483925f' - 'f4497e40fecb224ca8f1af5187250f77000e5ff9f811d24390b18d37851b4460') + "element-desktop.sh") +sha256sums=("SKIP" + "SKIP" + "81354e663e354bd66b3f2bb303314b790bdf6d61c3d8e2df7407eb500885647d" + "e4965abefbd609cf88349437b811bc4433d671f5ec5cd51992fd6179d483925f") pkgver() { @@ -48,10 +46,13 @@ prepare() { # 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 + + # Workaround for resolve './component-index' in matrix-react-sdk\src error: + # https://github.com/vector-im/element-web/issues/16555#issuecomment-805456702 + yarn upgrade matrix-react-sdk + cd node_modules/matrix-react-sdk + yarn reskindex } build() { @@ -83,7 +84,7 @@ package_element-desktop-git() { depends=("element-web-git=${pkgver}" electron sqlcipher) provides=(element-desktop) conflicts=(element-desktop) - backup=('etc/element/config.json') + backup=("etc/element/config.json") cd element-desktop diff --git a/element-web-reskindex.patch b/element-web-reskindex.patch deleted file mode 100644 index 5d99c33b86ce..000000000000 --- a/element-web-reskindex.patch +++ /dev/null @@ -1,13 +0,0 @@ -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", |