4 Commits

Author SHA1 Message Date
0a93fe0370 Bump submodules to 27f4b024 2026-03-31 17:26:34 +02:00
b13eac38f9 Update submodules 2026-03-30 14:52:10 +02:00
Joakim Hulthe
c92f4fbf84 Mount CARGO_HOME into build container 2026-03-30 14:46:21 +02:00
7650a60fa6 mullvad-vpn-slint: Package .desktop and icons 2026-03-30 14:38:10 +02:00
5 changed files with 43 additions and 7 deletions

View File

@@ -5,6 +5,7 @@ cd "$(dirname "$0")"
package="$1" package="$1"
builder_image="mullvad-slint-musl-builder" builder_image="mullvad-slint-musl-builder"
cargo_home="${CARGO_HOME:-$HOME/.cargo}"
. "$HOME/.abuild/abuild.conf" . "$HOME/.abuild/abuild.conf"
docker build . -f Dockerfile -t "$builder_image" docker build . -f Dockerfile -t "$builder_image"
@@ -14,8 +15,10 @@ docker run --rm \
-v "$PACKAGER_PRIVKEY":/key.rsa:ro \ -v "$PACKAGER_PRIVKEY":/key.rsa:ro \
-v "$PACKAGER_PRIVKEY.pub":/key.rsa.pub:ro \ -v "$PACKAGER_PRIVKEY.pub":/key.rsa.pub:ro \
-v "$PACKAGER_PRIVKEY.pub":/etc/apk/keys/key.rsa.pub:ro \ -v "$PACKAGER_PRIVKEY.pub":/etc/apk/keys/key.rsa.pub:ro \
-v ./target:/cargo-target \
-v ./packages:/root/packages \ -v ./packages:/root/packages \
-v "$cargo_home":/cargo-home \
-e "CARGO_HOME=/cargo-home" \
-v ./target:/cargo-target \
-e "CARGO_TARGET_DIR=/cargo-target" \ -e "CARGO_TARGET_DIR=/cargo-target" \
-it \ -it \
"$builder_image" \ "$builder_image" \

View File

@@ -48,10 +48,40 @@ build() {
package() { package() {
local target="$(rustup +stable show active-toolchain | sed 's/^[^-]*-//' | grep -o "^[^ ]*")" local target="$(rustup +stable show active-toolchain | sed 's/^[^-]*-//' | grep -o "^[^ ]*")"
# TODO: .desktop # Executable
# TODO: icon
install -m755 -D "$_cargo_target_dir/$target/release/mullvad-slint" \ install -m755 -D "$_cargo_target_dir/$target/release/mullvad-slint" \
"$pkgdir"/usr/bin/mullvad-slint "$pkgdir"/usr/bin/mullvad-slint
# .desktop file
install -m644 -D "$startdir/mullvadvpn-app/dist-assets/linux/slint/mullvad-vpn-slint.desktop" \
"$pkgdir"/usr/share/applications/mullvad-vpn-slint.desktop
# Icons
install -m644 -D "$startdir/mullvadvpn-app/dist-assets/linux/slint/icon_1_16x16x32.png" \
"$pkgdir"/usr/share/icons/hicolor/16x16/apps/mullvad.png
install -m644 -D "$startdir/mullvadvpn-app/dist-assets/linux/slint/icon_2_20x20x32.png" \
"$pkgdir"/usr/share/icons/hicolor/20x20/apps/mullvad.png
install -m644 -D "$startdir/mullvadvpn-app/dist-assets/linux/slint/icon_3_24x24x32.png" \
"$pkgdir"/usr/share/icons/hicolor/24x24/apps/mullvad.png
install -m644 -D "$startdir/mullvadvpn-app/dist-assets/linux/slint/icon_5_30x30x32.png" \
"$pkgdir"/usr/share/icons/hicolor/30x30/apps/mullvad.png
install -m644 -D "$startdir/mullvadvpn-app/dist-assets/linux/slint/icon_6_32x32x32.png" \
"$pkgdir"/usr/share/icons/hicolor/32x32/apps/mullvad.png
install -m644 -D "$startdir/mullvadvpn-app/dist-assets/linux/slint/icon_7_36x36x32.png" \
"$pkgdir"/usr/share/icons/hicolor/36x36/apps/mullvad.png
install -m644 -D "$startdir/mullvadvpn-app/dist-assets/linux/slint/icon_8_40x40x32.png" \
"$pkgdir"/usr/share/icons/hicolor/40x40/apps/mullvad.png
install -m644 -D "$startdir/mullvadvpn-app/dist-assets/linux/slint/icon_9_48x48x32.png" \
"$pkgdir"/usr/share/icons/hicolor/48x48/apps/mullvad.png
install -m644 -D "$startdir/mullvadvpn-app/dist-assets/linux/slint/icon_12_64x64x32.png" \
"$pkgdir"/usr/share/icons/hicolor/64x64/apps/mullvad.png
install -m644 -D "$startdir/mullvadvpn-app/dist-assets/linux/slint/icon_13_72x72x32.png" \
"$pkgdir"/usr/share/icons/hicolor/72x72/apps/mullvad.png
install -m644 -D "$startdir/mullvadvpn-app/dist-assets/linux/slint/icon_15_96x96x32.png" \
"$pkgdir"/usr/share/icons/hicolor/96x96/apps/mullvad.png
install -m644 -D "$startdir/mullvadvpn-app/dist-assets/linux/slint/icon_4_256x256x32.png" \
"$pkgdir"/usr/share/icons/hicolor/256x256/apps/mullvad.png
install -m644 -D "$startdir/mullvadvpn-app/dist-assets/linux/slint/icon_10_512x512x32.png" \
"$pkgdir"/usr/share/icons/hicolor/512x512/apps/mullvad.png
} }

View File

@@ -5,6 +5,7 @@ cd "$(dirname "$0")"
package="$1" package="$1"
builder_image="mullvad-slint-musl-builder" builder_image="mullvad-slint-musl-builder"
cargo_home="${CARGO_HOME:-$HOME/.cargo}"
. "$HOME/.abuild/abuild.conf" . "$HOME/.abuild/abuild.conf"
podman build . -f Dockerfile -t "$builder_image" podman build . -f Dockerfile -t "$builder_image"
@@ -14,8 +15,10 @@ podman run --rm \
-v "$PACKAGER_PRIVKEY":/key.rsa:ro \ -v "$PACKAGER_PRIVKEY":/key.rsa:ro \
-v "$PACKAGER_PRIVKEY.pub":/key.rsa.pub:ro \ -v "$PACKAGER_PRIVKEY.pub":/key.rsa.pub:ro \
-v "$PACKAGER_PRIVKEY.pub":/etc/apk/keys/key.rsa.pub:ro \ -v "$PACKAGER_PRIVKEY.pub":/etc/apk/keys/key.rsa.pub:ro \
-v ./target:/cargo-target \
-v ./packages:/root/packages \ -v ./packages:/root/packages \
-v "$cargo_home":/cargo-home \
-e "CARGO_HOME=/cargo-home" \
-v ./target:/cargo-target \
-e "CARGO_TARGET_DIR=/cargo-target" \ -e "CARGO_TARGET_DIR=/cargo-target" \
-it \ -it \
"$builder_image" \ "$builder_image" \