0.21.0

3 files changed, 25 insertions, 56 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 69289cde32d0..f58a41724bed 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,21 +1,23 @@
 pkgbase = webtorrent-desktop-bin
 	pkgdesc = Streaming torrent client.
-	pkgver = 0.20.0
+	pkgver = 0.21.0
 	pkgrel = 1
 	url = https://webtorrent.io/desktop
-	arch = i686
 	arch = x86_64
 	license = MIT
 	depends = gconf
+	depends = libnotify
 	provides = webtorrent-desktop
 	conflicts = webtorrent-desktop
 	conflicts = webtorrent-desktop-git
-	source = webtorrent-desktop.desktop
-	sha256sums = 4eba7b17fd0cd90f77fc1a1005f74d8fcd93dac4f669d1b1abbf71734b5bafa6
-	source_i686 = https://github.com/feross/webtorrent-desktop/releases/download/v0.20.0/WebTorrent-v0.20.0-linux-ia32.zip
-	sha256sums_i686 = 7f54dcb0b197f98aeca7508aa3d5279950a4bdf20fa718c22833200c78084251
-	source_x86_64 = https://github.com/feross/webtorrent-desktop/releases/download/v0.20.0/WebTorrent-v0.20.0-linux.zip
-	sha256sums_x86_64 = 4dd5de977791635741ee0bcf0de452f3d0e74d294a0a1b441c129463aa2636ac
+	source = https://github.com/webtorrent/webtorrent-desktop/releases/download/v0.21.0/WebTorrent-v0.21.0-linux.zip
+	source = https://github.com/webtorrent/webtorrent-desktop/raw/v0.21.0/static/linux/share/applications/webtorrent-desktop.desktop
+	source = 48x48.png::https://github.com/webtorrent/webtorrent-desktop/raw/v0.21.0/static/linux/share/icons/hicolor/48x48/apps/webtorrent-desktop.png
+	source = 256x256.png::https://github.com/webtorrent/webtorrent-desktop/raw/v0.21.0/static/linux/share/icons/hicolor/256x256/apps/webtorrent-desktop.png
+	sha256sums = e0305fef7fa0c8a753a9a061ae7a77294433c52c51308089b12a3df96652e60a
+	sha256sums = 8a99900eb1207d3ae278c943b95bd31a35ef8ad2fdcf3e1e664337dc176e26ec
+	sha256sums = e41e7e31e3116a7c665419d79ee7242520d0305454b26edc6a792da81337c903
+	sha256sums = d30ffbff61753c42239868f2d10feb89d24c6a5fc42fe5e117a5b373f7ee57b5
 
 pkgname = webtorrent-desktop-bin
 
diff --git a/PKGBUILD b/PKGBUILD
index ff5e944c5656..7eefa2f47847 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,34 +2,34 @@
 
 pkgname=webtorrent-desktop-bin
 _pkgname=webtorrent-desktop
-pkgver=0.20.0
+pkgver=0.21.0
 pkgrel=1
 pkgdesc="Streaming torrent client."
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="https://webtorrent.io/desktop"
 license=('MIT')
-depends=('gconf')
+depends=('gconf' 'libnotify')
 provides=('webtorrent-desktop')
 conflicts=('webtorrent-desktop' 'webtorrent-desktop-git')
-source=("${_pkgname}.desktop")
-source_i686=("https://github.com/feross/${_pkgname}/releases/download/v${pkgver}/WebTorrent-v${pkgver}-linux-ia32.zip")
-source_x86_64=("https://github.com/feross/${_pkgname}/releases/download/v${pkgver}/WebTorrent-v${pkgver}-linux.zip")
-sha256sums=('4eba7b17fd0cd90f77fc1a1005f74d8fcd93dac4f669d1b1abbf71734b5bafa6')
-sha256sums_i686=('7f54dcb0b197f98aeca7508aa3d5279950a4bdf20fa718c22833200c78084251')
-sha256sums_x86_64=('4dd5de977791635741ee0bcf0de452f3d0e74d294a0a1b441c129463aa2636ac')
-
-[ "$CARCH" = "i686" ]   && _platform=ia32
-[ "$CARCH" = "x86_64" ] && _platform=x64
+source=("https://github.com/webtorrent/${_pkgname}/releases/download/v${pkgver}/WebTorrent-v${pkgver}-linux.zip"
+        "https://github.com/webtorrent/${_pkgname}/raw/v${pkgver}/static/linux/share/applications/${_pkgname}.desktop"
+        "48x48.png::https://github.com/webtorrent/${_pkgname}/raw/v${pkgver}/static/linux/share/icons/hicolor/48x48/apps/${_pkgname}.png"
+        "256x256.png::https://github.com/webtorrent/${_pkgname}/raw/v${pkgver}/static/linux/share/icons/hicolor/256x256/apps/${_pkgname}.png")
+sha256sums=('e0305fef7fa0c8a753a9a061ae7a77294433c52c51308089b12a3df96652e60a'
+            '8a99900eb1207d3ae278c943b95bd31a35ef8ad2fdcf3e1e664337dc176e26ec'
+            'e41e7e31e3116a7c665419d79ee7242520d0305454b26edc6a792da81337c903'
+            'd30ffbff61753c42239868f2d10feb89d24c6a5fc42fe5e117a5b373f7ee57b5')
 
 package() {
   install -dm755 "${pkgdir}/usr/share"
   install -dm755 "${pkgdir}/usr/bin"
 
-  cp -a "WebTorrent-linux-${_platform}" "${pkgdir}/usr/share/${_pkgname}"
+  cp -a "WebTorrent-linux-x64" "${pkgdir}/usr/share/${_pkgname}"
   ln -s "/usr/share/${_pkgname}/WebTorrent" "${pkgdir}/usr/bin/${_pkgname}"
 
   install -Dm644 "${_pkgname}.desktop" "${pkgdir}/usr/share/applications/${_pkgname}.desktop"
-  install -Dm644 "WebTorrent-linux-${_platform}/resources/app.asar.unpacked/static/WebTorrent.png" "${pkgdir}/usr/share/icons/hicolor/256x256/apps/${_pkgname}.png"
+  install -Dm644 "48x48.png" "${pkgdir}/usr/share/icons/hicolor/48x48/apps/${_pkgname}.png"
+  install -Dm644 "256x256.png" "${pkgdir}/usr/share/icons/hicolor/256x256/apps/${_pkgname}.png"
 
-  install -Dm644 "WebTorrent-linux-${_platform}/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -Dm644 "WebTorrent-linux-x64/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/webtorrent-desktop.desktop b/webtorrent-desktop.desktop
deleted file mode 100644
index cdb87928d306..000000000000
--- a/webtorrent-desktop.desktop
+++ /dev/null
@@ -1,33 +0,0 @@
-[Desktop Entry]
-Name=WebTorrent
-Version=1.0
-GenericName=BitTorrent Client
-X-GNOME-FullName=WebTorrent
-Comment=Download and share files over BitTorrent
-Encoding=UTF-8
-Type=Application
-Icon=webtorrent-desktop
-Terminal=false
-Path=/usr/share/webtorrent-desktop
-Exec=/usr/bin/webtorrent-desktop %U
-TryExec=/usr/bin/webtorrent-desktop
-StartupNotify=false
-Categories=Network;FileTransfer;P2P;
-MimeType=application/x-bittorrent;x-scheme-handler/magnet;x-scheme-handler/stream-magnet;
-
-Actions=CreateNewTorrent;OpenTorrentFile;OpenTorrentAddress;
-
-[Desktop Action CreateNewTorrent]
-Name=Create New Torrent...
-Exec=/usr/bin/webtorrent-desktop -n
-Path=/usr/share/webtorrent-desktop
-
-[Desktop Action OpenTorrentFile]
-Name=Open Torrent File...
-Exec=/usr/bin/webtorrent-desktop -o
-Path=/usr/share/webtorrent-desktop
-
-[Desktop Action OpenTorrentAddress]
-Name=Open Torrent Address...
-Exec=/usr/bin/webtorrent-desktop -u
-Path=/usr/share/webtorrent-desktop