1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
|
Description: Autogenerated patch header for a single-debian-patch file.
The delta against upstream is either kept as a single patch, or maintained
in some VCS, and exported as a single patch instead of more manageable
atomic patches.
Forwarded: not-needed
---
--- terminus-3.6.0.orig/meson.build
+++ terminus-3.6.0/meson.build
@@ -1,6 +1,7 @@
project('terminus',
['c','vala'],
- version: '3.6.0')
+ version: '3.6.0',
+ meson_version: '>=0.56.0')
add_global_arguments('-DGETTEXT_PACKAGE="terminus"',language: 'c')
--- terminus-3.6.0.orig/src/meson.build
+++ terminus-3.6.0/src/meson.build
@@ -5,7 +5,7 @@ cfg_terminus.set('GETTEXT_PACKAGE', 'ter
cfg_terminus.set('RELEASE_NAME', 'terminus')
cfg_terminus.set('PREFIX', get_option('prefix'))
cfg_terminus.set('VERSION', '3.6.0')
-cfg_terminus.set('TESTSRCDIR', meson.source_root())
+cfg_terminus.set('TESTSRCDIR', meson.project_source_root())
cfgfile_2 = configure_file(
input: 'Config.vala.base',
@@ -41,7 +41,7 @@ terminus_sources += ['terminus.vala']
terminus_sources += ['window.vala']
terminus_sources += [extras_gresource_xml_file_c]
terminus_vala_args = ['--pkg','posix']
-terminus_vala_args += ['--gresources='+join_paths(meson.source_root(),'data/extras.gresource.xml')]
+terminus_vala_args += ['--gresources='+join_paths(meson.project_source_root(),'data/extras.gresource.xml')]
terminus_link_args = ['-rdynamic']
terminus_hfolders = ['.']
--- terminus-3.6.0.orig/terminus_gnome_shell45/extension.js
+++ terminus-3.6.0/terminus_gnome_shell45/extension.js
@@ -216,15 +216,21 @@ class LaunchSubprocess {
}
spawnv(argv) {
- try {
- if (Meta.is_wayland_compositor()) {
- this.subprocess = this._waylandClient.spawnv(global.display, argv);
- } else {
- this.subprocess = this._launcher.spawnv(argv);
+ if (Meta.WaylandClient.new_subprocess) {
+ // New API introduced in https://gitlab.gnome.org/GNOME/mutter/-/merge_requests/4491
+ this._waylandClient = Meta.WaylandClient.new_subprocess (global.context, this._launcher, argv);
+ this.subprocess = this._waylandClient.get_subprocess();
+ } else {
+ try {
+ if (Meta.is_wayland_compositor()) {
+ this.subprocess = this._waylandClient.spawnv(global.display, argv);
+ } else {
+ this.subprocess = this._launcher.spawnv(argv);
+ }
+ } catch (e) {
+ this.subprocess = null;
+ console.log(`Error while trying to launch TERMINUS process: ${e.message}\n${e.stack}`);
}
- } catch (e) {
- this.subprocess = null;
- console.log(`Error while trying to launch TERMINUS process: ${e.message}\n${e.stack}`);
}
// This is for GLib 2.68 or greater
if (this._launcher.close) {
--- terminus-3.6.0.orig/terminus_gnome_shell45/metadata.json
+++ terminus-3.6.0/terminus_gnome_shell45/metadata.json
@@ -1,5 +1,5 @@
{"uuid": "showTerminusQuakeWindow@rastersoft.com",
"name": "Show Terminus Quake Mode",
-"shell-version": ["45", "46", "47", "48"],
+"shell-version": ["45", "46", "47", "48", "49"],
"session-modes": ["user", "unlock-dialog"],
"description": "Allows to show the Quake-like terminal from Terminus by pressing the defined hotkey. Useful when using Wayland, since there Terminus can't create hotkeys and must rely on the desktop."}
|
