merge: upstream 1.2.20 into deploy/all-2026-08-24

# Conflicts:
#	Makefile

1 files changed, 7 insertions, 5 deletions

diff --git a/Makefile b/Makefile
index ace07d8..342ec07 100644
--- a/Makefile
+++ b/Makefile
@@ -11,10 +11,10 @@
 ROOT    := $(shell pwd)
 NPROC   := $(shell nproc 2>/dev/null || echo 2)
 SUDO    := $(shell [ "$$(id -u)" = "0" ] && echo "" || echo "sudo")
-# Not "1.2.19". This tree is upstream v1.2.19 plus our own hardening commits and
+# Not "1.2.20". This tree is upstream v1.2.20 plus our own hardening commits and
 # a hand-merged payout ledger, so a binary built here must not be mistakable for
 # the upstream release of that number -- it names every release artifact.
-VERSION := 1.2.19+sec
+VERSION := 1.2.20+sec
 
 # ---- Pinned third-party sources -------------------------------------------
 #
@@ -127,10 +127,11 @@ deps-apt:
             echo "  warning: apt-get update failed, using the package lists on disk"; \
           $(SUDO) apt-get install -y build-essential cmake git pkg-config autoconf \
             libtool libssl-dev libdb5.3++-dev libsodium-dev nlohmann-json3-dev \
-            libboost-dev libglfw3-dev libgl-dev python3-pil clang; \
+            libboost-dev libglfw3-dev libgl-dev libsqlite3-dev \
+            python3-pil clang; \
         else \
           echo "Not an apt system — install: g++ cmake git autoconf libtool"; \
-          echo "  libssl libdb++ libsodium nlohmann-json boost glfw3 opengl python3-pil"; \
+          echo "  libssl libdb++ libsodium nlohmann-json boost glfw3 opengl sqlite3 python3-pil"; \
         fi
 
 deps-secp256k1:
@@ -232,7 +233,7 @@ img = ico.convert('RGBA'); \
 img.save(d + '/bitflash.png'); \
 import shutil; shutil.copy(d + '/bitflash.png', \
 d + '/usr/share/icons/hicolor/256x256/apps/bitflash.png')"
-        @for lib in libsodium.so.23 libdb_cxx-5.3.so libglfw.so.3; do \
+        @for lib in libsodium.so.23 libdb_cxx-5.3.so libsqlite3.so.0 libglfw.so.3; do \
           path=$$(ldconfig -p | grep " $$lib " | awk '{print $$NF}' | head -1); \
           [ -z "$$path" ] && path=$$(find /usr/lib /lib -name "$$lib" 2>/dev/null | head -1); \
           [ -n "$$path" ] && cp -L "$$path" $(APPDIR)/usr/lib/ && echo "  bundled $$lib" || echo "  missing $$lib"; \
@@ -259,6 +260,7 @@ deps-windows:
           mingw-w64-ucrt-x86_64-glfw \
           mingw-w64-ucrt-x86_64-openssl \
           mingw-w64-ucrt-x86_64-db \
+          mingw-w64-ucrt-x86_64-sqlite3 \
           mingw-w64-ucrt-x86_64-libsodium \
           mingw-w64-ucrt-x86_64-nlohmann-json \
           mingw-w64-ucrt-x86_64-boost \