From 39460d64f2665d22f6fc4f6f57f863e8106304f3 Mon Sep 17 00:00:00 2001 From: Ryo Nakano Date: Mon, 8 Dec 2025 21:08:52 +0900 Subject: [PATCH 01/18] Rebase on freedesktop platform --- io.elementary.Sdk.json.in | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/io.elementary.Sdk.json.in b/io.elementary.Sdk.json.in index 6083c1a..d8ce935 100644 --- a/io.elementary.Sdk.json.in +++ b/io.elementary.Sdk.json.in @@ -3,16 +3,16 @@ "id": "io.elementary.Sdk", "id-platform": "io.elementary.Platform", "default-branch": "@branch@", - "runtime-version": "49", - "runtime": "org.gnome.Platform", - "sdk": "org.gnome.Sdk", + "runtime-version": "25.08", + "runtime": "org.freedesktop.Platform", + "sdk": "org.freedesktop.Sdk", "sdk-extensions": [ - "org.gnome.Sdk.Debug", - "org.gnome.Sdk.Locale", - "org.gnome.Sdk.Docs" + "org.freedesktop.Sdk.Debug", + "org.freedesktop.Sdk.Locale", + "org.freedesktop.Sdk.Docs" ], "platform-extensions": [ - "org.gnome.Platform.Locale" + "org.freedesktop.Platform.Locale" ], "inherit-extensions": [ "org.freedesktop.Platform.GL", From 6c4a1fa5c015cf354f5cb4e99acb8070f8e69b27 Mon Sep 17 00:00:00 2001 From: Ryo Nakano Date: Mon, 8 Dec 2025 21:48:52 +0900 Subject: [PATCH 02/18] Add vala --- io.elementary.Sdk.json.in | 41 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) diff --git a/io.elementary.Sdk.json.in b/io.elementary.Sdk.json.in index d8ce935..7b72f0d 100644 --- a/io.elementary.Sdk.json.in +++ b/io.elementary.Sdk.json.in @@ -50,6 +50,47 @@ } }, "modules": [ + { + "name": "vala", + "cleanup": [ + "*" + ], + "buildsystem": "autotools", + "sources": [ + { + "type": "git", + "url": "https://gitlab.gnome.org/GNOME/vala.git", + "tag": "0.56.18", + "commit": "0996c1b8604c77f854854daa874a08579d1b9c1a", + "x-checker-data": { + "type": "git", + "tag-pattern": "^([\\d.]+)$" + } + } + ], + "modules": [ + { + "name": "graphviz", + "cleanup": [ + "/include", + "/bin", + "/share/graphviz" + ], + "sources": [ + { + "type": "git", + "url": "https://gitlab.com/graphviz/graphviz.git", + "tag": "14.1.0", + "commit": "dc69e2feb5d8e621b4eaf01f208906503ef9b973", + "x-checker-data": { + "type": "git", + "tag-pattern": "^([\\d.]+)$" + } + } + ] + } + ] + }, { "name": "icons", "buildsystem": "meson", From c5bc49599e6666db0cbcc29db5154a483da88d78 Mon Sep 17 00:00:00 2001 From: Ryo Nakano Date: Tue, 9 Dec 2025 20:22:54 +0900 Subject: [PATCH 03/18] Use archives, add missing modules --- io.elementary.Sdk.json.in | 87 +++++++++++++++++++++++++++++++++------ 1 file changed, 75 insertions(+), 12 deletions(-) diff --git a/io.elementary.Sdk.json.in b/io.elementary.Sdk.json.in index 7b72f0d..8967d46 100644 --- a/io.elementary.Sdk.json.in +++ b/io.elementary.Sdk.json.in @@ -58,13 +58,12 @@ "buildsystem": "autotools", "sources": [ { - "type": "git", - "url": "https://gitlab.gnome.org/GNOME/vala.git", - "tag": "0.56.18", - "commit": "0996c1b8604c77f854854daa874a08579d1b9c1a", + "type": "archive", + "url": "https://download.gnome.org/sources/vala/0.56/vala-0.56.18.tar.xz", + "sha256": "f2affe7d40ab63db8e7b9ecc3f6bdc9c2fc7e3134c84ff2d795f482fe926a382", "x-checker-data": { - "type": "git", - "tag-pattern": "^([\\d.]+)$" + "type": "gnome", + "name": "vala" } } ], @@ -78,19 +77,83 @@ ], "sources": [ { - "type": "git", - "url": "https://gitlab.com/graphviz/graphviz.git", - "tag": "14.1.0", - "commit": "dc69e2feb5d8e621b4eaf01f208906503ef9b973", + "type": "archive", + "url": "https://gitlab.com/graphviz/graphviz/-/archive/14.1.0/graphviz-14.1.0.tar.gz", + "sha256": "094e87ed6946ff71f5d27cd754d46bd62429ac7ff3ca20b5648a3977c62df556", "x-checker-data": { - "type": "git", - "tag-pattern": "^([\\d.]+)$" + "type": "anitya", + "project-id": 1249, + "url-template": "https://gitlab.com/graphviz/graphviz/-/archive/$version/graphviz-$version.tar.gz" } } ] } ] }, + { + "name": "libgee", + "buildsystem": "autotools", + "build-options": { + "cflags": "-Wno-error=incompatible-pointer-types" + }, + "sources": [ + { + "type": "archive", + "url": "https://download.gnome.org/sources/libgee/0.20/libgee-0.20.8.tar.xz", + "sha256": "189815ac143d89867193b0c52b7dc31f3aa108a15f04d6b5dca2b6adfad0b0ee", + "x-checker-data": { + "type": "gnome", + "name": "libgee" + } + } + ] + }, + { + "name": "gtk", + "buildsystem": "meson", + "config-opts": [ + "-Dbuild-demos=false", + "-Dbuild-testsuite=false", + "-Dbuild-examples=false", + "-Dbuild-tests=false" + ], + "sources": [ + { + "type": "archive", + "url": "https://download.gnome.org/sources/gtk/4.20/gtk-4.20.3.tar.xz", + "sha256": "2873f2903088a66c71173ea2ed85ffae266a66b972c3a4842bbb2f6f187ec153", + "x-checker-data": { + "type": "gnome", + "name": "gtk", + "versions": { + "<": "4.21" + } + } + } + ] + }, + { + "name": "libadwaita", + "buildsystem": "meson", + "config-opts": [ + "-Dtests=false", + "-Dexamples=false" + ], + "sources": [ + { + "type": "archive", + "url": "https://download.gnome.org/sources/libadwaita/1.8/libadwaita-1.8.2.tar.xz", + "sha256": "589a6e0f4191740e8690a7d3298e16fa0d4061341b551da7abb2f030b550adb1", + "x-checker-data": { + "type": "gnome", + "name": "libadwaita", + "versions": { + "<": "1.9" + } + } + } + ] + }, { "name": "icons", "buildsystem": "meson", From ea55792b8c84edf911124eda451c0d553f2252e5 Mon Sep 17 00:00:00 2001 From: Ryo Nakano Date: Tue, 9 Dec 2025 20:58:59 +0900 Subject: [PATCH 04/18] Fix wrong sha256 --- io.elementary.Sdk.json.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/io.elementary.Sdk.json.in b/io.elementary.Sdk.json.in index 8967d46..5b9ccda 100644 --- a/io.elementary.Sdk.json.in +++ b/io.elementary.Sdk.json.in @@ -79,7 +79,7 @@ { "type": "archive", "url": "https://gitlab.com/graphviz/graphviz/-/archive/14.1.0/graphviz-14.1.0.tar.gz", - "sha256": "094e87ed6946ff71f5d27cd754d46bd62429ac7ff3ca20b5648a3977c62df556", + "sha256": "71fc8b295d51847e66844ab41825cfb653ef8b5671b5cd2ab36cd14d28a03cfb", "x-checker-data": { "type": "anitya", "project-id": 1249, From 0c5364adb2350226761fc83ae53e5b52af00bfa8 Mon Sep 17 00:00:00 2001 From: Ryo Nakano Date: Tue, 9 Dec 2025 22:48:36 +0900 Subject: [PATCH 05/18] Install sassc before libadwaita --- io.elementary.Sdk.json.in | 86 +++++++++++++++++++-------------------- 1 file changed, 42 insertions(+), 44 deletions(-) diff --git a/io.elementary.Sdk.json.in b/io.elementary.Sdk.json.in index 5b9ccda..b952ad8 100644 --- a/io.elementary.Sdk.json.in +++ b/io.elementary.Sdk.json.in @@ -132,6 +132,48 @@ } ] }, + { + "name": "sassc", + "cleanup": [ + "*" + ], + "sources": [ + { + "type": "git", + "url": "https://github.com/sass/sassc.git", + "tag": "3.6.2" + }, + { + "type": "script", + "dest-filename": "autogen.sh", + "commands": [ + "autoreconf -si" + ] + } + ], + "modules": [ + { + "name": "libsass", + "cleanup": [ + "*" + ], + "sources": [ + { + "type": "git", + "url": "https://github.com/sass/libsass.git", + "tag": "3.6.5" + }, + { + "type": "script", + "dest-filename": "autogen.sh", + "commands": [ + "autoreconf -si" + ] + } + ] + } + ] + }, { "name": "libadwaita", "buildsystem": "meson", @@ -204,50 +246,6 @@ "tag-pattern": "^([\\d.]+)$" } } - ], - "modules": [ - { - "name": "sassc", - "cleanup": [ - "*" - ], - "sources": [ - { - "type": "git", - "url": "https://github.com/sass/sassc.git", - "tag": "3.6.2" - }, - { - "type": "script", - "dest-filename": "autogen.sh", - "commands": [ - "autoreconf -si" - ] - } - ], - "modules": [ - { - "name": "libsass", - "cleanup": [ - "*" - ], - "sources": [ - { - "type": "git", - "url": "https://github.com/sass/libsass.git", - "tag": "3.6.5" - }, - { - "type": "script", - "dest-filename": "autogen.sh", - "commands": [ - "autoreconf -si" - ] - } - ] - } - ] - } ] }, { From 3d0b97ae27b3756fe4b6da8f1e8ef171a34978da Mon Sep 17 00:00:00 2001 From: Ryo Nakano Date: Wed, 10 Dec 2025 07:24:37 +0900 Subject: [PATCH 06/18] Enable gtk gir --- io.elementary.Sdk.json.in | 1 + 1 file changed, 1 insertion(+) diff --git a/io.elementary.Sdk.json.in b/io.elementary.Sdk.json.in index b952ad8..fb6f7b1 100644 --- a/io.elementary.Sdk.json.in +++ b/io.elementary.Sdk.json.in @@ -112,6 +112,7 @@ "name": "gtk", "buildsystem": "meson", "config-opts": [ + "-Dintrospection=enabled", "-Dbuild-demos=false", "-Dbuild-testsuite=false", "-Dbuild-examples=false", From 3fd49c9a91fc677d6c8de444b10ff508d3fed2a1 Mon Sep 17 00:00:00 2001 From: Ryo Nakano Date: Sun, 8 Feb 2026 20:58:12 +0900 Subject: [PATCH 07/18] Use older version of GTK without the cursor shape protocol --- io.elementary.Sdk.json.in | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/io.elementary.Sdk.json.in b/io.elementary.Sdk.json.in index fb6f7b1..6883c86 100644 --- a/io.elementary.Sdk.json.in +++ b/io.elementary.Sdk.json.in @@ -121,13 +121,13 @@ "sources": [ { "type": "archive", - "url": "https://download.gnome.org/sources/gtk/4.20/gtk-4.20.3.tar.xz", - "sha256": "2873f2903088a66c71173ea2ed85ffae266a66b972c3a4842bbb2f6f187ec153", + "url": "https://download.gnome.org/sources/gtk/4.18/gtk-4.18.6.tar.xz", + "sha256": "e1817c650ddc3261f9a8345b3b22a26a5d80af154630dedc03cc7becefffd0fa", "x-checker-data": { "type": "gnome", "name": "gtk", "versions": { - "<": "4.21" + "<": "4.19" } } } @@ -185,13 +185,13 @@ "sources": [ { "type": "archive", - "url": "https://download.gnome.org/sources/libadwaita/1.8/libadwaita-1.8.2.tar.xz", - "sha256": "589a6e0f4191740e8690a7d3298e16fa0d4061341b551da7abb2f030b550adb1", + "url": "https://download.gnome.org/sources/libadwaita/1.7/libadwaita-1.7.10.tar.xz", + "sha256": "50435b2b2d49be19cd9b0b84d2bb775b8741e71e2555d26a73f81d1ab1e29033", "x-checker-data": { "type": "gnome", "name": "libadwaita", "versions": { - "<": "1.9" + "<": "1.8" } } } From cd2a5417fdfff95ad3d6ece7e34ed1b51550dff4 Mon Sep 17 00:00:00 2001 From: Ryo Nakano Date: Sat, 14 Mar 2026 15:47:23 +0900 Subject: [PATCH 08/18] Do not cleanup vala from SDK --- io.elementary.Sdk.json.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/io.elementary.Sdk.json.in b/io.elementary.Sdk.json.in index 6edb10d..7bc01f2 100644 --- a/io.elementary.Sdk.json.in +++ b/io.elementary.Sdk.json.in @@ -52,7 +52,7 @@ "modules": [ { "name": "vala", - "cleanup": [ + "cleanup-platform": [ "*" ], "buildsystem": "autotools", From f56ea150e05844f51c5805e26156302060b1680a Mon Sep 17 00:00:00 2001 From: Ryo Nakano Date: Sat, 14 Mar 2026 17:53:19 +0900 Subject: [PATCH 09/18] Install pygobject and its dependency, pycairo Because a project that uses elementary Flatpak Platform with blueprint-compiler fails to build without it, which was probably included in GNOME Flatpak Platform: Found ninja-1.13.2 at /usr/bin/ninja [1/50] Generating data/blueprints with a custom command FAILED: [code=1] data /app/bin/blueprint-compiler batch-compile data/. ../data ../data/ui/help-overlay.blp Traceback (most recent call last): File "/app/bin/blueprint-compiler", line 40, in from blueprintcompiler import main File "/app/lib/python3.13/site-packages/blueprintcompiler/main.py", line 27, in from . import formatter, interactive_port, linter, parser, tokenizer File "/app/lib/python3.13/site-packages/blueprintcompiler/interactive_port.py", line 25, in from . import decompiler, parser, tokenizer File "/app/lib/python3.13/site-packages/blueprintcompiler/decompiler.py", line 26, in from .gir import * File "/app/lib/python3.13/site-packages/blueprintcompiler/gir.py", line 25, in import gi # type: ignore ^^^^^^^^^ ModuleNotFoundError: No module named 'gi' [2/50] Merging translations for data/com.github.ryonakano.reco.Devel.metainfo.xml ninja: build stopped: subcommand failed. --- io.elementary.Sdk.json.in | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/io.elementary.Sdk.json.in b/io.elementary.Sdk.json.in index 7bc01f2..dee3e1e 100644 --- a/io.elementary.Sdk.json.in +++ b/io.elementary.Sdk.json.in @@ -90,6 +90,38 @@ } ] }, + { + "name": "pygobject", + "buildsystem": "meson", + "sources": [ + { + "type": "archive", + "url": "https://download.gnome.org/sources/pygobject/3.56/pygobject-3.56.1.tar.gz", + "sha256": "2ec1cc8c55c7ffeebb97e58a9bba7aa1e74611f1173628084685446804a8881a", + "x-checker-data": { + "type": "gnome", + "name": "pygobject" + } + } + ], + "modules": [ + { + "name": "pycairo", + "cleanup": [ + "*" + ], + "buildsystem": "meson", + "sources": [ + { + "type": "git", + "url": "https://github.com/pygobject/pycairo.git", + "tag": "v1.29.0", + "commit": "f2c40870be2d5e9d15ecee339e1d5e30d82c7959" + } + ] + } + ] + }, { "name": "libgee", "buildsystem": "autotools", From b8abcb6e38d0c3890069bc2aaec21745353296b4 Mon Sep 17 00:00:00 2001 From: Ryo Nakano Date: Thu, 7 May 2026 23:12:29 +0900 Subject: [PATCH 10/18] Bump libadwaita to 1.7.12 --- io.elementary.Sdk.json.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/io.elementary.Sdk.json.in b/io.elementary.Sdk.json.in index 615d835..77c8f36 100644 --- a/io.elementary.Sdk.json.in +++ b/io.elementary.Sdk.json.in @@ -217,8 +217,8 @@ "sources": [ { "type": "archive", - "url": "https://download.gnome.org/sources/libadwaita/1.7/libadwaita-1.7.10.tar.xz", - "sha256": "50435b2b2d49be19cd9b0b84d2bb775b8741e71e2555d26a73f81d1ab1e29033", + "url": "https://download.gnome.org/sources/libadwaita/1.7/libadwaita-1.7.12.tar.xz", + "sha256": "94c41ab41c2d2188af8290ac0dbb906896cf75e76e69722c2ea2572531de3308", "x-checker-data": { "type": "gnome", "name": "libadwaita", From 245ccc95fb89103cd04c5a78a37989a1cb929745 Mon Sep 17 00:00:00 2001 From: Ryo Nakano Date: Sat, 29 Aug 2026 22:16:35 +0900 Subject: [PATCH 11/18] Use newer GTK and libadwaita --- io.elementary.Sdk.json.in | 27 +++++++++++++++------------ 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/io.elementary.Sdk.json.in b/io.elementary.Sdk.json.in index 8296b0c..0d31eee 100644 --- a/io.elementary.Sdk.json.in +++ b/io.elementary.Sdk.json.in @@ -141,7 +141,14 @@ ] }, { - "name": "gtk", + "name": "gtk4", + "cleanup": [ + "/bin", + "/share/bash-completion", + "/share/gettext", + "/share/glib-2.0", + "/share/gtk-4.0" + ], "buildsystem": "meson", "config-opts": [ "-Dintrospection=enabled", @@ -153,14 +160,13 @@ "sources": [ { "type": "archive", - "url": "https://download.gnome.org/sources/gtk/4.18/gtk-4.18.6.tar.xz", - "sha256": "e1817c650ddc3261f9a8345b3b22a26a5d80af154630dedc03cc7becefffd0fa", + "url": "https://download.gnome.org/sources/gtk/4.22/gtk-4.22.4.tar.xz", + "sha256": "51bd9f60c7d23a665a556c7364c21fb2e4e282566b3e7e092455e8f910330893", "x-checker-data": { "type": "gnome", "name": "gtk", - "versions": { - "<": "4.19" - } + "stable-only": true, + "version-scheme": "odd-minor-is-unstable" } } ] @@ -217,14 +223,11 @@ "sources": [ { "type": "archive", - "url": "https://download.gnome.org/sources/libadwaita/1.7/libadwaita-1.7.12.tar.xz", - "sha256": "94c41ab41c2d2188af8290ac0dbb906896cf75e76e69722c2ea2572531de3308", + "url": "https://download.gnome.org/sources/libadwaita/1.9/libadwaita-1.9.3.tar.xz", + "sha256": "fc59b37028fe0126308e7b805d2f6e4e80227080a1797715e5e6286b8111e723", "x-checker-data": { "type": "gnome", - "name": "libadwaita", - "versions": { - "<": "1.8" - } + "name": "libadwaita" } } ] From 653031189df0c3fb671a92467c3a3772c58caf7b Mon Sep 17 00:00:00 2001 From: Ryo Nakano Date: Sun, 20 Sep 2026 07:08:18 +0900 Subject: [PATCH 12/18] libgee: Remove no longer needed cflags --- io.elementary.Sdk.json.in | 3 --- 1 file changed, 3 deletions(-) diff --git a/io.elementary.Sdk.json.in b/io.elementary.Sdk.json.in index 13b70a0..1322ddc 100644 --- a/io.elementary.Sdk.json.in +++ b/io.elementary.Sdk.json.in @@ -125,9 +125,6 @@ { "name": "libgee", "buildsystem": "autotools", - "build-options": { - "cflags": "-Wno-error=incompatible-pointer-types" - }, "sources": [ { "type": "archive", From 69e4665ae46c59d296eb1523e53f393dff2de77b Mon Sep 17 00:00:00 2001 From: Ryo Nakano Date: Sun, 20 Sep 2026 07:09:19 +0900 Subject: [PATCH 13/18] Use org.freedesktop.Sdk.Extension.vala instead of adding the module by ourselves --- io.elementary.Sdk.json.in | 47 +++++---------------------------------- 1 file changed, 5 insertions(+), 42 deletions(-) diff --git a/io.elementary.Sdk.json.in b/io.elementary.Sdk.json.in index 1322ddc..8cc0b15 100644 --- a/io.elementary.Sdk.json.in +++ b/io.elementary.Sdk.json.in @@ -9,7 +9,8 @@ "sdk-extensions": [ "org.freedesktop.Sdk.Debug", "org.freedesktop.Sdk.Locale", - "org.freedesktop.Sdk.Docs" + "org.freedesktop.Sdk.Docs", + "org.freedesktop.Sdk.Extension.vala" ], "platform-extensions": [ "org.freedesktop.Platform.Locale" @@ -47,49 +48,11 @@ "build-options": { "env": { "PYTHON": "python3" - } + }, + "prepend-path": "/usr/lib/sdk/vala/bin", + "prepend-ld-library-path": "/usr/lib/sdk/vala/lib" }, "modules": [ - { - "name": "vala", - "cleanup-platform": [ - "*" - ], - "buildsystem": "autotools", - "sources": [ - { - "type": "archive", - "url": "https://download.gnome.org/sources/vala/0.56/vala-0.56.18.tar.xz", - "sha256": "f2affe7d40ab63db8e7b9ecc3f6bdc9c2fc7e3134c84ff2d795f482fe926a382", - "x-checker-data": { - "type": "gnome", - "name": "vala" - } - } - ], - "modules": [ - { - "name": "graphviz", - "cleanup": [ - "/include", - "/bin", - "/share/graphviz" - ], - "sources": [ - { - "type": "archive", - "url": "https://gitlab.com/graphviz/graphviz/-/archive/14.1.0/graphviz-14.1.0.tar.gz", - "sha256": "71fc8b295d51847e66844ab41825cfb653ef8b5671b5cd2ab36cd14d28a03cfb", - "x-checker-data": { - "type": "anitya", - "project-id": 1249, - "url-template": "https://gitlab.com/graphviz/graphviz/-/archive/$version/graphviz-$version.tar.gz" - } - } - ] - } - ] - }, { "name": "pygobject", "buildsystem": "meson", From 205fd98561ab6b4f2921363aceacf4fcc25ea704 Mon Sep 17 00:00:00 2001 From: Ryo Nakano Date: Sun, 20 Sep 2026 07:11:14 +0900 Subject: [PATCH 14/18] Bump to org.freedesktop.Platform 26.08 --- .gitmodules | 3 +++ io.elementary.Sdk.json.in | 5 ++++- shared-modules | 1 + 3 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 .gitmodules create mode 160000 shared-modules diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..1e7a990 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "shared-modules"] + path = shared-modules + url = https://github.com/flathub/shared-modules.git diff --git a/io.elementary.Sdk.json.in b/io.elementary.Sdk.json.in index 8cc0b15..00e1b26 100644 --- a/io.elementary.Sdk.json.in +++ b/io.elementary.Sdk.json.in @@ -3,7 +3,7 @@ "id": "io.elementary.Sdk", "id-platform": "io.elementary.Platform", "default-branch": "@branch@", - "runtime-version": "25.08", + "runtime-version": "26.08", "runtime": "org.freedesktop.Platform", "sdk": "org.freedesktop.Sdk", "sdk-extensions": [ @@ -190,6 +190,9 @@ "name": "libadwaita" } } + ], + "modules": [ + "../shared-modules/appstream/appstream-compose.json" ] }, { diff --git a/shared-modules b/shared-modules new file mode 160000 index 0000000..cb9ec60 --- /dev/null +++ b/shared-modules @@ -0,0 +1 @@ +Subproject commit cb9ec602a1ece1c76d5a4f8aa1d87c4a6bf99c3e From 15cc5b4d0c137d7b872109799f608b29ddc202f0 Mon Sep 17 00:00:00 2001 From: Ryo Nakano Date: Sun, 20 Sep 2026 07:11:44 +0900 Subject: [PATCH 15/18] Update GTK and libadwaita --- io.elementary.Sdk.json.in | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/io.elementary.Sdk.json.in b/io.elementary.Sdk.json.in index 00e1b26..6a1dd98 100644 --- a/io.elementary.Sdk.json.in +++ b/io.elementary.Sdk.json.in @@ -120,13 +120,16 @@ "sources": [ { "type": "archive", - "url": "https://download.gnome.org/sources/gtk/4.22/gtk-4.22.4.tar.xz", - "sha256": "51bd9f60c7d23a665a556c7364c21fb2e4e282566b3e7e092455e8f910330893", + "url": "https://download.gnome.org/sources/gtk/4.22/gtk-4.22.5.tar.xz", + "sha256": "7fd725deb2cb3f8dc218ad862c5056ff8548f49d3b0e4081796e444c22d19686", "x-checker-data": { "type": "gnome", "name": "gtk", "stable-only": true, - "version-scheme": "odd-minor-is-unstable" + "version-scheme": "odd-minor-is-unstable", + "versions": { + "<": "2.24.0" + } } } ] @@ -183,11 +186,14 @@ "sources": [ { "type": "archive", - "url": "https://download.gnome.org/sources/libadwaita/1.9/libadwaita-1.9.3.tar.xz", - "sha256": "fc59b37028fe0126308e7b805d2f6e4e80227080a1797715e5e6286b8111e723", + "url": "https://download.gnome.org/sources/libadwaita/1.9/libadwaita-1.9.4.tar.xz", + "sha256": "f5ab3453ee743dc293cdf96d6821789cd20e8d125d9b41637703c12bfa4162ee", "x-checker-data": { "type": "gnome", - "name": "libadwaita" + "name": "libadwaita", + "versions": { + "<": "1.10.0" + } } } ], From ba22a765b3df7216c63b49c34c116af57340eec6 Mon Sep 17 00:00:00 2001 From: Ryo Nakano Date: Sun, 20 Sep 2026 07:12:49 +0900 Subject: [PATCH 16/18] Update pygobject --- io.elementary.Sdk.json.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/io.elementary.Sdk.json.in b/io.elementary.Sdk.json.in index 6a1dd98..a86beba 100644 --- a/io.elementary.Sdk.json.in +++ b/io.elementary.Sdk.json.in @@ -59,8 +59,8 @@ "sources": [ { "type": "archive", - "url": "https://download.gnome.org/sources/pygobject/3.56/pygobject-3.56.1.tar.gz", - "sha256": "2ec1cc8c55c7ffeebb97e58a9bba7aa1e74611f1173628084685446804a8881a", + "url": "https://download.gnome.org/sources/pygobject/3.58/pygobject-3.58.0.tar.gz", + "sha256": "45068697de3ffe46840ca369705f23118b34db4f7deb63f6eff079a6734ddcca", "x-checker-data": { "type": "gnome", "name": "pygobject" From a3135316c781344f678553988de8682193dc3bb3 Mon Sep 17 00:00:00 2001 From: Ryo Nakano Date: Sun, 20 Sep 2026 07:20:49 +0900 Subject: [PATCH 17/18] Actions: Make sure to checkout submodules --- .github/workflows/ci.yml | 2 ++ .github/workflows/daily.yml | 2 ++ .github/workflows/flatpak-x-checker.yml | 2 ++ .github/workflows/release.yml | 2 ++ 4 files changed, 8 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9c1c4d4..198fb61 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,6 +33,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@v7 + with: + submodules: recursive - name: Clean uses: ./.github/actions/maximize-build-space diff --git a/.github/workflows/daily.yml b/.github/workflows/daily.yml index 2f4ee77..358be27 100644 --- a/.github/workflows/daily.yml +++ b/.github/workflows/daily.yml @@ -34,6 +34,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@v7 + with: + submodules: recursive - name: Clean uses: ./.github/actions/maximize-build-space diff --git a/.github/workflows/flatpak-x-checker.yml b/.github/workflows/flatpak-x-checker.yml index a32782e..08b2b89 100644 --- a/.github/workflows/flatpak-x-checker.yml +++ b/.github/workflows/flatpak-x-checker.yml @@ -10,6 +10,8 @@ jobs: steps: - uses: actions/checkout@v7 + with: + submodules: recursive - uses: docker://ghcr.io/flathub/flatpak-external-data-checker:latest env: GIT_AUTHOR_NAME: elementaryBot diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ed270ad..b6f42b6 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -37,6 +37,8 @@ jobs: steps: - name: Checkout uses: actions/checkout@v7 + with: + submodules: recursive - name: Clean uses: ./.github/actions/maximize-build-space From 738af6ffcbd826f577f53ea9c61c1f99a0150037 Mon Sep 17 00:00:00 2001 From: Ryo Nakano Date: Sun, 20 Sep 2026 10:39:42 +0900 Subject: [PATCH 18/18] Drop pygobject We and third-party mostly uses Vala. Let's drop this for now and add when requested. --- io.elementary.Sdk.json.in | 32 -------------------------------- 1 file changed, 32 deletions(-) diff --git a/io.elementary.Sdk.json.in b/io.elementary.Sdk.json.in index a86beba..c5031ad 100644 --- a/io.elementary.Sdk.json.in +++ b/io.elementary.Sdk.json.in @@ -53,38 +53,6 @@ "prepend-ld-library-path": "/usr/lib/sdk/vala/lib" }, "modules": [ - { - "name": "pygobject", - "buildsystem": "meson", - "sources": [ - { - "type": "archive", - "url": "https://download.gnome.org/sources/pygobject/3.58/pygobject-3.58.0.tar.gz", - "sha256": "45068697de3ffe46840ca369705f23118b34db4f7deb63f6eff079a6734ddcca", - "x-checker-data": { - "type": "gnome", - "name": "pygobject" - } - } - ], - "modules": [ - { - "name": "pycairo", - "cleanup": [ - "*" - ], - "buildsystem": "meson", - "sources": [ - { - "type": "git", - "url": "https://github.com/pygobject/pycairo.git", - "tag": "v1.29.0", - "commit": "f2c40870be2d5e9d15ecee339e1d5e30d82c7959" - } - ] - } - ] - }, { "name": "libgee", "buildsystem": "autotools",