package now builds from source

4 files changed, 79 insertions, 16 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bdffad0faa90..b95ac3f186e0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,22 +1,24 @@
 pkgbase = mullvad-vpn-beta
-	pkgdesc = The Mullvad VPN client app for desktop (latest/beta release)
+	pkgdesc = The Mullvad VPN client app for desktop
 	pkgver = 2019.9.stable
-	pkgrel = 4
+	pkgrel = 5
 	url = https://www.mullvad.net
 	install = mullvad-vpn.install
 	arch = x86_64
 	license = GPL3
+	makedepends = git
+	makedepends = cargo
+	makedepends = npm
 	depends = libnotify
 	depends = libappindicator-gtk3
 	depends = libxss
 	depends = nss
 	provides = mullvad-vpn
 	conflicts = mullvad-vpn
-	source = https://github.com/mullvad/mullvadvpn-app/releases/download/2019.9/MullvadVPN-2019.9_amd64.deb
-	source = https://github.com/mullvad/mullvadvpn-app/releases/download/2019.9/MullvadVPN-2019.9_amd64.deb.asc
-	validpgpkeys = A1198702FC3E0A09A9AE5B75D5A1D4F266DE8DDF
-	sha256sums = 4ba5b1c87cb5afdadbcfb37413bdd7ea72df139dd01815e9ca0f1c54f81f03e1
+	source = git+https://github.com/mullvad/mullvadvpn-app.git#tag=2019.9
+	source = mullvad-vpn.desktop
 	sha256sums = SKIP
+	sha256sums = 121d90e6683e64d9c0d2dbb7b346fa918bdb37cf21fdaf9f66232304ed23abc2
 
 pkgname = mullvad-vpn-beta
 
diff --git a/.gitignore b/.gitignore
index 1eda0cac5061..deb98c4cc516 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,5 @@
 !.gitignore
 !PKGBUILD
 !.SRCINFO
+!mullvad-vpn.desktop
 !mullvad-vpn.install
diff --git a/PKGBUILD b/PKGBUILD
index e37b5e6d0a5d..532c7eaf7175 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,28 +1,79 @@
 # Maintainer: telans <telans@protonmail.com>
 # Co-Maintainer: yochananmarqos <yochanan.marqos@gmail.com>
-
 pkgname=mullvad-vpn-beta
 pkgver=2019.9.stable
 _pkgver=2019.9
-pkgrel=4
-pkgdesc="The Mullvad VPN client app for desktop (latest/beta release)"
+pkgrel=5
+pkgdesc="The Mullvad VPN client app for desktop"
 url="https://www.mullvad.net"
 arch=('x86_64')
 license=('GPL3')
 depends=('libnotify' 'libappindicator-gtk3' 'libxss' 'nss')
+makedepends=('git' 'cargo' 'npm')
 provides=("${pkgname%-beta}")
 conflicts=("${pkgname%-beta}")
 install="${pkgname%-beta}.install"
-source=("https://github.com/mullvad/mullvadvpn-app/releases/download/$_pkgver/MullvadVPN-${_pkgver}_amd64.deb"{,.asc})
-sha256sums=('4ba5b1c87cb5afdadbcfb37413bdd7ea72df139dd01815e9ca0f1c54f81f03e1'
-            'SKIP')
-validpgpkeys=('A1198702FC3E0A09A9AE5B75D5A1D4F266DE8DDF') # Mullvad (code signing) <admin@mullvad.net>
+source=("git+https://github.com/mullvad/mullvadvpn-app.git#tag=$_pkgver"
+        "${pkgname%-beta}.desktop")
+sha256sums=('SKIP'
+            '121d90e6683e64d9c0d2dbb7b346fa918bdb37cf21fdaf9f66232304ed23abc2')
+
+prepare() {
+	cd "$srcdir/mullvadvpn-app"
+	git submodule update --init --recursive
+}
+
+build() {
+	cd "$srcdir/mullvadvpn-app"
+
+	# Build mullvad-daemon
+	cargo build --release --locked
+
+	# Build Electron GUI app
+	cd gui
+	npm install --cache "$srcdir/npm-cache"
+}
+
+check() {
+	cd "$srcdir/mullvadvpn-app"
+	cargo test --release --locked
+
+	cd gui
+	npm test
+}
 
 package() {
-	tar -xvf data.tar.xz -C "$pkgdir"
+	cd "$srcdir/mullvadvpn-app"
+	install -dm755 "$pkgdir/opt/Mullvad VPN"
+	cp -a dist/linux-unpacked/* "$pkgdir/opt/Mullvad VPN"
+
+	install -Dm644 target/release/libtalpid_openvpn_plugin.so -t \
+		"$pkgdir/opt/Mullvad VPN/resources"
+	install -m755 target/release/{mullvad-daemon,mullvad-problem-report} -t \
+		"$pkgdir/opt/Mullvad VPN/resources"
+	install -Dm644 dist/linux-unpacked/resources/mullvad-daemon.service -t \
+		"$pkgdir/usr/lib/systemd/system"
+	install -Dm755 target/release/mullvad -t "$pkgdir/usr/bin"
+
+	ln -s "/opt/Mullvad VPN/resources/mullvad-problem-report" \
+		"$pkgdir/usr/bin/mullvad-problem-report"
 
 	ln -s "/opt/Mullvad VPN/mullvad-gui" "$pkgdir/usr/bin/${pkgname%-beta}"
 
-	install -Dm644 "$pkgdir/opt/Mullvad VPN/resources/mullvad-daemon.service" \
-		"$pkgdir/usr/lib/systemd/system/mullvad-daemon.service"
+	install -Dm644 "$srcdir/${pkgname%-beta}.desktop" -t \
+		"$pkgdir/usr/share/applications"
+
+	for icon_size in 16 48; do
+		icons_dir=/usr/share/icons/hicolor/${icon_size}x${icon_size}/apps
+		install -d $pkgdir/$icons_dir
+		install -m644 dist/.icon-set/icon_${icon_size}x${icon_size}.png \
+			$pkgdir$icons_dir/${pkgname%-beta}.png
+	done
+
+	for icon_size in 32 64 128 256 512 1024; do
+		icons_dir=/usr/share/icons/hicolor/${icon_size}x${icon_size}/apps
+		install -d $pkgdir/$icons_dir
+		install -m644 dist/.icon-set/icon_${icon_size}.png \
+			$pkgdir$icons_dir/${pkgname%-beta}.png
+	done
 }
diff --git a/mullvad-vpn.desktop b/mullvad-vpn.desktop
new file mode 100644
index 000000000000..0a407c85db4c
--- /dev/null
+++ b/mullvad-vpn.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Mullvad VPN
+Exec="/opt/Mullvad VPN/mullvad-vpn" %U
+Terminal=false
+Type=Application
+Icon=mullvad-vpn
+StartupWMClass=Mullvad VPN
+Comment=Mullvad VPN client
+Categories=Network;