Skip to content

pre 46 maintenance #909

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 17, 2024
Merged

pre 46 maintenance #909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9d0bf13
Pre 46 maintenance
sonnyp Mar 17, 2024
a221883
f
sonnyp Mar 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,5 @@ __pycache__

# IDEs / editors
.idea

target
4 changes: 2 additions & 2 deletions build-aux/modules/libshumate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"sources": [
{
"type": "archive",
"url": "https://download.gnome.org/sources/libshumate/1.2/libshumate-1.2.rc2.tar.xz",
"sha256": "ad24ed819c2f4f5330857e1dc69e55405dd700cad14c3e764080bd305e453345"
"url": "https://download.gnome.org/sources/libshumate/1.2/libshumate-1.2.0.tar.xz",
"sha256": "4f8413a707cd00f84cee39ca49f58c48fc436f008ea80d6532ac37dafd0ba96b"
}
],
"modules": [
Expand Down
2 changes: 1 addition & 1 deletion demos
Open in desktop
Submodule demos updated 20 files
+1 −1 src/Advanced Buttons/main.blp
+17 −4 src/Editable Label/main.blp
+26 −37 src/Event Controllers/main.blp
+6 −6 src/Event Controllers/main.js
+6 −6 src/Event Controllers/main.py
+6 −6 src/Event Controllers/main.vala
+ − src/Frame/image.png
+6 −6 src/Frame/main.blp
+10 −7 src/List View Widgets/main.blp
+1 −1 src/Menu Button/main.json
+2 −2 src/Message Dialogs/main.js
+1 −1 src/Power Profile Monitor/main.blp
+5 −10 src/Power Profile Monitor/main.js
+8 −11 src/Power Profile Monitor/main.py
+ − src/Separator/image.png
+1 −1 src/Spell Checker/main.blp
+2 −2 src/Text Fields/main.blp
+6 −22 src/Tooltip/main.blp
+1 −1 src/View Switcher/main.blp
+2 −2 src/Web View/main.blp
2 changes: 1 addition & 1 deletion src/IconLibrary/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import Gtk from "gi://Gtk?version=4.0";
import Gtk from "gi://Gtk";
import Gdk from "gi://Gdk";
import Adw from "gi://Adw";
import Gio from "gi://Gio";
Expand Down
14 changes: 6 additions & 8 deletions src/cli/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,11 @@ import GLib from "gi://GLib";
import Gio from "gi://Gio";
import Gtk from "gi://Gtk";
import Adw from "gi://Adw";
import GObject from "gi://GObject";
import Shumate from "gi://Shumate";

import { parse } from "../langs/xml/xml.js";
import { LSPError, diagnostic_severities } from "../lsp/LSP.js";

import {
createLSPClient,
Expand All @@ -17,7 +22,7 @@ import {
import lint, { waitForDiagnostics } from "./lint.js";
import format, { formatting } from "./format.js";

Gtk.init();
GObject.type_ensure(Shumate.SimpleMap);

export async function main([action, ...args]) {
const current_dir = Gio.File.new_for_path(GLib.get_current_dir());
Expand Down Expand Up @@ -77,13 +82,6 @@ export async function main([action, ...args]) {
return success ? 0 : 1;
}

import { parse } from "../langs/xml/xml.js";
import Shumate from "gi://Shumate";
import { LSPError, diagnostic_severities } from "../lsp/LSP.js";

// Why?
new Shumate.Map();

const application = new Adw.Application();
const window = new Adw.ApplicationWindow();

Expand Down
23 changes: 5 additions & 18 deletions src/init.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,13 @@
import "gi://GIRepository?version=2.0";
import "gi://Gtk?version=4.0";
import "gi://GtkSource?version=5";
import "gi://Adw?version=1";
import Vte from "gi://Vte?version=3.91";
import "gi://Soup?version=3.0";
import "gi://WebKit?version=6.0";
import "gi://Pango?version=1.0";
import GObject from "gi://GObject";

import Gtk from "gi://Gtk";
import Gio from "gi://Gio";
import Source from "gi://GtkSource";
import Adw from "gi://Adw";
import Vte from "gi://Vte";
import GObject from "gi://GObject";
import Gio from "gi://Gio";
import Xdp from "gi://Xdp";
import Source from "gi://GtkSource";
import WebKit from "gi://WebKit";

Adw.init();
GObject.type_ensure(Vte.Terminal);

Gio._promisify(Adw.AlertDialog.prototype, "choose", "choose_finish");
Expand Down Expand Up @@ -77,12 +70,6 @@ Gio._promisify(Source.FileLoader.prototype, "load_async", "load_finish");
Gio._promisify(Gio.DBusProxy, "new", "new_finish");
Gio._promisify(Gio.DBusConnection.prototype, "close", "close_finish");

Gio._promisify(
WebKit.WebView.prototype,
"evaluate_javascript",
"evaluate_javascript_finish",
);

Gio._promisify(
Gio.File.prototype,
"enumerate_children_async",
Expand Down
10 changes: 10 additions & 0 deletions src/langs/rust/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# Rust

## Update Cargo.toml

```sh
cargo install cargo-edit
cd template
cargo upgrade
cargo check
```
2 changes: 2 additions & 0 deletions src/langs/rust/template/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
install_data(['Cargo.lock', 'Cargo.toml', 'lib.rs', 'workbench.rs'],
install_dir : join_paths(pkgdatadir, 'langs/rust/template'))
2 changes: 1 addition & 1 deletion src/meson.build
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ blueprint_compiler = find_program(
meson.add_install_script('../build-aux/library-index.js', pkgdatadir)

install_subdir('../demos/src', install_dir : join_paths(pkgdatadir, 'demos'), strip_directory: true)
install_subdir('langs/rust/template', install_dir : join_paths(pkgdatadir, 'langs/rust'))
subdir('langs/rust/template')

configure_file(
input: 'bin.js',
Expand Down
2 changes: 0 additions & 2 deletions src/workbench
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
#!/bin/bash

export WEBKIT_DISABLE_DMABUF_RENDERER=1
# export G_MESSAGES_DEBUG=@app_id@
# export GSK_RENDERER=gl

# Required to allow pkgconfig to find pc files in /app/lib/pkgconfig
export PKG_CONFIG_PATH=/app/lib/pkgconfig/:$PKG_CONFIG_PATH
Expand Down