brl/gnome-shell
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

js: Update for Gio/GioUnix split

Browse Source 
GLib 2.79.2 split out the platform specific Gio APIs into a separate
GIRs, while still keeping a copy in the Gio GIR. gjs then added warnings
about the APIs being moved.

This bumps the Gio(Unix) version requirement to 2.79.2 and switches to
using the new GioUnix GIR.

See: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/3892
See: https://gitlab.gnome.org/GNOME/gjs/-/merge_requests/918
Closes: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/7539
Part-of: <https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3288>
This commit is contained in:
Sebastian Keller 2024-04-27 15:14:16 +02:00 committed by Florian Müllner
parent 72208da0c2
commit 80a37bcf53
5 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -27,7 +27,7 @@ default:
- 'api_failure' - 'api_failure'
variables: variables:
MUTTER_CI_IMAGE: registry.gitlab.gnome.org/gnome/mutter/fedora/40:x86_64-2024-02-23.0 MUTTER_CI_IMAGE: registry.gitlab.gnome.org/gnome/mutter/fedora/40:x86_64-2024-04-29.0
FDO_UPSTREAM_REPO: GNOME/gnome-shell FDO_UPSTREAM_REPO: GNOME/gnome-shell
BUNDLE: "extensions-git.flatpak" BUNDLE: "extensions-git.flatpak"
LINT_LOG: "eslint-report.xml" LINT_LOG: "eslint-report.xml"

1
js/misc/dependencies.js
View File

@ -12,6 +12,7 @@ import 'gi://Gdk?version=4.0';
import 'gi://Gdm?version=1.0'; import 'gi://Gdm?version=1.0';
import 'gi://Geoclue?version=2.0'; import 'gi://Geoclue?version=2.0';
import 'gi://Gio?version=2.0'; import 'gi://Gio?version=2.0';
import 'gi://GioUnix?version=2.0';
import 'gi://GDesktopEnums?version=3.0'; import 'gi://GDesktopEnums?version=3.0';
import 'gi://GdkPixbuf?version=2.0'; import 'gi://GdkPixbuf?version=2.0';
import 'gi://GnomeBG?version=4.0'; import 'gi://GnomeBG?version=4.0';

3
js/misc/loginManager.js
View File

@ -2,6 +2,7 @@
import GLib from 'gi://GLib'; import GLib from 'gi://GLib';
import Gio from 'gi://Gio'; import Gio from 'gi://Gio';
import GioUnix from 'gi://GioUnix';
import * as Signals from './signals.js'; import * as Signals from './signals.js';
import {loadInterfaceXML} from './fileUtils.js'; import {loadInterfaceXML} from './fileUtils.js';
@ -206,7 +207,7 @@ class LoginManagerSystemd extends Signals.EventEmitter {
await this._proxy.call_with_unix_fd_list('Inhibit', await this._proxy.call_with_unix_fd_list('Inhibit',
inVariant, 0, -1, null, cancellable); inVariant, 0, -1, null, cancellable);
const [fd] = fdList.steal_fds(); const [fd] = fdList.steal_fds();
return new Gio.UnixInputStream({fd}); return new GioUnix.InputStream({fd});
} }
_prepareForSleep(proxy, sender, [aboutToSuspend]) { _prepareForSleep(proxy, sender, [aboutToSuspend]) {

5
js/ui/components/networkAgent.js
View File

@ -2,6 +2,7 @@
import Clutter from 'gi://Clutter'; import Clutter from 'gi://Clutter';
import Gio from 'gi://Gio'; import Gio from 'gi://Gio';
import GioUnix from 'gi://GioUnix';
import GLib from 'gi://GLib'; import GLib from 'gi://GLib';
import GObject from 'gi://GObject'; import GObject from 'gi://GObject';
import NM from 'gi://NM'; import NM from 'gi://NM';
@ -469,8 +470,8 @@ class VPNRequestHandler extends Signals.EventEmitter {
}); });
this._childPid = pid; this._childPid = pid;
this._stdin = new Gio.UnixOutputStream({fd: stdin, close_fd: true}); this._stdin = new GioUnix.OutputStream({fd: stdin, close_fd: true});
this._stdout = new Gio.UnixInputStream({fd: stdout, close_fd: true}); this._stdout = new GioUnix.InputStream({fd: stdout, close_fd: true});
GLib.close(stderr); GLib.close(stderr);
this._dataStdout = new Gio.DataInputStream({base_stream: this._stdout}); this._dataStdout = new Gio.DataInputStream({base_stream: this._stdout});

2
meson.build
View File

@ -22,7 +22,7 @@ libmutter_test_pc = 'libmutter-test-' + mutter_api_version
ecal_req = '>= 3.33.1' ecal_req = '>= 3.33.1'
eds_req = '>= 3.33.1' eds_req = '>= 3.33.1'
gcr_req = '>= 3.90.0' gcr_req = '>= 3.90.0'
gio_req = '>= 2.56.0' gio_req = '>= 2.79.2'
gi_req = '>= 1.49.1' gi_req = '>= 1.49.1'
gjs_req = '>= 1.73.1' gjs_req = '>= 1.73.1'
gtk_req = '>= 4.0' gtk_req = '>= 4.0'