From 68fa0a9bacc4347effb44ae00677375135647af3 Mon Sep 17 00:00:00 2001
From: Patrick Northon <northon_patrick3@yahoo.ca>
Date: Mon, 15 Sep 2025 06:59:27 -0400
Subject: [PATCH] httplib2.socks has been removed. Replace by python-pysocks.

---
 .SRCINFO                | 5 +++--
 PKGBUILD                | 5 +++--
 fvm-sourcebuild-wrapper | 2 ++
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 18007a99604a0..a76db199d9631 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = fvm-sourcebuild
 	pkgdesc = Flutter Version Management: A simple CLI to manage Flutter SDK versions. (Build engine from sources)
 	pkgver = 3.2.1
-	pkgrel = 3
+	pkgrel = 4
 	url = https://fvm.app
 	arch = x86_64
 	license = MIT
@@ -12,7 +12,7 @@ pkgbase = fvm-sourcebuild
 	source = fvm-3.2.1.tar.gz::https://github.com/leoafarias/fvm/archive/refs/tags/3.2.1.tar.gz
 	source = fvm-sourcebuild-wrapper
 	sha256sums = d4d524a5e1d7c5160b17ee9c3b2dd4482224d2e1c27c8d494fa0290ae818cd41
-	sha256sums = eca1f94a591767a387d40403fbf0593635dfa1a914704e5096082e7c1ec590d2
+	sha256sums = 0fc63820607260487b854bfe3cd76d7164fa22ccbf64eea3bd4470200bff3db1
 
 pkgname = fvm-sourcebuild
 	depends = cmake
@@ -27,5 +27,6 @@ pkgname = fvm-sourcebuild
 	depends = gn
 	depends = llvm
 	depends = python-httplib2
+	depends = python-pysocks
 	depends = python-six
 	depends = python311
diff --git a/PKGBUILD b/PKGBUILD
index 49e39bcaa540e..656df2461f935 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 _pkgname=fvm
 pkgname=${_pkgname}-sourcebuild
 pkgver=3.2.1
-pkgrel=3
+pkgrel=4
 provides=(${_pkgname})
 conflicts=(${_pkgname})
 pkgdesc="Flutter Version Management: A simple CLI to manage Flutter SDK versions. (Build engine from sources)"
@@ -18,7 +18,7 @@ source=(
 	"$_pkgname-$pkgver.tar.gz::https://github.com/leoafarias/fvm/archive/refs/tags/$pkgver.tar.gz"
 	"${pkgname}-wrapper")
 sha256sums=('d4d524a5e1d7c5160b17ee9c3b2dd4482224d2e1c27c8d494fa0290ae818cd41'
-            'eca1f94a591767a387d40403fbf0593635dfa1a914704e5096082e7c1ec590d2')
+            '0fc63820607260487b854bfe3cd76d7164fa22ccbf64eea3bd4470200bff3db1')
 
 prepare() {
 	cd "$_pkgname-$pkgver"
@@ -49,6 +49,7 @@ package() {
 		'gn'
 		'llvm'
 		'python-httplib2'
+		'python-pysocks'
 		'python-six'
 		'python311'
 	)
diff --git a/fvm-sourcebuild-wrapper b/fvm-sourcebuild-wrapper
index 9005d6559a868..1752c8e998759 100755
--- a/fvm-sourcebuild-wrapper
+++ b/fvm-sourcebuild-wrapper
@@ -382,7 +382,9 @@ _download()
 		_git clone --origin=origin -s "$flutter_dir" "$cached_flutter_engine_dir/flutter"
 	fi
 	_git -C '.engine-src/flutter' checkout --force --no-track -B makepkg "$engine_version"
+
 	_clone_src "$ARCH_FLUTTER_DEPOT_TOOL_URL" "$fvm_cache_dir/depot_tools"
+	sed -i 's/import httplib2.socks/import socks/' '.engine-src/depot_tools/gerrit_util.py'
 }
 
 build_engine()