From 33a154a5d7502419381dc601aff1e4b0c660054d Mon Sep 17 00:00:00 2001 From: Vasyl Gello Date: Fri, 30 Oct 2026 16:06:37 +0200 Subject: [PATCH] Fix F-Droid 1.5.0 build by disabling lockfile enforcement (#16673) * build_fdroid.sh: Revert unnecessary sed un-bracing Claude has identified the issue but optimized stuff blindly: the fact that F-Droid recipe for RustDesk 1.4.9 abused the sed instruction does not mean it will be abused continuously, nor that it should be abused (and fixed). Signed-off-by: Vasyl Gello * build_fdroid.sh: do not attempt applying dropdown patch on 3.44.0+ Signed-off-by: Vasyl Gello * Disable lockfile enforcement for now Signed-off-by: Vasyl Gello --------- Signed-off-by: Vasyl Gello --- flutter/build_fdroid.sh | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/flutter/build_fdroid.sh b/flutter/build_fdroid.sh index cc40e1422..1f3e027d3 100755 --- a/flutter/build_fdroid.sh +++ b/flutter/build_fdroid.sh @@ -40,7 +40,7 @@ prepare_flutter() { # Patch flutter - if dpkg --compare-versions "${VERSION}" ge "3.24.4"; then + if dpkg --compare-versions "${VERSION}" ge "3.24.4" && dpkg --compare-versions "${VERSION}" lt "3.44.0"; then git apply "${ROOTDIR}/.github/patches/flutter_3.24.4_dropdown_menu_enableFilter.diff" fi @@ -324,11 +324,7 @@ prebuild) # Install Flutter bridge version - # Unbraced on purpose: F-Droid recipes rewrite the braced form with sed to - # pin a version, but the bridge generator only works with the Flutter - # version bridge.yml uses - - prepare_flutter "$FLUTTER_BRIDGE_VERSION" "${HOME}/flutter" + prepare_flutter "${FLUTTER_BRIDGE_VERSION}" "${HOME}/flutter" # Save changes @@ -346,7 +342,7 @@ prebuild) pushd flutter flutter clean - flutter packages pub get --enforce-lockfile + flutter packages pub get popd # flutter