From 80e0b6b97612c93f543eebd7fbbd900c6239d325 Mon Sep 17 00:00:00 2001 From: Aditya Alok Date: Sat, 16 Apr 2022 16:18:17 +0530 Subject: [PATCH] feat(proton-bridge): enable auto-update, upgrade to 2.1.3 Signed-off-by: Aditya Alok --- packages/proton-bridge/build.sh | 13 +++----- packages/proton-bridge/replace_intro.patch | 36 ---------------------- 2 files changed, 4 insertions(+), 45 deletions(-) delete mode 100644 packages/proton-bridge/replace_intro.patch diff --git a/packages/proton-bridge/build.sh b/packages/proton-bridge/build.sh index 10cbec10f..ecf2ea399 100644 --- a/packages/proton-bridge/build.sh +++ b/packages/proton-bridge/build.sh @@ -1,19 +1,14 @@ TERMUX_PKG_HOMEPAGE=https://github.com/ProtonMail/proton-bridge TERMUX_PKG_DESCRIPTION="ProtonMail Bridge application" TERMUX_PKG_LICENSE="GPL-3.0" -TERMUX_PKG_VERSION=1.8.10 +TERMUX_PKG_VERSION=2.1.3 TERMUX_PKG_SRCURL=https://github.com/ProtonMail/proton-bridge.git TERMUX_PKG_GIT_BRANCH=br-$TERMUX_PKG_VERSION TERMUX_PKG_MAINTAINER="Radomír Polách " TERMUX_PKG_DEPENDS=libsecret - -# On 32bit arches we get: -# ../build/pkg/mod/github.com/!proton!mail/go-rfc5322@v0.8.0/parser/rfc5322_parser.go:2756: constant 4230534781 overflows int -# ../build/pkg/mod/github.com/!proton!mail/go-rfc5322@v0.8.0/parser/rfc5322_parser.go:2780: constant 4230534781 overflows int -# ../build/pkg/mod/github.com/!proton!mail/go-rfc5322@v0.8.0/parser/rfc5322_parser.go:6683: constant 2740715144 overflows int -# ../build/pkg/mod/github.com/!proton!mail/go-rfc5322@v0.8.0/parser/rfc5322_parser.go:6683: constant 4294967167 overflows int -# ../build/pkg/mod/github.com/!proton!mail/go-rfc5322@v0.8.0/parser/rfc5322_parser.go:11728: constant 4244674173 overflows int -# ../build/pkg/mod/github.com/!proton!mail/go-rfc5322@v0.8.0/parser/rfc5322_parser.go:12153: constant 4292870143 overflows int +TERMUX_PKG_AUTO_UPDATE=true +# The go-rfc5322 module cannot currently be compiled for 32-bit OSes: +# https://github.com/ProtonMail/proton-bridge/blob/v2.1.1/BUILDS.md#prerequisites TERMUX_PKG_BLACKLISTED_ARCHES="arm, i686" termux_step_make() { diff --git a/packages/proton-bridge/replace_intro.patch b/packages/proton-bridge/replace_intro.patch deleted file mode 100644 index c5364fe26..000000000 --- a/packages/proton-bridge/replace_intro.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/internal/frontend/cli/frontend.go b/internal/frontend/cli/frontend.go -index 82c0dbc..c34d73a 100644 ---- a/internal/frontend/cli/frontend.go -+++ b/internal/frontend/cli/frontend.go -@@ -241,21 +241,16 @@ func (f *frontendCLI) Loop(credentialsError error) error { - } - - f.Print(` -- Welcome to ProtonMail Bridge interactive shell -- ___....___ -- ^^ __..-:'':__:..:__:'':-..__ -- _.-:__:.-:'': : : :'':-.:__:-._ -- .':.-: : : : : : : : : :._:'. -- _ :.': : : : : : : : : : : :'.: _ -- [ ]: : : : : : : : : : : : : :[ ] -- [ ]: : : : : : : : : : : : : :[ ] -- :::::::::[ ]:__:__:__:__:__:__:__:__:__:__:__:__:__:[ ]::::::::::: -- !!!!!!!!![ ]!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!![ ]!!!!!!!!!!! -- ^^^^^^^^^[ ]^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^[ ]^^^^^^^^^^^ -- [ ] [ ] -- [ ] [ ] -- jgs [ ] [ ] -- ~~^_~^~/ \~^-~^~ _~^-~_^~-^~_^~~-^~_~^~-~_~-^~_^/ \~^ ~~_ ^ -+ Welcome to ProtonMail Bridge -+ interactive shell for Android -+ -+ ^^ -+ _ _ -+___[ ]_____________________[ ]___ -+!!![ ]!!!!!!!!!!!!!!!!!!!!![ ]!!! -+^^^[ ]^^^^^^^^^^^^^^^^^^^^^[ ]^^^ -+jgs[ ] [ ] -+^~/ \^~~~~~~~~~~~~~~~~~^/ \~^ - `) - f.Run() - return nil