From 331a7b13d957da585630b5ca25155393c16db292 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Mon, 3 Mar 2025 13:08:36 -0800 Subject: [PATCH 1/7] Bump platform to 8.1 --- io.elementary.code.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/io.elementary.code.yml b/io.elementary.code.yml index c0764fbf43..0e21036f74 100644 --- a/io.elementary.code.yml +++ b/io.elementary.code.yml @@ -1,6 +1,6 @@ app-id: io.elementary.code runtime: io.elementary.Sdk # The outline plugin requires libvala which is only in the SDK, not the runtime -runtime-version: '7.1' +runtime-version: '8.1' sdk: io.elementary.Sdk command: io.elementary.code finish-args: From f611c216ff26b66a74812b649e39b94954c0245e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Danielle=20For=C3=A9?= Date: Mon, 3 Mar 2025 13:11:38 -0800 Subject: [PATCH 2/7] 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 fdf5ef0449..515dd7c843 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,7 +45,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 19a7862a59f8e3de684160f139fa45786212e5e6 Mon Sep 17 00:00:00 2001 From: Ryo Nakano Date: Sat, 26 Jul 2025 20:19:53 +0900 Subject: [PATCH 3/7] Install libs under /app/lib instead of /app/lib64 --- io.elementary.code.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/io.elementary.code.yml b/io.elementary.code.yml index ff91e5f7c1..58e701b24b 100644 --- a/io.elementary.code.yml +++ b/io.elementary.code.yml @@ -78,6 +78,7 @@ modules: buildsystem: cmake-ninja config-opts: - '-DCMAKE_BUILD_TYPE=RelWithDebInfo' + - '-DCMAKE_INSTALL_LIBDIR:PATH=/app/lib' sources: - type: git url: https://github.com/libgit2/libgit2.git @@ -88,6 +89,7 @@ modules: config-opts: - '-DCMAKE_BUILD_TYPE=RelWithDebInfo' - '-DBUILD_DOCUMENTATION:BOOL=OFF' + - '-DCMAKE_INSTALL_LIBDIR:PATH=/app/lib' sources: - type: git url: https://github.com/editorconfig/editorconfig-core-c.git From 6f0b46ac7e5ae9307731cf62c976c07488cbd2c0 Mon Sep 17 00:00:00 2001 From: Ryo Nakano Date: Sat, 26 Jul 2025 20:35:34 +0900 Subject: [PATCH 4/7] Flatpak: bump platform to 8.2 --- .github/workflows/ci.yml | 2 +- io.elementary.code.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 92c3066b4b..677f17ac83 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -45,7 +45,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.code.yml b/io.elementary.code.yml index 58e701b24b..667c868542 100644 --- a/io.elementary.code.yml +++ b/io.elementary.code.yml @@ -1,6 +1,6 @@ -app-id: io.elementary.code +id: io.elementary.code runtime: io.elementary.Sdk # The outline plugin requires libvala which is only in the SDK, not the runtime -runtime-version: '8.1' +runtime-version: '8.2' sdk: io.elementary.Sdk command: io.elementary.code finish-args: From 524209599da0ad35da58012f5c4abbe0dff00759 Mon Sep 17 00:00:00 2001 From: Ryo Nakano Date: Sat, 26 Jul 2025 20:40:12 +0900 Subject: [PATCH 5/7] Install gtksourceview under /app/lib explicitly --- io.elementary.code.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/io.elementary.code.yml b/io.elementary.code.yml index 667c868542..d9f8389c02 100644 --- a/io.elementary.code.yml +++ b/io.elementary.code.yml @@ -29,6 +29,8 @@ cleanup: modules: - name: gtksourceview buildsystem: meson + config-opts: + - --libdir=/app/lib sources: - type: git url: https://gitlab.gnome.org/GNOME/gtksourceview.git From 242984c22819e3a0aa4d9c0e6a4dbacf5b980e82 Mon Sep 17 00:00:00 2001 From: Ryo Nakano Date: Sat, 26 Jul 2025 20:56:27 +0900 Subject: [PATCH 6/7] Install libpeas under /app/lib explicitly --- io.elementary.code.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/io.elementary.code.yml b/io.elementary.code.yml index d9f8389c02..af18d4ff14 100644 --- a/io.elementary.code.yml +++ b/io.elementary.code.yml @@ -41,6 +41,7 @@ modules: config-opts: - -Dlua51=false - -Dgjs=false + - --libdir=/app/lib sources: - type: archive url: https://download.gnome.org/sources/libpeas/2.0/libpeas-2.0.5.tar.xz From f36394eb1b38ee92435f6b4d89fd83f229c686a8 Mon Sep 17 00:00:00 2001 From: Ryo Nakano Date: Sat, 26 Jul 2025 21:12:22 +0900 Subject: [PATCH 7/7] Set libdir globally --- io.elementary.code.yml | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/io.elementary.code.yml b/io.elementary.code.yml index af18d4ff14..39ceeaf607 100644 --- a/io.elementary.code.yml +++ b/io.elementary.code.yml @@ -26,11 +26,11 @@ cleanup: - '/share/vala' - '*.a' - '*.la' +build-options: + libdir: /app/lib modules: - name: gtksourceview buildsystem: meson - config-opts: - - --libdir=/app/lib sources: - type: git url: https://gitlab.gnome.org/GNOME/gtksourceview.git @@ -41,7 +41,6 @@ modules: config-opts: - -Dlua51=false - -Dgjs=false - - --libdir=/app/lib sources: - type: archive url: https://download.gnome.org/sources/libpeas/2.0/libpeas-2.0.5.tar.xz @@ -69,7 +68,6 @@ modules: - '-DBUILD_SHARED_LIBS:BOOL=ON' - '-DBUILD_EXAMPLES:BOOL=OFF' - '-DBUILD_TESTING:BOOL=OFF' - - '-DCMAKE_INSTALL_LIBDIR:PATH=/app/lib' cleanup: - '/share/man' - '/share/doc' @@ -81,7 +79,6 @@ modules: buildsystem: cmake-ninja config-opts: - '-DCMAKE_BUILD_TYPE=RelWithDebInfo' - - '-DCMAKE_INSTALL_LIBDIR:PATH=/app/lib' sources: - type: git url: https://github.com/libgit2/libgit2.git @@ -92,7 +89,6 @@ modules: config-opts: - '-DCMAKE_BUILD_TYPE=RelWithDebInfo' - '-DBUILD_DOCUMENTATION:BOOL=OFF' - - '-DCMAKE_INSTALL_LIBDIR:PATH=/app/lib' sources: - type: git url: https://github.com/editorconfig/editorconfig-core-c.git