upgpkg

4 files changed, 42 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e090e1d73131..00b29adab9c5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Thu May 19 17:48:50 UTC 2016
+# Wed Aug 24 15:39:50 UTC 2016
 pkgbase = electronic-wechat
 	pkgdesc = A better WeChat client
-	pkgver = 1.3.0
+	pkgver = 1.4.0
 	pkgrel = 1
 	url = https://github.com/geeeeeeeeek/electronic-wechat
 	arch = x86_64
@@ -16,10 +16,15 @@ pkgbase = electronic-wechat
 	depends = libxtst
 	depends = alsa-lib
 	depends = gconf
-	source = git+https://github.com/geeeeeeeeek/electronic-wechat.git#tag=v1.3.0
+	depends = electron
+	source = git+https://github.com/geeeeeeeeek/electronic-wechat.git#tag=v1.4.0
 	source = electronic-wechat.desktop.in
+	source = remove-bundle-electron.patch
+	source = electronic-wechat.sh.in
 	sha256sums = SKIP
 	sha256sums = 192d2b31d8faa30142cffecb56352198a316e62b88703f5d3216acdcf76f6730
+	sha256sums = fe5e738390b7f638d2aa6e98ed2212b4de9964ddbcee4a380a7079eb06330427
+	sha256sums = 52b5c50a43f3a92e58d06f568152ed3d06d46318dc98dcbb10497f24f0353245
 
 pkgname = electronic-wechat
 
diff --git a/PKGBUILD b/PKGBUILD
index ecbb2a9fe023..ea66dc647652 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,28 +2,32 @@
 # Maintainer: hexchain <i at hexchain.org>
 
 pkgname=electronic-wechat
-pkgver=1.3.0
+pkgver=1.4.0
 pkgrel=1
 pkgdesc="A better WeChat client"
 arch=('x86_64')
 url="https://github.com/geeeeeeeeek/electronic-wechat"
 license=('custom')
-depends=('nss' 'gtk2' 'libnotify' 'libxtst' 'alsa-lib' 'gconf')
+depends=('nss' 'gtk2' 'libnotify' 'libxtst' 'alsa-lib' 'gconf' 'electron')
 makedepends=('git' 'npm' 'imagemagick')
 source=(
     "git+https://github.com/geeeeeeeeek/electronic-wechat.git#tag=v${pkgver}"
     electronic-wechat.desktop.in
+    'remove-bundle-electron.patch'
+    'electronic-wechat.sh.in'
 )
 
 prepare() {
     cd "$srcdir"
     sed "s|@@VERSION@@|$pkgver|" electronic-wechat.desktop.in > electronic-wechat.desktop
+
+    cd "$srcdir/$pkgname"
+    patch -p1 < "$srcdir/remove-bundle-electron.patch"
 }
 
 build() {
     cd "$srcdir/$pkgname"
     npm install
-    npm run build:linux64
 }
 
 package() {
@@ -40,13 +44,14 @@ package() {
         convert assets/icon.png -resize ${size}x${size} "$target/$pkgname.png"
     done
 
-    cd "$srcdir/$pkgname/dist/$pkgname-linux-x64/"
+    cd "$srcdir/$pkgname/"
+    rm -rf scripts
     mkdir -p "$pkgdir/usr/lib/$pkgname/"
-    cp -rv --no-preserve='ownership' * "$pkgdir/usr/lib/$pkgname/"
-
-    mkdir -p "$pkgdir/usr/bin/"
-    ln -sf "/usr/lib/$pkgname/$pkgname" "$pkgdir/usr/bin/$pkgname"
+    cp -rv --no-preserve='ownership' -- * "$pkgdir/usr/lib/$pkgname/"
+    install -Dm755 "$srcdir/electronic-wechat.sh.in" "$pkgdir/usr/bin/electronic-wechat"
 }
 
 sha256sums=('SKIP'
-            '192d2b31d8faa30142cffecb56352198a316e62b88703f5d3216acdcf76f6730')
+            '192d2b31d8faa30142cffecb56352198a316e62b88703f5d3216acdcf76f6730'
+            'fe5e738390b7f638d2aa6e98ed2212b4de9964ddbcee4a380a7079eb06330427'
+            '52b5c50a43f3a92e58d06f568152ed3d06d46318dc98dcbb10497f24f0353245')
diff --git a/electronic-wechat.sh.in b/electronic-wechat.sh.in
new file mode 100644
index 000000000000..724e3cbd4279
--- /dev/null
+++ b/electronic-wechat.sh.in
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+PACKAGE_NAME="electronic-wechat"
+EW_DIR="/usr/lib/$PACKAGE_NAME"
+
+cd "$EW_DIR" || exit 1
+exec electron .
diff --git a/remove-bundle-electron.patch b/remove-bundle-electron.patch
new file mode 100644
index 000000000000..8509c07be58c
--- /dev/null
+++ b/remove-bundle-electron.patch
@@ -0,0 +1,13 @@
+diff --git a/package.json b/package.json
+index c332e96..3ae031e 100644
+--- a/package.json
++++ b/package.json
+@@ -32,8 +32,6 @@
+   },
+   "homepage": "https://github.com/geeeeeeeeek/wechat-electron/",
+   "dependencies": {
+-    "electron-packager": "^7.0.0",
+-    "electron": "^1.3.4",
+     "pinyin": "^2.7.1"
+   }
+ }