Skip to content

protonmail-bridge: update to 3.21.2. #58510

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
WillC33 wants to merge 1 commit into from
+19 −16
Closed

protonmail-bridge: update to 3.21.2. #58510

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 0 additions & 7 deletions srcpkgs/protonmail-bridge/patches/no-gui-tester.patch
View file
Open in desktop

This file was deleted.

10 changes: 10 additions & 0 deletions srcpkgs/protonmail-bridge/patches/qt610-deploy-script.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
--- a/internal/frontend/bridge-gui/bridge-gui/CMakeLists.txt
+++ b/internal/frontend/bridge-gui/bridge-gui/CMakeLists.txt
@@ -172,7 +172,7 @@ install(TARGETS bridge-gui
)
qt_generate_deploy_app_script(
TARGET bridge-gui
- FILENAME_VARIABLE deploy_script
+ OUTPUT_SCRIPT deploy_script
NO_UNSUPPORTED_PLATFORM_ERROR)
if(UNIX AND NOT APPLE)
11 changes: 5 additions & 6 deletions srcpkgs/protonmail-bridge/patches/system-icu.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
--- a/internal/frontend/bridge-gui/bridge-gui/DeployLinux.cmake.orig
--- a/internal/frontend/bridge-gui/bridge-gui/DeployLinux.cmake
+++ b/internal/frontend/bridge-gui/bridge-gui/DeployLinux.cmake
@@ -54,9 +54,9 @@
AppendQt6Lib("libQt6Core.so.6")
@@ -54,9 +54,9 @@ AppendQt6Lib("libQt6Core.so.6")
AppendQt6Lib("libQt6QuickTemplates2.so.6")
AppendQt6Lib("libQt6DBus.so.6")
-AppendQt6Lib("libicui18n.so.56")
-AppendQt6Lib("libicuuc.so.56")
-AppendQt6Lib("libicudata.so.56")
-AppendQt6Lib("libicui18n.so.73")
-AppendQt6Lib("libicuuc.so.73")
-AppendQt6Lib("libicudata.so.73")
+AppendQt6Lib("libicui18n.so")
+AppendQt6Lib("libicuuc.so")
+AppendQt6Lib("libicudata.so")
Expand Down
7 changes: 4 additions & 3 deletions srcpkgs/protonmail-bridge/template
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Template file for 'protonmail-bridge'
pkgname=protonmail-bridge
version=3.12.0
revision=3
version=3.21.2
revision=1
archs="x86_64* aarch64* riscv64*"
build_style=cmake
build_helper=qmake6
Expand All @@ -25,12 +25,13 @@ maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="https://proton.me/mail/bridge"
distfiles="https://github.com/ProtonMail/proton-bridge/archive/refs/tags/v${version}.tar.gz"
checksum=4215fd1848fff262da55194270f495e19722cdf8bbf98dbe3ca4ff5ca5aa4a1f
checksum=d6c373f219d7351b18277061faab24cd677c28ea4398de5c48f752e7a14f1c2a
nopie_files="/usr/libexec/protonmail/bridge"
nocross="protobuf generation fails"

post_patch() {
vsed -i -e 's/^Exec=.*$/Exec=protonmail-bridge-gui/' "$wrksrc"/dist/proton-bridge.desktop
vsed -i -e '/include(Deploy.*\.cmake)/d' "$wrksrc"/internal/frontend/bridge-gui/bridge-gui/CMakeLists.txt
}

pre_build() {
Expand Down
Loading