From 1dd9e3c7eb438344ae1eea41ab4d2b4c00d9b139 Mon Sep 17 00:00:00 2001 From: Sonny Piers Date: Mon, 28 Sep 2026 11:44:50 +0200 Subject: [PATCH 1/3] GNOME 51 --- Makefile | 4 ++-- build-aux/modules/libportal.json | 18 ------------------ build-aux/modules/libshumate.json | 4 ++-- build-aux/modules/libspelling.json | 4 ++-- build-aux/modules/vte.json | 23 ++++++++++------------- build-aux/re.sonny.Workbench.Devel.json | 3 +-- build-aux/re.sonny.Workbench.json | 3 +-- data/app.metainfo.xml | 18 ++++++++++++++++++ src/Extensions/Extensions.js | 2 +- src/langs/javascript/biome.json | 2 +- 10 files changed, 38 insertions(+), 43 deletions(-) delete mode 100644 build-aux/modules/libportal.json diff --git a/Makefile b/Makefile index 9c8627ef2..51af8d981 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ FLATPAK_ARGS ?= setup: flatpak $(FLATPAK_ARGS) remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo - flatpak $(FLATPAK_ARGS) install --or-update --noninteractive flathub org.gnome.Sdk//50 org.flatpak.Builder org.freedesktop.Sdk.Extension.rust-stable//25.08 org.freedesktop.Sdk.Extension.vala//25.08 org.freedesktop.Sdk.Extension.llvm22//25.08 org.freedesktop.Sdk.Extension.node26//25.08 org.freedesktop.Sdk.Extension.typescript//25.08 + flatpak $(FLATPAK_ARGS) install --or-update --noninteractive flathub org.gnome.Sdk//51 org.flatpak.Builder org.freedesktop.Sdk.Extension.rust-stable//26.08 org.freedesktop.Sdk.Extension.vala//26.08 org.freedesktop.Sdk.Extension.llvm22//26.08 org.freedesktop.Sdk.Extension.node26//26.08 org.freedesktop.Sdk.Extension.typescript//26.08 # flatpak remote-add --if-not-exists flathub-beta https://flathub.org/beta-repo/flathub-beta.flatpakrepo # flatpak remote-add --if-not-exists gnome-nightly https://nightly.gnome.org/gnome-nightly.flatpakrepo # flatpak install --or-update --noninteractive gnome-nightly org.gnome.Sdk//master @@ -79,6 +79,6 @@ flatpak: flatpak run org.flatpak.Builder --ccache --force-clean flatpak build-aux/re.sonny.Workbench.Devel.json # This is what Flathub does - consider moving to lint flatpak run --env=G_DEBUG=fatal-criticals --command=appstream-util org.flatpak.Builder validate flatpak/files/share/appdata/re.sonny.Workbench.Devel.appdata.xml - flatpak run --command="desktop-file-validate" --filesystem=host:ro org.freedesktop.Sdk//25.08 flatpak/files/share/applications/re.sonny.Workbench.Devel.desktop + flatpak run --command="desktop-file-validate" --filesystem=host:ro org.freedesktop.Sdk//26.08 flatpak/files/share/applications/re.sonny.Workbench.Devel.desktop # appstreamcli validate --override=release-time-missing=info /path/to/your/app.metainfo.xml flatpak run org.flatpak.Builder --run flatpak build-aux/re.sonny.Workbench.Devel.json bash diff --git a/build-aux/modules/libportal.json b/build-aux/modules/libportal.json deleted file mode 100644 index 6ec0005d4..000000000 --- a/build-aux/modules/libportal.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "name": "libportal", - "buildsystem": "meson", - "config-opts": [ - "-Dtests=false", - "-Dbackend-gtk3=disabled", - "-Dbackend-gtk4=enabled", - "-Dbackend-qt5=disabled", - "-Ddocs=false" - ], - "sources": [ - { - "type": "archive", - "url": "https://github.com/flatpak/libportal/releases/download/0.9.1/libportal-0.9.1.tar.xz", - "sha256": "de801ee349ed3c255a9af3c01b1a401fab5b3fc1c35eb2fd7dfb35d4b8194d7f" - } - ] -} diff --git a/build-aux/modules/libshumate.json b/build-aux/modules/libshumate.json index eff76e80a..1264982fa 100644 --- a/build-aux/modules/libshumate.json +++ b/build-aux/modules/libshumate.json @@ -5,8 +5,8 @@ "sources": [ { "type": "archive", - "url": "https://download.gnome.org/sources/libshumate/1.6/libshumate-1.6.1.tar.xz", - "sha256": "b36aad34500791785f546684d0f2ed644e4819ff4e85ae67a2245f159eccb2d4" + "url": "https://download.gnome.org/sources/libshumate/1.7/libshumate-1.7.0.tar.xz", + "sha256": "3896cc4b6a7bf83141c27df23ce48cdd68467603bc6b764960307cdcbbef80e5" } ], "modules": [ diff --git a/build-aux/modules/libspelling.json b/build-aux/modules/libspelling.json index 05448b1f6..a0bcbe6a5 100644 --- a/build-aux/modules/libspelling.json +++ b/build-aux/modules/libspelling.json @@ -5,8 +5,8 @@ "sources": [ { "type": "archive", - "url": "https://download.gnome.org/sources/libspelling/0.4/libspelling-0.4.9.tar.xz", - "sha256": "d093fd35ae0f1c98fb58876505287fc0a885e47da9d2411d6d7cd595f34d4ebf" + "url": "https://download.gnome.org/sources/libspelling/0.4/libspelling-0.4.10.tar.xz", + "sha256": "56e3f01a3a18b575beea4c34349f99cdaba316e1f7c271b1231f7bcf5d9af73b" } ] } diff --git a/build-aux/modules/vte.json b/build-aux/modules/vte.json index d5b1dacc8..b56fd8c4d 100644 --- a/build-aux/modules/vte.json +++ b/build-aux/modules/vte.json @@ -12,8 +12,8 @@ "sources": [ { "type": "archive", - "url": "https://download.gnome.org/sources/vte/0.84/vte-0.84.0.tar.xz", - "sha256": "0414e31583836aeb7878da25f67c515f7e8879917ecc37c92e26b83e8d8fc3e3" + "url": "https://download.gnome.org/sources/vte/0.84/vte-0.84.1.tar.xz", + "sha256": "aca1caa8478aebcdbb1d67897fb3511eb7601debae6810e16a15b6fa25f31ac8" } ], "modules": [ @@ -22,25 +22,22 @@ "buildsystem": "cmake-ninja", "sources": [ { - "type": "archive", - "url": "https://github.com/fastfloat/fast_float/archive/refs/tags/v8.2.5.tar.gz", - "sha256": "17c7fb14499fcf42c3f5d143df0fbe22172e92749ec5f75ef13224005421a654" + "type": "git", + "url": "https://github.com/fastfloat/fast_float.git", + "tag": "v8.2.5", + "commit": "05087a303dad9c98768b33c829d398223a649bc6" } ] }, { "name": "simdutf", "buildsystem": "cmake-ninja", - "config-opts": [ - "-DCMAKE_CXX_VISIBILITY_PRESET=hidden", - "-DCMAKE_POSITION_INDEPENDENT_CODE=TRUE", - "-DCMAKE_VISIBILITY_INLINES_HIDDEN=TRUE" - ], "sources": [ { - "type": "archive", - "url": "https://github.com/simdutf/simdutf/archive/refs/tags/v7.4.0.tar.gz", - "sha256": "8fd729ebfd5ec56cb0395bcc176c4801e1f8a0ea834d166d52279d7b9e801283" + "type": "git", + "url": "https://github.com/simdutf/simdutf.git", + "tag": "v9.0.0", + "commit": "ca7acbcea967b5dcbab490066e99e3a6e6925539" } ] } diff --git a/build-aux/re.sonny.Workbench.Devel.json b/build-aux/re.sonny.Workbench.Devel.json index d888c089e..e9c596607 100644 --- a/build-aux/re.sonny.Workbench.Devel.json +++ b/build-aux/re.sonny.Workbench.Devel.json @@ -2,7 +2,7 @@ "$schema": "https://raw.githubusercontent.com/flatpak/flatpak-builder/main/data/flatpak-manifest.schema.json", "id": "re.sonny.Workbench.Devel", "runtime": "org.gnome.Sdk", - "runtime-version": "50", + "runtime-version": "51", "sdk": "org.gnome.Sdk", "sdk-extensions": [ "org.freedesktop.Sdk.Extension.vala", @@ -40,7 +40,6 @@ "modules/biome.json", "modules/vte.json", "modules/libshumate.json", - "modules/libportal.json", "modules/libspelling.json", "modules/gom.json", "modules/GTKCssLanguageServer.json", diff --git a/build-aux/re.sonny.Workbench.json b/build-aux/re.sonny.Workbench.json index 083e086cd..5fdf1da65 100644 --- a/build-aux/re.sonny.Workbench.json +++ b/build-aux/re.sonny.Workbench.json @@ -2,7 +2,7 @@ "$schema": "https://raw.githubusercontent.com/flatpak/flatpak-builder/main/data/flatpak-manifest.schema.json", "id": "re.sonny.Workbench", "runtime": "org.gnome.Sdk", - "runtime-version": "50", + "runtime-version": "51", "sdk": "org.gnome.Sdk", "sdk-extensions": [ "org.freedesktop.Sdk.Extension.vala", @@ -40,7 +40,6 @@ "modules/biome.json", "modules/vte.json", "modules/libshumate.json", - "modules/libportal.json", "modules/libspelling.json", "modules/gom.json", "modules/GTKCssLanguageServer.json", diff --git a/data/app.metainfo.xml b/data/app.metainfo.xml index 6c89f2b27..ec0ec30fe 100644 --- a/data/app.metainfo.xml +++ b/data/app.metainfo.xml @@ -43,6 +43,24 @@ + + +
    +
  • Use GNOME 51
    • +
+

Library:

+
    +
  • +
+

Dependencies:

+
    +
  • Update libshumate to 1.7.0
    • +
  • Update vte to 0.84.1
    • +
  • Update libspelling to 0.4.10
    • +
+ + +
    diff --git a/src/Extensions/Extensions.js b/src/Extensions/Extensions.js index ba5414124..2778257e9 100644 --- a/src/Extensions/Extensions.js +++ b/src/Extensions/Extensions.js @@ -83,7 +83,7 @@ export function isTypeScriptAvailable() { const llvm = "llvm22"; const node = "node26"; const runtime = getFlatpakInfo().get_string("Application", "runtime"); -const freedesktop_version = runtime.endsWith("master") ? "25.08" : "25.08"; +const freedesktop_version = runtime.endsWith("master") ? "26.08" : "26.08"; export function isTypeScriptEnabled() { return settings.get_boolean("typescript"); diff --git a/src/langs/javascript/biome.json b/src/langs/javascript/biome.json index ca5b2788e..389fdbe62 100644 --- a/src/langs/javascript/biome.json +++ b/src/langs/javascript/biome.json @@ -1,5 +1,5 @@ { - "$schema": "https://biomejs.dev/schemas/1.3.3/schema.json", + "$schema": "https://biomejs.dev/schemas/2.5.0/schema.json", "javascript": { "globals": ["workbench"] }, From 6afd0ab61ed8bfedf1f80c28117a6649b3e211f0 Mon Sep 17 00:00:00 2001 From: Sonny Piers Date: Mon, 28 Sep 2026 16:08:51 +0200 Subject: [PATCH 2/3] f --- .vscode/extensions.json | 14 -------------- .vscode/settings.json | 39 --------------------------------------- meson.build | 2 +- 3 files changed, 1 insertion(+), 54 deletions(-) delete mode 100644 .vscode/extensions.json delete mode 100644 .vscode/settings.json diff --git a/.vscode/extensions.json b/.vscode/extensions.json deleted file mode 100644 index b58a2b074..000000000 --- a/.vscode/extensions.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "recommendations": [ - "bilelmoussaoui.flatpak-vscode", - "editorconfig.editorconfig", - "esbenp.prettier-vscode", - "mrorz.language-gettext", - "yzhang.markdown-all-in-one", - "mesonbuild.mesonbuild", - "prince781.vala", - "bodil.blueprint-gtk", - "dbaeumer.vscode-eslint", - "charliermarsh.ruff" - ] -} diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index 3374992bd..000000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,39 +0,0 @@ -{ - "editor.formatOnSave": true, - "javascript.preferences.importModuleSpecifierEnding": "js", - "typescript.preferences.importModuleSpecifierEnding": "js", - "files.watcherExclude": { - "**/.git/objects/**": true, - "**/.git/subtree-cache/**": true, - "**/.hg/store/**": true, - "**/node_modules/*/**": true, - "**/.flatpak": true, - "**/src/lib": true, - ".flatpak": true, - ".flatpak/**": true, - "_build/**": true - }, - "editor.defaultFormatter": "esbenp.prettier-vscode", - "[yaml]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "[json]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "rust-analyzer.server.path": "${workspaceFolder}/.flatpak/rust-analyzer.sh", - "rust-analyzer.runnables.command": "${workspaceFolder}/.flatpak/cargo.sh", - "rust-analyzer.files.excludeDirs": [ - ".flatpak", - ".flatpak-builder", - "_build", - "build", - "builddir" - ], - "vala.languageServerPath": "${workspaceFolder}/.flatpak/vala-language-server.sh", - "[meson]": { - "editor.defaultFormatter": "mesonbuild.mesonbuild" - }, - "mesonbuild.configureOnOpen": false, - "mesonbuild.buildFolder": "_build", - "mesonbuild.mesonPath": "${workspaceFolder}/.flatpak/meson.sh" -} diff --git a/meson.build b/meson.build index b38aecf2b..9bf22da46 100644 --- a/meson.build +++ b/meson.build @@ -1,7 +1,7 @@ project( 'Workbench', ['vala', 'c', 'rust'], - version: '50.0', + version: '51.0', meson_version: '>= 1.0.0', license: 'GPL-3.0-only', default_options: [ From a9022db388e1a24ae3ae6f40896a8f448b6da044 Mon Sep 17 00:00:00 2001 From: Sonny Piers Date: Mon, 28 Sep 2026 17:06:33 +0200 Subject: [PATCH 3/3] f --- demos/src/List View with a Tree/main.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/demos/src/List View with a Tree/main.js b/demos/src/List View with a Tree/main.js index 679b6428b..6b4a90446 100644 --- a/demos/src/List View with a Tree/main.js +++ b/demos/src/List View with a Tree/main.js @@ -36,7 +36,7 @@ const TreeWidget = GObject.registerClass( function create_model_func(item) { if (item.children.length < 1) return null; - const child_model = new Gio.ListStore(TreeNode); + const child_model = new Gio.ListStore({ item_type: TreeNode }); for (const child of item.children) { child_model.append(child); } @@ -68,7 +68,7 @@ const root_model = new TreeNode("Root", [ ]), ]); -const tree_model = new Gio.ListStore(TreeNode); +const tree_model = new Gio.ListStore({ item_type: TreeNode }); tree_model.append(root_model); const tree_list_model = Gtk.TreeListModel.new(