From 77bd50725e579902fe1dfddc79393106638c85a2 Mon Sep 17 00:00:00 2001
From: Michael Telatynski <7t3chguy@gmail.com>
Date: Wed, 30 Oct 2024 10:41:55 +0000
Subject: [PATCH] Upgrade to glibc2.31 for Linux builds (#1967)

---
 .github/workflows/build_linux.yaml | 2 +-
 dockerbuild/Dockerfile             | 5 +++--
 electron-builder.ts                | 2 ++
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/build_linux.yaml b/.github/workflows/build_linux.yaml
index abfe143..7f5b9c7 100644
--- a/.github/workflows/build_linux.yaml
+++ b/.github/workflows/build_linux.yaml
@@ -144,7 +144,7 @@ jobs:
                       ./scripts/glibc-check.sh $filename
                   done
               env:
-                  MAX_VER: 2.28 # buster-era glibc
+                  MAX_VER: 2.31 # bullseye-era glibc
 
     build:
         needs: hak
diff --git a/dockerbuild/Dockerfile b/dockerbuild/Dockerfile
index 0aee3d7..398c148 100644
--- a/dockerbuild/Dockerfile
+++ b/dockerbuild/Dockerfile
@@ -1,5 +1,6 @@
-# Docker image to facilitate building Element Desktop's native bits using a glibc version with broader compatibility
-FROM rust:buster
+# Docker image to facilitate building Element Desktop's native bits using a glibc version (2.31)
+# with broader compatibility, down to Debian bullseye & Ubuntu focal.
+FROM rust:bullseye
 
 ENV DEBIAN_FRONTEND noninteractive
 
diff --git a/electron-builder.ts b/electron-builder.ts
index 042f969..ae0d067 100644
--- a/electron-builder.ts
+++ b/electron-builder.ts
@@ -135,6 +135,8 @@ const config: Writable<Configuration> = {
             "Replaces: riot-desktop (<< 1.7.0), riot-web (<< 1.7.0)",
             "--deb-field",
             "Breaks: riot-desktop (<< 1.7.0), riot-web (<< 1.7.0)",
+            "--deb-pre-depends",
+            "libc6 (>= 2.31)",
         ],
     },
     mac: {