From e4f3c2133a58e31659640824c699c33a6495b76c Mon Sep 17 00:00:00 2001
From: Patrick Northon <northon_patrick3@yahoo.ca>
Date: Sat, 21 Feb 2026 17:26:17 -0500
Subject: [PATCH] Fix issues with flutter 3.41

---
 .SRCINFO                |  4 ++--
 PKGBUILD                |  4 ++--
 fvm-sourcebuild-wrapper | 21 ++++++++++++---------
 3 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 92f3d981b8be7..1a6ba19cd0edb 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 = 4.0.5
-	pkgrel = 1
+	pkgrel = 2
 	url = https://fvm.app
 	arch = x86_64
 	license = MIT
@@ -12,7 +12,7 @@ pkgbase = fvm-sourcebuild
 	source = fvm-4.0.5.tar.gz::https://github.com/leoafarias/fvm/archive/refs/tags/v4.0.5.tar.gz
 	source = fvm-sourcebuild-wrapper
 	sha256sums = 2434d6fd2072548ac0e59c3c6c90554db46e6cdfd97ba79ffbcd270a8eb24b44
-	sha256sums = 0fc63820607260487b854bfe3cd76d7164fa22ccbf64eea3bd4470200bff3db1
+	sha256sums = 20864e4e7b44dd49046fd8c94362c3a90100ca31c0e92489ab540ef713d27c32
 
 pkgname = fvm-sourcebuild
 	depends = cmake
diff --git a/PKGBUILD b/PKGBUILD
index 9a901cf3bcefc..d129419a323e5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@
 _pkgname=fvm
 pkgname=${_pkgname}-sourcebuild
 pkgver=4.0.5
-pkgrel=1
+pkgrel=2
 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/v$pkgver.tar.gz"
 	"${pkgname}-wrapper")
 sha256sums=('2434d6fd2072548ac0e59c3c6c90554db46e6cdfd97ba79ffbcd270a8eb24b44'
-            '0fc63820607260487b854bfe3cd76d7164fa22ccbf64eea3bd4470200bff3db1')
+            '20864e4e7b44dd49046fd8c94362c3a90100ca31c0e92489ab540ef713d27c32')
 
 prepare() {
 	cd "$_pkgname-$pkgver"
diff --git a/fvm-sourcebuild-wrapper b/fvm-sourcebuild-wrapper
index 1752c8e998759..912527faf7597 100755
--- a/fvm-sourcebuild-wrapper
+++ b/fvm-sourcebuild-wrapper
@@ -292,13 +292,17 @@ EOF
 	# Not our problem.
 	sed -i 's/"-Werror",//' 'build/config/compiler/BUILD.gn'
 
-	cat > 'third_party/dart/build/dart/prebuilt_dart_sdk.gni' <<-EOF
-		import("../executable_suffix.gni")
-		_dart_root = rebase_path("../..")
-		#_prebuilt_dart_exe = ""
-		#_prebuilt_dart_exe_trial = ""
-		prebuilt_dart_exe_works = true
-EOF
+	if [[ -f 'third_party/dart/build/dart/prebuilt_dart_sdk.gni' ]]; then
+		cat > 'third_party/dart/build/dart/prebuilt_dart_sdk.gni' <<-EOF
+			import("../executable_suffix.gni")
+			_dart_root = rebase_path("../..")
+			#_prebuilt_dart_exe = ""
+			#_prebuilt_dart_exe_trial = ""
+			prebuilt_dart_exe_works = true
+		EOF
+	fi
+
+	sed -z -i 's|extern "C" {\n#include <atk/atk.h>\n}|#include <atk/atk.h>|' 'flutter/shell/platform/linux/fl_view_accessible.cc'
 
 	#_ln "${srcdir}/emsdk" 'buildtools/emsdk'
 	popd
@@ -381,8 +385,7 @@ _download()
 	if [[ ! -e "$cached_flutter_engine_dir/flutter" ]]; then
 		_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"
-
+	_git -C '.engine-src/flutter' -c 'core.hooksPath=/dev/null' 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'
 }