update to 2.1.9 an fix dependencies

4 files changed, 50 insertions, 65 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 18a8e257c03f..1d6d8d96ddc6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,27 @@
 pkgbase = electronic-wechat
 	pkgdesc = A better WeChat client
-	pkgver = 2.0
-	pkgrel = 2
-	url = https://github.com/geeeeeeeeek/electronic-wechat
+	pkgver = 2.1.9
+	pkgrel = 1
+	url = https://github.com/kooritea/electronic-wechat
 	arch = x86_64
 	license = custom
 	makedepends = git
+	makedepends = electron
 	makedepends = npm
+	makedepends = python2
 	makedepends = imagemagick
-	depends = electron
+	depends = python
+	depends = nodejs
+	depends = hicolor-icon-theme
 	optdepends = libappindicator-gtk3: fix broken tray icon in KDE
-	source = git+https://github.com/geeeeeeeeek/electronic-wechat.git#tag=V2.0
+	source = electronic-wechat-2.1.9.tar.gz::https://github.com/kooritea/electronic-wechat/archive/v2.1.9.tar.gz
 	source = electronic-wechat.desktop
 	source = remove-bundle-electron.patch
 	source = electronic-wechat.sh
-	sha256sums = SKIP
+	sha256sums = b542315d71c6643f94b0525470c7dc7eb652989328e0f1185d1df2a6b2ff6921
 	sha256sums = 56c0db46c3b9fc31ac16265d0346ef47a6422392607bcce954e0f550894475be
-	sha256sums = e6db14369ebd0071f9c9302aab0eed07fd4eff67375c522e03b3b6eb800f2891
-	sha256sums = dddbd40a98fdfa47728fadaceda35a5ac38f59fd1be4fde2cbdaaf309d4e6bf1
+	sha256sums = 8a4a6a109f6881798c291ffa11fcd76ac482ccf5b01f0566c16b007dda0b9fac
+	sha256sums = 10696031537d5d749b1d8914829057d73aaccb788263b4df8bc5ff7ed7939bff
 
 pkgname = electronic-wechat
 
diff --git a/PKGBUILD b/PKGBUILD
index adb3705677bc..53987960f66c 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,78 +1,54 @@
+# Maintainer: Stephan Springer <buzo+arch@Lini.de>
 # Contributor: wenLiangcan <boxeed at gmail dot com>
-# Maintainer: hexchain <i at hexchain.org>
+# Contributor: hexchain <i at hexchain.org>
 
 pkgname=electronic-wechat
-pkgver=2.0
-pkgrel=2
+pkgver=2.1.9
+pkgrel=1
 pkgdesc="A better WeChat client"
 arch=('x86_64')
-url="https://github.com/geeeeeeeeek/electronic-wechat"
+url='https://github.com/kooritea/electronic-wechat'
 license=('custom')
-depends=('electron')
+depends=('python' 'nodejs' 'hicolor-icon-theme')
 optdepends=('libappindicator-gtk3: fix broken tray icon in KDE')
-makedepends=('git' 'npm' 'imagemagick')
+makedepends=('git' 'electron' 'npm' 'python2' 'imagemagick')
 source=(
-    "git+https://github.com/geeeeeeeeek/electronic-wechat.git#tag=V2.0"
+    "$pkgname-$pkgver.tar.gz::https://github.com/kooritea/electronic-wechat/archive/v$pkgver.tar.gz"
     'electronic-wechat.desktop'
     'remove-bundle-electron.patch'
     'electronic-wechat.sh'
 )
+sha256sums=('b542315d71c6643f94b0525470c7dc7eb652989328e0f1185d1df2a6b2ff6921'
+            '56c0db46c3b9fc31ac16265d0346ef47a6422392607bcce954e0f550894475be'
+            '8a4a6a109f6881798c291ffa11fcd76ac482ccf5b01f0566c16b007dda0b9fac'
+            '10696031537d5d749b1d8914829057d73aaccb788263b4df8bc5ff7ed7939bff')
 
 prepare() {
-    cd "$srcdir/$pkgname"
+    cd "$srcdir/$pkgname-$pkgver"
     patch -p1 < "$srcdir/remove-bundle-electron.patch"
 }
 
 build() {
-    cd "$srcdir/$pkgname"
-    npm install
+    cd "$srcdir/$pkgname-$pkgver"
+    PYTHON=/usr/bin/python2 npm install
     # npm run build:linux64
 }
 
 package() {
     cd "$srcdir"
-    install -Dm644 electronic-wechat.desktop -t "$pkgdir/usr/share/applications/"
+    install -Dm644 electronic-wechat.desktop -t "$pkgdir/usr/share/applications"
 
-    cd "$srcdir/$pkgname"
+    cd "$srcdir/$pkgname-$pkgver"
     install -Dm644 LICENSE.md "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
     install -Dm644 assets/icon.png "$pkgdir/usr/share/icons/hicolor/512x512/apps/electronic-wechat.png"
 
     for size in 16 24 32 48 64 72 128 256; do
-        target="$pkgdir/usr/share/icons/hicolor/${size}x${size}/apps/"
+        target="$pkgdir/usr/share/icons/hicolor/${size}x${size}/apps"
         mkdir -p $target
         convert assets/icon.png -resize ${size}x${size} "$target/$pkgname.png"
     done
-
-    cd "$srcdir/$pkgname/"
     rm -rf scripts
-    mkdir -p "$pkgdir/usr/lib/$pkgname/"
-    cp -r --no-preserve='ownership' -- * "$pkgdir/usr/lib/$pkgname/"
+    mkdir -p "$pkgdir/usr/lib/$pkgname"
+    cp -r --no-preserve='ownership' -- * "$pkgdir/usr/lib/$pkgname"
     install -Dm755 "$srcdir/electronic-wechat.sh" "$pkgdir/usr/bin/electronic-wechat"
 }
-
-# package() {
-#     cd "$srcdir"
-#     install -Dm644 electronic-wechat.desktop -t "$pkgdir/usr/share/applications/"
-
-#     cd "$srcdir/$pkgname"
-#     install -Dm644 LICENSE.md "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-#     install -Dm644 assets/icon.png "$pkgdir/usr/share/icons/hicolor/512x512/apps/electronic-wechat.png"
-
-#     for size in 16 24 32 48 64 72 128 256; do
-#         target="$pkgdir/usr/share/icons/hicolor/${size}x${size}/apps/"
-#         mkdir -p $target
-#         convert assets/icon.png -resize ${size}x${size} "$target/$pkgname.png"
-#     done
-
-#     cd "$srcdir/$pkgname/dist/electronic-wechat-linux-x64/"
-#     mkdir -p "$pkgdir/usr/lib/$pkgname/"
-#     cp -rv --no-preserve='ownership' -- * "$pkgdir/usr/lib/$pkgname/"
-#     # install -Dm755 "$srcdir/electronic-wechat.sh.in" "$pkgdir/usr/bin/electronic-wechat"
-#     mkdir -p "$pkgdir/usr/bin"
-#     ln -sf "/usr/lib/$pkgname/electronic-wechat" "$pkgdir/usr/bin/"
-# }
-
-sha256sums=('SKIP'
-            '56c0db46c3b9fc31ac16265d0346ef47a6422392607bcce954e0f550894475be'
-            'e6db14369ebd0071f9c9302aab0eed07fd4eff67375c522e03b3b6eb800f2891'
-            'dddbd40a98fdfa47728fadaceda35a5ac38f59fd1be4fde2cbdaaf309d4e6bf1')
diff --git a/electronic-wechat.sh b/electronic-wechat.sh
index 3e8c8eaa76c2..19f98f081562 100755
--- a/electronic-wechat.sh
+++ b/electronic-wechat.sh
@@ -4,4 +4,4 @@ PACKAGE_NAME="electronic-wechat"
 EW_DIR="/usr/lib/$PACKAGE_NAME"
 
 cd "$EW_DIR" || exit 1
-exec electron . "$@"
+exec /usr/bin/electron . "$@"
diff --git a/remove-bundle-electron.patch b/remove-bundle-electron.patch
index f1cdee423583..b6c624ec2a87 100644
--- a/remove-bundle-electron.patch
+++ b/remove-bundle-electron.patch
@@ -1,13 +1,18 @@
-diff --git a/package.json b/package.json
-index ed80ba9..7724d79 100644
---- a/package.json
-+++ b/package.json
-@@ -32,8 +32,6 @@
-   },
-   "homepage": "https://github.com/geeeeeeeeek/wechat-electron/",
+--- a/package.json	2018-09-04 19:04:11.268838831 +0200
++++ b/package.json	2018-09-04 19:27:47.045369310 +0200
+@@ -40,7 +40,6 @@
+   "originalhomepage": "https://github.com/geeeeeeeeek/wechat-electron/",
    "dependencies": {
--    "electron": "^1.4.15",
--    "electron-packager": "^8.5.1",
-     "nconf": "^0.8.4",
-     "pinyin": "^2.8.0",
-     "emojione": "^2.2.7",
+     "electron-localshortcut": "^3.1.0",
+-    "electron-packager": "^12.1.1",
+     "emojione": "^3.1.4",
+     "is-xfce": "^2.0.0",
+     "nconf": "^0.10.0",
+@@ -48,7 +47,6 @@
+   },
+   "devDependencies": {
+     "babel-eslint": "^8.2.3",
+-    "electron": "^2.0.8",
+     "eslint": "^4.19.1",
+     "eslint-config-airbnb": "^16.1.0",
+     "eslint-plugin-import": "^2.2.0",