From 39460d64f2665d22f6fc4f6f57f863e8106304f3 Mon Sep 17 00:00:00 2001 From: Ryo Nakano Date: Mon, 8 Dec 2025 21:08:52 +0900 Subject: [PATCH 1/6] 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 2/6] 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 3/6] 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 4/6] 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 5/6] 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 6/6] 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",