Robin Candau pushed to branch main at Arch Linux / Packaging / Packages / protonmail-bridge
Commits: 423e3f27 by Robin Candau at 2024-06-07T11:01:47+02:00 upgpkg: 3.11.1-3: Fix binaries names and add some doc about the required testing env - - - - - 2 changed files: - .SRCINFO - PKGBUILD Changes: ===================================== .SRCINFO ===================================== @@ -1,7 +1,7 @@ pkgbase = protonmail-bridge pkgdesc = Integrate ProtonMail paid account with any program that supports IMAP and SMTP pkgver = 3.11.1 - pkgrel = 2 + pkgrel = 3 url = https://github.com/ProtonMail/proton-bridge arch = x86_64 license = GPL-3.0-only ===================================== PKGBUILD ===================================== @@ -1,4 +1,5 @@ # Maintainer: Carl Smedstad <car...@archlinux.org> +# Maintainer: Robin Candau <an...@archlinux.org> # Contributor: Ali Molaei <ali dot molaei at protonmail dot com> # Contributor: Ben Westover <me at benthetechguy dot net> # Contributor: Lenovsky <lenovsky at pm dot me> @@ -11,7 +12,7 @@ pkgname=( protonmail-bridge ) pkgver=3.11.1 -pkgrel=2 +pkgrel=3 pkgdesc="Integrate ProtonMail paid account with any program that supports IMAP and SMTP" arch=(x86_64) url="https://github.com/ProtonMail/proton-bridge" @@ -107,6 +108,8 @@ check() { cmake --build build --target bridgepp-test ./build/bridgepp/bridgepp-test + # These tests are expecting ports 1143 & 1144 (default and fallback ports for IMAP) and ports 1025 & 1026 (default and fallback ports for SMTP) to be free for some specific tests scenarios + # If those ports are already in use by any other service(s) (e.g. there's already a running protonmail-bridge instance on those default ports in your build env/machine), tests will fail go test ./... } @@ -127,7 +130,11 @@ package_protonmail-bridge-core() { install -Dm644 -t "$pkgdir/usr/share/doc/$pkgname" ./*.md install -Dm644 -t "$pkgdir/usr/lib/systemd/user" "$srcdir/protonmail-bridge.service" - install -Dm755 bridge "$pkgdir/usr/bin/protonmail-bridge-core" + + # The "core" bin is expected to be called "bridge" but that's a too generic name to have under /usr/bin (it conflicts with iproute2 for instance) + install -Dm755 bridge "$pkgdir/usr/lib/protonmail/bridge/bridge" + install -dm755 "$pkgdir/usr/bin/" + ln -s /usr/lib/protonmail/bridge/bridge "$pkgdir/usr/bin/protonmail-bridge-core" } package_protonmail-bridge() { @@ -154,5 +161,9 @@ package_protonmail-bridge() { install -Dm644 -t "$pkgdir/usr/share/applications" "$srcdir/protonmail-bridge.desktop" install -Dm644 dist/bridge.svg "$pkgdir/usr/share/icons/hicolor/scalable/apps/protonmail-bridge.svg" - install -Dm755 build/bridge-gui "$pkgdir/usr/bin/protonmail-bridge" + + # The "gui" bin is expected to be called "bridge-gui" but that's a too generic name to have under /usr/bin + install -Dm755 build/bridge-gui "$pkgdir/usr/lib/protonmail/bridge/bridge-gui" + install -dm755 "$pkgdir/usr/bin/" + ln -s /usr/lib/protonmail/bridge/bridge-gui "$pkgdir/usr/bin/protonmail-bridge" } View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/protonmail-bridge/-/commit/423e3f275ad14bb4e71e7b3d32a6980d806c7b36 -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/protonmail-bridge/-/commit/423e3f275ad14bb4e71e7b3d32a6980d806c7b36 You're receiving this email because of your account on gitlab.archlinux.org.