ready

2 files changed, 32 insertions, 9 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4d4c9be2f960..98f7dbc063aa 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,13 @@
 pkgbase = eddie-ui
 	pkgdesc = Eddie - OpenVPN UI
-	pkgver = 2.14.4
+	pkgver = 2.14.5
 	pkgrel = 1
 	url = https://eddie.website
 	install = eddie-ui.install
 	arch = i686
 	arch = x86_64
 	license = GPL3
+	makedepends = cmake
 	depends = mono
 	depends = openvpn
 	depends = sudo
diff --git a/PKGBUILD b/PKGBUILD
index 866ff3efcd16..6c5428420b55 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,13 @@
 # Maintainer: Eddie.website <maintainer@eddie.website>
 # Based on work by Uncle Hunto <unclehunto äτ ÝãΗ00 Ð0τ ÇÖΜ> and Beini <bane aτ iki dot fi>
 
+# This current PKGUILD it's based on the latest GitHub commit.
+# Soon, it will be based on the latest STABLE GitHub version. 
+# The package "eddie-ui-git" is based on the latest GitHub commit (beta).
+# Pending work: man & changelog files generated automatically.
+
 pkgname=eddie-ui
-pkgver=2.14.4
+pkgver=2.14.5
 pkgrel=1
 pkgdesc='Eddie - OpenVPN UI'
 arch=('i686' 'x86_64')
@@ -10,6 +15,7 @@ url=https://eddie.website
 license=(GPL3)
 depends=(mono openvpn sudo desktop-file-utils libnotify libappindicator-gtk2)
 optdepends=('stunnel: VPN over SSL' 'openssh: VPN over SSH')
+makedepends=('cmake')
 provides=('eddie-ui')
 conflicts=('airvpn' 'airvpn-beta-bin' 'airvpn-git')
 install=eddie-ui.install
@@ -25,8 +31,24 @@ esac
 
 build() {
   export TERM=xterm # Fix Mono bug "Magic number is wrong".
+
+  # Compile C# sources
   cd "Eddie"
   xbuild /p:Configuration="Release" /p:Platform="$_pkgarch" src/eddie2.linux.sln
+
+  # Compile C sources (Tray)
+  cd src/UI.GTK.Linux.Tray
+  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_LIBRARY_OUTPUT_DIRECTORY=.  
+  make
+  strip -S --strip-unneeded -o eddie-tray-strip eddie_tray
+  cd ../..
+
+  # Compile C sources (Linux Native)
+  cd src/Lib.Platform.Linux.Native
+  cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_LIBRARY_OUTPUT_DIRECTORY=.
+  make
+  strip -S --strip-unneeded -o libLib.Platform.Linux.Native.strip.so libLib.Platform.Linux.Native.so
+  cd ../..
 }
 
 package() {
@@ -36,18 +58,18 @@ package() {
   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 -Dm644 "src/Lib.Platform.Linux.Native/libLib.Platform.Linux.Native.strip.so" "$pkgdir/usr/lib/eddie-ui/libLib.Platform.Linux.Native.so"
+  install -Dm755 "src/UI.GTK.Linux.Tray/eddie-tray-strip" "$pkgdir/usr/lib/eddie-ui/eddie-tray"
   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"
+  # install -Dm644 "resources/arch/usr/share/doc/eddie-ui/changelog.Debian.gz" "$pkgdir/usr/share/doc/eddie-ui/changelog.gz" # TOFIX: Missing changelog generation
+  install -Dm644 "resources/arch/usr/share/doc/eddie-ui/copyright"    "$pkgdir/usr/share/doc/eddie-ui/copyright"
+  # install -Dm644 "resources/arch/usr/share/man/man8/eddie-ui.8.gz"    "$pkgdir/usr/share/man/man1/eddie-ui.8.gz" # TOFIX: Missing man generation
+  install -Dm644 "resources/arch/usr/share/polkit-1/actions/org.airvpn.eddie.ui.policy" "$pkgdir/usr/share/polkit-1/actions/org.airvpn.eddie.ui.policy"
+  install -Dm644 "resources/arch/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}')