diff --git a/Makefile b/Makefile index d3649e47f..4d3881362 100644 --- a/Makefile +++ b/Makefile @@ -4,9 +4,7 @@ SHELL:=/bin/bash -O globstar setup: flatpak remote-add --user --if-not-exists flathub https://dl.flathub.org/repo/flathub.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 - flatpak install --or-update --user --noninteractive flathub org.flatpak.Builder org.freedesktop.Sdk.Extension.rust-stable//23.08 org.freedesktop.Sdk.Extension.vala//23.08 org.freedesktop.Sdk.Extension.llvm16//23.08 + flatpak install --or-update --user --noninteractive flathub org.gnome.Sdk//46beta org.flatpak.Builder org.freedesktop.Sdk.Extension.rust-stable//23.08 org.freedesktop.Sdk.Extension.vala//23.08 org.freedesktop.Sdk.Extension.llvm16//23.08 npm install make build diff --git a/build-aux/re.sonny.Workbench.Devel.json b/build-aux/re.sonny.Workbench.Devel.json index 55662dc9e..66cc7ff26 100644 --- a/build-aux/re.sonny.Workbench.Devel.json +++ b/build-aux/re.sonny.Workbench.Devel.json @@ -1,7 +1,7 @@ { "id": "re.sonny.Workbench.Devel", "runtime": "org.gnome.Sdk", - "runtime-version": "master", + "runtime-version": "46beta", "sdk": "org.gnome.Sdk", "sdk-extensions": [ "org.freedesktop.Sdk.Extension.vala", diff --git a/build-aux/re.sonny.Workbench.json b/build-aux/re.sonny.Workbench.json index b3a68e09e..b3e9327e5 100644 --- a/build-aux/re.sonny.Workbench.json +++ b/build-aux/re.sonny.Workbench.json @@ -1,7 +1,7 @@ { "id": "re.sonny.Workbench", "runtime": "org.gnome.Sdk", - "runtime-version": "master", + "runtime-version": "46beta", "sdk": "org.gnome.Sdk", "sdk-extensions": [ "org.freedesktop.Sdk.Extension.vala", diff --git a/data/app.metainfo.xml b/data/app.metainfo.xml index 9bcaa0066..515ab0209 100644 --- a/data/app.metainfo.xml +++ b/data/app.metainfo.xml @@ -46,7 +46,7 @@ - +
  • Use GNOME 46
    • @@ -55,6 +55,7 @@
  • Stop adding a superfluous newlines to end of files
  • Optimize opening Library entries
  • Open project windows maximized
    • +
  • Fix dangling bwrap processes after quitting Workbench
  • Update Biome to 1.5.3
  • Update gst-plugin-gtk4 to 0.12.1
  • Update libshumate to 1.2
    • @@ -535,4 +536,12 @@ [(51, 209, 122)] + + medium + + + keyboard + pointing + touch + diff --git a/data/meson.build b/data/meson.build index cd5f293b3..bb1443844 100644 --- a/data/meson.build +++ b/data/meson.build @@ -5,12 +5,10 @@ desktop_file = configure_file( install_dir: join_paths(get_option('datadir'), 'applications') ) -desktop_utils = find_program('desktop-file-validate', required: false) -if desktop_utils.found() - test('Validate desktop file', desktop_utils, - args: [desktop_file] - ) -endif +desktop_utils = find_program('desktop-file-validate', required: true) +test('Validate desktop file', desktop_utils, + args: [desktop_file] +) configure_file( input: 'app.service', @@ -26,12 +24,10 @@ appstream_file = configure_file( install_dir: join_paths(get_option('datadir'), 'metainfo') ) -appstream_cli = find_program('appstreamcli', required: false) -if appstream_cli.found() - test('Validate metainfo file', appstream_cli, - args: ['validate', '--override=release-time-missing=info', '--no-net', '--explain', appstream_file] - ) -endif +appstream_cli = find_program('appstreamcli', required: true) +test('Validate metainfo file', appstream_cli, + args: ['validate', '--override=release-time-missing=info', '--no-net', '--explain', appstream_file] +) configure_file( input: 'app.gschema.xml', @@ -40,11 +36,9 @@ configure_file( install_dir: join_paths(get_option('datadir'), 'glib-2.0/schemas') ) -compile_schemas = find_program('glib-compile-schemas', required: false) -if compile_schemas.found() - test('Validate schema file', compile_schemas, - args: ['--strict', '--dry-run', meson.current_source_dir()] - ) -endif +compile_schemas = find_program('glib-compile-schemas', required: true) +test('Validate schema file', compile_schemas, + args: ['--strict', '--dry-run', meson.current_source_dir()] +) install_subdir('icons/hicolor', install_dir : join_paths(get_option('datadir'), 'icons')) diff --git a/demos b/demos index c92f1b3d5..fdab20945 160000 --- a/demos +++ b/demos @@ -1 +1 @@ -Subproject commit c92f1b3d5a0b1ba616396e28280c755679a84a18 +Subproject commit fdab20945d5d36dad549585ae489111549835922 diff --git a/meson.build b/meson.build index 7ffda37dd..bdf1099b5 100644 --- a/meson.build +++ b/meson.build @@ -1,5 +1,5 @@ project('Workbench', ['vala', 'c', 'rust'], - version: '46.0', + version: '46beta', meson_version: '>= 0.59.0', license: 'GPL-3.0-only' ) diff --git a/src/init.js b/src/init.js index 0bf9adf38..cc146c03e 100644 --- a/src/init.js +++ b/src/init.js @@ -1,3 +1,4 @@ +import "gi://GIRepository?version=2.0"; import "gi://Gtk?version=4.0"; import "gi://GtkSource?version=5"; import "gi://Adw?version=1"; diff --git a/test/init.js b/test/init.js deleted file mode 100644 index 04ea9a229..000000000 --- a/test/init.js +++ /dev/null @@ -1,9 +0,0 @@ -// FIXME: use src/init.js -// breaks `make test`, we need to run tests from Workbench sandbox - -import "gi://Gtk?version=4.0"; -import "gi://GtkSource?version=5"; -import "gi://Adw?version=1"; -import "gi://Soup?version=3.0"; -import "gi://WebKit?version=6.0"; -import "gi://Pango?version=1.0"; diff --git a/test/isDiagnosticInRange.test.js b/test/isDiagnosticInRange.test.js index cba60d914..c276aae96 100644 --- a/test/isDiagnosticInRange.test.js +++ b/test/isDiagnosticInRange.test.js @@ -1,4 +1,4 @@ -import "./init.js"; +import "../src/init.js"; import tst, { assert } from "../troll/tst/tst.js"; diff --git a/test/previewer.test.js b/test/previewer.test.js index dc3fb255f..c6b89f786 100644 --- a/test/previewer.test.js +++ b/test/previewer.test.js @@ -1,4 +1,4 @@ -import "./init.js"; +import "../src/init.js"; import WebKit from "gi://WebKit"; import Source from "gi://GtkSource"; diff --git a/test/xml.test.js b/test/xml.test.js index ba4e75dce..862ee54d7 100644 --- a/test/xml.test.js +++ b/test/xml.test.js @@ -1,4 +1,4 @@ -import "./init.js"; +import "../src/init.js"; import tst, { assert } from "../troll/tst/tst.js"; import { format } from "../src/langs/xml/xml.js";