upgpkg

5 files changed, 54 insertions, 55 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 41e9d1aed464..5ec1691990e4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,9 @@
 # Generated by mksrcinfo v8
-# Fri Feb  3 15:23:36 UTC 2017
+# Mon Feb 13 14:33:14 UTC 2017
 pkgbase = electronic-wechat
 	pkgdesc = A better WeChat client
-	pkgver = 1.4.0
-	pkgrel = 3
+	pkgver = 2.0
+	pkgrel = 1
 	url = https://github.com/geeeeeeeeek/electronic-wechat
 	arch = x86_64
 	license = custom
@@ -11,12 +11,14 @@ pkgbase = electronic-wechat
 	makedepends = npm
 	makedepends = imagemagick
 	depends = electron
-	source = git+https://github.com/geeeeeeeeek/electronic-wechat.git#tag=v1.4.0
-	source = electronic-wechat.desktop.in
-	source = electronic-wechat.sh.in
+	source = git+https://github.com/geeeeeeeeek/electronic-wechat.git#tag=v2.0
+	source = electronic-wechat.desktop
+	source = remove-bundle-electron.patch
+	source = electronic-wechat.sh
 	sha256sums = SKIP
-	sha256sums = 192d2b31d8faa30142cffecb56352198a316e62b88703f5d3216acdcf76f6730
-	sha256sums = f2f2dc7e81e2f16cff2936f8694af8f02d089ff69236a95b9dc954695d9d69e9
+	sha256sums = 56c0db46c3b9fc31ac16265d0346ef47a6422392607bcce954e0f550894475be
+	sha256sums = e6db14369ebd0071f9c9302aab0eed07fd4eff67375c522e03b3b6eb800f2891
+	sha256sums = dddbd40a98fdfa47728fadaceda35a5ac38f59fd1be4fde2cbdaaf309d4e6bf1
 
 pkgname = electronic-wechat
 
diff --git a/PKGBUILD b/PKGBUILD
index a31be5a2f734..30c5384aa7bf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,8 +2,8 @@
 # Maintainer: hexchain <i at hexchain.org>
 
 pkgname=electronic-wechat
-pkgver=1.4.0
-pkgrel=3
+pkgver=2.0
+pkgrel=1
 pkgdesc="A better WeChat client"
 arch=('x86_64')
 url="https://github.com/geeeeeeeeek/electronic-wechat"
@@ -12,46 +12,22 @@ depends=('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'
+    'electronic-wechat.desktop'
+    'remove-bundle-electron.patch'
+    'electronic-wechat.sh'
 )
 
 prepare() {
-    cd "$srcdir"
-    sed "s|@@VERSION@@|$pkgver|" electronic-wechat.desktop.in > electronic-wechat.desktop
-
-#    cd "$srcdir/$pkgname"
-#    patch -p1 < "$srcdir/remove-bundle-electron.patch"
+    cd "$srcdir/$pkgname"
+    patch -p1 < "$srcdir/remove-bundle-electron.patch"
 }
 
 build() {
     cd "$srcdir/$pkgname"
     npm install
-    npm run build:linux64
+    # npm run build:linux64
 }
 
-# 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/"
-#     rm -rf scripts
-#     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"
-# }
-
 package() {
     cd "$srcdir"
     install -Dm644 electronic-wechat.desktop -t "$pkgdir/usr/share/applications/"
@@ -66,14 +42,36 @@ package() {
         convert assets/icon.png -resize ${size}x${size} "$target/$pkgname.png"
     done
 
-    cd "$srcdir/$pkgname/dist/electronic-wechat-linux-x64/"
+    cd "$srcdir/$pkgname/"
+    rm -rf scripts
     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/"
+    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'
-            '192d2b31d8faa30142cffecb56352198a316e62b88703f5d3216acdcf76f6730'
-            'f2f2dc7e81e2f16cff2936f8694af8f02d089ff69236a95b9dc954695d9d69e9')
+            '56c0db46c3b9fc31ac16265d0346ef47a6422392607bcce954e0f550894475be'
+            'e6db14369ebd0071f9c9302aab0eed07fd4eff67375c522e03b3b6eb800f2891'
+            'dddbd40a98fdfa47728fadaceda35a5ac38f59fd1be4fde2cbdaaf309d4e6bf1')
diff --git a/electronic-wechat.desktop.in b/electronic-wechat.desktop
index b308bbaf5ab7..a3df9c5d4b2e 100644
--- a/electronic-wechat.desktop.in
+++ b/electronic-wechat.desktop
@@ -7,4 +7,3 @@ Icon=electronic-wechat
 Categories=Network;InstantMessaging;Application;
 Terminal=false
 StartupNotify=true
-Version=@@VERSION@@
diff --git a/electronic-wechat.sh.in b/electronic-wechat.sh
index 9493d14191a1..3e8c8eaa76c2 100644..100755
--- a/electronic-wechat.sh.in
+++ b/electronic-wechat.sh
@@ -4,4 +4,4 @@ PACKAGE_NAME="electronic-wechat"
 EW_DIR="/usr/lib/$PACKAGE_NAME"
 
 cd "$EW_DIR" || exit 1
-exec electronic-wechat "$@"
+exec electron . "$@"
diff --git a/remove-bundle-electron.patch b/remove-bundle-electron.patch
index 8509c07be58c..f1cdee423583 100644
--- a/remove-bundle-electron.patch
+++ b/remove-bundle-electron.patch
@@ -1,13 +1,13 @@
 diff --git a/package.json b/package.json
-index c332e96..3ae031e 100644
+index ed80ba9..7724d79 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"
-   }
- }
+-    "electron": "^1.4.15",
+-    "electron-packager": "^8.5.1",
+     "nconf": "^0.8.4",
+     "pinyin": "^2.8.0",
+     "emojione": "^2.2.7",