GNOME 49

sonnyp · sonnyp · commit 6745318df066 · 2025-10-13T21:15:04.000+02:00
diff --git a/.gitmodules b/.gitmodules
@@ -4,9 +4,6 @@
 [submodule "demos"]
 	path = demos
 	url = https://github.com/workbenchdev/demos.git
-[submodule "blueprint-compiler"]
-	path = blueprint-compiler
-	url = https://gitlab.gnome.org/jwestman/blueprint-compiler.git
 [submodule "src/langs/typescript/template/gi-types"]
 	path = gi-types
 	url = https://gitlab.gnome.org/BrainBlasted/gi-typescript-definitions.git
diff --git a/Makefile b/Makefile
@@ -4,7 +4,7 @@ SHELL:=/bin/bash -O globstar
 
 setup:
 	flatpak remote-add --user --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
-	flatpak install --or-update --user --noninteractive flathub org.gnome.Sdk//48 org.flatpak.Builder org.freedesktop.Sdk.Extension.rust-stable//24.08 org.freedesktop.Sdk.Extension.vala//24.08 org.freedesktop.Sdk.Extension.llvm18//24.08 org.freedesktop.Sdk.Extension.node20//24.08 org.freedesktop.Sdk.Extension.typescript//24.08
+	flatpak install --or-update --user --noninteractive flathub org.gnome.Sdk//49 org.flatpak.Builder org.freedesktop.Sdk.Extension.rust-stable//25.08 org.freedesktop.Sdk.Extension.vala//25.08 org.freedesktop.Sdk.Extension.llvm21//25.08 org.freedesktop.Sdk.Extension.node24//25.08 org.freedesktop.Sdk.Extension.typescript//25.08
 # flatpak remote-add --user --if-not-exists flathub-beta https://flathub.org/beta-repo/flathub-beta.flatpakrepo
 # flatpak remote-add --user --if-not-exists gnome-nightly https://nightly.gnome.org/gnome-nightly.flatpakrepo
 # flatpak install --or-update --user --noninteractive gnome-nightly org.gnome.Sdk//master
@@ -73,7 +73,7 @@ ci: setup build test
 # make sure to test without the sdk extensions installed
 sandbox: setup
 	flatpak run org.flatpak.Builder --ccache --user --install --force-clean flatpak build-aux/re.sonny.Workbench.Devel.json
-# flatpak remove --noninteractive org.freedesktop.Sdk.Extension.rust-stable//24.08 org.freedesktop.Sdk.Extension.vala//24.08 org.freedesktop.Sdk.Extension.llvm18//24.08
+# flatpak remove --noninteractive org.freedesktop.Sdk.Extension.rust-stable//24.08 org.freedesktop.Sdk.Extension.vala//24.08 org.freedesktop.Sdk.Extension.llvm20//24.08
 	flatpak run --command="bash" re.sonny.Workbench.Devel
 
 flatpak:
diff --git a/blueprint-compiler b/blueprint-compiler
diff --git a/build-aux/modules/biome.json b/build-aux/modules/biome.json
@@ -1,7 +1,7 @@
 {
   "name": "biome",
   "buildsystem": "simple",
-  "build-commands": ["chmod +x biome", "cp biome /app/bin/biome"],
+  "build-commands": ["chmod +x biome", "install -D biome /app/bin/biome"],
   "sources": [
     {
       "type": "file",
diff --git a/build-aux/modules/blueprint-compiler.json b/build-aux/modules/blueprint-compiler.json
diff --git a/build-aux/modules/gom.json b/build-aux/modules/gom.json
@@ -5,8 +5,8 @@
   "sources": [
     {
       "type": "archive",
-      "url": "https://download.gnome.org/sources/gom/0.5/gom-0.5.3.tar.xz",
-      "sha256": "069d0909fbdc6b4d27edf7a879366194e3ab508b03548bf5b89ff63546d20177"
+      "url": "https://download.gnome.org/sources/gom/0.5/gom-0.5.4.tar.xz",
+      "sha256": "57ba806fe080a937d5664178d21bad7653b2c561ea128187a7b10bc1762b7f65"
     }
   ]
 }
diff --git 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.4/libshumate-1.4.rc.tar.xz",
-      "sha256": "a57b97dbbda55bcb07c6f0197ff006128518c2b2c88fbee8bea5168acbc9baee"
+      "url": "https://download.gnome.org/sources/libshumate/1.5/libshumate-1.5.1.tar.xz",
+      "sha256": "daadf8b700134388c7e933e0b623586aaa7f2fbe8b3a6259387513303b9876e6"
     }
   ],
   "modules": [
diff --git 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.6.tar.xz",
-      "sha256": "3248a9b5336ea2f727d2db912d2f0083accc0505ce707679b3d9b8266c0101f5"
+      "url": "https://download.gnome.org/sources/libspelling/0.4/libspelling-0.4.9.tar.xz",
+      "sha256": "d093fd35ae0f1c98fb58876505287fc0a885e47da9d2411d6d7cd595f34d4ebf"
     }
   ]
 }
diff --git 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.79/vte-0.79.91.tar.xz",
-      "sha256": "adca667d40ae1839ba258b63701cd05fba249303d72258711cc69294b2cb8646"
+      "url": "https://download.gnome.org/sources/vte/0.82/vte-0.82.1.tar.xz",
+      "sha256": "79376d70402d271e2d38424418e1aea72357934d272e321e3906b71706a78e3a"
     }
   ],
   "modules": [
diff --git a/build-aux/re.sonny.Workbench.Devel.json b/build-aux/re.sonny.Workbench.Devel.json
@@ -2,17 +2,18 @@
   "$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": "48",
+  "runtime-version": "49",
   "sdk": "org.gnome.Sdk",
   "sdk-extensions": [
     "org.freedesktop.Sdk.Extension.vala",
     "org.freedesktop.Sdk.Extension.rust-stable",
-    "org.freedesktop.Sdk.Extension.llvm18",
-    "org.freedesktop.Sdk.Extension.node20",
+    "org.freedesktop.Sdk.Extension.llvm21",
+    "org.freedesktop.Sdk.Extension.node24",
     "org.freedesktop.Sdk.Extension.typescript"
   ],
   "build-options": {
-    "append-path": "/usr/lib/sdk/vala/bin:/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/node20/bin:/usr/lib/sdk/typescript/bin",
+    "append-path": "/usr/lib/sdk/vala/bin:/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm21/bin:/usr/lib/sdk/node24/bin:/usr/lib/sdk/typescript/bin",
+    "prepend-ld-library-path": "/usr/lib/sdk/llvm21/lib",
     "append-ld-library-path": "/usr/lib/sdk/vala/lib"
   },
   "command": "workbench",
@@ -36,7 +37,6 @@
     "*.a"
   ],
   "modules": [
-    "modules/blueprint-compiler.json",
     "modules/biome.json",
     "modules/vte.json",
     "modules/libshumate.json",
diff --git a/build-aux/re.sonny.Workbench.json b/build-aux/re.sonny.Workbench.json
@@ -2,17 +2,18 @@
   "$schema": "https://raw.githubusercontent.com/flatpak/flatpak-builder/main/data/flatpak-manifest.schema.json",
   "id": "re.sonny.Workbench",
   "runtime": "org.gnome.Sdk",
-  "runtime-version": "48",
+  "runtime-version": "49",
   "sdk": "org.gnome.Sdk",
   "sdk-extensions": [
     "org.freedesktop.Sdk.Extension.vala",
     "org.freedesktop.Sdk.Extension.rust-stable",
-    "org.freedesktop.Sdk.Extension.llvm18",
-    "org.freedesktop.Sdk.Extension.node20",
+    "org.freedesktop.Sdk.Extension.llvm21",
+    "org.freedesktop.Sdk.Extension.node24",
     "org.freedesktop.Sdk.Extension.typescript"
   ],
   "build-options": {
-    "append-path": "/usr/lib/sdk/vala/bin:/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/node20/bin:/usr/lib/sdk/typescript/bin",
+    "append-path": "/usr/lib/sdk/vala/bin:/usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm21/bin:/usr/lib/sdk/node24/bin:/usr/lib/sdk/typescript/bin",
+    "prepend-ld-library-path": "/usr/lib/sdk/llvm21/lib",
     "append-ld-library-path": "/usr/lib/sdk/vala/lib"
   },
   "command": "workbench",
@@ -36,7 +37,6 @@
     "*.a"
   ],
   "modules": [
-    "modules/blueprint-compiler.json",
     "modules/biome.json",
     "modules/vte.json",
     "modules/libshumate.json",
diff --git a/data/app.gschema.xml b/data/app.gschema.xml
@@ -19,7 +19,7 @@
       <default>true</default>
     </key>
     <key name="typescript" type="b">
-      <default>true</default>
+      <default>false</default>
     </key>
   </schema>
   <schema id="@app_id@.Session" path="/re/sonny/Workbench/">
diff --git a/data/app.metainfo.xml b/data/app.metainfo.xml
@@ -43,22 +43,23 @@
   </screenshots>
   <content_rating type="oars-1.1" />
   <releases>
-    <release version="48.0" date="2025-04-xx">
+    <release version="49.0" date="2025-10-13">
       <description translatable="no">
         <ul>
-          <li>Use GNOME 48</li>
+          <li>Use GNOME 49</li>
+          <li>Temporarily disable experimental TypeScript support</li>
         </ul>
         <p>Library:</p>
         <ul>
           <li>Add "Shortcuts Window" demo</li>
         </ul>
         <p>Dependencies:</p>
         <ul>
-          <!-- <li>Update Jsonrpc-GLib to 3.44.1</li> -->
           <li>Update libportal to 0.9.1</li>
-          <li>Update libshumate to 1.4</li>
-          <li>Update libspelling to 0.4.6</li>
-          <li>Update vte to 0.80.0</li>
+          <li>Update libshumate to 1.5.1</li>
+          <li>Update libspelling to 0.4.9</li>
+          <li>Update vte to 0.82.1</li>
+          <li>Update gom to 0.5.4</li>
         </ul>
       </description>
     </release>
@@ -682,8 +683,9 @@
       </description>
     </release>
     <release version="1.0.0" date="2022-03-02">
-      <description
-      >This is the first release of Workbench. We hope you like it.</description>
+      <description>
+        <p>This is the first release of Workbench. We hope you like it.</p>
+      </description>
     </release>
   </releases>
   <kudos>
diff --git a/demos b/demos
@@ -1 +1 @@
-Subproject commit cd8b209df99294c72a5846ead00797db0bafa862
+Subproject commit 5efa50c4692da433fdd9ce696b329ebcea03fb1b
diff --git a/meson.build b/meson.build
@@ -1,7 +1,7 @@
 project(
   'Workbench',
   ['vala', 'c', 'rust'],
-  version: '48.0',
+  version: '49.0',
   meson_version: '>= 1.0.0',
   license: 'GPL-3.0-only',
   default_options: [
@@ -38,4 +38,4 @@ gnome.post_install(
   glib_compile_schemas: true,
   gtk_update_icon_cache: true,
   update_desktop_database: true,
-)
+)
diff --git a/src/Extensions/Extensions.js b/src/Extensions/Extensions.js
@@ -79,10 +79,11 @@ export function isTypeScriptAvailable() {
   return typescript_available;
 }
 
-const llvm = "llvm18";
-const node = "node20";
+// FIXME: read from manifest
+const llvm = "llvm21";
+const node = "node24";
 const runtime = getFlatpakInfo().get_string("Application", "runtime");
-const freedesktop_version = runtime.endsWith("master") ? "24.08" : "24.08";
+const freedesktop_version = runtime.endsWith("master") ? "25.08" : "25.08";
 
 export function isTypeScriptEnabled() {
   return settings.get_boolean("typescript");
diff --git a/src/Previewer/utils.js b/src/Previewer/utils.js
@@ -3,7 +3,8 @@ import Gtk from "gi://Gtk";
 import Gio from "gi://Gio";
 import Adw from "gi://Adw";
 import GIRepository from "gi://GIRepository";
-// const repository = GIRepository.Repository.get_default();
+
+const repository = new GIRepository.Repository();
 
 // sort and reverse to make sure GtkSource is before Gtk
 // and so that GtkSourceCompletionProvider matches GtkSource and not Gtk
@@ -158,7 +159,7 @@ export async function detectCrash(str, object_id) {
 }
 
 function getNamespaces() {
-  const search_paths = GIRepository.Repository.get_search_path();
+  const search_paths = repository.get_search_path();
 
   const namespaces = [];
   for (const search_path of search_paths) {
diff --git a/src/about.js b/src/about.js
@@ -23,7 +23,6 @@ GTK ${getGIRepositoryVersion(Gtk)}
 GLib ${getGLibVersion()}
 Flatpak ${flatpak_info.get_string("Instance", "flatpak-version")}
 ${getValaVersion()}
-${getBlueprintVersion()}
 `.trim();
 
   const dialog = new Adw.AboutDialog({
@@ -102,7 +101,3 @@ function getValaVersion() {
   const [, data] = GLib.spawn_command_line_sync("valac --version");
   return new TextDecoder().decode(data).trim();
 }
-
-function getBlueprintVersion() {
-  return "Blueprint 0.16.0";
-}
diff --git a/src/init.js b/src/init.js
@@ -1,4 +1,4 @@
-import "gi://GIRepository?version=2.0";
+import "gi://GIRepository?version=3.0";
 import Gtk from "gi://Gtk?version=4.0";
 import Source from "gi://GtkSource";
 import Adw from "gi://Adw";
diff --git a/src/meson.build b/src/meson.build
@@ -9,10 +9,6 @@ bin_conf.set('pkgdatadir', pkgdatadir)
 bin_conf.set('sourcedir', meson.project_source_root())
 bin_conf.set('command', 'SHELL=/bin/sh script --flush --quiet --return $XDG_RUNTIME_DIR/$FLATPAK_ID/typescript --command "' + app_id + ' $@"')
 
-blueprint_compiler = find_program(
-  '/app/bin/blueprint-compiler',
-)
-
 meson.add_install_script('../build-aux/library.js', pkgdatadir)
 
 subdir('langs/javascript')
@@ -64,7 +60,6 @@ custom_target('workbench',
     '--prefix', '/re/sonny/Workbench',
     '--project-root', meson.project_source_root(),
     '--resource-root', meson.project_source_root() / 'src',
-    '--blueprint-compiler', blueprint_compiler,
     '--no-executable',
     '@INPUT0@',
     '@OUTDIR@',
diff --git a/src/workbench b/src/workbench
@@ -7,8 +7,8 @@ export PKG_CONFIG_PATH=/app/lib/pkgconfig/:$PKG_CONFIG_PATH
 
 source /usr/lib/sdk/rust-stable/enable.sh 2> /dev/null
 source /usr/lib/sdk/vala/enable.sh 2> /dev/null
-source /usr/lib/sdk/llvm18/enable.sh 2> /dev/null
-source /usr/lib/sdk/node20/enable.sh 2> /dev/null
+source /usr/lib/sdk/llvm11/enable.sh 2> /dev/null
+source /usr/lib/sdk/node24/enable.sh 2> /dev/null
 
 ## enabling the typescript extension
 export PATH=$PATH:/usr/lib/sdk/typescript/bin
diff --git a/troll b/troll
@@ -1 +1 @@
-Subproject commit bccc2a7fd570d5e9d6845e8fa8e4d838f35f571b
+Subproject commit 8b0275948eedec9ed0378f9bdda1aa4aac3062ba

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "biome",`
`3`	`3`	`"buildsystem": "simple",`
`4`		`- "build-commands": ["chmod +x biome", "cp biome /app/bin/biome"],`
	`4`	`+ "build-commands": ["chmod +x biome", "install -D biome /app/bin/biome"],`
`5`	`5`	`"sources": [`
`6`	`6`	`{`
`7`	`7`	`"type": "file",`
Original file line number	Diff line number	Diff line change
`@@ -5,8 +5,8 @@`
`5`	`5`	`"sources": [`
`6`	`6`	`{`
`7`	`7`	`"type": "archive",`
`8`		`- "url": "https://download.gnome.org/sources/gom/0.5/gom-0.5.3.tar.xz",`
`9`		`- "sha256": "069d0909fbdc6b4d27edf7a879366194e3ab508b03548bf5b89ff63546d20177"`
	`8`	`+ "url": "https://download.gnome.org/sources/gom/0.5/gom-0.5.4.tar.xz",`
	`9`	`+ "sha256": "57ba806fe080a937d5664178d21bad7653b2c561ea128187a7b10bc1762b7f65"`
`10`	`10`	`}`
`11`	`11`	`]`
`12`	`12`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,8 +12,8 @@`
`12`	`12`	`"sources": [`
`13`	`13`	`{`
`14`	`14`	`"type": "archive",`
`15`		`- "url": "https://download.gnome.org/sources/vte/0.79/vte-0.79.91.tar.xz",`
`16`		`- "sha256": "adca667d40ae1839ba258b63701cd05fba249303d72258711cc69294b2cb8646"`
	`15`	`+ "url": "https://download.gnome.org/sources/vte/0.82/vte-0.82.1.tar.xz",`
	`16`	`+ "sha256": "79376d70402d271e2d38424418e1aea72357934d272e321e3906b71706a78e3a"`
`17`	`17`	`}`
`18`	`18`	`],`
`19`	`19`	`"modules": [`