Update to 0.12.0

2 files changed, 44 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f6ed79a10fec..b931c3666fba 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,22 @@
 pkgbase = ezra-project
 	pkgdesc = Bible study software focussing on topical study based on keywords/tags
-	pkgver = 0.11.1
-	pkgrel = 4
+	pkgver = 0.12.0
+	pkgrel = 1
 	url = https://github.com/tobias-klein/ezra-project
 	arch = x86_64
 	license = GPL3
-	makedepends = cmake
-	makedepends = gendesk
+	makedepends = jq
+	makedepends = moreutils
+	makedepends = node-gyp
+	makedepends = node-prune
+	makedepends = nodejs-addon-api
+	makedepends = nodejs-pug-cli
+	makedepends = nodejs-sword-interface
 	makedepends = npm
-	makedepends = sword
-	depends = curl
 	depends = electron
 	depends = icu
 	depends = nodejs
-	depends = python2
-	depends = sqlite
-	source = https://github.com/tobias-klein/ezra-project/archive/0.11.1.tar.gz
+	source = ezra-project-0.12.0.tar.gz::https://github.com/tobias-klein/ezra-project/archive/0.12.0.tar.gz
 	source = ezra-project.sh
 	sha256sums = cf662fc55d658d5e03ed95025428b81b1d12cb6d3f0aed9b6e41278f80b65ecd
 	sha256sums = 0a36167bce248b6082045163cf60b143d02ca1e447a791cf0c88e960a7fdc618
diff --git a/PKGBUILD b/PKGBUILD
index b9e85cc723ee..9730a7332f1d 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,24 @@
 # Maintainer: Caleb Maclennan <caleb@alerque.com>
 
 pkgname=ezra-project
-pkgver=0.11.1
-pkgrel=4
-pkgdesc="Bible study software focussing on topical study based on keywords/tags"
+pkgver=0.12.0
+pkgrel=1
+pkgdesc='Bible study software focussing on topical study based on keywords/tags'
 arch=('x86_64')
 url="https://github.com/tobias-klein/$pkgname"
 license=('GPL3')
-depends=('curl'
-         'electron'
+depends=('electron'
          'icu'
-         'nodejs'
-         'python2'
-         'sqlite')
-makedepends=('cmake' 'gendesk' 'npm' 'sword')
-source=("https://github.com/tobias-klein/$pkgname/archive/$pkgver.tar.gz"
+         'nodejs')
+makedepends=('jq'
+             'moreutils'
+             'node-gyp'
+             'node-prune'
+             'nodejs-addon-api' # run time dep but gets baked into electron asar
+             'nodejs-pug-cli'
+             'nodejs-sword-interface' # run time dep but gets baked into electron asar
+             'npm')
+source=("$pkgname-$pkgver.tar.gz::$url/archive/$pkgver.tar.gz"
         'ezra-project.sh')
 sha256sums=('cf662fc55d658d5e03ed95025428b81b1d12cb6d3f0aed9b6e41278f80b65ecd'
             '0a36167bce248b6082045163cf60b143d02ca1e447a791cf0c88e960a7fdc618')
@@ -22,27 +26,33 @@ _electron="$(electron --version | sed 's/^v//')"
 
 prepare() {
     cd "$pkgname-$pkgver"
-    npm uninstall --no-audit -D electron
-    npm install --no-audit electron@"$_electron"
-    gendesk -f -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" --name "Ezra Project"
+    jq 'del(.dependencies["node-addon-api", "node-sword-interface"], .devDependencies["electron", "electron-osx-sign", "node-abi", "node-gyp", "pug-cli", "sequelize-cli"])' package.json |
+        sponge package.json
 }
 
 build() {
     cd "$pkgname-$pkgver"
-    npm run compile-pug
-    npm run install-node-prune
-    "$(npm bin)"/electron-rebuild -f -w node-sword-interface -v "$_electron"
-    npm run prune-node-modules
-    npm run purge-build-artifacts
-    npm run cleanup-gyp-shebang
+    rm -f node_modules/{node-addon-api,node-sword-interface}
+    local _electron="$(electron --version | sed 's/^v//')"
+    npm install --cache "$srcdir/npm-cache" --no-audit --no-fund
+    npx electron-rebuild --version="$_electron"
+    node-prune node_modules
+    npx electron-packager ./ "$pkgname" --electron-version="$_electron"
+    ./build_scripts/purge_build_artifacts.sh
+    npm link node-addon-api node-sword-interface
+    npx electron-packager ./ "$pkgname" \
+        --electron-version="$_electron" \
+        --overwrite \
+        --asar \
+        --platform=linux \
+        --arch=x64
 }
 
 package() {
     cd "$pkgname-$pkgver"
+    install -Dm755 "../$pkgname.sh" "$pkgdir/usr/bin/$pkgname"
     install -Dm644 -t "$pkgdir/usr/share/applications/" "$pkgname.desktop"
-    install -Dm755 "$srcdir/$pkgname.sh" "$pkgdir/usr/bin/$pkgname"
-    "$(npm bin)"/electron-packager . "$pkgname" --overwrite --asar --platform=linux --arch=x64 --prune=true --out=release --electron-version="$_electron"
-    rm release/ezra-project-linux-x64/"$pkgname"
-    mkdir -p "$pkgdir/usr/lib/"
-    cp -a release/ezra-project-linux-x64 "$pkgdir/usr/lib/$pkgname"
+    install -Dm644 -t "$pkgdir/usr/lib/$pkgname/resources/" "$pkgname-linux-x64/resources/app.asar"
+    install -Dm644 -t "$pkgdir/usr/share/licences/$pkgname/" LICENSE
+    install -Dm644 -t "$pkgdir/usr/share/doc/$pkgname/" {CHANGELOG,README,TECH,LOC_METRICS}.md
 }