diff options
| -rw-r--r-- | .SRCINFO | 11 | ||||
| -rw-r--r-- | PKGBUILD | 77 | ||||
| -rw-r--r-- | node.sh | 6 | ||||
| -rw-r--r-- | sqlectron-gui.sh | 3 |
4 files changed, 47 insertions, 50 deletions
@@ -1,7 +1,7 @@ pkgbase = sqlectron-gui-git pkgdesc = A simple and lightweight SQL client with cross database and platform support - pkgver = 1.30.0+10+g3b448ef - pkgrel = 2 + pkgver = 1.32.0+24+gf4bdaba + pkgrel = 1 url = https://sqlectron.github.io/ arch = x86_64 license = MIT @@ -9,17 +9,14 @@ pkgbase = sqlectron-gui-git makedepends = git makedepends = libsass makedepends = npm - depends = electron2 + makedepends = python2 + depends = electron6 provides = sqlectron-gui conflicts = sqlectron-gui source = sqlectron-gui-git::git+https://github.com/sqlectron/sqlectron-gui.git - source = node.sh source = sqlectron-gui.desktop - source = sqlectron-gui.sh sha1sums = SKIP - sha1sums = f756fdbfbb244886f4cd907030715f46222207de sha1sums = b9fb3bc29a17dee5de9295e2fdb2b3025ed51d1f - sha1sums = 6ad81d34e04c1760d4be27f0e4ec25ff5267deca pkgname = sqlectron-gui-git @@ -1,31 +1,36 @@ # Maintainer: surefire@cryptomile.net pkgname=sqlectron-gui-git -pkgver=1.30.0+10+g3b448ef -pkgrel=2 +_electron=electron6 +pkgver=1.32.0+24+gf4bdaba +pkgrel=1 pkgdesc="A simple and lightweight SQL client with cross database and platform support" arch=('x86_64') url="https://sqlectron.github.io/" license=('MIT') -depends=('electron2') +depends=($_electron) makedepends=( 'asar' 'git' 'libsass' 'npm' + 'python2' ) conflicts=('sqlectron-gui') provides=('sqlectron-gui') source=( "${pkgname}::git+https://github.com/sqlectron/sqlectron-gui.git" - 'node.sh' 'sqlectron-gui.desktop' - 'sqlectron-gui.sh' ) sha1sums=('SKIP' - 'f756fdbfbb244886f4cd907030715f46222207de' - 'b9fb3bc29a17dee5de9295e2fdb2b3025ed51d1f' - '6ad81d34e04c1760d4be27f0e4ec25ff5267deca') + 'b9fb3bc29a17dee5de9295e2fdb2b3025ed51d1f') + +case "$CARCH" in + i686) _arch=ia32;; + x86_64) _arch=x64;; + aarch64) _arch=arm64;; + *) _arch=DUMMY;; +esac pkgver() { cd "${pkgname}" @@ -37,58 +42,62 @@ prepare() { # remove extra dependencies sed -i package.json \ - -e '/"node-sass":/ s/3\.4\.2/4.11.0/' \ -e '/"postinstall":/ d' \ -e '/"electron":/ d' \ -e '/"electron-builder":/ d' \ -e '/"spawn-auto-restart":/ d' \ -e '/"webpack-dev-middleware":/ d' \ -e '/"webpack-dev-server":/ d' \ - -e '/"webpack-bundle-analyzer":/ s/,$//' - - install -Dm0755 "$srcdir/node.sh" "$srcdir/bin/node" + -e '/"webpack-cli":/ s/,$//' } build() { cd "${pkgname}" - export PATH="$srcdir/bin:$PATH" + export SKIP_SASS_BINARY_DOWNLOAD_FOR_CI=1 export SASS_FORCE_BUILD=1 export LIBSASS_EXT=auto export npm_config_optional=false - export npm_config_nodedir=/usr/lib/electron2/node - export npm_config_scripts_prepend_node_path=false + export npm_config_build_from_source=true + export npm_config_sqlite=/usr - npm install --build-from-source + npm install npm run compile:browser npm run compile:renderer mkdir app - mv -t ./app out - cp -t ./app package.json - - pushd app - npm install \ - --production \ - --build-from-source \ - --runtime=electron \ - --target=$(</usr/lib/electron2/version) - - popd - asar p app app.asar + mv -t app out + cp -rt app build package.json + + cd app + + local electron_build_opts=( + production + arch=$_arch + runtime=electron + disturl=https://electronjs.org/headers + target=$(</usr/lib/$_electron/version) + target_arch=$_arch + use_system_libusb=true + ) + + HOME="$srcdir/.electron-gyp" npm install "${electron_build_opts[@]/#/--}" + + cat <<-EOF > ../sqlectron-gui + #!/usr/bin/sh + exec $_electron /usr/lib/sqlectron-gui/app.asar "\$@" + EOF } package() { cd "${pkgname}" - install -Dm0755 ../sqlectron-gui.sh "${pkgdir}/usr/bin/sqlectron-gui" - - install -Dm0644 build/app.png "${pkgdir}/usr/share/pixmaps/sqlectron-gui.png" + asar p app app.asar + install -Dm0755 -t "${pkgdir}/usr/bin" sqlectron-gui + install -Dm0644 -t "${pkgdir}/usr/share/applications" ../sqlectron-gui.desktop install -Dm0644 -t "${pkgdir}/usr/lib/sqlectron-gui" app.asar - - install -Dm0644 -t "${pkgdir}/usr/share/applications" ../sqlectron-gui.desktop - install -Dm0644 -t "${pkgdir}/usr/share/licenses/${pkgname}" LICENSE + install -Dm0644 build/app.png "${pkgdir}/usr/share/pixmaps/sqlectron-gui.png" } diff --git a/node.sh b/node.sh deleted file mode 100644 index 84bccb086e7b..000000000000 --- a/node.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -export ELECTRON_RUN_AS_NODE=1 -export ELECTRON_NO_ASAR=1 - -exec /usr/lib/electron2/electron2 "$@" diff --git a/sqlectron-gui.sh b/sqlectron-gui.sh deleted file mode 100644 index 0370598e24fb..000000000000 --- a/sqlectron-gui.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/usr/bin/sh - -exec electron2 /usr/lib/sqlectron-gui/app.asar "$@" |