diff options
author | Marcel Radzio | 2019-03-27 20:09:25 +0100 |
---|---|---|
committer | MTRNord | 2020-03-28 23:07:20 +0100 |
commit | 9126355b02bb7279a10de8d78cdbc2951626d9ba (patch) | |
tree | cfd9e5af09227251f137d1312f58d4520d1f17bd | |
parent | b840ec8db6c3f592d85578f70aa9fb77f1d4ebf3 (diff) | |
download | aur-9126355b02bb7279a10de8d78cdbc2951626d9ba.tar.gz |
Fix possible symlink errors made by yarn link
-rw-r--r-- | .SRCINFO | 9 | ||||
-rw-r--r-- | .gitignore | 4 | ||||
-rw-r--r-- | PKGBUILD | 33 | ||||
-rwxr-xr-x | fetch-develop.deps.sh | 20 |
4 files changed, 46 insertions, 20 deletions
@@ -1,13 +1,14 @@ pkgbase = riot-desktop-git pkgdesc = A glossy Matrix collaboration client for the desktop. - pkgver = v0.16.5.r26.gf69869ac - pkgrel = 2 + pkgver = v1.5.13.r112.gd9fbbe16 + pkgrel = 1 url = https://riot.im arch = any license = Apache makedepends = git - makedepends = npm + makedepends = nodejs makedepends = jq + makedepends = yarn depends = electron provides = riot-desktop conflicts = riot-desktop @@ -16,9 +17,11 @@ pkgbase = riot-desktop-git source = riot-desktop-git::git://github.com/vector-im/riot-web.git#branch=develop source = riot-desktop.desktop source = riot-desktop.sh + source = fetch-develop.deps.sh sha256sums = SKIP sha256sums = ae0654027f0646178961f6397322aefdc817d052625772dd297d636fe9726aff sha256sums = 0f8d896793e6f6f677febb5921b2256c9786fad67294cb32efd6d059ed21e04c + sha256sums = 8150ac32779104e0e523ddb7df105871e6023fca1f9b6517ee449aa40bfa6247 pkgname = riot-desktop-git diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000000..55fede260406 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +src/ +pkg/ +riot-desktop-git/ +*.tar.xz
\ No newline at end of file @@ -1,28 +1,29 @@ # Maintainer: Marcel Radzio <info@nordgedanken.de> pkgbase=riot-desktop-git -pkgver=v0.16.5.r26.gf69869ac -pkgrel=2 +pkgver=v1.5.13.r112.gd9fbbe16 +pkgrel=1 pkgname=riot-desktop-git pkgdesc="A glossy Matrix collaboration client for the desktop." arch=('any') url="https://riot.im" license=('Apache') depends=('electron') -makedepends=('git' 'npm' 'jq') +makedepends=('git' 'nodejs' 'jq' 'yarn') conflicts=('riot-desktop' 'riot-web') provides=('riot-desktop') backup=("etc/riot/config.json") source=('riot-desktop-git::git://github.com/vector-im/riot-web.git#branch=develop' "riot-desktop.desktop" - "riot-desktop.sh") + "riot-desktop.sh" + "fetch-develop.deps.sh") sha256sums=('SKIP' - 'ae0654027f0646178961f6397322aefdc817d052625772dd297d636fe9726aff' - '0f8d896793e6f6f677febb5921b2256c9786fad67294cb32efd6d059ed21e04c') + 'ae0654027f0646178961f6397322aefdc817d052625772dd297d636fe9726aff' + '0f8d896793e6f6f677febb5921b2256c9786fad67294cb32efd6d059ed21e04c' + '8150ac32779104e0e523ddb7df105871e6023fca1f9b6517ee449aa40bfa6247') pkgver() { cd "$srcdir/${pkgname}" -# 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)" @@ -37,16 +38,14 @@ prepare() { build() { cd "$srcdir/${pkgname}" - jq '.dependencies."matrix-react-sdk" = "github:matrix-org/matrix-react-sdk#develop"' "$srcdir/${pkgname}/package.json" > "$srcdir/${pkgname}/package_tmp.json" - cp "$srcdir/${pkgname}/package_tmp.json" "$srcdir/${pkgname}/package.json" - jq '.dependencies."matrix-js-sdk" = "github:matrix-org/matrix-js-sdk#develop"' "$srcdir/${pkgname}/package.json" > "$srcdir/${pkgname}/package_tmp.json" - mv "$srcdir/${pkgname}/package_tmp.json" "$srcdir/${pkgname}/package.json" - jq '.scripts."build:react-sdk" = "node scripts/npm-sub.js matrix-react-sdk run build"' "$srcdir/${pkgname}/package.json" > "$srcdir/${pkgname}/package_tmp.json" - mv "$srcdir/${pkgname}/package_tmp.json" "$srcdir/${pkgname}/package.json" - npm install --cache "${srcdir}/npm-cache" + "${srcdir}"/fetch-develop.deps.sh "${srcdir}/npm-cache" - npm run build + 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 } @@ -61,7 +60,7 @@ package() { echo "${pkgver}" > "${pkgdir}"/usr/share/webapps/riot/version cd electron_app - npm install --cache "${srcdir}/npm-cache" + yarn --cache-folder "${srcdir}/npm-cache" cd .. install -d "${pkgdir}"{/usr/lib/riot/electron_app,/etc/webapps/riot} @@ -78,7 +77,7 @@ package() { install -Dm644 "${srcdir}"/riot-desktop.desktop "${pkgdir}"/usr/share/applications/riot.desktop install -Dm755 "${srcdir}"/riot-desktop.sh "${pkgdir}"/usr/bin/riot-desktop - install -Dm644 res/themes/riot/img/logos/riot-logo.svg "${pkgdir}"/usr/share/icons/hicolor/scalable/apps/riot.svg + 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 diff --git a/fetch-develop.deps.sh b/fetch-develop.deps.sh new file mode 100755 index 000000000000..fdbb713fa214 --- /dev/null +++ b/fetch-develop.deps.sh @@ -0,0 +1,20 @@ +#!/bin/sh + +set -ex + +YARN_INSTALL_ARGS=("$@") + +echo "get matrix-js-sdk" +git clone https://github.com/matrix-org/matrix-js-sdk.git +pushd matrix-js-sdk +git checkout develop +yarn install --cache-folder="${YARN_INSTALL_ARGS[@]}" +yarn add source-map-loader --cache-folder="${YARN_INSTALL_ARGS[@]}" # because webpack is made of fail (https://github.com/webpack/webpack/issues/1472) +popd + +echo "get matrix-react-sdk" +git clone https://github.com/matrix-org/matrix-react-sdk.git +pushd matrix-react-sdk +git checkout develop +yarn install --cache-folder="${YARN_INSTALL_ARGS[@]}" +popd
\ No newline at end of file |