mullvad-vpn-slint: Enable tray-icon feature

Dockerfile

@@ -1,55 +1,20 @@
-FROM alpine:3.21
+FROM alpine:edge
 
 # Install build dependencies
 # TODO: trim dependencies?
 RUN apk update && apk add \
-  build-base abuild \
-	rustup \
   build-base \
-  musl-dev \
-  gcc \
-  cmake \
-  make \
-  pkgconfig \
-  perl \
-  python3 \
-  curl \
+  abuild \
   git \
-  llvm \
-  clang \
-  clang-libclang \
+	rustup \
+  musl-dev \
+  pkgconfig \
   protobuf-dev \
-  libc-dev \
-  linux-headers \
-  freetype-dev \
-  freetype-static \
-  fontconfig-dev \
-  fontconfig-static \
-  bzip2-dev \
-  bzip2-static \
-  brotli-dev \
-  brotli-static \
-  expat-dev \
-  expat-static \
-  libx11-dev \
-  libxcursor-dev \
-  libxkbcommon-dev \
-  libxkbcommon-static \
-  wayland-dev \
-  wayland-libs-client \
-  wayland-libs-server \
-  wayland-static \
-  openssl-dev \
-  openssl-libs-static \
-  zlib-dev \
-  zlib-static \
-  libpng-dev \
-  libpng-static \
-  libwebp-dev \
-  libwebp-static \
-  tiff-dev \
-  libjpeg-turbo-dev \
-  libjpeg-turbo-static
+  protobuf-dev \
+  libmnl-dev \
+  libnftnl-dev \
+  dbus-dev \
+  fontconfig-dev
   
 RUN rustup-init -y --default-toolchain stable
 

docker-build.sh

@@ -0,0 +1,23 @@
+#!/bin/sh
+
+set -ex
+cd "$(dirname "$0")"
+
+package="$1"
+builder_image="mullvad-slint-musl-builder"
+. "$HOME/.abuild/abuild.conf"
+
+docker build . -f Dockerfile -t "$builder_image"
+docker run --rm \
+    -v "./$package":/build \
+    -v ./abuild.conf:/root/.abuild/abuild.conf:ro \
+    -v "$PACKAGER_PRIVKEY":/key.rsa:ro \
+    -v "$PACKAGER_PRIVKEY.pub":/key.rsa.pub:ro \
+    -v "$PACKAGER_PRIVKEY.pub":/etc/apk/keys/key.rsa.pub:ro \
+    -v ./target:/cargo-target \
+    -v ./packages:/root/packages \
+    -e "CARGO_TARGET_DIR=/cargo-target" \
+    -it \
+    "$builder_image" \
+    abuild -F
+

mullvad-vpn-daemon/APKBUILD

@@ -0,0 +1,75 @@
+# Contributor:
+# Maintainer: Joakim Hulthe <joakim@hulthe.net>
+pkgname=mullvad-vpn-daemon
+pkgver=2026.1_git
+pkgrel=0
+pkgdesc="Mullvad VPN GUI"
+url="https://mullvad.net/"
+arch="$(uname -m)"
+license="GPL-3-or-later"
+depends="
+"
+# TODO: dbus-dev? also Dockerfile
+# TODO: libmnl-dev? also Dockerfile
+# TODO: libnftnl-dev? also Dockerfile
+# TODO: git? also Dockerfile
+makedepends="
+  build-base
+	rustup
+  musl-dev
+  pkgconfig
+  git
+  protobuf-dev
+  libmnl-dev
+  libnftnl-dev
+  dbus-dev
+"
+checkdepends=""
+install=""
+subpackages=""
+source=""
+builddir="$srcdir/"
+options="net !check suid"
+
+_cargo_target_dir="${CARGO_TARGET_DIR:-$startdir/mullvadvpn-app/target}"
+
+build() {
+	# rustup-init -y --default-toolchain stable
+	source "$HOME/.cargo/env"
+
+	cd "$startdir/mullvadvpn-app"
+
+	local target="$(rustup +stable show active-toolchain | sed 's/^[^-]*-//' | grep -o "^[^ ]*")"
+
+	# * Force the `stable` toolchain since it's installed in the container.
+	#   We don't wan't to needlessly download rust while building.
+	# * Specify `--target` so that the final binary ends up in target/<target>/release.
+	cargo +stable build --release --locked \
+	    --target "$target" \
+	    -p mullvad-daemon \
+	    -p mullvad-cli \
+	    -p mullvad-exclude \
+	    -p mullvad-problem-report
+}
+
+package() {
+	local target="$(rustup +stable show active-toolchain | sed 's/^[^-]*-//' | grep -o "^[^ ]*")"
+
+	install -m755 -D "$_cargo_target_dir/$target/release/mullvad-daemon" \
+		"$pkgdir"/usr/bin/mullvad-daemon
+
+	install -m755 -D "$_cargo_target_dir/$target/release/mullvad" \
+		"$pkgdir"/usr/bin/mullvad
+
+  # TODO: setuid
+	install -m755 -D "$_cargo_target_dir/$target/release/mullvad-exclude" \
+		"$pkgdir"/usr/bin/mullvad-exclude
+
+	install -m755 -D "$_cargo_target_dir/$target/release/mullvad-problem-report" \
+		"$pkgdir"/usr/bin/mullvad-problem-report
+	chmod u+s "$pkgdir"/usr/bin/mullvad-problem-report
+
+	# TODO: systemd services
+	# TODO: pre/post(de)install-scripts
+}
+

mullvad-vpn-slint/APKBUILD

@@ -1,6 +1,6 @@
 # Contributor:
-# Maintainer:
-pkgname=mullvad-slint
+# Maintainer: Joakim Hulthe <joakim@hulthe.net>
+pkgname=mullvad-vpn-slint
 pkgver=2026.1_git
 pkgrel=0
 pkgdesc="Mullvad VPN GUI"
@@ -9,62 +9,24 @@ arch="$(uname -m)"
 license="GPL-3-or-later"
 # TODO: maybe depend on mullvad-vpn-daemon?
 depends="
-  freetype-dev
-  freetype-static
-  fontconfig-dev
-  fontconfig-static
-  bzip2-dev
-  bzip2-static
-  brotli-dev
-  brotli-static
-  expat-dev
-  expat-static
-  libx11-dev
-  libxcursor-dev
-  libxkbcommon-dev
-  libxkbcommon-static
-  wayland-dev
-  wayland-libs-client
-  wayland-libs-server
-  wayland-static
-  openssl-dev
-  openssl-libs-static
-  zlib-dev
-  zlib-static
-  libpng-dev
-  libpng-static
-  libwebp-dev
-  libwebp-static
-  tiff-dev
-  libjpeg-turbo-dev
-  libjpeg-turbo-static
 "
 makedepends="
-	rustup
   build-base
+	rustup
   musl-dev
-  gcc
-  cmake
-  make
   pkgconfig
-  perl
-  python3
-  curl
-  git
-  llvm
-  clang
-  clang-libclang
   protobuf-dev
-  libc-dev
-  linux-headers
+  fontconfig-dev
+  dbus-dev
 "
 checkdepends=""
 install=""
 subpackages=""
 source=""
 builddir="$srcdir/"
-options="net"
+options="net !check"
 
+_cargo_target_dir="${CARGO_TARGET_DIR:-$startdir/mullvadvpn-app/target}"
 
 build() {
 	# rustup-init -y --default-toolchain stable
@@ -77,22 +39,19 @@ build() {
 
 	# * Force the `stable` toolchain since it's installed in the container.
 	#   We don't wan't to needlessly download rust while building.
-	# * Disable `tray-icon` feature. (TODO: figure out how to compile with libdbus)
 	# * Specify `--target` so that the final binary ends up in target/<target>/release.
 	cargo +stable build --release --locked \
 	    --target "$target" \
-	    --no-default-features --features map \
 	    -p mullvad-slint
 }
 
 package() {
-	local cargo_target_dir="${CARGO_TARGET_DIR:-$startdir/mullvadvpn-app/target}"
 	local target="$(rustup +stable show active-toolchain | sed 's/^[^-]*-//' | grep -o "^[^ ]*")"
 
 	# TODO: .desktop
 	# TODO: icon
 
-	install -m755 -D "$cargo_target_dir/$target/release/$pkgname" \
-		"$pkgdir"/usr/bin/"$pkgname"
+	install -m755 -D "$_cargo_target_dir/$target/release/mullvad-slint" \
+		"$pkgdir"/usr/bin/mullvad-slint
 }