From 4d33b6cad9545ddd8abb98967a1f2e0f60484a2f Mon Sep 17 00:00:00 2001
From: SomberNight <somber.night@protonmail.com>
Date: Thu, 29 Jan 2026 15:27:49 +0000
Subject: [PATCH] build: android: upgrade docker base img to debian 13

This should make the F-Droid build simpler.
ref https://gitlab.com/fdroid/fdroiddata/-/merge_requests/32358#note_3038803195
---
 contrib/android/Dockerfile          | 9 +++------
 contrib/android/apt.sources.list    | 4 ++--
 contrib/freeze_containers_distro.sh | 2 +-
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/contrib/android/Dockerfile b/contrib/android/Dockerfile
index 57419a479..a7c8d9080 100644
--- a/contrib/android/Dockerfile
+++ b/contrib/android/Dockerfile
@@ -1,6 +1,6 @@
 # based on https://github.com/kivy/python-for-android/blob/master/Dockerfile
 
-FROM debian:bookworm@sha256:d568e251e460295a8743e9d5ef7de673c5a8f9027db11f4e666e96fb5bed708e
+FROM debian:trixie@sha256:a3b5f4f0286249a124bfe9845b3aec0f88de32ff31dd8d7e1b945f9f98d116b0
 
 ENV DEBIAN_FRONTEND=noninteractive
 
@@ -94,7 +94,7 @@ RUN mkdir --parents "${ANDROID_SDK_HOME}/.android/" \
 # accept Android licenses (JDK necessary!)
 RUN apt -y update -qq \
     && apt -y install -qq --no-install-recommends --allow-downgrades \
-        openjdk-17-jdk-headless \
+        openjdk-21-jdk-headless \
     && apt -y autoremove
 RUN yes | ${ANDROID_SDK_MANAGER} --licenses > /dev/null
 
@@ -138,7 +138,6 @@ RUN apt -y update -q \
         lbzip2 \
         patch \
         sudo \
-        software-properties-common \
         git \
         zip \
         unzip \
@@ -150,9 +149,7 @@ RUN apt -y update -q \
         libtool \
         pkg-config \
         zlib1g-dev \
-        libncurses5-dev \
-        libncursesw5-dev \
-        libtinfo5 \
+        libncurses-dev \
         cmake \
         libffi-dev \
         libssl-dev \
diff --git a/contrib/android/apt.sources.list b/contrib/android/apt.sources.list
index b1a8f892b..db248cc0e 100644
--- a/contrib/android/apt.sources.list
+++ b/contrib/android/apt.sources.list
@@ -1,2 +1,2 @@
-deb https://snapshot.debian.org/archive/debian/20250530T143637Z/ bookworm main
-deb-src https://snapshot.debian.org/archive/debian/20250530T143637Z/ bookworm main
+deb https://snapshot.debian.org/archive/debian/20260129T082333Z/ trixie main
+deb-src https://snapshot.debian.org/archive/debian/20260129T082333Z/ trixie main
diff --git a/contrib/freeze_containers_distro.sh b/contrib/freeze_containers_distro.sh
index 132f81761..cc19f7de2 100755
--- a/contrib/freeze_containers_distro.sh
+++ b/contrib/freeze_containers_distro.sh
@@ -7,7 +7,7 @@ set -e
 DEBIAN_SNAPSHOT_BASE="https://snapshot.debian.org/archive/debian/"
 DEBIAN_APPIMAGE_DISTRO="bullseye"  # should match build-linux/appimage Dockerfile base
 DEBIAN_WINE_DISTRO="bookworm"    # should match build-wine Dockerfile base
-DEBIAN_ANDROID_DISTRO="bookworm" # should match android Dockerfile base
+DEBIAN_ANDROID_DISTRO="trixie" # should match android Dockerfile base
 
 contrib="$(dirname "$0")"