From dbb734eae8facca664e9a11e23bf5b34e8d3118a Mon Sep 17 00:00:00 2001
From: Xiaonan Shen <s@sxn.dev>
Date: Wed, 4 May 2022 18:29:48 +0800
Subject: [PATCH] Patch for 32 bit build

---
 .github/workflows/build.yaml |  2 +-
 Dockerfile                   |  2 +-
 build.sh                     | 20 +++++++-------------
 3 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
index 2c21aab..fb28658 100644
--- a/.github/workflows/build.yaml
+++ b/.github/workflows/build.yaml
@@ -1,4 +1,4 @@
-name: build from source
+name: Build docker image
 
 on:
   push:
diff --git a/Dockerfile b/Dockerfile
index 5a02ce3..680c911 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -17,7 +17,7 @@ EXPOSE 143/tcp
 
 # Install dependencies and protonmail bridge
 RUN apt-get update \
-    && apt-get install -y --no-install-recommends socat pass libsecret-1-0 ca-certificates dbus \
+    && apt-get install -y --no-install-recommends socat pass libsecret-1-0 ca-certificates dbus-x11 \
     && rm -rf /var/lib/apt/lists/*
 
 # Copy bash scripts
diff --git a/build.sh b/build.sh
index e09432c..aef0d7d 100644
--- a/build.sh
+++ b/build.sh
@@ -15,17 +15,11 @@ ls /build
 rm -rf internal/frontend/cli
 cp -r /build/http_rest_frontend/cli internal/frontend/cli
 
-# Build
-if ! make build-nogui ; then
-	# If build fails it's probably because it is a 32bit
-	# system and there was a overflow error on the parser
-	# This is a workaround for this problem found at:
-	#   https://github.com/antlr/antlr4/issues/2433#issuecomment-774514106
-	# find $(go env GOPATH)/pkg/mod/github.com/\!proton\!mail/go-rfc5322*/ -type f -exec sed -i.bak 's/(1<</(int64(1)<</g' {} +
-
-	# Try again after implementing the workaround
-	# make build-nogui
-
-	uname -m
-	exit 1
+# Workaround for 32bit build. More details can be found in:
+#   https://github.com/antlr/antlr4/issues/2433#issuecomment-774514106
+if [[ $(uname -m) == "armv7l" ]]; then
+	find $(go env GOPATH)/pkg/mod/github.com/\!proton\!mail/go-rfc5322*/ -type f -exec sed -i.bak 's/(1<</(int64(1)<</g' {} +
 fi
+
+# Build
+make build-nogui