From 1b634a86c7effc8c9f1ddfc3b2f68c26cb1fa70e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Mon, 3 Mar 2025 13:17:51 -0800 Subject: [PATCH 1/8] Bump to platform 8.1 --- io.elementary.mail.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/io.elementary.mail.json b/io.elementary.mail.json index 661b04776..69d7a713e 100644 --- a/io.elementary.mail.json +++ b/io.elementary.mail.json @@ -1,7 +1,7 @@ { "app-id": "io.elementary.mail", "runtime": "io.elementary.Platform", - "runtime-version": "8", + "runtime-version": "8.1", "sdk": "io.elementary.Sdk", "command": "io.elementary.mail", "finish-args": [ From c27ad273ccdd51635081f82e466697b48819cfea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Mon, 3 Mar 2025 13:18:33 -0800 Subject: [PATCH 2/8] Update ci.yml --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index dfc81f2b0..9c8b037ad 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -54,7 +54,7 @@ jobs: fail-fast: false container: - image: ghcr.io/elementary/flatpak-platform/runtime:8-${{ matrix.configuration.arch }} + image: ghcr.io/elementary/flatpak-platform/runtime:8.1-${{ matrix.configuration.arch }} options: --privileged steps: From b74fa695dd91f07d7db115d4614c6d33e7f6a3d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Mon, 3 Mar 2025 13:18:59 -0800 Subject: [PATCH 3/8] Update merge.yml --- .github/workflows/merge.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index fa9ecb404..cf1becbed 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -21,7 +21,7 @@ jobs: fail-fast: false container: - image: ghcr.io/elementary/flatpak-platform/runtime:8-${{ matrix.configuration.arch }} + image: ghcr.io/elementary/flatpak-platform/runtime:8.1-${{ matrix.configuration.arch }} options: --privileged steps: From aba91a2b93849a7e4edc52de9162beb1eb83cc9a Mon Sep 17 00:00:00 2001 From: Ryo Nakano Date: Fri, 2 May 2025 19:32:14 +0900 Subject: [PATCH 4/8] Bump forks to 0.15.9 --- io.elementary.mail.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/io.elementary.mail.json b/io.elementary.mail.json index 69d7a713e..ae3651a30 100644 --- a/io.elementary.mail.json +++ b/io.elementary.mail.json @@ -109,7 +109,7 @@ { "type": "git", "url": "https://gitlab.gnome.org/GNOME/folks.git", - "tag": "0.15.5" + "tag": "0.15.9" } ] }, From 5e66bd59c9fb2065f6196b8bd4e2aefeccd2c132 Mon Sep 17 00:00:00 2001 From: Ryo Nakano Date: Fri, 2 May 2025 19:43:45 +0900 Subject: [PATCH 5/8] Explicit libdir to prevent installation to /app/lib64 --- io.elementary.mail.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/io.elementary.mail.json b/io.elementary.mail.json index ae3651a30..ce1c16f5d 100644 --- a/io.elementary.mail.json +++ b/io.elementary.mail.json @@ -103,7 +103,8 @@ "-Dofono_backend=false", "-Dtelepathy_backend=false", "-Dimport_tool=false", - "-Dinspect_tool=false" + "-Dinspect_tool=false", + "-Dlibdir=/app/lib" ], "sources": [ { From 67b28b2ee3451588adceea153f3e2a7992473aed Mon Sep 17 00:00:00 2001 From: Ryo Nakano Date: Sat, 26 Jul 2025 21:24:52 +0900 Subject: [PATCH 6/8] Flatpak: bump platform to 8.2 --- .github/workflows/ci.yml | 2 +- .github/workflows/merge.yml | 2 +- io.elementary.mail.json | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 1755e6ce1..7cef92fc3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -54,7 +54,7 @@ jobs: fail-fast: false container: - image: ghcr.io/elementary/flatpak-platform/runtime:8.1-${{ matrix.configuration.arch }} + image: ghcr.io/elementary/flatpak-platform/runtime:8.2-${{ matrix.configuration.arch }} options: --privileged steps: diff --git a/.github/workflows/merge.yml b/.github/workflows/merge.yml index 3d1b24299..ebd61cabe 100644 --- a/.github/workflows/merge.yml +++ b/.github/workflows/merge.yml @@ -21,7 +21,7 @@ jobs: fail-fast: false container: - image: ghcr.io/elementary/flatpak-platform/runtime:8.1-${{ matrix.configuration.arch }} + image: ghcr.io/elementary/flatpak-platform/runtime:8.2-${{ matrix.configuration.arch }} options: --privileged steps: diff --git a/io.elementary.mail.json b/io.elementary.mail.json index ce1c16f5d..fae6f403a 100644 --- a/io.elementary.mail.json +++ b/io.elementary.mail.json @@ -1,7 +1,7 @@ { - "app-id": "io.elementary.mail", + "id": "io.elementary.mail", "runtime": "io.elementary.Platform", - "runtime-version": "8.1", + "runtime-version": "8.2", "sdk": "io.elementary.Sdk", "command": "io.elementary.mail", "finish-args": [ From 0f98948a8a136f496adb62ca0cb556099a79d70a Mon Sep 17 00:00:00 2001 From: Ryo Nakano Date: Sat, 26 Jul 2025 22:46:52 +0900 Subject: [PATCH 7/8] Use latest EDS to avoid crash when building --- io.elementary.mail.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/io.elementary.mail.json b/io.elementary.mail.json index fae6f403a..e4eb5d2b4 100644 --- a/io.elementary.mail.json +++ b/io.elementary.mail.json @@ -51,7 +51,7 @@ { "type": "git", "url": "https://gitlab.gnome.org/GNOME/evolution-data-server.git", - "tag": "3.52.4" + "tag": "3.57.1" } ], "modules": [ From 32705adae06bb68785385e7b671313781db90d37 Mon Sep 17 00:00:00 2001 From: Ryo Nakano Date: Sun, 27 Jul 2025 21:34:46 +0900 Subject: [PATCH 8/8] Avoid API-breaking changes in camel --- io.elementary.mail.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/io.elementary.mail.json b/io.elementary.mail.json index e4eb5d2b4..e7bb2f440 100644 --- a/io.elementary.mail.json +++ b/io.elementary.mail.json @@ -51,7 +51,7 @@ { "type": "git", "url": "https://gitlab.gnome.org/GNOME/evolution-data-server.git", - "tag": "3.57.1" + "tag": "3.56.2" } ], "modules": [