Update to 3.6.1

4 files changed, 51 insertions, 67 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 8267af015632..ea4e6daf5b3f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,38 @@
 pkgbase = protonmail-bridge
-	pkgdesc = Integrate ProtonMail paid account with any program that supports IMAP and SMTP (THIS IS OUT-OF-DATE PLEASE READ THE COMMENTS AND INSTALL NOTICE)
-	pkgver = 2.3.0
-	pkgrel = 2
+	pkgdesc = Integrate ProtonMail paid account with any program that supports IMAP and SMTP
+	pkgver = 3.6.1
+	pkgrel = 1
 	url = https://protonmail.com/bridge
-	install = notice.install
 	arch = x86_64
 	license = GPL3
 	makedepends = go
-	makedepends = gcc
+	makedepends = cmake
+	makedepends = ninja
+	makedepends = zip
+	makedepends = qt6-base
 	makedepends = git
 	depends = hicolor-icon-theme
 	depends = libsecret
-	depends = ttf-dejavu
+	depends = libglvnd
+	depends = icu
+	depends = qt6-declarative
+	depends = qt6-svg
+	depends = qt6-wayland
 	optdepends = org.freedesktop.secrets: Applications that support Freedesktop secrets api
 	optdepends = gnome-keyring: gnome-keyring support
 	optdepends = pass: pass support
 	conflicts = protonmail-bridge-bin
 	options = !emptydirs
 	options = !strip
-	source = protonmail-bridge_2.3.0.tar.gz::https://github.com/ProtonMail/proton-bridge/archive/refs/tags/v2.3.0.tar.gz
+	source = git+https://github.com/ProtonMail/proton-bridge.git#tag=v3.6.1
+	source = git+https://github.com/microsoft/vcpkg.git
 	source = protonmail-bridge.desktop
-	sha256sums = 174abd106ca9b261dec0cb853c796a8aefd7cdb82006089482445558430b0d61
+	source = qt-dir.patch
+	source = modern-icu.patch
+	sha256sums = SKIP
+	sha256sums = SKIP
 	sha256sums = 226bc140ec5c34cfdff42b33058d045446a4006518d2660db932c7f51632b48a
+	sha256sums = 60175b564bdf1f7e3e51933748019e4335054c72f08cdf4c453a00437fdc93a8
+	sha256sums = 3adae43253c1e8a60f0e74df4592de280a1827a914514b46cbe7f36cea6856b2
 
 pkgname = protonmail-bridge
diff --git a/.gitignore b/.gitignore
index 7df8f1f73436..75b0133ee352 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
-proton-bridge
-pkg/
-src/
-*.tar.gz
-*.tar.xz
-*.tar.zst
+*
+!PKGBUILD
+!.SRCINFO
+!.patch
+!.desktop
+!.install
diff --git a/PKGBUILD b/PKGBUILD
index 82b3a85b6c60..59d3d29d8c71 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,17 +1,17 @@
 # Maintainer: Ali Molaei <ali dot molaei at protonmail dot com>
 # Contributor: Lenovsky <lenovsky at pm dot me>
 # Contributor: aimileus <me at aimileus dot nl>
+# Contributor: Ben Westover <me at benthetechguy dot net>
 
 pkgname=protonmail-bridge
-pkgver=2.3.0
-pkgrel=2
-pkgdesc="Integrate ProtonMail paid account with any program that supports IMAP and SMTP (THIS IS OUT-OF-DATE PLEASE READ THE COMMENTS AND INSTALL NOTICE)"
+pkgver=3.6.1
+pkgrel=1
+pkgdesc="Integrate ProtonMail paid account with any program that supports IMAP and SMTP"
 arch=('x86_64')
-install=notice.install
 url="https://protonmail.com/bridge"
 license=('GPL3')
-makedepends=('go' 'gcc' 'git')
-depends=('hicolor-icon-theme' 'libsecret' 'ttf-dejavu')
+makedepends=('go' 'cmake' 'ninja' 'zip' 'qt6-base' 'git')
+depends=('hicolor-icon-theme' 'libsecret' 'libglvnd' 'icu' 'qt6-declarative' 'qt6-svg' 'qt6-wayland')
 optdepends=(
     'org.freedesktop.secrets: Applications that support Freedesktop secrets api'
     'gnome-keyring: gnome-keyring support'
@@ -20,38 +20,37 @@ optdepends=(
 conflicts=('protonmail-bridge-bin')
 options=('!emptydirs' '!strip')
 
-# Source to compile from tar.gz file
-source=("protonmail-bridge_${pkgver}.tar.gz::https://github.com/ProtonMail/proton-bridge/archive/refs/tags/v${pkgver}.tar.gz"
-        "protonmail-bridge.desktop")
-
-# Source to compile to a specific tag
-#source=("git+https://github.com/ProtonMail/proton-bridge.git#tag=v${pkgver}"
-#        "protonmail-bridge.desktop")
-
-# Source to compile to a specific commit
-#source=("git+https://github.com/ProtonMail/proton-bridge.git#commit=a219ecf3cbe4fa31517136131fc585e93b86c3dd"
-#        "protonmail-bridge.desktop")
-
-sha256sums=('174abd106ca9b261dec0cb853c796a8aefd7cdb82006089482445558430b0d61'
-            '226bc140ec5c34cfdff42b33058d045446a4006518d2660db932c7f51632b48a')
+source=("git+https://github.com/ProtonMail/proton-bridge.git#tag=v${pkgver}"
+        "git+https://github.com/microsoft/vcpkg.git"
+        "protonmail-bridge.desktop"
+        "qt-dir.patch"
+        "modern-icu.patch")
+sha256sums=('SKIP'
+            'SKIP'
+            '226bc140ec5c34cfdff42b33058d045446a4006518d2660db932c7f51632b48a'
+            '60175b564bdf1f7e3e51933748019e4335054c72f08cdf4c453a00437fdc93a8'
+            '3adae43253c1e8a60f0e74df4592de280a1827a914514b46cbe7f36cea6856b2')
 
 prepare() {
-    cd proton-bridge-${pkgver}/
-#    sed -i s/1.8.0+git/1.8.1+git/ Makefile
-    export PATH=$PATH:$(go env GOPATH)/bin/  
-    make clean
+    cd proton-bridge
+    git submodule init
+    git config submodule.submodules/vcpkg.url "$srcdir/vcpkg"
+    git -c protocol.file.allow=always submodule update
+
+    cat ../qt-dir.patch | patch -p1
+    cat ../modern-icu.patch | patch -p1
 }
 
 build(){
     export PATH=$PATH:$(go env GOPATH)/bin/
-    cd ${srcdir}/proton-bridge-${pkgver}/
+    cd proton-bridge
     make build
 }
 
 package() {
     mkdir -p "${pkgdir}"/opt
     mkdir -p "${pkgdir}"/usr/bin
-    cp -r proton-bridge-${pkgver}/cmd/Desktop-Bridge/deploy/linux/ "${pkgdir}"/opt/protonmail-bridge
+    cp -r proton-bridge/cmd/Desktop-Bridge/deploy/linux/ "${pkgdir}"/opt/protonmail-bridge
     install -D -m644 "${pkgdir}"/opt/protonmail-bridge/LICENSE -t "${pkgdir}"/usr/share/licenses/"${pkgname}"/
     install -D -m644 "${pkgdir}"/opt/protonmail-bridge/logo.svg "${pkgdir}"/usr/share/icons/hicolor/scalable/apps/"${pkgname}".svg
     install -D -m644 "${srcdir}"/protonmail-bridge.desktop -t "${pkgdir}"/usr/share/applications/
diff --git a/notice.install b/notice.install
deleted file mode 100755
index eff89130b4bd..000000000000
--- a/notice.install
+++ /dev/null
@@ -1,27 +0,0 @@
-notice() {
-	echo "##################################################################"
-	echo "############ IMPORTANT NOTICE ABOUT ProtonMail Bridge ############"
-	echo "##################################################################"
-	echo "#                                                                #"
-	echo "# This package is out-of-date for now due to issues building a   #"
-	echo "# working binary out of the proton-bridge source code, you can   #"
-	echo "# read the comments here:                                        #"
-	echo "#    https://aur.archlinux.org/packages/protonmail-bridge        #"
-	echo "#                                                                #"
-	echo "# and this issue on GitHub:                                      #"
-	echo "#    https://github.com/ProtonMail/proton-bridge/issues/346      #"
-	echo "#                                                                #"
-	echo "# if you want to help. Until then, I strongly recommend you not  #"
-	echo "# to use this package as it's not updated for about a year and   #"
-	echo "# use \"protonmail-bridge-bin\" instead until the issue resolves.  #"
-	echo "#                                                                #"
-	echo "##################################################################"
-}
-
-pre_upgrade() {
-	notice
-}
-
-pre_install() {
-	notice
-}