From f7d56f0380965e6f35fa5a10ebfa7ab5fba4ea97 Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 29 Oct 2024 16:48:01 +0000 Subject: [PATCH 1/3] Upgrade to glibc2.31 for Linux builds Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- dockerbuild/Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dockerbuild/Dockerfile b/dockerbuild/Dockerfile index 0aee3d716..398c148b2 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 From 18703e94d3988e576c3ade970ac6c5b0cb59187f Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 29 Oct 2024 16:53:24 +0000 Subject: [PATCH 2/3] Update glibc version check Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- .github/workflows/build_linux.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/build_linux.yaml b/.github/workflows/build_linux.yaml index abfe143e6..7f5b9c799 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 From ab608af47e020f0f85384f47771f052b2e55ea2d Mon Sep 17 00:00:00 2001 From: Michael Telatynski <7t3chguy@gmail.com> Date: Tue, 29 Oct 2024 17:22:56 +0000 Subject: [PATCH 3/3] Specify libc version in deb pre-depends Signed-off-by: Michael Telatynski <7t3chguy@gmail.com> --- electron-builder.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/electron-builder.ts b/electron-builder.ts index 042f96929..ae0d06784 100644 --- a/electron-builder.ts +++ b/electron-builder.ts @@ -135,6 +135,8 @@ const config: Writable = { "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: {