2.14.4 git-based

2 files changed, 45 insertions, 48 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e95e8311e28c..4d4c9be2f960 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -10,6 +10,7 @@ pkgbase = eddie-ui
 	depends = mono
 	depends = openvpn
 	depends = sudo
+	depends = desktop-file-utils
 	depends = libnotify
 	depends = libappindicator-gtk2
 	optdepends = stunnel: VPN over SSL
@@ -17,10 +18,9 @@ pkgbase = eddie-ui
 	provides = eddie-ui
 	conflicts = airvpn
 	conflicts = airvpn-beta-bin
-	source_i686 = eddie-ui_linux_x86_debian_2.14.4.deb::https://eddie.website/download/?platform=linux&arch=x86&ui=ui&format=debian.deb&version=experimental
-	md5sums_i686 = 91b6c9c1acb8e3b6cdef7c3e63eb1617
-	source_x86_64 = eddie-ui_linux_x64_debian_2.14.4.deb::https://eddie.website/download/?platform=linux&arch=x64&ui=ui&format=debian.deb&version=experimental
-	md5sums_x86_64 = cae507d21b3417e3f0a76c9d1dfbff7d
+	conflicts = airvpn-git
+	source = git+https://github.com/AirVPN/Eddie.git
+	sha1sums = SKIP
 
 pkgname = eddie-ui
 
diff --git a/PKGBUILD b/PKGBUILD
index f2fac82dff97..866ff3efcd16 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,5 @@
 # Maintainer: Eddie.website <maintainer@eddie.website>
-# Based on work by Uncle Hunto - https://aur.archlinux.org/account/uncle
+# Based on work by Uncle Hunto <unclehunto äτ ÝãΗ00 Ð0τ ÇÖΜ> and Beini <bane aτ iki dot fi>
 
 pkgname=eddie-ui
 pkgver=2.14.4
@@ -8,63 +8,60 @@ pkgdesc='Eddie - OpenVPN UI'
 arch=('i686' 'x86_64')
 url=https://eddie.website
 license=(GPL3)
-depends=(mono openvpn sudo libnotify libappindicator-gtk2)
+depends=(mono openvpn sudo desktop-file-utils libnotify libappindicator-gtk2)
 optdepends=('stunnel: VPN over SSL' 'openssh: VPN over SSH')
 provides=('eddie-ui')
-conflicts=('airvpn' 'airvpn-beta-bin')
+conflicts=('airvpn' 'airvpn-beta-bin' 'airvpn-git')
 install=eddie-ui.install
-#source_i686=("eddie-ui_linux_x86_debian_${pkgver}.deb::https://eddie.website/download/?platform=linux&arch=x86&ui=ui&format=debian.deb&version=${pkgver}")
-#source_x86_64=("eddie-ui_linux_x64_debian_${pkgver}.deb::https://eddie.website/download/?platform=linux&arch=x64&ui=ui&format=debian.deb&version=${pkgver}")
-source_i686=("eddie-ui_linux_x86_debian_${pkgver}.deb::https://eddie.website/download/?platform=linux&arch=x86&ui=ui&format=debian.deb&version=experimental")
-source_x86_64=("eddie-ui_linux_x64_debian_${pkgver}.deb::https://eddie.website/download/?platform=linux&arch=x64&ui=ui&format=debian.deb&version=experimental")
+source=('git+https://github.com/AirVPN/Eddie.git')
+sha1sums=('SKIP')
 
-#md5sums_i686=('ff5f5d71fabd6f9dca0f1350449ecc17')
-#md5sums_x86_64=('b34bbe4571f3a3849eb53345a6a03c89')
-#sha256sums_i686=('19394ece88ceadc539cac159f96298919e94134bcaf78116be4b6d93035b9aea')
-#s256sums_hax86_64=('be5b1f941dae8265344da2d0d94847fd13c669bcfc5618d5d1af689138473406')
+case "$CARCH" in
+    i686) _pkgarch="x86"
+      ;;
+    x86_64) _pkgarch="x64"
+      ;;
+esac
 
-package() {
-  msg2 "Extracting the data.tar.lzma..."
-  bsdtar -xf data.tar.gz
+build() {
+  export TERM=xterm # Fix Mono bug "Magic number is wrong".
+  cd "Eddie"
+  xbuild /p:Configuration="Release" /p:Platform="$_pkgarch" src/eddie2.linux.sln
+}
 
-  msg2 "Moving stuff in place..."
-  install -Dm755 "$srcdir/usr/lib/eddie-ui/Eddie-UI.exe"         "$pkgdir/usr/lib/eddie-ui/Eddie-UI.exe"
-  install -Dm644 "$srcdir/usr/lib/eddie-ui/Lib.Common.dll"     "$pkgdir/usr/lib/eddie-ui/Lib.Common.dll"
-  install -Dm644 "$srcdir/usr/lib/eddie-ui/Lib.Core.dll"       "$pkgdir/usr/lib/eddie-ui/Lib.Core.dll"
-  install -Dm644 "$srcdir/usr/lib/eddie-ui/Lib.Forms.dll"      "$pkgdir/usr/lib/eddie-ui/Lib.Forms.dll"
-  install -Dm644 "$srcdir/usr/lib/eddie-ui/Lib.Platform.Linux.dll" \
-                 "$pkgdir/usr/lib/eddie-ui/Lib.Platform.Linux.dll"
-  install -Dm644 "$srcdir/usr/lib/eddie-ui/libLib.Platform.Linux.Native.so" \
-                 "$pkgdir/usr/lib/eddie-ui/libLib.Platform.Linux.Native.so"
-  install -Dm755 "$srcdir/usr/lib/eddie-ui/eddie_tray" "$pkgdir/usr/lib/eddie-ui/eddie_tray"
-  install -Dm755 "$srcdir/usr/lib/eddie-ui/update-resolv-conf" "$pkgdir/usr/lib/eddie-ui/update-resolv-conf"
-  install -Dm755 "$srcdir/usr/bin/eddie-ui"                    "$pkgdir/usr/bin/eddie-ui"
-  install -Dm644 "$srcdir/usr/share/eddie-ui/cacert.pem"       "$pkgdir/usr/share/eddie-ui/cacert.pem"
-  install -Dm644 "$srcdir/usr/share/eddie-ui/icon.png"       "$pkgdir/usr/share/eddie-ui/icon.png"
-  install -Dm644 "$srcdir/usr/share/eddie-ui/icon_gray.png"       "$pkgdir/usr/share/eddie-ui/icon_gray.png"
-  install -Dm644 "$srcdir/usr/share/doc/eddie-ui/changelog.Debian.gz" "$pkgdir/usr/share/doc/eddie-ui/changelog.gz"
-  install -Dm644 "$srcdir/usr/share/doc/eddie-ui/copyright"    "$pkgdir/usr/share/doc/eddie-ui/copyright"
-  install -Dm644 "$srcdir/usr/share/man/man8/eddie-ui.8.gz"    "$pkgdir/usr/share/man/man1/eddie-ui.8.gz"
-  install -Dm644 "$srcdir/usr/share/polkit-1/actions/com.eddie.linux.ui.policy" \
-                 "$pkgdir/usr/share/polkit-1/actions/com.eddie.linux.ui.policy"
+package() {
+  cd "Eddie"
+  install -Dm755 "src/App.Forms.Linux/bin/$_pkgarch/Release/App.Forms.Linux.exe" "$pkgdir/usr/lib/eddie-ui/Eddie-UI.exe"
+  install -Dm644 "src/App.Forms.Linux/bin/$_pkgarch/Release/Lib.Common.dll" "$pkgdir/usr/lib/eddie-ui/Lib.Common.dll"
+  install -Dm644 "src/App.Forms.Linux/bin/$_pkgarch/Release/Lib.Core.dll" "$pkgdir/usr/lib/eddie-ui/Lib.Core.dll"
+  install -Dm644 "src/App.Forms.Linux/bin/$_pkgarch/Release/Lib.Forms.dll" "$pkgdir/usr/lib/eddie-ui/Lib.Forms.dll"
+  install -Dm644 "src/App.Forms.Linux/bin/$_pkgarch/Release/Lib.Platform.Linux.dll" "$pkgdir/usr/lib/eddie-ui/Lib.Platform.Linux.dll"
+  install -Dm644 "deploy/linux_$_pkgarch/libLib.Platform.Linux.Native.so" "$pkgdir/usr/lib/eddie-ui/libLib.Platform.Linux.Native.so" # TOFIX: Compile from C sources.
+  install -Dm755 "deploy/linux_$_pkgarch/eddie_tray" "$pkgdir/usr/lib/eddie-ui/eddie_tray" # TOFIX: Compile from C sources.
+  install -Dm755 "deploy/linux_$_pkgarch/update-resolv-conf" "$pkgdir/usr/lib/eddie-ui/update-resolv-conf"
+  install -Dm755 "resources/debian/usr/bin/eddie-ui" "$pkgdir/usr/bin/eddie-ui"
+  install -Dm644 "common/cacert.pem"       "$pkgdir/usr/share/eddie-ui/cacert.pem"
+  install -Dm644 "common/icon.png"       "$pkgdir/usr/share/eddie-ui/icon.png"
+  install -Dm644 "common/icon_gray.png"       "$pkgdir/usr/share/eddie-ui/icon_gray.png"
+  # install -Dm644 "resources/opensuse/usr/share/doc/eddie-ui/changelog.Debian.gz" "$pkgdir/usr/share/doc/eddie-ui/changelog.gz" # TOFIX: Missing changelog generation
+  install -Dm644 "resources/opensuse/usr/share/doc/eddie-ui/copyright"    "$pkgdir/usr/share/doc/eddie-ui/copyright"
+  # install -Dm644 "resources/opensuse/usr/share/man/man8/eddie-ui.8.gz"    "$pkgdir/usr/share/man/man1/eddie-ui.8.gz" # TOFIX: Missing man generation
+  install -Dm644 "resources/opensuse/usr/share/polkit-1/actions/com.eddie.linux.ui.policy" "$pkgdir/usr/share/polkit-1/actions/com.eddie.linux.ui.policy"
+  install -Dm644 "resources/opensuse/usr/share/pixmaps/eddie-ui.png"  "$pkgdir/usr/share/pixmaps/eddie-ui.png"
 
   ## 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/eddie-ui.png"  "$pkgdir/usr/share/pixmaps/eddie-ui.png"
-    cp "$srcdir/usr/share/applications/eddie-ui.desktop" "$srcdir/eddie-ui.desktop"
     desktop-file-install -m 644 --set-comment="OpenVPN UI" \
     --dir="$pkgdir/usr/share/applications/" \
-    --set-icon="/usr/share/pixmaps/eddie-ui.png" "eddie-ui.desktop"
+    --set-icon="/usr/share/pixmaps/eddie-ui.png" \
+    "resources/opensuse/usr/share/applications/eddie-ui.desktop"
   else
-  msg2 "Installing desktop file..."
-  install -Dm644 "$srcdir/usr/share/pixmaps/eddie-ui.png"  "$pkgdir/usr/share/pixmaps/eddie-ui.png"
-  desktop-file-install -m 644 --set-comment="OpenVPN UI" \
-  --dir="$pkgdir/usr/share/applications/" "$srcdir/usr/share/applications/eddie-ui.desktop"
+    msg2 "Installing desktop file..."
+    desktop-file-install -m 644 --set-comment="OpenVPN UI" \
+    --dir="$pkgdir/usr/share/applications/" \
+    "resources/opensuse/usr/share/applications/eddie-ui.desktop"
   fi
 }
 
-
-md5sums_i686=('91b6c9c1acb8e3b6cdef7c3e63eb1617')
-md5sums_x86_64=('cae507d21b3417e3f0a76c9d1dfbff7d')