Bump to v1.6.2

1 files changed, 66 insertions, 53 deletions

diff --git a/PKGBUILD b/PKGBUILD
index 8c72f31d0198..bdd6db591e37 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,84 +1,97 @@
-# Maintainer: Marcel Radzio <info@nordgedanken.de>
+# Owner: Marcel Radzio <info@nordgedanken.de>
+# Maintainer: Daniel Mason (idanoo) <daniel@m2.nz>
 pkgbase=riot-desktop-git
-pkgver=v1.5.13.r112.gd9fbbe16
+pkgver=v1.6.2.r0.g075299a7
 pkgrel=1
-pkgname=riot-desktop-git
+pkgname=(riot-web-git riot-desktop-git)
 pkgdesc="A glossy Matrix collaboration client for the desktop."
-arch=('any')
+arch=('x86_64')
 url="https://riot.im"
 license=('Apache')
 depends=('electron')
-makedepends=('git' 'nodejs' 'jq' 'yarn')
-conflicts=('riot-desktop' 'riot-web')
+makedepends=('git' 'nodejs' 'jq' 'yarn' 'npm' 'python' 'rust' 'sqlcipher' 'electron')
 provides=('riot-desktop')
 backup=("etc/riot/config.json")
-source=('riot-desktop-git::git://github.com/vector-im/riot-web.git#branch=develop'
+_giturl='git://github.com/vector-im'
+source=("riot-web::${_giturl}/riot-web.git#tag=v1.6.2"
+        "riot-desktop::${_giturl}/riot-desktop.git#tag=v1.6.2"
         "riot-desktop.desktop"
-        "riot-desktop.sh"
-	"fetch-develop.deps.sh")
+        "riot-desktop.sh")
 sha256sums=('SKIP'
-            'ae0654027f0646178961f6397322aefdc817d052625772dd297d636fe9726aff'
-            '0f8d896793e6f6f677febb5921b2256c9786fad67294cb32efd6d059ed21e04c'
-            '8150ac32779104e0e523ddb7df105871e6023fca1f9b6517ee449aa40bfa6247')
+            'SKIP'
+            'b94e5d51831cf57729c96e716cdda3a034a1dda7a0f9e2e6fbd040be2c862604'
+            'a6cc599b226357a6e219d17b29834aa34b993029c5c83e46402117f10fa4f91e')
 
 pkgver() {
-	cd "$srcdir/${pkgname}"
+  cd "$srcdir/riot-web"
 
-	( set -o pipefail
-		git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
-		printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-	)
+  ( set -o pipefail
+    git describe --long 2>/dev/null | sed 's/\([^-]*-g\)/r\1/;s/-/./g' ||
+    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  )
 }
 
 prepare() {
-	cd "$srcdir/${pkgname}"
-	sed -i 's@https://riot.im/download/desktop/update/@null@g' electron_app/riot.im/config.json
+  cd riot-desktop
+  # Switch target to output to directory rather than .deb package
+  sed -i 's/"target": "deb"/"target": "dir"/g' package.json
+  sed -i 's@"https://packages.riot.im/desktop/update/"@null@g' riot.im/release/config.json
+  yarn install
+
+  cd ../riot-web
+  # Disable auto updating
+  sed -i 's@"https://packages.riot.im/desktop/update/"@null@g' riot.im/app/config.json
+  yarn install
 }
 
 build() {
-	cd "$srcdir/${pkgname}"
+  cd riot-web
+  yarn build
 
+  cd ../riot-desktop
+  yarn run build:native
+  yarn run build
+}
 
-	"${srcdir}"/fetch-develop.deps.sh "${srcdir}/npm-cache"
-
-	yarn install --cache-folder="${srcdir}/npm-cache"
-	rm -r node_modules/matrix-js-sdk; ln -s ../matrix-js-sdk node_modules/
-	rm -r node_modules/matrix-react-sdk; ln -s ../matrix-react-sdk node_modules/
-	
-	yarn build
+package_riot-web-git() {
+  pkgdesc="Glossy Matrix collaboration client for the web."
+  provides=(vector-web)
+  replaces=(vector-web)
 
-}
+  cd riot-web
 
-package() {
-	cd "$srcdir/${pkgname}"
+  install -d "${pkgdir}"/{usr/share/webapps,etc/webapps}/riot
 
-	install -d "${pkgdir}"/{usr/share/webapps,etc/webapps}/riot
+  cp -r webapp/* "${pkgdir}"/usr/share/webapps/riot/
+  install -Dm644 config.sample.json -t "${pkgdir}"/etc/webapps/riot/
+  ln -s /etc/webapps/riot/config.json "${pkgdir}"/usr/share/webapps/riot/
+  echo "${pkgver}" > "${pkgdir}"/usr/share/webapps/riot/version
+}
 
-	cp -r webapp/* "${pkgdir}"/usr/share/webapps/riot/
-	install -Dm644 config.sample.json -t "${pkgdir}"/etc/webapps/riot/
-	ln -s /etc/webapps/riot/config.json "${pkgdir}"/usr/share/webapps/riot/
-	echo "${pkgver}" > "${pkgdir}"/usr/share/webapps/riot/version
+package_riot-desktop-git() {
+  pkgdesc="Glossy Matrix collaboration client for the desktop."
+  depends=("riot-web-git=${pkgver}" electron sqlcipher)
+  backup=('etc/riot/config.json')
 
-	cd electron_app
-	yarn --cache-folder "${srcdir}/npm-cache"
-	cd ..
+  cd riot-desktop
 
-	install -d "${pkgdir}"{/usr/lib/riot/electron_app,/etc/webapps/riot}
+  install -d "${pkgdir}"{/usr/lib/riot,/etc/webapps/riot}
 
-	ln -s /usr/share/webapps/riot "${pkgdir}"/usr/lib/riot/webapp
-	ln -s /etc/riot/config.json "${pkgdir}"/etc/webapps/riot/config.json
+  # Install the app content, replace the webapp with a symlink to the system package
+  cp -r dist/linux-unpacked/resources/* "${pkgdir}"/usr/lib/riot/
+  ln -s /usr/share/webapps/riot "${pkgdir}"/usr/lib/riot/webapp
 
-	install -Dm644 package.json -t "${pkgdir}"/usr/lib/riot
-	cp -r electron_app/src "${pkgdir}"/usr/lib/riot/electron_app/
-	cp -r electron_app/node_modules "${pkgdir}"/usr/lib/riot/electron_app/
-	install -Dm644 electron_app/img/riot.png -t "${pkgdir}"/usr/lib/riot/electron_app/img
-	install -Dm644 electron_app/riot.im/config.json -t "${pkgdir}"/etc/riot
+  # Config file
+  ln -s /etc/riot/config.json "${pkgdir}"/etc/webapps/riot/config.json
+  install -Dm644 riot.im/release/config.json -t "${pkgdir}"/etc/riot/
 
-	install -Dm644 "${srcdir}"/riot-desktop.desktop "${pkgdir}"/usr/share/applications/riot.desktop
-	install -Dm755 "${srcdir}"/riot-desktop.sh "${pkgdir}"/usr/bin/riot-desktop
+  # Required extras
+  install -Dm644 ../riot-desktop.desktop "${pkgdir}"/usr/share/applications/riot-desktop.desktop
+  install -Dm755 ../riot-desktop.sh "${pkgdir}"/usr/bin/riot-desktop
 
-	install -Dm644 "${srcdir}"/riot-desktop-git/webapp/themes/riot/img/logos/riot-im-logo.svg "${pkgdir}"/usr/share/icons/hicolor/scalable/apps/riot.svg
-	for i in 16 24 48 64 96 128 256 512; do
-		install -Dm644 electron_app/build/icons/${i}x${i}.png "${pkgdir}"/usr/share/icons/hicolor/${i}x${i}/apps/riot.png
-	done
-}
+  # Icons
+  install -Dm644 ../riot-web/res/themes/riot/img/logos/riot-im-logo.svg "${pkgdir}"/usr/share/icons/hicolor/scalable/apps/riot.svg
+  for i in 16 24 48 64 96 128 256 512; do
+    install -Dm644 build/icons/${i}x${i}.png "${pkgdir}"/usr/share/icons/hicolor/${i}x${i}/apps/riot.png
+  done
+}
\ No newline at end of file