Fix: betaflight-configurator 10.9.0-1 downgrade nw-builder

https://github.com/betaflight/betaflight-configurator/pull/3462

3 files changed, 36 insertions, 3 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3ea746c13090..ba1da96cb027 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -15,9 +15,11 @@ pkgbase = betaflight-configurator
 	source = betaflight-configurator.sh
 	source = betaflight-configurator.desktop
 	source = remove_android_build_deps.patch
+	source = nw-builder.patch
 	sha512sums = SKIP
 	sha512sums = 1f9113fce812355d1f8cc614d4905845c601622b87aad2b6e74b62913582018a87059727a333db0673a4b767a10564389eece1f588658d171dc4d8446055a0e9
 	sha512sums = 79e5ab59cf8520ce7e20fb2bd89ee99ce3debba69e7da892bf219912cc32c7056a7c8fd6dae19eebfe4956c948d0bc75ece40911b203fcc2f34e43f2d8329532
 	sha512sums = 07f52591ac364627efadfa005a2788d3c4fd4c7817a630afdfbafb809c937351b80c1ee6794a02a15c8916767b189ed1556d2a9c8cc91d51bcc33cd9a6f2a558
+	sha512sums = 62db5fd8ac9d36a6b9151a4932e6d0ec0cf928d9a19759cbc7c4b2fac6d819a056b8d7f0939a6f2e9fe863d8817ab091d5a37fdefa6fe8ad278ada65ba8fb3b2
 
 pkgname = betaflight-configurator
diff --git a/PKGBUILD b/PKGBUILD
index 6dfa01dcd7e8..33bf19b43995 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -13,22 +13,27 @@ makedepends=('yarn' 'npm' 'git')
 source=("git+https://github.com/betaflight/betaflight-configurator.git#tag=$pkgver"
         "$pkgname.sh"
         "$pkgname.desktop"
-        "remove_android_build_deps.patch")
+        "remove_android_build_deps.patch"
+        "nw-builder.patch")
 sha512sums=('SKIP'
             '1f9113fce812355d1f8cc614d4905845c601622b87aad2b6e74b62913582018a87059727a333db0673a4b767a10564389eece1f588658d171dc4d8446055a0e9'
             '79e5ab59cf8520ce7e20fb2bd89ee99ce3debba69e7da892bf219912cc32c7056a7c8fd6dae19eebfe4956c948d0bc75ece40911b203fcc2f34e43f2d8329532'
-            '07f52591ac364627efadfa005a2788d3c4fd4c7817a630afdfbafb809c937351b80c1ee6794a02a15c8916767b189ed1556d2a9c8cc91d51bcc33cd9a6f2a558')
+            '07f52591ac364627efadfa005a2788d3c4fd4c7817a630afdfbafb809c937351b80c1ee6794a02a15c8916767b189ed1556d2a9c8cc91d51bcc33cd9a6f2a558'
+            '62db5fd8ac9d36a6b9151a4932e6d0ec0cf928d9a19759cbc7c4b2fac6d819a056b8d7f0939a6f2e9fe863d8817ab091d5a37fdefa6fe8ad278ada65ba8fb3b2')
 options=(!strip)
 install=$pkgname.install
 
 prepare() {
 	cd $pkgname
-	
+
 	# Allow higher node version
 	sed 's#"node": "#&>=#' -i package.json
 
 	# Remove unecessary Andoid/Cordova XML build dependcy
 	patch -Np1 < "$srcdir/remove_android_build_deps.patch"
+
+	# Downgrade nw-builder to version 3.8.3 to resolve dependency with nw-install
+	patch -Np1 < "$srcdir/nw-builder.patch"
 }
 
 build() {
diff --git a/nw-builder.patch b/nw-builder.patch
new file mode 100644
index 000000000000..6b88cbdc975a
--- /dev/null
+++ b/nw-builder.patch
@@ -0,0 +1,26 @@
+From 30bf9b79edc90533a903e59cf5e0650f0bdb53de Mon Sep 17 00:00:00 2001
+From: Miguel Angel Mulero Martinez <migmul@gmail.com>
+Date: Sat, 27 May 2023 09:11:15 +0200
+Subject: [PATCH] Downgrade nw-builder to version 3.8.3
+
+Since version 3.8.4, nw-builder has a dependency with nw-install, that
+is not available at this moment. Downgrade to 3.8.3 since it is
+available again or we migrate to version 4.x.x.
+---
+ package.json |   2 +-
+ yarn.lock    | 548 ++++++++++++++++++++++++++++++++++++++++++++-------
+ 2 files changed, 473 insertions(+), 77 deletions(-)
+
+diff --git a/package.json b/package.json
+index b42593052f..ce39d2842f 100644
+--- a/package.json
++++ b/package.json
+@@ -113,7 +113,7 @@
+     "gulp-yarn": "^3.0.0",
+     "gulp-zip": "^5.1.0",
+     "husky": "^4.3.0",
+-    "nw-builder": "^3.8.6",
++    "nw-builder": "3.8.3",
+     "os": "^0.1.2",
+     "postcss": "^8.4.17",
+     "rollup": "^3.9.0",