Robin Candau pushed to branch main at Arch Linux / Packaging / Packages / protonmail-bridge
Commits: 80811ce2 by Robin Candau at 2024-10-24T16:08:19+02:00 upgpkg: 3.14.0-6: Add patches to fix startup crash with Qt 6.8 See https://github.com/ProtonMail/proton-bridge/issues/500 & https://github.com/ProtonMail/proton-bridge/pull/502 Fixes https://gitlab.archlinux.org/archlinux/packaging/packages/protonmail-bridge/-/issues/3 - - - - - 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.14.0 - pkgrel = 5 + pkgrel = 6 url = https://github.com/ProtonMail/proton-bridge arch = x86_64 license = GPL-3.0-only @@ -25,11 +25,15 @@ pkgbase = protonmail-bridge source = remove-vcpkg-dependency.patch source = remove-failing-test.patch source = fix-wayland-icon.patch::https://github.com/ProtonMail/proton-bridge/commit/75e7bba6e62ef4b0a58334f2bcc7c56b7769c69c.patch + source = fix-colorimage-crash-with-qt6.8.patch::https://github.com/ProtonMail/proton-bridge/commit/5615176ca9eb172f223bec9f85f8ca1d090c2686.patch + source = fix-name-clash-popupType-qt6.8.patch::https://github.com/ProtonMail/proton-bridge/commit/834a2f910a30086132d53004fd8f7d770925bdad.patch sha256sums = 14f08f3b2d01b0454979fd6a85b1cbcf3fa0864e272019653d86b75b6d7842ce sha256sums = d51fb6efde22354d84b894b979a685d06fcc9cf3040d999d1cd6ebf5242a5043 sha256sums = 436a9a293424fb7d48a8fd61fff7d63985dec56d6170cd2fbae24fe03ef98136 sha256sums = c3a72d39a76abf3ee1567c5c44aac130fb327f4f5c93e426fef7ae3b4bf7f04f sha256sums = 45a68688cf2a06539d60e3e35b112a67319c58c23c35ec4cf3712d2f0cb50cb2 + sha256sums = 7a96cf4a07c436e3abdb380cd94b4c705985f54c9aeb337b12d0d14c0fba041a + sha256sums = aa8abdeea5ae474cf41f325d6e104b9a7dfcf2a36b452c3b9caa67e66d1c1eb7 pkgname = protonmail-bridge-core pkgdesc = Integrate ProtonMail paid account with any program that supports IMAP and SMTP (core executable and daemon) ===================================== PKGBUILD ===================================== @@ -12,7 +12,7 @@ pkgname=( protonmail-bridge ) pkgver=3.14.0 -pkgrel=5 +pkgrel=6 pkgdesc="Integrate ProtonMail paid account with any program that supports IMAP and SMTP" arch=(x86_64) url="https://github.com/ProtonMail/proton-bridge"; @@ -40,12 +40,16 @@ source=( "remove-vcpkg-dependency.patch" "remove-failing-test.patch" "fix-wayland-icon.patch::$url/commit/75e7bba6e62ef4b0a58334f2bcc7c56b7769c69c.patch" + "fix-colorimage-crash-with-qt6.8.patch::$url/commit/5615176ca9eb172f223bec9f85f8ca1d090c2686.patch" + "fix-name-clash-popupType-qt6.8.patch::$url/commit/834a2f910a30086132d53004fd8f7d770925bdad.patch" ) sha256sums=('14f08f3b2d01b0454979fd6a85b1cbcf3fa0864e272019653d86b75b6d7842ce' 'd51fb6efde22354d84b894b979a685d06fcc9cf3040d999d1cd6ebf5242a5043' '436a9a293424fb7d48a8fd61fff7d63985dec56d6170cd2fbae24fe03ef98136' 'c3a72d39a76abf3ee1567c5c44aac130fb327f4f5c93e426fef7ae3b4bf7f04f' - '45a68688cf2a06539d60e3e35b112a67319c58c23c35ec4cf3712d2f0cb50cb2') + '45a68688cf2a06539d60e3e35b112a67319c58c23c35ec4cf3712d2f0cb50cb2' + '7a96cf4a07c436e3abdb380cd94b4c705985f54c9aeb337b12d0d14c0fba041a' + 'aa8abdeea5ae474cf41f325d6e104b9a7dfcf2a36b452c3b9caa67e66d1c1eb7') _archive="$_pkgbase" @@ -64,6 +68,11 @@ prepare() { # on Wayland patch --forward --strip 1 --input "$srcdir/fix-wayland-icon.patch" + # Fix ColorImage Qt crash & name clash with popupType + # to avoid startup crash with Qt 6.8 + patch --forward --strip 1 --input "$srcdir/fix-colorimage-crash-with-qt6.8.patch" + patch --forward --strip 1 --input "$srcdir/fix-name-clash-popupType-qt6.8.patch" + # Use system Qt rather than bundling it. cat /dev/null > internal/frontend/bridge-gui/bridge-gui/DeployLinux.cmake View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/protonmail-bridge/-/commit/80811ce2e3da12f4b2faf46488a640e461bb5b7e -- View it on GitLab: https://gitlab.archlinux.org/archlinux/packaging/packages/protonmail-bridge/-/commit/80811ce2e3da12f4b2faf46488a640e461bb5b7e You're receiving this email because of your account on gitlab.archlinux.org.
