Update to 2.14.4

2 files changed, 17 insertions, 36 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 554c9974d9c5..5bfc26677588 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,28 +1,27 @@
 # Generated by mksrcinfo v8
-# Sun May  6 01:57:11 UTC 2018
+# Sun Jun  3 20:27:20 UTC 2018
 pkgbase = airvpn-beta-bin
 	pkgdesc = AirVPN client "Eddie" based on OpenVPN, beta version.
-	pkgver = 2.14.3
+	pkgver = 2.14.4
 	pkgrel = 1
 	url = https://airvpn.org/linux/
 	install = airvpn.install
-	arch = i686
 	arch = x86_64
 	license = GPL3
 	depends = mono
 	depends = openvpn
 	depends = curl
+	depends = libnotify
 	optdepends = stunnel: VPN over SSL
 	optdepends = openssh: VPN over SSH
+	optdepends = libappindicator-gtk2: Tray icon w/GTK 2
+	optdepends = libappindicator-gtk3: Tray icon w/GTK 3
 	provides = airvpn
 	conflicts = airvpn
 	conflicts = airvpn-bin
-	source_i686 = airvpn_linux_x86_debian_2.14.3_experimental.deb::https://airvpn.org/eddie/download/?platform=linux&arch=x86&ui=ui&format=debian.deb&version=experimental
-	md5sums_i686 = 4d3a98432e5d693cb50cb07c41480232
-	sha256sums_i686 = 60719a941ad74cdb200ad4f938fe0f8fe328d791ec29d6f0361f14f1805267b8
-	source_x86_64 = airvpn_linux_x64_debian_2.14.3_experimental.deb::https://airvpn.org/eddie/download/?platform=linux&arch=x64&ui=ui&format=debian.deb&version=experimental
-	md5sums_x86_64 = da67e17b8f98702801e635a112cd71a6
-	sha256sums_x86_64 = e727591fdc5411ccaad12c780ba05413a9285ad7e95f46aa96151cbe4fedbffe
+	source_x86_64 = eddie-ui_2.14.4_linux_x64_debian_experimental.tar.xz::https://eddie.website/download/?platform=linux&arch=x64&ui=ui&format=debian.deb&version=experimental
+	md5sums_x86_64 = cae507d21b3417e3f0a76c9d1dfbff7d
+	sha256sums_x86_64 = fb1587250b2552d6bfabea7b138fa67dfc784cadc89dd3e7df2313500bd8a2de
 
 pkgname = airvpn-beta-bin
 
diff --git a/PKGBUILD b/PKGBUILD
index 7adfa5f00109..fe7f5577e689 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,23 +1,21 @@
 # Maintainer: Uncle Hunto <unclehunto äτ ÝãΗ00 Ð0τ ÇÖΜ>
 
 pkgname=airvpn-beta-bin
-pkgver=2.14.3
+pkgver=2.14.4
 pkgrel=1
 pkgdesc='AirVPN client "Eddie" based on OpenVPN, beta version.'
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url=https://airvpn.org/linux/
 license=(GPL3)
-depends=(mono openvpn curl)
-optdepends=('stunnel: VPN over SSL' 'openssh: VPN over SSH')
+depends=(mono openvpn curl libnotify)
+optdepends=('stunnel: VPN over SSL' 'openssh: VPN over SSH' 'libappindicator-gtk2: Tray icon w/GTK 2' 'libappindicator-gtk3: Tray icon w/GTK 3')
 provides=('airvpn')
 conflicts=('airvpn' 'airvpn-bin')
 install=airvpn.install
-source_i686=("airvpn_linux_x86_debian_${pkgver}_experimental.deb"::'https://airvpn.org/eddie/download/?platform=linux&arch=x86&ui=ui&format=debian.deb&version=experimental')
-source_x86_64=("airvpn_linux_x64_debian_${pkgver}_experimental.deb"::'https://airvpn.org/eddie/download/?platform=linux&arch=x64&ui=ui&format=debian.deb&version=experimental')
-md5sums_i686=('4d3a98432e5d693cb50cb07c41480232')
-md5sums_x86_64=('da67e17b8f98702801e635a112cd71a6')
-sha256sums_i686=('60719a941ad74cdb200ad4f938fe0f8fe328d791ec29d6f0361f14f1805267b8')
-sha256sums_x86_64=('e727591fdc5411ccaad12c780ba05413a9285ad7e95f46aa96151cbe4fedbffe')
+source_i686=("eddie-ui_${pkgver}_linux_x86_debian_experimental.deb"::'https://eddie.website/download/?platform=linux&arch=x86&ui=ui&format=debian.deb&version=experimental')
+source_x86_64=("eddie-ui_${pkgver}_linux_x64_debian_experimental.tar.xz"::'https://eddie.website/download/?platform=linux&arch=x64&ui=ui&format=debian.deb&version=experimental')
+md5sums_x86_64=('cae507d21b3417e3f0a76c9d1dfbff7d')
+sha256sums_x86_64=('fb1587250b2552d6bfabea7b138fa67dfc784cadc89dd3e7df2313500bd8a2de')
 
 package() {
   cd "$srcdir"
@@ -25,24 +23,8 @@ package() {
   bsdtar -xf "$srcdir/data.tar.gz"
 
   msg2 "Moving stuff in place..."
-  for _file in usr/{bin/*,lib/AirVPN/*,share/{AirVPN/*,doc/airvpn/*,man/man8/*}}; do
+  for _file in usr/{bin/*,lib/eddie-ui/*,share/{applications/*,doc/eddie-ui/*,eddie-ui/*,man/man8/*,pixmaps/*,polkit-1/actions/*}}; do
     _octal=$(stat -c "%a" "$_file")
     install -Dm"${_octal}" "$_file" "${pkgdir}/$_file"
   done
-
-  ## Fix .desktop file for KDE
-  _desktop_session=$(printf "%s" "$DESKTOP_SESSION" | awk -F "/" '{print $NF}')
-  if [ "$_desktop_session" = "plasma" ]; then
-    msg2 "Installing desktop file for KDE..."
-    install -Dm644 "$srcdir/usr/share/pixmaps/AirVPN.png"  "$pkgdir/usr/share/pixmaps/airvpn.png"
-    cp "$srcdir/usr/share/applications/AirVPN.desktop" "$srcdir/airvpn.desktop"
-    desktop-file-install -m 644 --set-comment="VPN service based on OpenVPN"\
-    --dir="$pkgdir/usr/share/applications/" \
-    --set-icon="/usr/share/pixmaps/airvpn.png" "$srcdir/airvpn.desktop"
-  else
-    msg2 "Installing desktop file..."
-    install -Dm644 "$srcdir/usr/share/pixmaps/AirVPN.png"  "$pkgdir/usr/share/pixmaps/AirVPN.png"
-    desktop-file-install -m 644 --set-comment="VPN service based on OpenVPN"\
-    --dir="$pkgdir/usr/share/applications/" "$srcdir/usr/share/applications/AirVPN.desktop"
-  fi
 }