2.21.6

2 files changed, 32 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 83168e9e7ff9..b41ed1a11fe7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = eddie-ui
 	pkgdesc = Eddie - VPN tunnel - UI
-	pkgver = 2.20.0
+	pkgver = 2.21.6
 	pkgrel = 1
 	url = https://eddie.website
 	install = eddie-ui.install
@@ -20,8 +20,7 @@ pkgbase = eddie-ui
 	conflicts = airvpn
 	conflicts = airvpn-beta-bin
 	conflicts = airvpn-git
-	source = https://github.com/AirVPN/Eddie/archive/2.20.0.tar.gz
-	sha1sums = c059e1e2ffc4ee16c86de9ac79ec037ba6ec5e65
+	source = https://github.com/AirVPN/Eddie/archive/2.21.6.tar.gz
+	sha1sums = c63513cd1da4adf2ba109c3334221d66170b226f
 
 pkgname = eddie-ui
-
diff --git a/PKGBUILD b/PKGBUILD
index af80f1754db3..cc837843d443 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Based on work by Uncle Hunto <unclehunto äτ ÝãΗ00 Ð0τ ÇÖΜ> and Beini <bane aτ iki dot fi>
 
 pkgname=eddie-ui
-pkgver=2.20.0
+pkgver=2.21.6
 pkgrel=1
 pkgdesc='Eddie - VPN tunnel - UI'
 arch=('i686' 'x86_64')
@@ -14,8 +14,8 @@ makedepends=('cmake')
 provides=('eddie-ui')
 conflicts=('airvpn' 'airvpn-beta-bin' 'airvpn-git')
 install=eddie-ui.install
-source=('https://github.com/AirVPN/Eddie/archive/2.20.0.tar.gz')
-sha1sums=('c059e1e2ffc4ee16c86de9ac79ec037ba6ec5e65')
+source=('https://github.com/AirVPN/Eddie/archive/2.21.6.tar.gz')
+sha1sums=('c63513cd1da4adf2ba109c3334221d66170b226f')
 
 case "$CARCH" in
     i686) _pkgarch="x86"
@@ -28,21 +28,29 @@ build() {
   export TERM=xterm # Fix Mono bug "Magic number is wrong".
 
   # Compile C# sources
+  # Forced target framework, otherwise throw
+  # warning : TargetFrameworkVersion 'v4.8' not supported by this toolset (ToolsVersion: 14.0).
+  # even on recent Manjaro (updated 2022-04-19)
+
+  # throw
+  # xbuild tool is deprecated and will be removed in future updates, use msbuild instead
+  # but never understand right dependencies that works on every Arch distro
   cd "Eddie-$pkgver"
   if [ "ui" = "cli" ]; then
-    xbuild /verbosity:minimal /p:Configuration="Release" /p:Platform="$_pkgarch" src/eddie.linux.cli.sln
+    xbuild /verbosity:minimal /p:TargetFrameworkVersion="v4.5" /p:Configuration="Release" /p:Platform="$_pkgarch" src/eddie.linux.cli.sln
   elif [ "ui" = "ui" ]; then
-    xbuild /verbosity:minimal /p:Configuration="Release" /p:Platform="$_pkgarch" src/eddie2.linux.ui.sln
+    xbuild /verbosity:minimal /p:TargetFrameworkVersion="v4.5" /p:Configuration="Release" /p:Platform="$_pkgarch" src/eddie2.linux.ui.sln
   fi
 
   # Compile C sources (Tray)
-  if [ "ui" = "ui" ]; then
-    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 ../..
-  fi
+  # Removed in 2.21.5, compatibility issue
+  #if [ "ui" = "ui" ]; then
+  #  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 ../..
+  #fi
 
   # Compile C sources
   chmod +x src/eddie.linux.postbuild.sh
@@ -63,6 +71,9 @@ package() {
   install -Dm644 "src/Lib.Platform.Linux.Native/bin/libLib.Platform.Linux.Native.so" "$pkgdir/usr/lib/eddie-ui/libLib.Platform.Linux.Native.so"  
   install -Dm755 "repository/linux_arch/bundle/eddie-ui/usr/bin/eddie-ui" "$pkgdir/usr/bin/eddie-ui"
   sed -i 's/{@lib}/lib/g' "$pkgdir/usr/bin/eddie-ui"
+  install -Dm644 "common/manifest.json"       "$pkgdir/usr/share/eddie-ui/manifest.json"
+  install -Dm644 "common/libraries.txt"       "$pkgdir/usr/share/eddie-ui/libraries.txt"
+  install -Dm644 "common/gpl3.txt"       "$pkgdir/usr/share/eddie-ui/gpl3.txt"
   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"
@@ -70,6 +81,9 @@ package() {
   install -Dm644 "common/icon_gray.png"       "$pkgdir/usr/share/eddie-ui/tray_gray.png"
   install -Dm644 "common/iso-3166.json"       "$pkgdir/usr/share/eddie-ui/iso-3166.json"
   install -Dm644 "common/lang/inv.json"       "$pkgdir/usr/share/eddie-ui/lang/inv.json"
+  install -Dm644 "common/providers/AirVPN.json"       "$pkgdir/usr/share/eddie-ui/providers/AirVPN.json"
+  install -Dm644 "common/providers/OpenVPN.json"       "$pkgdir/usr/share/eddie-ui/providers/OpenVPN.json"
+  install -Dm644 "common/providers/WireGuard.json"       "$pkgdir/usr/share/eddie-ui/providers/WireGuard.json"
   install -Dm644 "repository/linux_arch/bundle/eddie-ui/usr/share/doc/eddie-ui/copyright"    "$pkgdir/usr/share/doc/eddie-ui/copyright"
   install -Dm644 "repository/linux_arch/bundle/eddie-ui/usr/share/polkit-1/actions/org.airvpn.eddie.ui.elevated.policy" "$pkgdir/usr/share/polkit-1/actions/org.airvpn.eddie.ui.elevated.policy"
   sed -i 's/{@lib}/lib/g' "$pkgdir/usr/share/polkit-1/actions/org.airvpn.eddie.ui.elevated.policy"  
@@ -79,11 +93,12 @@ package() {
   elif [ "ui" = "ui" ]; then
     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.Forms.dll" "$pkgdir/usr/lib/eddie-ui/Lib.Forms.dll"
-    install -Dm755 "src/UI.GTK.Linux.Tray/eddie-tray-strip" "$pkgdir/usr/lib/eddie-ui/eddie-tray"
+    install -Dm644 "src/App.Forms.Linux/bin/$_pkgarch/Release/Lib.Forms.Skin.dll" "$pkgdir/usr/lib/eddie-ui/Lib.Forms.Skin.dll"
+    #install -Dm755 "src/UI.GTK.Linux.Tray/eddie-tray-strip" "$pkgdir/usr/lib/eddie-ui/eddie-tray"
     install -Dm644 "repository/linux_arch/bundle/eddie-ui/usr/share/pixmaps/eddie-ui.png"  "$pkgdir/usr/share/pixmaps/eddie-ui.png"
   fi
 
-  # cp -r "common/webui"	"$pkgdir/usr/share/eddie-ui/webui"
+  # remember: the day when common/webui is need, i need a script that generate 'install' line above for each file, include dir is unresolved
 
   # Generate changelog
   curl "https://eddie.website/changelog/?software=client&format=debian&hidden=yes" -o "$pkgdir/usr/share/doc/eddie-ui/changelog"