From 11305d5f0e6629d83d10bda22052af53ee0354c2 Mon Sep 17 00:00:00 2001
From: tituspijean <tituspijean@outlook.com>
Date: Wed, 29 Dec 2021 17:35:17 +0100
Subject: [PATCH 1/4] Add libffi-dev dependency for successful build

---
 scripts/_common.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/_common.sh b/scripts/_common.sh
index 7a9038d..1254db4 100644
--- a/scripts/_common.sh
+++ b/scripts/_common.sh
@@ -6,7 +6,7 @@
 
 # dependencies used by the app
 # HACK zlib1g-dev libjpeg-dev (libwebp-dev optional but necessary for stickers) are necessary to compile / install pillow
-pkg_dependencies="postgresql python3 zlib1g-dev libjpeg-dev libwebp-dev python3-venv libpq-dev"
+pkg_dependencies="postgresql python3 zlib1g-dev libjpeg-dev libwebp-dev python3-venv libpq-dev libffi-dev"
 
 #=================================================
 # PERSONAL HELPERS

From 769004f9fc34fd6044e47331c605d39da0667079 Mon Sep 17 00:00:00 2001
From: Gredin67 <gredin67@sans-nuage.fr>
Date: Wed, 23 Mar 2022 23:45:52 +0100
Subject: [PATCH 2/4] Update install

---
 scripts/install | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/install b/scripts/install
index 7bcefe1..7af3af8 100755
--- a/scripts/install
+++ b/scripts/install
@@ -188,7 +188,7 @@ mkdir -p /var/log/$app
 # Configure Mautrix-Bridge
 python3 -m venv $final_path
 export HOME=$final_path # HACK see https://github.com/mautrix/telegram/issues/661
-$final_path/bin/pip3 install --upgrade setuptools wheel # HACK fixes "error: invalid command 'bdist_wheel'"
+$final_path/bin/pip3 install --upgrade pip setuptools wheel
 $final_path/bin/pip3 install --upgrade $final_path/src/mautrix-telegram.tar.gz[postgres,speedups,qr_login] # metrics,hq_thumbnails,e2be
 # -r optional-requirements.txt
 $final_path/bin/python3 -m mautrix_telegram -g -c "$mautrix_config_path" -r "$app_service_registration_path/$app.yaml"

From 8f4eab48b44aa3cc929242de132f402308b754d9 Mon Sep 17 00:00:00 2001
From: Gredin67 <gredin67@sans-nuage.fr>
Date: Wed, 23 Mar 2022 23:46:40 +0100
Subject: [PATCH 3/4] Update upgrade

---
 scripts/upgrade | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/upgrade b/scripts/upgrade
index efe9cac..5b39e60 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -117,8 +117,8 @@ ynh_system_user_create --username=$mautrix_bridge_user
 
 if [ "$upgrade_type" == "UPGRADE_APP" ]; then
   ynh_script_progression --message="Upgrading python packages..." --weight=1
-  export HOME=$final_path # HACK see https://github.com/mautrix/telegram/issues/661
-  $final_path/bin/pip3 install --upgrade setuptools wheel # HACK fixes "error: invalid command 'bdist_wheel'"
+  export HOME=$final_path
+  $final_path/bin/pip3 install --upgrade pip setuptools wheel
   $final_path/bin/pip3 install --upgrade $final_path/src/mautrix-telegram.tar.gz[postgres,speedups,qr_login] #,hq_thumbnails
 fi
 

From dfed70e3419d23349690ea2234747ac1de2d7fb0 Mon Sep 17 00:00:00 2001
From: Gredin67 <gredin67@sans-nuage.fr>
Date: Wed, 23 Mar 2022 23:52:22 +0100
Subject: [PATCH 4/4] Update upgrade

---
 scripts/upgrade | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/upgrade b/scripts/upgrade
index 5b39e60..896060e 100644
--- a/scripts/upgrade
+++ b/scripts/upgrade
@@ -117,6 +117,7 @@ ynh_system_user_create --username=$mautrix_bridge_user
 
 if [ "$upgrade_type" == "UPGRADE_APP" ]; then
   ynh_script_progression --message="Upgrading python packages..." --weight=1
+  python3 -m venv $final_path
   export HOME=$final_path
   $final_path/bin/pip3 install --upgrade pip setuptools wheel
   $final_path/bin/pip3 install --upgrade $final_path/src/mautrix-telegram.tar.gz[postgres,speedups,qr_login] #,hq_thumbnails