46 beta (#896)

Author: sonnyp

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
 

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",

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",

data/app.metainfo.xml

@@ -46,7 +46,7 @@
   </screenshots>
   <content_rating type="oars-1.1" />
   <releases>
-    <release version="46.0" date="2024-03-xx">
+    <release version="46beta" date="2024-02-21">
       <description translatable="no">
         <ul>
           <li>Use GNOME 46</li>
@@ -55,6 +55,7 @@
           <li>Stop adding a superfluous newlines to end of files</li>
           <li>Optimize opening Library entries</li>
           <li>Open project windows maximized</li>
+          <li>Fix dangling bwrap processes after quitting Workbench</li>
           <li>Update Biome to 1.5.3</li>
           <li>Update gst-plugin-gtk4 to 0.12.1</li>
           <li>Update libshumate to 1.2</li>
@@ -535,4 +536,12 @@
   <custom>
     <value key="GnomeSoftware::key-colors">[(51, 209, 122)]</value>
   </custom>
+  <requires>
+    <display_length compare="ge">medium</display_length>
+  </requires>
+  <recommends>
+    <control>keyboard</control>
+    <control>pointing</control>
+    <control>touch</control>
+  </recommends>
 </component>

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'))

demos

@@ -1,5 +1,5 @@
 project('Workbench', ['vala', 'c', 'rust'],
-  version: '46.0',
+  version: '46beta',
   meson_version: '>= 0.59.0',
   license: 'GPL-3.0-only'
 )

meson.build

@@ -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";

src/init.js

@@ -1,4 +1,4 @@
-import "./init.js";
+import "../src/init.js";
 
 import tst, { assert } from "../troll/tst/tst.js";
 

test/init.js

@@ -1,4 +1,4 @@
-import "./init.js";
+import "../src/init.js";
 
 import WebKit from "gi://WebKit";
 import Source from "gi://GtkSource";

test/isDiagnosticInRange.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";