mirror of
https://github.com/ublue-os/packages.git
synced 2026-11-03 21:49:48 -09:00
chore: remove gnome 47 tech debt (#1204)
This commit is contained in:
renner
GitHub
parent
606f6e0533
commit
be8ece26f5
19 changed files with 0 additions and 5428 deletions
|
|
@ -1,208 +0,0 @@
|
|||
From 325ea8da548bac876d7c707b616e1bb4190305f8 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Jonas=20=C3=85dahl?= <jadahl@gmail.com>
|
||||
Date: Wed, 13 Dec 2023 17:31:07 +0100
|
||||
Subject: [PATCH] xsettings: Get UI scaling factor from dedicated D-Bus API
|
||||
|
||||
Instead of getting the UI scaling factor from the display configuration
|
||||
API, get it from a new X11 properties API exposed by mutter.
|
||||
---
|
||||
plugins/xsettings/gsd-xsettings-manager.c | 140 ++++++++--------------
|
||||
1 file changed, 53 insertions(+), 87 deletions(-)
|
||||
|
||||
diff --git a/plugins/xsettings/gsd-xsettings-manager.c b/plugins/xsettings/gsd-xsettings-manager.c
|
||||
index f8ec6ebc..8a8f069f 100644
|
||||
--- a/plugins/xsettings/gsd-xsettings-manager.c
|
||||
+++ b/plugins/xsettings/gsd-xsettings-manager.c
|
||||
@@ -609,81 +609,47 @@ get_dpi_from_gsettings (GsdXSettingsManager *manager)
|
||||
return dpi * factor;
|
||||
}
|
||||
|
||||
-static gboolean
|
||||
-get_legacy_ui_scale (GVariantIter *properties,
|
||||
- int *scale)
|
||||
-{
|
||||
- const char *key;
|
||||
- GVariant *value;
|
||||
-
|
||||
- *scale = 0;
|
||||
-
|
||||
- while (g_variant_iter_loop (properties, "{&sv}", &key, &value)) {
|
||||
- if (!g_str_equal (key, "legacy-ui-scaling-factor"))
|
||||
- continue;
|
||||
-
|
||||
- *scale = g_variant_get_int32 (value);
|
||||
- break;
|
||||
- }
|
||||
-
|
||||
- if (*scale < 1) {
|
||||
- g_warning ("Failed to get current UI legacy scaling factor");
|
||||
- *scale = 1;
|
||||
- return FALSE;
|
||||
- }
|
||||
-
|
||||
- return TRUE;
|
||||
-}
|
||||
-
|
||||
-#define MODE_FORMAT "(siiddada{sv})"
|
||||
-#define MODES_FORMAT "a" MODE_FORMAT
|
||||
-
|
||||
-#define MONITOR_SPEC_FORMAT "(ssss)"
|
||||
-#define MONITOR_FORMAT "(" MONITOR_SPEC_FORMAT MODES_FORMAT "a{sv})"
|
||||
-#define MONITORS_FORMAT "a" MONITOR_FORMAT
|
||||
-
|
||||
-#define LOGICAL_MONITOR_FORMAT "(iiduba" MONITOR_SPEC_FORMAT "a{sv})"
|
||||
-#define LOGICAL_MONITORS_FORMAT "a" LOGICAL_MONITOR_FORMAT
|
||||
-
|
||||
-#define CURRENT_STATE_FORMAT "(u" MONITORS_FORMAT LOGICAL_MONITORS_FORMAT "a{sv})"
|
||||
-
|
||||
static int
|
||||
get_window_scale (GsdXSettingsManager *manager)
|
||||
{
|
||||
g_autoptr(GError) error = NULL;
|
||||
- g_autoptr(GVariant) current_state = NULL;
|
||||
+ g_autoptr(GVariant) res = NULL;
|
||||
+ g_autoptr(GVariant) ui_scaling_factor_variant = NULL;
|
||||
g_autoptr(GVariantIter) properties = NULL;
|
||||
- int scale = 1;
|
||||
-
|
||||
- current_state =
|
||||
- g_dbus_connection_call_sync (manager->dbus_connection,
|
||||
- "org.gnome.Mutter.DisplayConfig",
|
||||
- "/org/gnome/Mutter/DisplayConfig",
|
||||
- "org.gnome.Mutter.DisplayConfig",
|
||||
- "GetCurrentState",
|
||||
- NULL,
|
||||
- NULL,
|
||||
- G_DBUS_CALL_FLAGS_NO_AUTO_START,
|
||||
- -1,
|
||||
- NULL,
|
||||
- &error);
|
||||
- if (!current_state) {
|
||||
- g_warning ("Failed to get current display configuration state: %s",
|
||||
- error->message);
|
||||
+ int ui_scaling_factor = 1;
|
||||
+
|
||||
+ res = g_dbus_connection_call_sync (manager->dbus_connection,
|
||||
+ "org.gnome.Mutter.X11",
|
||||
+ "/org/gnome/Mutter/X11",
|
||||
+ "org.freedesktop.DBus.Properties",
|
||||
+ "Get",
|
||||
+ g_variant_new ("(ss)",
|
||||
+ "org.gnome.Mutter.X11",
|
||||
+ "UiScalingFactor"),
|
||||
+ NULL,
|
||||
+ G_DBUS_CALL_FLAGS_NO_AUTO_START,
|
||||
+ -1,
|
||||
+ NULL,
|
||||
+ &error);
|
||||
+ if (!res) {
|
||||
+ if (g_error_matches (error,
|
||||
+ G_DBUS_ERROR,
|
||||
+ G_DBUS_ERROR_NAME_HAS_NO_OWNER)) {
|
||||
+ /* Mutter X11 interface is not yet on the bus, this is expected
|
||||
+ * while starting up, it'll appear on the bus right away.
|
||||
+ */
|
||||
+ } else {
|
||||
+ g_warning ("Failed to get current UI scaling factor: %s",
|
||||
+ error->message);
|
||||
+ }
|
||||
+
|
||||
return 1;
|
||||
}
|
||||
|
||||
- g_variant_get (current_state,
|
||||
- CURRENT_STATE_FORMAT,
|
||||
- NULL,
|
||||
- NULL,
|
||||
- NULL,
|
||||
- &properties);
|
||||
-
|
||||
- if (!get_legacy_ui_scale (properties, &scale))
|
||||
- g_warning ("Failed to get current UI legacy scaling factor");
|
||||
+ g_variant_get (res, "(v)", &ui_scaling_factor_variant);
|
||||
+ g_variant_get (ui_scaling_factor_variant, "i", &ui_scaling_factor);
|
||||
|
||||
- return scale;
|
||||
+ return ui_scaling_factor;
|
||||
}
|
||||
|
||||
typedef struct {
|
||||
@@ -1120,33 +1086,33 @@ setup_xsettings_managers (GsdXSettingsManager *manager)
|
||||
}
|
||||
|
||||
static void
|
||||
-monitors_changed (GsdXSettingsManager *manager)
|
||||
+ui_scaling_factor_changed (GsdXSettingsManager *manager)
|
||||
{
|
||||
update_xft_settings (manager);
|
||||
queue_notify (manager);
|
||||
}
|
||||
|
||||
static void
|
||||
-on_monitors_changed (GDBusConnection *connection,
|
||||
- const gchar *sender_name,
|
||||
- const gchar *object_path,
|
||||
- const gchar *interface_name,
|
||||
- const gchar *signal_name,
|
||||
- GVariant *parameters,
|
||||
- gpointer data)
|
||||
+on_mutter_x11_properties_changed (GDBusConnection *connection,
|
||||
+ const gchar *sender_name,
|
||||
+ const gchar *object_path,
|
||||
+ const gchar *interface_name,
|
||||
+ const gchar *signal_name,
|
||||
+ GVariant *parameters,
|
||||
+ gpointer data)
|
||||
{
|
||||
GsdXSettingsManager *manager = data;
|
||||
- monitors_changed (manager);
|
||||
+ ui_scaling_factor_changed (manager);
|
||||
}
|
||||
|
||||
static void
|
||||
-on_display_config_name_appeared_handler (GDBusConnection *connection,
|
||||
- const gchar *name,
|
||||
- const gchar *name_owner,
|
||||
- gpointer data)
|
||||
+on_mutter_x11_name_appeared_handler (GDBusConnection *connection,
|
||||
+ const gchar *name,
|
||||
+ const gchar *name_owner,
|
||||
+ gpointer data)
|
||||
{
|
||||
GsdXSettingsManager *manager = data;
|
||||
- monitors_changed (manager);
|
||||
+ ui_scaling_factor_changed (manager);
|
||||
}
|
||||
|
||||
static void
|
||||
@@ -1422,20 +1388,20 @@ gsd_xsettings_manager_start (GsdXSettingsManager *manager,
|
||||
|
||||
manager->monitors_changed_id =
|
||||
g_dbus_connection_signal_subscribe (manager->dbus_connection,
|
||||
- "org.gnome.Mutter.DisplayConfig",
|
||||
- "org.gnome.Mutter.DisplayConfig",
|
||||
- "MonitorsChanged",
|
||||
- "/org/gnome/Mutter/DisplayConfig",
|
||||
+ "org.gnome.Mutter.X11",
|
||||
+ "org.freedesktop.DBus.Properties",
|
||||
+ "PropertiesChanged",
|
||||
+ "/org/gnome/Mutter/X11",
|
||||
NULL,
|
||||
G_DBUS_SIGNAL_FLAGS_NONE,
|
||||
- on_monitors_changed,
|
||||
+ on_mutter_x11_properties_changed,
|
||||
manager,
|
||||
NULL);
|
||||
manager->display_config_watch_id =
|
||||
g_bus_watch_name_on_connection (manager->dbus_connection,
|
||||
- "org.gnome.Mutter.DisplayConfig",
|
||||
+ "org.gnome.Mutter.X11",
|
||||
G_BUS_NAME_WATCHER_FLAGS_NONE,
|
||||
- on_display_config_name_appeared_handler,
|
||||
+ on_mutter_x11_name_appeared_handler,
|
||||
NULL,
|
||||
manager,
|
||||
NULL);
|
||||
--
|
||||
GitLab
|
||||
|
||||
|
|
@ -1,208 +0,0 @@
|
|||
%global glib2_version 2.58
|
||||
%global colord_version 1.4.5
|
||||
%global geocode_glib_version 3.26.3
|
||||
%global gnome_desktop_version 3.37.1
|
||||
%global gsettings_desktop_schemas_version 46~beta
|
||||
%global gtk3_version 3.15.3
|
||||
%global geoclue_version 2.3.1
|
||||
|
||||
%ifnarch s390 s390x
|
||||
%global wacom_unit org.gnome.SettingsDaemon.Wacom.service
|
||||
%else
|
||||
%global wacom_unit %{nil}
|
||||
%endif
|
||||
%global systemd_units org.gnome.SettingsDaemon.A11ySettings.service org.gnome.SettingsDaemon.Color.service org.gnome.SettingsDaemon.Datetime.service org.gnome.SettingsDaemon.Housekeeping.service org.gnome.SettingsDaemon.Keyboard.service org.gnome.SettingsDaemon.MediaKeys.service org.gnome.SettingsDaemon.Power.service org.gnome.SettingsDaemon.PrintNotifications.service org.gnome.SettingsDaemon.Rfkill.service org.gnome.SettingsDaemon.ScreensaverProxy.service org.gnome.SettingsDaemon.Sharing.service org.gnome.SettingsDaemon.Smartcard.service org.gnome.SettingsDaemon.Sound.service org.gnome.SettingsDaemon.UsbProtection.service org.gnome.SettingsDaemon.Wwan.service org.gnome.SettingsDaemon.XSettings.service %%{wacom_unit}
|
||||
|
||||
%global gnome_major_version 46
|
||||
%global gnome_version %{gnome_major_version}.0
|
||||
|
||||
%global tarball_version %%(echo %{gnome_version} | tr '~' '.')
|
||||
%global major_version %%(echo %{gnome_version} | cut -f 1 -d '~' | cut -f 1 -d '.')
|
||||
|
||||
Name: gnome-settings-daemon
|
||||
Version: %{gnome_version}.xscaling.{{{ git_dir_version }}}
|
||||
Release: 1%{?dist}
|
||||
Summary: The daemon sharing settings from GNOME to GTK+/KDE applications
|
||||
|
||||
License: GPL-2.0-or-later AND LGPL-2.1-or-later
|
||||
URL: https://gitlab.gnome.org/GNOME/gnome-settings-daemon
|
||||
Source0: https://download.gnome.org/sources/%{name}/%{gnome_major_version}/%{name}-%{tarball_version}.tar.xz
|
||||
|
||||
# https://gitlab.gnome.org/GNOME/gnome-settings-daemon/-/merge_requests/353
|
||||
Patch0: 353.patch
|
||||
|
||||
BuildRequires: gcc
|
||||
BuildRequires: gettext
|
||||
BuildRequires: meson >= 0.49.0
|
||||
BuildRequires: perl-interpreter
|
||||
BuildRequires: systemd-rpm-macros
|
||||
BuildRequires: pkgconfig(alsa)
|
||||
BuildRequires: pkgconfig(colord) >= %{colord_version}
|
||||
BuildRequires: pkgconfig(cups)
|
||||
BuildRequires: pkgconfig(fontconfig)
|
||||
BuildRequires: pkgconfig(gck-2)
|
||||
BuildRequires: pkgconfig(gcr-4)
|
||||
BuildRequires: pkgconfig(geoclue-2.0) >= %{geoclue_version}
|
||||
BuildRequires: pkgconfig(geocode-glib-2.0) >= %{geocode_glib_version}
|
||||
BuildRequires: pkgconfig(glib-2.0) >= %{glib2_version}
|
||||
BuildRequires: pkgconfig(gnome-desktop-3.0) >= %{gnome_desktop_version}
|
||||
BuildRequires: pkgconfig(gsettings-desktop-schemas) >= %{gsettings_desktop_schemas_version}
|
||||
BuildRequires: pkgconfig(gtk+-3.0) >= %{gtk3_version}
|
||||
BuildRequires: pkgconfig(gudev-1.0)
|
||||
BuildRequires: pkgconfig(gweather4)
|
||||
BuildRequires: pkgconfig(lcms2) >= 2.2
|
||||
BuildRequires: pkgconfig(libcanberra-gtk3)
|
||||
BuildRequires: pkgconfig(libgeoclue-2.0)
|
||||
BuildRequires: pkgconfig(libnm)
|
||||
BuildRequires: pkgconfig(libnotify)
|
||||
BuildRequires: pkgconfig(libpulse)
|
||||
BuildRequires: pkgconfig(libpulse-mainloop-glib)
|
||||
BuildRequires: pkgconfig(librsvg-2.0)
|
||||
BuildRequires: pkgconfig(mm-glib)
|
||||
BuildRequires: pkgconfig(nss)
|
||||
BuildRequires: pkgconfig(polkit-gobject-1)
|
||||
BuildRequires: pkgconfig(upower-glib)
|
||||
BuildRequires: pkgconfig(x11)
|
||||
BuildRequires: pkgconfig(xi)
|
||||
BuildRequires: pkgconfig(wayland-client)
|
||||
%ifnarch s390 s390x
|
||||
BuildRequires: pkgconfig(libwacom) >= 0.7
|
||||
%endif
|
||||
|
||||
Requires: colord >= %{colord_version}
|
||||
Requires: iio-sensor-proxy
|
||||
Requires: geoclue2 >= %{geoclue_version}
|
||||
Requires: geocode-glib2%{?_isa} >= %{geocode_glib_version}
|
||||
Requires: glib2%{?_isa} >= %{glib2_version}
|
||||
Requires: gnome-desktop3%{?_isa} >= %{gnome_desktop_version}
|
||||
Requires: gsettings-desktop-schemas%{?_isa} >= %{gsettings_desktop_schemas_version}
|
||||
Requires: gtk3%{?_isa} >= %{gtk3_version}
|
||||
Requires: libgweather4%{?_isa}
|
||||
|
||||
Provides: gnome-settings-daemon = %{gnome_version}-%{release}
|
||||
|
||||
%description
|
||||
A daemon to share settings from GNOME to other applications. It also
|
||||
handles global keybindings, as well as a number of desktop-wide settings.
|
||||
|
||||
%package devel
|
||||
Summary: Development files for %{name}
|
||||
Requires: %{name}%{?_isa} = %{version}-%{release}
|
||||
|
||||
%description devel
|
||||
The %{name}-devel package contains libraries and header files for
|
||||
developing applications that use %{name}.
|
||||
|
||||
%prep
|
||||
%autosetup -p1 -n %{name}-%{tarball_version}
|
||||
|
||||
%build
|
||||
%meson
|
||||
%meson_build
|
||||
|
||||
%install
|
||||
%meson_install
|
||||
|
||||
%find_lang %{name} --with-gnome
|
||||
|
||||
%post
|
||||
%systemd_user_post %{systemd_units}
|
||||
|
||||
%preun
|
||||
%systemd_user_preun %{systemd_units}
|
||||
|
||||
%files -f %{name}.lang
|
||||
%license COPYING COPYING.LIB
|
||||
%doc AUTHORS NEWS README
|
||||
|
||||
# list daemons explicitly, so we notice if one goes missing
|
||||
# some of these don't have a separate gschema
|
||||
%{_libexecdir}/gsd-datetime
|
||||
%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Datetime.desktop
|
||||
|
||||
%{_libexecdir}/gsd-housekeeping
|
||||
%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Housekeeping.desktop
|
||||
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.housekeeping.gschema.xml
|
||||
|
||||
%{_libexecdir}/gsd-keyboard
|
||||
%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Keyboard.desktop
|
||||
|
||||
%{_libexecdir}/gsd-media-keys
|
||||
%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.MediaKeys.desktop
|
||||
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.media-keys.gschema.xml
|
||||
|
||||
%{_libexecdir}/gsd-backlight-helper
|
||||
%{_datadir}/polkit-1/actions/org.gnome.settings-daemon.plugins.power.policy
|
||||
%{_libexecdir}/gsd-power
|
||||
%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Power.desktop
|
||||
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.power.gschema.xml
|
||||
|
||||
%{_libexecdir}/gsd-print-notifications
|
||||
%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.PrintNotifications.desktop
|
||||
%{_libexecdir}/gsd-printer
|
||||
|
||||
%{_libexecdir}/gsd-rfkill
|
||||
%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Rfkill.desktop
|
||||
|
||||
%{_libexecdir}/gsd-screensaver-proxy
|
||||
%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.ScreensaverProxy.desktop
|
||||
|
||||
%{_libexecdir}/gsd-smartcard
|
||||
%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Smartcard.desktop
|
||||
|
||||
%{_libexecdir}/gsd-sound
|
||||
%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Sound.desktop
|
||||
|
||||
%{_libexecdir}/gsd-usb-protection
|
||||
%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.UsbProtection.desktop
|
||||
|
||||
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.peripherals.gschema.xml
|
||||
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.peripherals.wacom.gschema.xml
|
||||
%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Wacom.desktop
|
||||
|
||||
%ifnarch s390 s390x
|
||||
%{_libexecdir}/gsd-wacom
|
||||
%{_libexecdir}/gsd-wacom-oled-helper
|
||||
%{_datadir}/polkit-1/actions/org.gnome.settings-daemon.plugins.wacom.policy
|
||||
%endif
|
||||
|
||||
%{_libexecdir}/gsd-xsettings
|
||||
%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.XSettings.desktop
|
||||
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.xsettings.gschema.xml
|
||||
|
||||
%{_libexecdir}/gsd-a11y-settings
|
||||
%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.A11ySettings.desktop
|
||||
|
||||
%{_libexecdir}/gsd-color
|
||||
%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Color.desktop
|
||||
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.color.gschema.xml
|
||||
|
||||
%{_libexecdir}/gsd-sharing
|
||||
%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Sharing.desktop
|
||||
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.sharing.gschema.xml
|
||||
|
||||
%{_sysconfdir}/xdg/autostart/org.gnome.SettingsDaemon.Wwan.desktop
|
||||
%{_libexecdir}/gsd-wwan
|
||||
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.wwan.gschema.xml
|
||||
|
||||
%dir %{_libdir}/gnome-settings-daemon-%{gnome_major_version}
|
||||
%{_libdir}/gnome-settings-daemon-%{gnome_major_version}/libgsd.so
|
||||
|
||||
%{_sysconfdir}/xdg/Xwayland-session.d/00-xrdb
|
||||
%{_userunitdir}/gnome-session-x11-services-ready.target.wants/
|
||||
%{_userunitdir}/gnome-session-x11-services.target.wants/
|
||||
%{lua: for service in string.gmatch(rpm.expand('%{systemd_units}'), "[^%s]+") do print(rpm.expand('%{_userunitdir}/')..service..'\n') end}
|
||||
%{_userunitdir}/*.target
|
||||
%{_udevrulesdir}/61-gnome-settings-daemon-rfkill.rules
|
||||
%{_datadir}/gnome-settings-daemon/
|
||||
%{_datadir}/GConf/gsettings/gnome-settings-daemon.convert
|
||||
|
||||
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.enums.xml
|
||||
%{_datadir}/glib-2.0/schemas/org.gnome.settings-daemon.plugins.gschema.xml
|
||||
|
||||
%files devel
|
||||
%{_includedir}/gnome-settings-daemon-%{gnome_major_version}
|
||||
%{_libdir}/pkgconfig/gnome-settings-daemon.pc
|
||||
|
||||
%changelog
|
||||
%autochangelog
|
||||
|
|
@ -1,67 +0,0 @@
|
|||
From ff73f820b1398e5d60b8984b0003db46ad70b8ec Mon Sep 17 00:00:00 2001
|
||||
From: Benjamin Berg <bberg@redhat.com>
|
||||
Date: Wed, 28 Apr 2021 16:50:03 +0200
|
||||
Subject: [PATCH] gdm: Work around failing fingerprint auth
|
||||
|
||||
On Fedora we have the problem that fingerprint auth fails immediately if
|
||||
the PAM configuration has not been updated and no prints are enrolled.
|
||||
|
||||
So, consider a verification failure within one second to be a service
|
||||
failure instead.
|
||||
---
|
||||
js/gdm/util.js | 18 ++++++++++++++++++
|
||||
1 file changed, 18 insertions(+)
|
||||
|
||||
diff --git a/js/gdm/util.js b/js/gdm/util.js
|
||||
index 97df6d687e..371953cb25 100644
|
||||
--- a/js/gdm/util.js
|
||||
+++ b/js/gdm/util.js
|
||||
@@ -109,6 +109,7 @@ export class ShellUserVerifier extends Signals.EventEmitter {
|
||||
this._defaultService = null;
|
||||
this._preemptingService = null;
|
||||
this._fingerprintReaderType = FingerprintReaderType.NONE;
|
||||
+ this._fprintStartTime = -1;
|
||||
|
||||
this._messageQueue = [];
|
||||
this._messageQueueTimeoutId = 0;
|
||||
@@ -669,6 +670,10 @@ export class ShellUserVerifier extends Signals.EventEmitter {
|
||||
this._hold.acquire();
|
||||
try {
|
||||
this._activeServices.add(serviceName);
|
||||
+
|
||||
+ if (serviceName == FINGERPRINT_SERVICE_NAME)
|
||||
+ this._fprintStartTime = GLib.get_monotonic_time();
|
||||
+
|
||||
if (this._userName) {
|
||||
await this._userVerifier.call_begin_verification_for_user(
|
||||
serviceName, this._userName, this._cancellable);
|
||||
@@ -763,6 +768,7 @@ export class ShellUserVerifier extends Signals.EventEmitter {
|
||||
const cancellable = this._cancellable;
|
||||
this._fingerprintFailedId = GLib.timeout_add(GLib.PRIORITY_DEFAULT,
|
||||
FINGERPRINT_ERROR_TIMEOUT_WAIT, () => {
|
||||
+ log("Generating _verificationFailed!");
|
||||
this._fingerprintFailedId = 0;
|
||||
if (!cancellable.is_cancelled())
|
||||
this._verificationFailed(serviceName, false);
|
||||
@@ -829,6 +835,18 @@ export class ShellUserVerifier extends Signals.EventEmitter {
|
||||
if (serviceName === FINGERPRINT_SERVICE_NAME) {
|
||||
if (this._fingerprintFailedId)
|
||||
GLib.source_remove(this._fingerprintFailedId);
|
||||
+
|
||||
+ // On Fedora we have the problem that fingerprint auth fails
|
||||
+ // immediately if the PAM configuration has not been updated and no
|
||||
+ // prints are enrolled.
|
||||
+ // So, consider a verification failure within one second to be a service
|
||||
+ // failure instead.
|
||||
+ if (this._fprintStartTime > GLib.get_monotonic_time() - GLib.USEC_PER_SEC) {
|
||||
+ log("Fingerprint service failed almost immediately, considering it unavailable.");
|
||||
+ log("Please fix your configuration by running: authselect select --force sssd with-fingerprint with-silent-lastlog");
|
||||
+ this._onServiceUnavailable(this._client, serviceName, null);
|
||||
+ return;
|
||||
+ }
|
||||
}
|
||||
|
||||
// For Not Listed / enterprise logins, immediately reset
|
||||
--
|
||||
2.43.2
|
||||
|
||||
|
|
@ -1,35 +0,0 @@
|
|||
From 78a733bae62f8af15f0771d7efde55473f295e46 Mon Sep 17 00:00:00 2001
|
||||
From: Ray Strode <rstrode@redhat.com>
|
||||
Date: Wed, 16 Aug 2023 18:46:54 -0400
|
||||
Subject: [PATCH 1/3] status/keyboard: Add a catch around reload call
|
||||
|
||||
Now that system input settings can get used in the user session
|
||||
they're getting seen by the tests and the tests are complaining:
|
||||
|
||||
Unhandled promise rejection. To suppress this warning, add an
|
||||
error handler to your promise chain with .catch() or a try-catch block
|
||||
around your await expression.
|
||||
|
||||
This commit adds the catch it's asking for.
|
||||
---
|
||||
js/ui/status/keyboard.js | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js
|
||||
index cfc0a01f6b..4ef2f355d3 100644
|
||||
--- a/js/ui/status/keyboard.js
|
||||
+++ b/js/ui/status/keyboard.js
|
||||
@@ -204,7 +204,9 @@ class InputSourceSystemSettings extends InputSourceSettings {
|
||||
this._options = '';
|
||||
this._model = '';
|
||||
|
||||
- this._reload();
|
||||
+ this._reload().catch(error => {
|
||||
+ logError(error, 'Could not reload system input settings');
|
||||
+ });
|
||||
|
||||
Gio.DBus.system.signal_subscribe(this._BUS_NAME,
|
||||
this._BUS_PROPS_IFACE,
|
||||
--
|
||||
2.43.1
|
||||
|
||||
|
|
@ -1,136 +0,0 @@
|
|||
From 0c0cc4ce1d3e08eba3e701d565398e01aa479ff7 Mon Sep 17 00:00:00 2001
|
||||
From: Ray Strode <rstrode@redhat.com>
|
||||
Date: Wed, 16 Aug 2023 11:13:39 -0400
|
||||
Subject: [PATCH 2/3] status/keyboard: Load keyboard from system settings if
|
||||
gsettings unconfigured
|
||||
|
||||
Right now if a user hasn't configured their input sources, the code
|
||||
falls back to
|
||||
using the current layout on Xorg and the mutter default with wayland.
|
||||
|
||||
This commit changes the code to instead fall back to using the system
|
||||
default (as configured by localed).
|
||||
---
|
||||
js/ui/status/keyboard.js | 62 +++++++++++++++++++++++++++++++---------
|
||||
1 file changed, 48 insertions(+), 14 deletions(-)
|
||||
|
||||
diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js
|
||||
index 4ef2f355d3..d91eb41bc6 100644
|
||||
--- a/js/ui/status/keyboard.js
|
||||
+++ b/js/ui/status/keyboard.js
|
||||
@@ -22,6 +22,9 @@ import * as Util from '../../misc/util.js';
|
||||
export const INPUT_SOURCE_TYPE_XKB = 'xkb';
|
||||
export const INPUT_SOURCE_TYPE_IBUS = 'ibus';
|
||||
|
||||
+const DESKTOP_INPUT_SOURCES_SCHEMA = 'org.gnome.desktop.input-sources';
|
||||
+const KEY_INPUT_SOURCES = 'sources';
|
||||
+
|
||||
export const LayoutMenuItem = GObject.registerClass(
|
||||
class LayoutMenuItem extends PopupMenu.PopupBaseMenuItem {
|
||||
_init(displayName, shortName) {
|
||||
@@ -278,18 +281,16 @@ class InputSourceSystemSettings extends InputSourceSettings {
|
||||
}
|
||||
|
||||
class InputSourceSessionSettings extends InputSourceSettings {
|
||||
- constructor() {
|
||||
+ constructor(settings) {
|
||||
super();
|
||||
|
||||
- this._DESKTOP_INPUT_SOURCES_SCHEMA = 'org.gnome.desktop.input-sources';
|
||||
- this._KEY_INPUT_SOURCES = 'sources';
|
||||
this._KEY_MRU_SOURCES = 'mru-sources';
|
||||
this._KEY_KEYBOARD_OPTIONS = 'xkb-options';
|
||||
this._KEY_KEYBOARD_MODEL = 'xkb-model';
|
||||
this._KEY_PER_WINDOW = 'per-window';
|
||||
|
||||
- this._settings = new Gio.Settings({schema_id: this._DESKTOP_INPUT_SOURCES_SCHEMA});
|
||||
- this._settings.connect(`changed::${this._KEY_INPUT_SOURCES}`, this._emitInputSourcesChanged.bind(this));
|
||||
+ this._settings = settings;
|
||||
+ this._settings.connect(`changed::${KEY_INPUT_SOURCES}`, this._emitInputSourcesChanged.bind(this));
|
||||
this._settings.connect(`changed::${this._KEY_KEYBOARD_OPTIONS}`, this._emitKeyboardOptionsChanged.bind(this));
|
||||
this._settings.connect(`changed::${this._KEY_KEYBOARD_MODEL}`, this._emitKeyboardModelChanged.bind(this));
|
||||
this._settings.connect(`changed::${this._KEY_PER_WINDOW}`, this._emitPerWindowChanged.bind(this));
|
||||
@@ -308,7 +309,7 @@ class InputSourceSessionSettings extends InputSourceSettings {
|
||||
}
|
||||
|
||||
get inputSources() {
|
||||
- return this._getSourcesList(this._KEY_INPUT_SOURCES);
|
||||
+ return this._getSourcesList(KEY_INPUT_SOURCES);
|
||||
}
|
||||
|
||||
get mruSources() {
|
||||
@@ -363,13 +364,6 @@ export class InputSourceManager extends Signals.EventEmitter {
|
||||
Meta.KeyBindingFlags.IS_REVERSED,
|
||||
Shell.ActionMode.ALL,
|
||||
this._switchInputSource.bind(this));
|
||||
- if (Main.sessionMode.isGreeter)
|
||||
- this._settings = new InputSourceSystemSettings();
|
||||
- else
|
||||
- this._settings = new InputSourceSessionSettings();
|
||||
- this._settings.connect('input-sources-changed', this._inputSourcesChanged.bind(this));
|
||||
- this._settings.connect('keyboard-options-changed', this._keyboardOptionsChanged.bind(this));
|
||||
- this._settings.connect('keyboard-model-changed', this._keyboardModelChanged.bind(this));
|
||||
|
||||
this._xkbInfo = KeyboardManager.getXkbInfo();
|
||||
this._keyboardManager = KeyboardManager.getKeyboardManager();
|
||||
@@ -381,16 +375,56 @@ export class InputSourceManager extends Signals.EventEmitter {
|
||||
this._ibusManager.connect('property-updated', this._ibusPropertyUpdated.bind(this));
|
||||
this._ibusManager.connect('set-content-type', this._ibusSetContentType.bind(this));
|
||||
|
||||
+ this._inputSettings = new Gio.Settings({schema_id: DESKTOP_INPUT_SOURCES_SCHEMA});
|
||||
+ this._setupInputSettings();
|
||||
+
|
||||
global.display.connect('modifiers-accelerator-activated', this._modifiersSwitcher.bind(this));
|
||||
|
||||
this._sourcesPerWindow = false;
|
||||
this._focusWindowNotifyId = 0;
|
||||
- this._settings.connect('per-window-changed', this._sourcesPerWindowChanged.bind(this));
|
||||
this._sourcesPerWindowChanged();
|
||||
this._disableIBus = false;
|
||||
this._reloading = false;
|
||||
}
|
||||
|
||||
+ _sessionHasNoInputSettings() {
|
||||
+ return this._inputSettings.get_user_value(KEY_INPUT_SOURCES) === null;
|
||||
+ }
|
||||
+
|
||||
+ _reloadInputSettings() {
|
||||
+ const hadNoSessionInputSettings = this._hasNoSessionInputSettings;
|
||||
+
|
||||
+ if (Main.sessionMode.isGreeter)
|
||||
+ this._hasNoSessionInputSettings = true;
|
||||
+ else
|
||||
+ this._hasNoSessionInputSettings = this._sessionHasNoInputSettings();
|
||||
+
|
||||
+ if (this._settings && hadNoSessionInputSettings === this._hasNoSessionInputSettings)
|
||||
+ return;
|
||||
+
|
||||
+ this._settings?.disconnectObject(this);
|
||||
+
|
||||
+ if (this._hasNoSessionInputSettings)
|
||||
+ this._settings = new InputSourceSystemSettings();
|
||||
+ else
|
||||
+ this._settings = new InputSourceSessionSettings(this._inputSettings);
|
||||
+
|
||||
+ this._settings.connectObject(
|
||||
+ 'input-sources-changed', this._inputSourcesChanged.bind(this),
|
||||
+ 'keyboard-options-changed', this._keyboardOptionsChanged.bind(this),
|
||||
+ 'keyboard-model-changed', this._keyboardModelChanged.bind(this),
|
||||
+ 'per-window-changed', this._sourcesPerWindowChanged.bind(this),
|
||||
+ this);
|
||||
+ this.reload();
|
||||
+ }
|
||||
+
|
||||
+ _setupInputSettings() {
|
||||
+ if (!Main.sessionMode.isGreeter)
|
||||
+ this._inputSettings.connect(`changed::${KEY_INPUT_SOURCES}`, this._reloadInputSettings.bind(this));
|
||||
+
|
||||
+ this._reloadInputSettings();
|
||||
+ }
|
||||
+
|
||||
reload() {
|
||||
this._reloading = true;
|
||||
this._keyboardManager.setKeyboardOptions(this._settings.keyboardOptions);
|
||||
--
|
||||
2.43.1
|
||||
|
||||
|
|
@ -1,128 +0,0 @@
|
|||
From d060baeb69a2a7d80fe403fc8eec90e20aa6cb7f Mon Sep 17 00:00:00 2001
|
||||
From: Ray Strode <rstrode@redhat.com>
|
||||
Date: Wed, 16 Aug 2023 14:09:50 -0400
|
||||
Subject: [PATCH 3/3] status/keyboard: Use gnome-desktop API for getting
|
||||
default input sources list
|
||||
|
||||
At the moment, gnome-shell tries to figure out the default input sources
|
||||
from localed. It fails to take into account the system locale and input
|
||||
methods.
|
||||
|
||||
This commit switches it to use a new function in gnome-desktop,
|
||||
gnome_get_default_input_sources, which does most of the heavy
|
||||
lifting itself, instead.
|
||||
---
|
||||
js/ui/status/keyboard.js | 59 ++++++++++++++++++----------------------
|
||||
1 file changed, 27 insertions(+), 32 deletions(-)
|
||||
|
||||
diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js
|
||||
index d91eb41bc6..19c36031f6 100644
|
||||
--- a/js/ui/status/keyboard.js
|
||||
+++ b/js/ui/status/keyboard.js
|
||||
@@ -3,6 +3,7 @@
|
||||
import Clutter from 'gi://Clutter';
|
||||
import Gio from 'gi://Gio';
|
||||
import GLib from 'gi://GLib';
|
||||
+import GnomeDesktop from 'gi://GnomeDesktop';
|
||||
import GObject from 'gi://GObject';
|
||||
import IBus from 'gi://IBus';
|
||||
import Meta from 'gi://Meta';
|
||||
@@ -25,6 +26,8 @@ export const INPUT_SOURCE_TYPE_IBUS = 'ibus';
|
||||
const DESKTOP_INPUT_SOURCES_SCHEMA = 'org.gnome.desktop.input-sources';
|
||||
const KEY_INPUT_SOURCES = 'sources';
|
||||
|
||||
+Gio._promisify(GnomeDesktop, 'get_default_input_sources');
|
||||
+
|
||||
export const LayoutMenuItem = GObject.registerClass(
|
||||
class LayoutMenuItem extends PopupMenu.PopupBaseMenuItem {
|
||||
_init(displayName, shortName) {
|
||||
@@ -202,9 +205,9 @@ class InputSourceSystemSettings extends InputSourceSettings {
|
||||
this._BUS_IFACE = 'org.freedesktop.locale1';
|
||||
this._BUS_PROPS_IFACE = 'org.freedesktop.DBus.Properties';
|
||||
|
||||
- this._layouts = '';
|
||||
- this._variants = '';
|
||||
- this._options = '';
|
||||
+ this._inputSourceIds = [];
|
||||
+ this._inputSourceTypes = [];
|
||||
+ this._options = [];
|
||||
this._model = '';
|
||||
|
||||
this._reload().catch(error => {
|
||||
@@ -221,30 +224,22 @@ class InputSourceSystemSettings extends InputSourceSettings {
|
||||
}
|
||||
|
||||
async _reload() {
|
||||
- let props;
|
||||
+ let inputSourceIds;
|
||||
+ let inputSourceTypes;
|
||||
+ let options;
|
||||
+ let model;
|
||||
try {
|
||||
- const result = await Gio.DBus.system.call(
|
||||
- this._BUS_NAME,
|
||||
- this._BUS_PATH,
|
||||
- this._BUS_PROPS_IFACE,
|
||||
- 'GetAll',
|
||||
- new GLib.Variant('(s)', [this._BUS_IFACE]),
|
||||
- null, Gio.DBusCallFlags.NONE, -1, null);
|
||||
- [props] = result.deepUnpack();
|
||||
+ [inputSourceIds, inputSourceTypes, options, model] =
|
||||
+ await GnomeDesktop.get_default_input_sources(null);
|
||||
} catch (e) {
|
||||
- log(`Could not get properties from ${this._BUS_NAME}`);
|
||||
+ logError(e, 'Could not get default input sources');
|
||||
return;
|
||||
}
|
||||
|
||||
- const layouts = props['X11Layout'].unpack();
|
||||
- const variants = props['X11Variant'].unpack();
|
||||
- const options = props['X11Options'].unpack();
|
||||
- const model = props['X11Model'].unpack();
|
||||
-
|
||||
- if (layouts !== this._layouts ||
|
||||
- variants !== this._variants) {
|
||||
- this._layouts = layouts;
|
||||
- this._variants = variants;
|
||||
+ if (inputSourceIds !== this._inputSourceIds ||
|
||||
+ inputSourceTypes !== this._inputSourceTypes) {
|
||||
+ this._inputSourceIds = inputSourceIds;
|
||||
+ this._inputSourceTypes = inputSourceTypes;
|
||||
this._emitInputSourcesChanged();
|
||||
}
|
||||
if (options !== this._options) {
|
||||
@@ -258,21 +253,21 @@ class InputSourceSystemSettings extends InputSourceSettings {
|
||||
}
|
||||
|
||||
get inputSources() {
|
||||
- let sourcesList = [];
|
||||
- let layouts = this._layouts.split(',');
|
||||
- let variants = this._variants.split(',');
|
||||
-
|
||||
- for (let i = 0; i < layouts.length && !!layouts[i]; i++) {
|
||||
- let id = layouts[i];
|
||||
- if (variants[i])
|
||||
- id += `+${variants[i]}`;
|
||||
- sourcesList.push({type: INPUT_SOURCE_TYPE_XKB, id});
|
||||
+ let sourcesList;
|
||||
+
|
||||
+ if (this._inputSourceIds) {
|
||||
+ sourcesList = this._inputSourceIds.map((id, index) => {
|
||||
+ return {type: this._inputSourceTypes[index], id};
|
||||
+ });
|
||||
+ } else {
|
||||
+ sourcesList = [];
|
||||
}
|
||||
+
|
||||
return sourcesList;
|
||||
}
|
||||
|
||||
get keyboardOptions() {
|
||||
- return this._options.split(',');
|
||||
+ return this._options;
|
||||
}
|
||||
|
||||
get keyboardModel() {
|
||||
--
|
||||
2.43.1
|
||||
|
||||
|
|
@ -1,98 +0,0 @@
|
|||
From c8c05c4a142f3de9c17a9ca83692dda364abccc8 Mon Sep 17 00:00:00 2001
|
||||
From: Jan200101 <sentrycraft123@gmail.com>
|
||||
Date: Thu, 15 Feb 2024 16:05:40 +0100
|
||||
Subject: [PATCH] shell-app: Improve discrete GPU detection
|
||||
|
||||
---
|
||||
.../net.hadess.SwitcherooControl.xml | 3 +-
|
||||
src/shell-app.c | 60 +++++++++++++++++++
|
||||
2 files changed, 62 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/data/dbus-interfaces/net.hadess.SwitcherooControl.xml b/data/dbus-interfaces/net.hadess.SwitcherooControl.xml
|
||||
index e52bc1a0d25..59a889654f4 100644
|
||||
--- a/data/dbus-interfaces/net.hadess.SwitcherooControl.xml
|
||||
+++ b/data/dbus-interfaces/net.hadess.SwitcherooControl.xml
|
||||
@@ -38,7 +38,8 @@
|
||||
will contain a user-facing name for the GPU, the "Environment" (as) key will
|
||||
contain an array of even number of strings, each being an environment
|
||||
variable to set to use the GPU, followed by its value, the "Default" (b) key
|
||||
- will tag the default (usually integrated) GPU.
|
||||
+ will tag the default GPU, the "Discrete" (b) key tags if the GPU is a
|
||||
+ dedicated component.
|
||||
-->
|
||||
<property name="GPUs" type="aa{sv}" access="read"/>
|
||||
|
||||
diff --git a/src/shell-app.c b/src/shell-app.c
|
||||
index 371bc6cf762..39f220ba954 100644
|
||||
--- a/src/shell-app.c
|
||||
+++ b/src/shell-app.c
|
||||
@@ -1300,6 +1300,66 @@ apply_discrete_gpu_env (GAppLaunchContext *context,
|
||||
}
|
||||
|
||||
num_children = g_variant_n_children (variant);
|
||||
+
|
||||
+ // Check if the Default GPU is Discrete
|
||||
+ for (i = 0; i < num_children; i++)
|
||||
+ {
|
||||
+ g_autoptr(GVariant) gpu = NULL;
|
||||
+ g_autoptr(GVariant) env = NULL;
|
||||
+ g_autoptr(GVariant) default_variant = NULL;
|
||||
+ g_autoptr(GVariant) discrete_variant = NULL;
|
||||
+ g_autofree const char **env_s = NULL;
|
||||
+
|
||||
+ gpu = g_variant_get_child_value (variant, i);
|
||||
+ if (!gpu ||
|
||||
+ !g_variant_is_of_type (gpu, G_VARIANT_TYPE ("a{s*}")))
|
||||
+ continue;
|
||||
+
|
||||
+ /* Skip over non-default GPUs */
|
||||
+ default_variant = g_variant_lookup_value (gpu, "Default", NULL);
|
||||
+ if (!default_variant || !g_variant_get_boolean (default_variant))
|
||||
+ continue;
|
||||
+
|
||||
+ /* break out if default GPU is not discrete */
|
||||
+ discrete_variant = g_variant_lookup_value (gpu, "Discrete", NULL);
|
||||
+ if (!discrete_variant || !g_variant_get_boolean (discrete_variant))
|
||||
+ break;
|
||||
+
|
||||
+ // Default GPU is discrete, no need to do anything
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ // Find the first Discrete GPU
|
||||
+ for (i = 0; i < num_children; i++)
|
||||
+ {
|
||||
+ g_autoptr(GVariant) gpu = NULL;
|
||||
+ g_autoptr(GVariant) env = NULL;
|
||||
+ g_autoptr(GVariant) discrete_variant = NULL;
|
||||
+ g_autofree const char **env_s = NULL;
|
||||
+ guint j;
|
||||
+
|
||||
+ gpu = g_variant_get_child_value (variant, i);
|
||||
+ if (!gpu ||
|
||||
+ !g_variant_is_of_type (gpu, G_VARIANT_TYPE ("a{s*}")))
|
||||
+ continue;
|
||||
+
|
||||
+ /* Skip over non-discrete GPUs */
|
||||
+ discrete_variant = g_variant_lookup_value (gpu, "Discrete", NULL);
|
||||
+ if (!discrete_variant || !g_variant_get_boolean (discrete_variant))
|
||||
+ continue;
|
||||
+
|
||||
+ env = g_variant_lookup_value (gpu, "Environment", NULL);
|
||||
+ if (!env)
|
||||
+ continue;
|
||||
+
|
||||
+ env_s = g_variant_get_strv (env, NULL);
|
||||
+ for (j = 0; env_s[j] != NULL; j = j + 2)
|
||||
+ g_app_launch_context_setenv (context, env_s[j], env_s[j+1]);
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ // fallback to old behavior
|
||||
+ // find the first non-Default GPU
|
||||
for (i = 0; i < num_children; i++)
|
||||
{
|
||||
g_autoptr(GVariant) gpu = NULL;
|
||||
--
|
||||
GitLab
|
||||
|
||||
|
|
@ -1,67 +0,0 @@
|
|||
From 22df9fa5e3c973d5a194f2bbdbcdd4a64511bc93 Mon Sep 17 00:00:00 2001
|
||||
From: Benjamin Berg <bberg@redhat.com>
|
||||
Date: Wed, 28 Apr 2021 16:50:03 +0200
|
||||
Subject: [PATCH] gdm: Work around failing fingerprint auth
|
||||
|
||||
On Fedora we have the problem that fingerprint auth fails immediately if
|
||||
the PAM configuration has not been updated and no prints are enrolled.
|
||||
|
||||
So, consider a verification failure within one second to be a service
|
||||
failure instead.
|
||||
---
|
||||
js/gdm/util.js | 18 ++++++++++++++++++
|
||||
1 file changed, 18 insertions(+)
|
||||
|
||||
diff --git a/js/gdm/util.js b/js/gdm/util.js
|
||||
index b02cd4d73..118a05100 100644
|
||||
--- a/js/gdm/util.js
|
||||
+++ b/js/gdm/util.js
|
||||
@@ -157,6 +157,7 @@ var ShellUserVerifier = class {
|
||||
null,
|
||||
null,
|
||||
Gio.DBusProxyFlags.DO_NOT_LOAD_PROPERTIES);
|
||||
+ this._fprintStartTime = -1;
|
||||
this._smartcardManager = SmartcardManager.getSmartcardManager();
|
||||
|
||||
// We check for smartcards right away, since an inserted smartcard
|
||||
@@ -543,6 +544,10 @@ var ShellUserVerifier = class {
|
||||
async _startService(serviceName) {
|
||||
this._hold.acquire();
|
||||
try {
|
||||
+ if (serviceName == FINGERPRINT_SERVICE_NAME) {
|
||||
+ this._fprintStartTime = GLib.get_monotonic_time();
|
||||
+ }
|
||||
+
|
||||
if (this._userName) {
|
||||
await this._userVerifier.call_begin_verification_for_user(
|
||||
serviceName, this._userName, this._cancellable);
|
||||
@@ -624,6 +629,7 @@ var ShellUserVerifier = class {
|
||||
const cancellable = this._cancellable;
|
||||
this._fingerprintFailedId = GLib.timeout_add(GLib.PRIORITY_DEFAULT,
|
||||
FINGERPRINT_ERROR_TIMEOUT_WAIT, () => {
|
||||
+ log("Generating _verificationFailed!");
|
||||
this._fingerprintFailedId = 0;
|
||||
if (!cancellable.is_cancelled())
|
||||
this._verificationFailed(serviceName, false);
|
||||
@@ -689,6 +695,18 @@ var ShellUserVerifier = class {
|
||||
if (serviceName === FINGERPRINT_SERVICE_NAME) {
|
||||
if (this._fingerprintFailedId)
|
||||
GLib.source_remove(this._fingerprintFailedId);
|
||||
+
|
||||
+ // On Fedora we have the problem that fingerprint auth fails
|
||||
+ // immediately if the PAM configuration has not been updated and no
|
||||
+ // prints are enrolled.
|
||||
+ // So, consider a verification failure within one second to be a service
|
||||
+ // failure instead.
|
||||
+ if (this._fprintStartTime > GLib.get_monotonic_time() - GLib.USEC_PER_SEC) {
|
||||
+ log("Fingerprint service failed almost immediately, considering it unavailable.");
|
||||
+ log("Please fix your configuration by running: authselect select --force sssd with-fingerprint with-silent-lastlog");
|
||||
+ this._onServiceUnavailable(this._client, serviceName, null);
|
||||
+ return;
|
||||
+ }
|
||||
}
|
||||
|
||||
// For Not Listed / enterprise logins, immediately reset
|
||||
--
|
||||
2.31.1
|
||||
|
||||
|
|
@ -1,89 +0,0 @@
|
|||
From 01b465beae325c88fe6539303ddbdf1cc1cb80a7 Mon Sep 17 00:00:00 2001
|
||||
From: Ray Strode <rstrode@redhat.com>
|
||||
Date: Wed, 16 Aug 2023 18:46:54 -0400
|
||||
Subject: [PATCH 1/3] status/keyboard: Add a catch around reload call
|
||||
|
||||
Now that system input settings can get used in the user session
|
||||
they're getting seen by the tests and the tests are complaining:
|
||||
|
||||
Unhandled promise rejection. To suppress this warning, add an
|
||||
error handler to your promise chain with .catch() or a try-catch block
|
||||
around your await expression.
|
||||
|
||||
This commit adds the catch it's asking for.
|
||||
---
|
||||
js/ui/status/keyboard.js | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js
|
||||
index 8d98e16de..7277c6d09 100644
|
||||
--- a/js/ui/status/keyboard.js
|
||||
+++ b/js/ui/status/keyboard.js
|
||||
@@ -171,61 +171,63 @@ class InputSourceSettings extends Signals.EventEmitter {
|
||||
get mruSources() {
|
||||
return [];
|
||||
}
|
||||
|
||||
set mruSources(sourcesList) {
|
||||
// do nothing
|
||||
}
|
||||
|
||||
get keyboardOptions() {
|
||||
return [];
|
||||
}
|
||||
|
||||
get perWindow() {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
class InputSourceSystemSettings extends InputSourceSettings {
|
||||
constructor() {
|
||||
super();
|
||||
|
||||
this._BUS_NAME = 'org.freedesktop.locale1';
|
||||
this._BUS_PATH = '/org/freedesktop/locale1';
|
||||
this._BUS_IFACE = 'org.freedesktop.locale1';
|
||||
this._BUS_PROPS_IFACE = 'org.freedesktop.DBus.Properties';
|
||||
|
||||
this._layouts = '';
|
||||
this._variants = '';
|
||||
this._options = '';
|
||||
|
||||
- this._reload();
|
||||
+ this._reload().catch(error => {
|
||||
+ logError(error, 'Could not reload system input settings');
|
||||
+ });
|
||||
|
||||
Gio.DBus.system.signal_subscribe(this._BUS_NAME,
|
||||
this._BUS_PROPS_IFACE,
|
||||
'PropertiesChanged',
|
||||
this._BUS_PATH,
|
||||
null,
|
||||
Gio.DBusSignalFlags.NONE,
|
||||
this._reload.bind(this));
|
||||
}
|
||||
|
||||
async _reload() {
|
||||
let props;
|
||||
try {
|
||||
const result = await Gio.DBus.system.call(
|
||||
this._BUS_NAME,
|
||||
this._BUS_PATH,
|
||||
this._BUS_PROPS_IFACE,
|
||||
'GetAll',
|
||||
new GLib.Variant('(s)', [this._BUS_IFACE]),
|
||||
null, Gio.DBusCallFlags.NONE, -1, null);
|
||||
[props] = result.deepUnpack();
|
||||
} catch (e) {
|
||||
log(`Could not get properties from ${this._BUS_NAME}`);
|
||||
return;
|
||||
}
|
||||
|
||||
const layouts = props['X11Layout'].unpack();
|
||||
const variants = props['X11Variant'].unpack();
|
||||
const options = props['X11Options'].unpack();
|
||||
|
||||
--
|
||||
2.41.0.rc2
|
||||
|
||||
|
|
@ -1,289 +0,0 @@
|
|||
From 455526804beab00adc7b96d01b7e53355123c3d7 Mon Sep 17 00:00:00 2001
|
||||
From: Ray Strode <rstrode@redhat.com>
|
||||
Date: Wed, 16 Aug 2023 11:13:39 -0400
|
||||
Subject: [PATCH 2/3] status/keyboard: Load keyboard from system settings if
|
||||
gsettings unconfigured
|
||||
|
||||
Right now if a user hasn't configured their input sources, the code falls back to
|
||||
using the current layout on Xorg and the mutter default with wayland.
|
||||
|
||||
This commit changes the code to instead fall back to using the system
|
||||
default (as configured by localed).
|
||||
---
|
||||
js/ui/status/keyboard.js | 58 +++++++++++++++++++++++++++++++---------
|
||||
1 file changed, 45 insertions(+), 13 deletions(-)
|
||||
|
||||
diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js
|
||||
index 7277c6d09..97e35d482 100644
|
||||
--- a/js/ui/status/keyboard.js
|
||||
+++ b/js/ui/status/keyboard.js
|
||||
@@ -1,54 +1,57 @@
|
||||
// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
|
||||
|
||||
import Clutter from 'gi://Clutter';
|
||||
import Gio from 'gi://Gio';
|
||||
import GLib from 'gi://GLib';
|
||||
import GObject from 'gi://GObject';
|
||||
import IBus from 'gi://IBus';
|
||||
import Meta from 'gi://Meta';
|
||||
import Shell from 'gi://Shell';
|
||||
import St from 'gi://St';
|
||||
import * as Gettext from 'gettext';
|
||||
import * as Signals from '../../misc/signals.js';
|
||||
|
||||
import * as IBusManager from '../../misc/ibusManager.js';
|
||||
import * as KeyboardManager from '../../misc/keyboardManager.js';
|
||||
import * as Main from '../main.js';
|
||||
import * as PopupMenu from '../popupMenu.js';
|
||||
import * as PanelMenu from '../panelMenu.js';
|
||||
import * as SwitcherPopup from '../switcherPopup.js';
|
||||
import * as Util from '../../misc/util.js';
|
||||
|
||||
export const INPUT_SOURCE_TYPE_XKB = 'xkb';
|
||||
export const INPUT_SOURCE_TYPE_IBUS = 'ibus';
|
||||
|
||||
+const DESKTOP_INPUT_SOURCES_SCHEMA = 'org.gnome.desktop.input-sources';
|
||||
+const KEY_INPUT_SOURCES = 'sources';
|
||||
+
|
||||
export const LayoutMenuItem = GObject.registerClass(
|
||||
class LayoutMenuItem extends PopupMenu.PopupBaseMenuItem {
|
||||
_init(displayName, shortName) {
|
||||
super._init();
|
||||
|
||||
this.setOrnament(PopupMenu.Ornament.NONE);
|
||||
|
||||
this.label = new St.Label({
|
||||
text: displayName,
|
||||
x_expand: true,
|
||||
});
|
||||
this.indicator = new St.Label({text: shortName});
|
||||
this.add_child(this.label);
|
||||
this.add(this.indicator);
|
||||
this.label_actor = this.label;
|
||||
}
|
||||
});
|
||||
|
||||
export class InputSource extends Signals.EventEmitter {
|
||||
constructor(type, id, displayName, shortName, index) {
|
||||
super();
|
||||
|
||||
this.type = type;
|
||||
this.id = id;
|
||||
this.displayName = displayName;
|
||||
this._shortName = shortName;
|
||||
this.index = index;
|
||||
|
||||
this.properties = null;
|
||||
|
||||
@@ -236,166 +239,195 @@ class InputSourceSystemSettings extends InputSourceSettings {
|
||||
this._layouts = layouts;
|
||||
this._variants = variants;
|
||||
this._emitInputSourcesChanged();
|
||||
}
|
||||
if (options !== this._options) {
|
||||
this._options = options;
|
||||
this._emitKeyboardOptionsChanged();
|
||||
}
|
||||
}
|
||||
|
||||
get inputSources() {
|
||||
let sourcesList = [];
|
||||
let layouts = this._layouts.split(',');
|
||||
let variants = this._variants.split(',');
|
||||
|
||||
for (let i = 0; i < layouts.length && !!layouts[i]; i++) {
|
||||
let id = layouts[i];
|
||||
if (variants[i])
|
||||
id += `+${variants[i]}`;
|
||||
sourcesList.push({type: INPUT_SOURCE_TYPE_XKB, id});
|
||||
}
|
||||
return sourcesList;
|
||||
}
|
||||
|
||||
get keyboardOptions() {
|
||||
return this._options.split(',');
|
||||
}
|
||||
}
|
||||
|
||||
class InputSourceSessionSettings extends InputSourceSettings {
|
||||
- constructor() {
|
||||
+ constructor(settings) {
|
||||
super();
|
||||
|
||||
- this._DESKTOP_INPUT_SOURCES_SCHEMA = 'org.gnome.desktop.input-sources';
|
||||
- this._KEY_INPUT_SOURCES = 'sources';
|
||||
this._KEY_MRU_SOURCES = 'mru-sources';
|
||||
this._KEY_KEYBOARD_OPTIONS = 'xkb-options';
|
||||
this._KEY_PER_WINDOW = 'per-window';
|
||||
|
||||
- this._settings = new Gio.Settings({schema_id: this._DESKTOP_INPUT_SOURCES_SCHEMA});
|
||||
- this._settings.connect(`changed::${this._KEY_INPUT_SOURCES}`, this._emitInputSourcesChanged.bind(this));
|
||||
+ this._settings = settings;
|
||||
+ this._settings.connect(`changed::${KEY_INPUT_SOURCES}`, this._emitInputSourcesChanged.bind(this));
|
||||
this._settings.connect(`changed::${this._KEY_KEYBOARD_OPTIONS}`, this._emitKeyboardOptionsChanged.bind(this));
|
||||
this._settings.connect(`changed::${this._KEY_PER_WINDOW}`, this._emitPerWindowChanged.bind(this));
|
||||
}
|
||||
|
||||
_getSourcesList(key) {
|
||||
let sourcesList = [];
|
||||
let sources = this._settings.get_value(key);
|
||||
let nSources = sources.n_children();
|
||||
|
||||
for (let i = 0; i < nSources; i++) {
|
||||
let [type, id] = sources.get_child_value(i).deepUnpack();
|
||||
sourcesList.push({type, id});
|
||||
}
|
||||
return sourcesList;
|
||||
}
|
||||
|
||||
get inputSources() {
|
||||
- return this._getSourcesList(this._KEY_INPUT_SOURCES);
|
||||
+ return this._getSourcesList(KEY_INPUT_SOURCES);
|
||||
}
|
||||
|
||||
get mruSources() {
|
||||
return this._getSourcesList(this._KEY_MRU_SOURCES);
|
||||
}
|
||||
|
||||
set mruSources(sourcesList) {
|
||||
let sources = GLib.Variant.new('a(ss)', sourcesList);
|
||||
this._settings.set_value(this._KEY_MRU_SOURCES, sources);
|
||||
}
|
||||
|
||||
get keyboardOptions() {
|
||||
return this._settings.get_strv(this._KEY_KEYBOARD_OPTIONS);
|
||||
}
|
||||
|
||||
get perWindow() {
|
||||
return this._settings.get_boolean(this._KEY_PER_WINDOW);
|
||||
}
|
||||
}
|
||||
|
||||
export class InputSourceManager extends Signals.EventEmitter {
|
||||
constructor() {
|
||||
super();
|
||||
|
||||
// All valid input sources currently in the gsettings
|
||||
// KEY_INPUT_SOURCES list indexed by their index there
|
||||
this._inputSources = {};
|
||||
// All valid input sources currently in the gsettings
|
||||
// KEY_INPUT_SOURCES list of type INPUT_SOURCE_TYPE_IBUS
|
||||
// indexed by the IBus ID
|
||||
this._ibusSources = {};
|
||||
|
||||
this._currentSource = null;
|
||||
|
||||
// All valid input sources currently in the gsettings
|
||||
// KEY_INPUT_SOURCES list ordered by most recently used
|
||||
this._mruSources = [];
|
||||
this._mruSourcesBackup = null;
|
||||
this._keybindingAction =
|
||||
Main.wm.addKeybinding('switch-input-source',
|
||||
new Gio.Settings({schema_id: 'org.gnome.desktop.wm.keybindings'}),
|
||||
Meta.KeyBindingFlags.NONE,
|
||||
Shell.ActionMode.ALL,
|
||||
this._switchInputSource.bind(this));
|
||||
this._keybindingActionBackward =
|
||||
Main.wm.addKeybinding('switch-input-source-backward',
|
||||
new Gio.Settings({schema_id: 'org.gnome.desktop.wm.keybindings'}),
|
||||
Meta.KeyBindingFlags.IS_REVERSED,
|
||||
Shell.ActionMode.ALL,
|
||||
this._switchInputSource.bind(this));
|
||||
- if (Main.sessionMode.isGreeter)
|
||||
- this._settings = new InputSourceSystemSettings();
|
||||
- else
|
||||
- this._settings = new InputSourceSessionSettings();
|
||||
- this._settings.connect('input-sources-changed', this._inputSourcesChanged.bind(this));
|
||||
- this._settings.connect('keyboard-options-changed', this._keyboardOptionsChanged.bind(this));
|
||||
|
||||
this._xkbInfo = KeyboardManager.getXkbInfo();
|
||||
this._keyboardManager = KeyboardManager.getKeyboardManager();
|
||||
|
||||
this._ibusReady = false;
|
||||
this._ibusManager = IBusManager.getIBusManager();
|
||||
this._ibusManager.connect('ready', this._ibusReadyCallback.bind(this));
|
||||
this._ibusManager.connect('properties-registered', this._ibusPropertiesRegistered.bind(this));
|
||||
this._ibusManager.connect('property-updated', this._ibusPropertyUpdated.bind(this));
|
||||
this._ibusManager.connect('set-content-type', this._ibusSetContentType.bind(this));
|
||||
|
||||
+ this._inputSettings = new Gio.Settings({schema_id: DESKTOP_INPUT_SOURCES_SCHEMA});
|
||||
+ this._setupInputSettings();
|
||||
+
|
||||
global.display.connect('modifiers-accelerator-activated', this._modifiersSwitcher.bind(this));
|
||||
|
||||
this._sourcesPerWindow = false;
|
||||
this._focusWindowNotifyId = 0;
|
||||
- this._settings.connect('per-window-changed', this._sourcesPerWindowChanged.bind(this));
|
||||
this._sourcesPerWindowChanged();
|
||||
this._disableIBus = false;
|
||||
this._reloading = false;
|
||||
}
|
||||
|
||||
+ _sessionHasNoInputSettings() {
|
||||
+ return this._inputSettings.get_user_value(KEY_INPUT_SOURCES) === null;
|
||||
+ }
|
||||
+
|
||||
+ _reloadInputSettings() {
|
||||
+ const hadNoSessionInputSettings = this._hasNoSessionInputSettings;
|
||||
+
|
||||
+ if (Main.sessionMode.isGreeter)
|
||||
+ this._hasNoSessionInputSettings = true;
|
||||
+ else
|
||||
+ this._hasNoSessionInputSettings = this._sessionHasNoInputSettings();
|
||||
+
|
||||
+ if (this._settings && hadNoSessionInputSettings === this._hasNoSessionInputSettings)
|
||||
+ return;
|
||||
+
|
||||
+ this._settings?.disconnectObject(this);
|
||||
+
|
||||
+ if (this._hasNoSessionInputSettings)
|
||||
+ this._settings = new InputSourceSystemSettings();
|
||||
+ else
|
||||
+ this._settings = new InputSourceSessionSettings(this._inputSettings);
|
||||
+
|
||||
+ this._settings.connectObject('input-sources-changed', this._inputSourcesChanged.bind(this),
|
||||
+ 'keyboard-options-changed', this._keyboardOptionsChanged.bind(this),
|
||||
+ 'per-window-changed', this._sourcesPerWindowChanged.bind(this), this);
|
||||
+ this.reload();
|
||||
+ }
|
||||
+
|
||||
+ _setupInputSettings() {
|
||||
+ if (!Main.sessionMode.isGreeter)
|
||||
+ this._inputSettings.connect(`changed::${KEY_INPUT_SOURCES}`, this._reloadInputSettings.bind(this));
|
||||
+
|
||||
+ this._reloadInputSettings();
|
||||
+ }
|
||||
+
|
||||
reload() {
|
||||
this._reloading = true;
|
||||
this._keyboardManager.setKeyboardOptions(this._settings.keyboardOptions);
|
||||
this._inputSourcesChanged();
|
||||
this._reloading = false;
|
||||
}
|
||||
|
||||
_ibusReadyCallback(im, ready) {
|
||||
if (this._ibusReady === ready)
|
||||
return;
|
||||
|
||||
this._ibusReady = ready;
|
||||
this._mruSources = [];
|
||||
this._inputSourcesChanged();
|
||||
}
|
||||
|
||||
_modifiersSwitcher() {
|
||||
let sourceIndexes = Object.keys(this._inputSources);
|
||||
if (sourceIndexes.length === 0) {
|
||||
KeyboardManager.releaseKeyboard();
|
||||
return true;
|
||||
}
|
||||
|
||||
let is = this._currentSource;
|
||||
if (!is)
|
||||
is = this._inputSources[sourceIndexes[0]];
|
||||
|
||||
let nextIndex = is.index + 1;
|
||||
if (nextIndex > sourceIndexes[sourceIndexes.length - 1])
|
||||
nextIndex = 0;
|
||||
--
|
||||
2.41.0.rc2
|
||||
|
||||
|
|
@ -1,233 +0,0 @@
|
|||
From a2684644e0799fe44180201fa96c4f77137f886f Mon Sep 17 00:00:00 2001
|
||||
From: Ray Strode <rstrode@redhat.com>
|
||||
Date: Wed, 16 Aug 2023 14:09:50 -0400
|
||||
Subject: [PATCH 3/3] status/keyboard: Use gnome-desktop API for getting
|
||||
default input sources list
|
||||
|
||||
At the moment, gnome-shell tries to figure out the default input sources
|
||||
from localed. It fails to take into account the system locale and input
|
||||
methods.
|
||||
|
||||
This commit switches it to use a new function in gnome-desktop,
|
||||
gnome_get_default_input_sources, which does most of the heavy
|
||||
lifting itself, instead.
|
||||
---
|
||||
js/ui/status/keyboard.js | 56 ++++++++++++++++++----------------------
|
||||
1 file changed, 25 insertions(+), 31 deletions(-)
|
||||
|
||||
diff --git a/js/ui/status/keyboard.js b/js/ui/status/keyboard.js
|
||||
index 97e35d482..8a2f1d2f7 100644
|
||||
--- a/js/ui/status/keyboard.js
|
||||
+++ b/js/ui/status/keyboard.js
|
||||
@@ -1,57 +1,60 @@
|
||||
// -*- mode: js; js-indent-level: 4; indent-tabs-mode: nil -*-
|
||||
|
||||
import Clutter from 'gi://Clutter';
|
||||
import Gio from 'gi://Gio';
|
||||
import GLib from 'gi://GLib';
|
||||
+import GnomeDesktop from 'gi://GnomeDesktop';
|
||||
import GObject from 'gi://GObject';
|
||||
import IBus from 'gi://IBus';
|
||||
import Meta from 'gi://Meta';
|
||||
import Shell from 'gi://Shell';
|
||||
import St from 'gi://St';
|
||||
import * as Gettext from 'gettext';
|
||||
import * as Signals from '../../misc/signals.js';
|
||||
|
||||
import * as IBusManager from '../../misc/ibusManager.js';
|
||||
import * as KeyboardManager from '../../misc/keyboardManager.js';
|
||||
import * as Main from '../main.js';
|
||||
import * as PopupMenu from '../popupMenu.js';
|
||||
import * as PanelMenu from '../panelMenu.js';
|
||||
import * as SwitcherPopup from '../switcherPopup.js';
|
||||
import * as Util from '../../misc/util.js';
|
||||
|
||||
export const INPUT_SOURCE_TYPE_XKB = 'xkb';
|
||||
export const INPUT_SOURCE_TYPE_IBUS = 'ibus';
|
||||
|
||||
const DESKTOP_INPUT_SOURCES_SCHEMA = 'org.gnome.desktop.input-sources';
|
||||
const KEY_INPUT_SOURCES = 'sources';
|
||||
|
||||
+Gio._promisify(GnomeDesktop, 'get_default_input_sources');
|
||||
+
|
||||
export const LayoutMenuItem = GObject.registerClass(
|
||||
class LayoutMenuItem extends PopupMenu.PopupBaseMenuItem {
|
||||
_init(displayName, shortName) {
|
||||
super._init();
|
||||
|
||||
this.setOrnament(PopupMenu.Ornament.NONE);
|
||||
|
||||
this.label = new St.Label({
|
||||
text: displayName,
|
||||
x_expand: true,
|
||||
});
|
||||
this.indicator = new St.Label({text: shortName});
|
||||
this.add_child(this.label);
|
||||
this.add(this.indicator);
|
||||
this.label_actor = this.label;
|
||||
}
|
||||
});
|
||||
|
||||
export class InputSource extends Signals.EventEmitter {
|
||||
constructor(type, id, displayName, shortName, index) {
|
||||
super();
|
||||
|
||||
this.type = type;
|
||||
this.id = id;
|
||||
this.displayName = displayName;
|
||||
this._shortName = shortName;
|
||||
this.index = index;
|
||||
|
||||
this.properties = null;
|
||||
|
||||
@@ -170,125 +173,116 @@ class InputSourceSettings extends Signals.EventEmitter {
|
||||
get inputSources() {
|
||||
return [];
|
||||
}
|
||||
|
||||
get mruSources() {
|
||||
return [];
|
||||
}
|
||||
|
||||
set mruSources(sourcesList) {
|
||||
// do nothing
|
||||
}
|
||||
|
||||
get keyboardOptions() {
|
||||
return [];
|
||||
}
|
||||
|
||||
get perWindow() {
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
class InputSourceSystemSettings extends InputSourceSettings {
|
||||
constructor() {
|
||||
super();
|
||||
|
||||
this._BUS_NAME = 'org.freedesktop.locale1';
|
||||
this._BUS_PATH = '/org/freedesktop/locale1';
|
||||
this._BUS_IFACE = 'org.freedesktop.locale1';
|
||||
this._BUS_PROPS_IFACE = 'org.freedesktop.DBus.Properties';
|
||||
|
||||
- this._layouts = '';
|
||||
- this._variants = '';
|
||||
- this._options = '';
|
||||
+ this._inputSourceIds = [];
|
||||
+ this._inputSourceTypes = [];
|
||||
+ this._options = [];
|
||||
|
||||
this._reload().catch(error => {
|
||||
logError(error, 'Could not reload system input settings');
|
||||
});
|
||||
|
||||
Gio.DBus.system.signal_subscribe(this._BUS_NAME,
|
||||
this._BUS_PROPS_IFACE,
|
||||
'PropertiesChanged',
|
||||
this._BUS_PATH,
|
||||
null,
|
||||
Gio.DBusSignalFlags.NONE,
|
||||
this._reload.bind(this));
|
||||
}
|
||||
|
||||
async _reload() {
|
||||
- let props;
|
||||
+ let inputSourceIds;
|
||||
+ let inputSourceTypes;
|
||||
+ let options;
|
||||
try {
|
||||
- const result = await Gio.DBus.system.call(
|
||||
- this._BUS_NAME,
|
||||
- this._BUS_PATH,
|
||||
- this._BUS_PROPS_IFACE,
|
||||
- 'GetAll',
|
||||
- new GLib.Variant('(s)', [this._BUS_IFACE]),
|
||||
- null, Gio.DBusCallFlags.NONE, -1, null);
|
||||
- [props] = result.deepUnpack();
|
||||
+ [inputSourceIds, inputSourceTypes, options] = await GnomeDesktop.get_default_input_sources (null);
|
||||
} catch (e) {
|
||||
- log(`Could not get properties from ${this._BUS_NAME}`);
|
||||
+ logError(e, 'Could not get default input sources');
|
||||
return;
|
||||
}
|
||||
|
||||
- const layouts = props['X11Layout'].unpack();
|
||||
- const variants = props['X11Variant'].unpack();
|
||||
- const options = props['X11Options'].unpack();
|
||||
-
|
||||
- if (layouts !== this._layouts ||
|
||||
- variants !== this._variants) {
|
||||
- this._layouts = layouts;
|
||||
- this._variants = variants;
|
||||
+ if (inputSourceIds !== this._inputSourceIds ||
|
||||
+ inputSourceTypes !== this._inputSourceTypes) {
|
||||
+ this._inputSourceIds = inputSourceIds;
|
||||
+ this._inputSourceTypes = inputSourceTypes;
|
||||
this._emitInputSourcesChanged();
|
||||
}
|
||||
if (options !== this._options) {
|
||||
this._options = options;
|
||||
this._emitKeyboardOptionsChanged();
|
||||
}
|
||||
}
|
||||
|
||||
get inputSources() {
|
||||
- let sourcesList = [];
|
||||
- let layouts = this._layouts.split(',');
|
||||
- let variants = this._variants.split(',');
|
||||
-
|
||||
- for (let i = 0; i < layouts.length && !!layouts[i]; i++) {
|
||||
- let id = layouts[i];
|
||||
- if (variants[i])
|
||||
- id += `+${variants[i]}`;
|
||||
- sourcesList.push({type: INPUT_SOURCE_TYPE_XKB, id});
|
||||
+ let sourcesList;
|
||||
+
|
||||
+ if (this._inputSourceIds) {
|
||||
+ sourcesList = this._inputSourceIds.map((id, index) => {
|
||||
+ return { type: this._inputSourceTypes[index], id };
|
||||
+ });
|
||||
+ } else {
|
||||
+ sourcesList = [];
|
||||
}
|
||||
+
|
||||
return sourcesList;
|
||||
}
|
||||
|
||||
get keyboardOptions() {
|
||||
- return this._options.split(',');
|
||||
+ return this._options;
|
||||
}
|
||||
}
|
||||
|
||||
class InputSourceSessionSettings extends InputSourceSettings {
|
||||
constructor(settings) {
|
||||
super();
|
||||
|
||||
this._KEY_MRU_SOURCES = 'mru-sources';
|
||||
this._KEY_KEYBOARD_OPTIONS = 'xkb-options';
|
||||
this._KEY_PER_WINDOW = 'per-window';
|
||||
|
||||
this._settings = settings;
|
||||
this._settings.connect(`changed::${KEY_INPUT_SOURCES}`, this._emitInputSourcesChanged.bind(this));
|
||||
this._settings.connect(`changed::${this._KEY_KEYBOARD_OPTIONS}`, this._emitKeyboardOptionsChanged.bind(this));
|
||||
this._settings.connect(`changed::${this._KEY_PER_WINDOW}`, this._emitPerWindowChanged.bind(this));
|
||||
}
|
||||
|
||||
_getSourcesList(key) {
|
||||
let sourcesList = [];
|
||||
let sources = this._settings.get_value(key);
|
||||
let nSources = sources.n_children();
|
||||
|
||||
for (let i = 0; i < nSources; i++) {
|
||||
let [type, id] = sources.get_child_value(i).deepUnpack();
|
||||
sourcesList.push({type, id});
|
||||
}
|
||||
return sourcesList;
|
||||
}
|
||||
|
||||
get inputSources() {
|
||||
--
|
||||
2.41.0.rc2
|
||||
|
||||
|
|
@ -1,98 +0,0 @@
|
|||
From c8c05c4a142f3de9c17a9ca83692dda364abccc8 Mon Sep 17 00:00:00 2001
|
||||
From: Jan200101 <sentrycraft123@gmail.com>
|
||||
Date: Thu, 15 Feb 2024 16:05:40 +0100
|
||||
Subject: [PATCH] shell-app: Improve discrete GPU detection
|
||||
|
||||
---
|
||||
.../net.hadess.SwitcherooControl.xml | 3 +-
|
||||
src/shell-app.c | 60 +++++++++++++++++++
|
||||
2 files changed, 62 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/data/dbus-interfaces/net.hadess.SwitcherooControl.xml b/data/dbus-interfaces/net.hadess.SwitcherooControl.xml
|
||||
index e52bc1a0d25..59a889654f4 100644
|
||||
--- a/data/dbus-interfaces/net.hadess.SwitcherooControl.xml
|
||||
+++ b/data/dbus-interfaces/net.hadess.SwitcherooControl.xml
|
||||
@@ -38,7 +38,8 @@
|
||||
will contain a user-facing name for the GPU, the "Environment" (as) key will
|
||||
contain an array of even number of strings, each being an environment
|
||||
variable to set to use the GPU, followed by its value, the "Default" (b) key
|
||||
- will tag the default (usually integrated) GPU.
|
||||
+ will tag the default GPU, the "Discrete" (b) key tags if the GPU is a
|
||||
+ dedicated component.
|
||||
-->
|
||||
<property name="GPUs" type="aa{sv}" access="read"/>
|
||||
|
||||
diff --git a/src/shell-app.c b/src/shell-app.c
|
||||
index 371bc6cf762..39f220ba954 100644
|
||||
--- a/src/shell-app.c
|
||||
+++ b/src/shell-app.c
|
||||
@@ -1300,6 +1300,66 @@ apply_discrete_gpu_env (GAppLaunchContext *context,
|
||||
}
|
||||
|
||||
num_children = g_variant_n_children (variant);
|
||||
+
|
||||
+ // Check if the Default GPU is Discrete
|
||||
+ for (i = 0; i < num_children; i++)
|
||||
+ {
|
||||
+ g_autoptr(GVariant) gpu = NULL;
|
||||
+ g_autoptr(GVariant) env = NULL;
|
||||
+ g_autoptr(GVariant) default_variant = NULL;
|
||||
+ g_autoptr(GVariant) discrete_variant = NULL;
|
||||
+ g_autofree const char **env_s = NULL;
|
||||
+
|
||||
+ gpu = g_variant_get_child_value (variant, i);
|
||||
+ if (!gpu ||
|
||||
+ !g_variant_is_of_type (gpu, G_VARIANT_TYPE ("a{s*}")))
|
||||
+ continue;
|
||||
+
|
||||
+ /* Skip over non-default GPUs */
|
||||
+ default_variant = g_variant_lookup_value (gpu, "Default", NULL);
|
||||
+ if (!default_variant || !g_variant_get_boolean (default_variant))
|
||||
+ continue;
|
||||
+
|
||||
+ /* break out if default GPU is not discrete */
|
||||
+ discrete_variant = g_variant_lookup_value (gpu, "Discrete", NULL);
|
||||
+ if (!discrete_variant || !g_variant_get_boolean (discrete_variant))
|
||||
+ break;
|
||||
+
|
||||
+ // Default GPU is discrete, no need to do anything
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ // Find the first Discrete GPU
|
||||
+ for (i = 0; i < num_children; i++)
|
||||
+ {
|
||||
+ g_autoptr(GVariant) gpu = NULL;
|
||||
+ g_autoptr(GVariant) env = NULL;
|
||||
+ g_autoptr(GVariant) discrete_variant = NULL;
|
||||
+ g_autofree const char **env_s = NULL;
|
||||
+ guint j;
|
||||
+
|
||||
+ gpu = g_variant_get_child_value (variant, i);
|
||||
+ if (!gpu ||
|
||||
+ !g_variant_is_of_type (gpu, G_VARIANT_TYPE ("a{s*}")))
|
||||
+ continue;
|
||||
+
|
||||
+ /* Skip over non-discrete GPUs */
|
||||
+ discrete_variant = g_variant_lookup_value (gpu, "Discrete", NULL);
|
||||
+ if (!discrete_variant || !g_variant_get_boolean (discrete_variant))
|
||||
+ continue;
|
||||
+
|
||||
+ env = g_variant_lookup_value (gpu, "Environment", NULL);
|
||||
+ if (!env)
|
||||
+ continue;
|
||||
+
|
||||
+ env_s = g_variant_get_strv (env, NULL);
|
||||
+ for (j = 0; env_s[j] != NULL; j = j + 2)
|
||||
+ g_app_launch_context_setenv (context, env_s[j], env_s[j+1]);
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ // fallback to old behavior
|
||||
+ // find the first non-Default GPU
|
||||
for (i = 0; i < num_children; i++)
|
||||
{
|
||||
g_autoptr(GVariant) gpu = NULL;
|
||||
--
|
||||
GitLab
|
||||
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -1,38 +0,0 @@
|
|||
From a2e62e671260576d23f18c22c10a48ac4a8504af Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
|
||||
Date: Wed, 17 Sep 2014 07:11:12 +0200
|
||||
Subject: [PATCH] Replace Web with Firefox in default favorites
|
||||
|
||||
---
|
||||
data/org.gnome.shell.gschema.xml.in | 2 +-
|
||||
js/ui/appFavorites.js | 1 +
|
||||
2 files changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/data/org.gnome.shell.gschema.xml.in b/data/org.gnome.shell.gschema.xml.in
|
||||
index cd6a2356d..b8a13a9cc 100644
|
||||
--- a/data/org.gnome.shell.gschema.xml.in
|
||||
+++ b/data/org.gnome.shell.gschema.xml.in
|
||||
@@ -50,7 +50,7 @@
|
||||
</description>
|
||||
</key>
|
||||
<key name="favorite-apps" type="as">
|
||||
- <default>[ 'org.gnome.Epiphany.desktop', 'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ]</default>
|
||||
+ <default>[ 'firefox.desktop', 'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop' ]</default>
|
||||
<summary>List of desktop file IDs for favorite applications</summary>
|
||||
<description>
|
||||
The applications corresponding to these identifiers
|
||||
diff --git a/js/ui/appFavorites.js b/js/ui/appFavorites.js
|
||||
index a876727ed..24ce16f81 100644
|
||||
--- a/js/ui/appFavorites.js
|
||||
+++ b/js/ui/appFavorites.js
|
||||
@@ -52,6 +52,7 @@ const RENAMED_DESKTOP_IDS = {
|
||||
'gnotski.desktop': 'org.gnome.Klotski.desktop',
|
||||
'gtali.desktop': 'org.gnome.Tali.desktop',
|
||||
'iagno.desktop': 'org.gnome.Reversi.desktop',
|
||||
+ 'mozilla-firefox.desktop': 'firefox.desktop',
|
||||
'nautilus.desktop': 'org.gnome.Nautilus.desktop',
|
||||
'org.gnome.gnome-2048.desktop': 'org.gnome.TwentyFortyEight.desktop',
|
||||
'org.gnome.taquin.desktop': 'org.gnome.Taquin.desktop',
|
||||
--
|
||||
2.30.1
|
||||
|
||||
|
|
@ -1,238 +0,0 @@
|
|||
%global tarball_version %%(echo %{version} | tr '~' '.')
|
||||
%global major_version 45
|
||||
%global minor_version 6
|
||||
|
||||
Name: gnome-shell
|
||||
Version: %{major_version}.%{minor_version}
|
||||
Release: %autorelease.switcheroo.{{{ git_dir_version }}}
|
||||
Summary: Window management and application launching for GNOME
|
||||
|
||||
License: GPLv2+
|
||||
URL: https://wiki.gnome.org/Projects/GnomeShell
|
||||
Source0: https://download.gnome.org/sources/gnome-shell/%{major_version}/%{name}-%{tarball_version}.tar.xz
|
||||
|
||||
# Replace Epiphany with Firefox in the default favourite apps list
|
||||
Patch: gnome-shell-favourite-apps-firefox.patch
|
||||
|
||||
# Some users might have a broken PAM config, so we really need this
|
||||
# downstream patch to stop trying on configuration errors.
|
||||
Patch: 0001-gdm-Work-around-failing-fingerprint-auth.patch
|
||||
|
||||
Patch: 0001-status-keyboard-Add-a-catch-around-reload-call.patch
|
||||
Patch: 0002-status-keyboard-Load-keyboard-from-system-settings-i.patch
|
||||
Patch: 0003-status-keyboard-Use-gnome-desktop-API-for-getting-de.patch
|
||||
|
||||
# shell-app: improve discrete GPU detectio
|
||||
# https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3193
|
||||
Patch: 3193.patch
|
||||
|
||||
%define eds_version 3.45.1
|
||||
%define gnome_desktop_version 44.0-7
|
||||
%define glib2_version 2.56.0
|
||||
%define gobject_introspection_version 1.49.1
|
||||
%define gjs_version 1.73.1
|
||||
%define gtk4_version 4.0.0
|
||||
%define adwaita_version 1.0.0
|
||||
%define mutter_version 45.0
|
||||
%define polkit_version 0.100
|
||||
%define gsettings_desktop_schemas_version 42~beta
|
||||
%define ibus_version 1.5.2
|
||||
%define gnome_bluetooth_version 1:42.3
|
||||
%define gstreamer_version 1.4.5
|
||||
%define pipewire_version 0.3.0
|
||||
%define gnome_settings_daemon_version 3.37.1
|
||||
|
||||
BuildRequires: bash-completion
|
||||
BuildRequires: gcc
|
||||
BuildRequires: meson
|
||||
BuildRequires: git
|
||||
BuildRequires: pkgconfig(ibus-1.0) >= %{ibus_version}
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: pkgconfig(libedataserver-1.2) >= %{eds_version}
|
||||
BuildRequires: pkgconfig(gcr-4)
|
||||
BuildRequires: pkgconfig(gjs-1.0) >= %{gjs_version}
|
||||
BuildRequires: pkgconfig(gio-2.0) >= %{glib2_version}
|
||||
BuildRequires: pkgconfig(gnome-autoar-0)
|
||||
BuildRequires: pkgconfig(gnome-desktop-4) >= %{gnome_desktop_version}
|
||||
BuildRequires: pkgconfig(gobject-introspection-1.0) >= %{gobject_introspection_version}
|
||||
BuildRequires: mesa-libGL-devel
|
||||
BuildRequires: mesa-libEGL-devel
|
||||
BuildRequires: pkgconfig(libnm)
|
||||
BuildRequires: pkgconfig(polkit-agent-1) >= %{polkit_version}
|
||||
BuildRequires: pkgconfig(libstartup-notification-1.0)
|
||||
BuildRequires: pkgconfig(libsystemd)
|
||||
# for screencast recorder functionality
|
||||
BuildRequires: pkgconfig(gstreamer-base-1.0) >= %{gstreamer_version}
|
||||
BuildRequires: pkgconfig(libpipewire-0.3) >= %{pipewire_version}
|
||||
BuildRequires: pkgconfig(gtk4) >= %{gtk4_version}
|
||||
BuildRequires: gettext >= 0.19.6
|
||||
BuildRequires: python3
|
||||
|
||||
# for barriers
|
||||
BuildRequires: libXfixes-devel >= 5.0
|
||||
# used in unused BigThemeImage
|
||||
BuildRequires: librsvg2-devel
|
||||
BuildRequires: mutter-devel >= %{mutter_version}
|
||||
BuildRequires: pkgconfig(libpulse)
|
||||
%ifnarch s390 s390x ppc ppc64 ppc64p7
|
||||
BuildRequires: gnome-bluetooth-libs-devel >= %{gnome_bluetooth_version}
|
||||
%endif
|
||||
# Bootstrap requirements
|
||||
BuildRequires: gtk-doc
|
||||
%ifnarch s390 s390x
|
||||
Recommends: gnome-bluetooth%{?_isa} >= %{gnome_bluetooth_version}
|
||||
%endif
|
||||
Requires: gnome-desktop3%{?_isa} >= %{gnome_desktop_version}
|
||||
%if 0%{?rhel} != 7
|
||||
# Disabled on RHEL 7 to allow logging into KDE session by default
|
||||
Recommends: gnome-session-xsession
|
||||
%endif
|
||||
Requires: gcr%{?_isa}
|
||||
Requires: gobject-introspection%{?_isa} >= %{gobject_introspection_version}
|
||||
Requires: gjs%{?_isa} >= %{gjs_version}
|
||||
Requires: gtk4%{?_isa} >= %{gtk4_version}
|
||||
Requires: libadwaita%{_isa} >= %{adwaita_version}
|
||||
Requires: libnma-gtk4%{?_isa}
|
||||
# needed for loading SVG's via gdk-pixbuf
|
||||
Requires: librsvg2%{?_isa}
|
||||
Requires: mutter%{?_isa} >= %{mutter_version}
|
||||
Requires: upower%{?_isa}
|
||||
Requires: polkit%{?_isa} >= %{polkit_version}
|
||||
Requires: gnome-desktop4%{?_isa} >= %{gnome_desktop_version}
|
||||
Requires: glib2%{?_isa} >= %{glib2_version}
|
||||
Requires: gsettings-desktop-schemas%{?_isa} >= %{gsettings_desktop_schemas_version}
|
||||
Requires: gnome-settings-daemon%{?_isa} >= %{gnome_settings_daemon_version}
|
||||
Requires: gstreamer1%{?_isa} >= %{gstreamer_version}
|
||||
# needed for screen recorder
|
||||
Requires: gstreamer1-plugins-good%{?_isa}
|
||||
Requires: pipewire-gstreamer%{?_isa}
|
||||
Requires: xdg-user-dirs-gtk
|
||||
# needed for schemas
|
||||
Requires: at-spi2-atk%{?_isa}
|
||||
# needed for on-screen keyboard
|
||||
Requires: ibus%{?_isa} >= %{ibus_version}
|
||||
# needed for "show keyboard layout"
|
||||
Requires: tecla
|
||||
# needed for the user menu
|
||||
Requires: accountsservice-libs%{?_isa}
|
||||
Requires: gdm-libs%{?_isa}
|
||||
# needed for settings items in menus
|
||||
Requires: gnome-control-center
|
||||
# needed by some utilities
|
||||
Requires: python3%{_isa}
|
||||
# needed for the dual-GPU launch menu
|
||||
Requires: switcheroo-control
|
||||
# needed for clocks/weather integration
|
||||
Requires: geoclue2-libs%{?_isa}
|
||||
Requires: libgweather4%{?_isa}
|
||||
# for gnome-extensions CLI tool
|
||||
Requires: gettext
|
||||
# needed for thunderbolt support
|
||||
Requires: bolt%{?_isa}
|
||||
# Needed for launching flatpak apps etc
|
||||
# 1.8.0 is needed for source type support in the screencast portal.
|
||||
Requires: xdg-desktop-portal-gtk >= 1.8.0
|
||||
Requires: xdg-desktop-portal-gnome
|
||||
# needed by the welcome dialog
|
||||
Recommends: gnome-tour
|
||||
|
||||
Provides: desktop-notification-daemon = %{version}-%{release}
|
||||
Provides: PolicyKit-authentication-agent = %{version}-%{release}
|
||||
Provides: bundled(gvc)
|
||||
Provides: bundled(libcroco) = 0.6.13
|
||||
|
||||
%if 0%{?rhel}
|
||||
# In Fedora, fedora-obsolete-packages obsoletes caribou
|
||||
Obsoletes: caribou < 0.4.21-10
|
||||
Obsoletes: caribou-antler < 0.4.21-10
|
||||
Obsoletes: caribou-devel < 0.4.21-10
|
||||
Obsoletes: caribou-gtk2-module < 0.4.21-10
|
||||
Obsoletes: caribou-gtk3-module < 0.4.21-10
|
||||
Obsoletes: python-caribou < 0.4.21-10
|
||||
Obsoletes: python2-caribou < 0.4.21-10
|
||||
Obsoletes: python3-caribou < 0.4.21-10
|
||||
%endif
|
||||
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1740897
|
||||
Conflicts: gnome-shell-extension-background-logo < 3.34.0
|
||||
|
||||
%description
|
||||
GNOME Shell provides core user interface functions for the GNOME 3 desktop,
|
||||
like switching to windows and launching applications. GNOME Shell takes
|
||||
advantage of the capabilities of modern graphics hardware and introduces
|
||||
innovative user interface concepts to provide a visually attractive and
|
||||
easy to use experience.
|
||||
|
||||
%prep
|
||||
%autosetup -S git -n %{name}-%{tarball_version}
|
||||
|
||||
%build
|
||||
%meson -Dextensions_app=false
|
||||
%meson_build
|
||||
|
||||
%install
|
||||
%meson_install
|
||||
|
||||
# Create empty directories where other packages can drop extensions
|
||||
mkdir -p %{buildroot}%{_datadir}/gnome-shell/extensions
|
||||
mkdir -p %{buildroot}%{_datadir}/gnome-shell/search-providers
|
||||
|
||||
%find_lang %{name}
|
||||
|
||||
%check
|
||||
desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Shell.desktop
|
||||
desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Shell.Extensions.desktop
|
||||
desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Shell.PortalHelper.desktop
|
||||
|
||||
%files -f %{name}.lang
|
||||
%license COPYING
|
||||
%doc README.md
|
||||
%{_bindir}/gnome-shell
|
||||
%{_bindir}/gnome-extensions
|
||||
%{_bindir}/gnome-shell-extension-prefs
|
||||
%{_bindir}/gnome-shell-extension-tool
|
||||
%{_bindir}/gnome-shell-test-tool
|
||||
%{_datadir}/glib-2.0/schemas/*.xml
|
||||
%{_datadir}/glib-2.0/schemas/00_org.gnome.shell.gschema.override
|
||||
%{_datadir}/applications/org.gnome.Shell.Extensions.desktop
|
||||
%{_datadir}/applications/org.gnome.Shell.desktop
|
||||
%{_datadir}/applications/org.gnome.Shell.PortalHelper.desktop
|
||||
%{_datadir}/bash-completion/completions/gnome-extensions
|
||||
%{_datadir}/gnome-control-center/keybindings/50-gnome-shell-launchers.xml
|
||||
%{_datadir}/gnome-control-center/keybindings/50-gnome-shell-screenshots.xml
|
||||
%{_datadir}/gnome-control-center/keybindings/50-gnome-shell-system.xml
|
||||
%{_datadir}/gnome-shell/
|
||||
%{_datadir}/dbus-1/services/org.gnome.ScreenSaver.service
|
||||
%{_datadir}/dbus-1/services/org.gnome.Shell.CalendarServer.service
|
||||
%{_datadir}/dbus-1/services/org.gnome.Shell.Extensions.service
|
||||
%{_datadir}/dbus-1/services/org.gnome.Shell.HotplugSniffer.service
|
||||
%{_datadir}/dbus-1/services/org.gnome.Shell.Notifications.service
|
||||
%{_datadir}/dbus-1/services/org.gnome.Shell.PortalHelper.service
|
||||
%{_datadir}/dbus-1/services/org.gnome.Shell.Screencast.service
|
||||
%{_datadir}/dbus-1/interfaces/org.gnome.Shell.Extensions.xml
|
||||
%{_datadir}/dbus-1/interfaces/org.gnome.Shell.Introspect.xml
|
||||
%{_datadir}/dbus-1/interfaces/org.gnome.Shell.PadOsd.xml
|
||||
%{_datadir}/dbus-1/interfaces/org.gnome.Shell.Screencast.xml
|
||||
%{_datadir}/dbus-1/interfaces/org.gnome.Shell.Screenshot.xml
|
||||
%{_datadir}/dbus-1/interfaces/org.gnome.ShellSearchProvider.xml
|
||||
%{_datadir}/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml
|
||||
%{_datadir}/icons/hicolor/scalable/apps/org.gnome.Shell.Extensions.svg
|
||||
%{_datadir}/icons/hicolor/symbolic/apps/org.gnome.Shell.Extensions-symbolic.svg
|
||||
%{_userunitdir}/org.gnome.Shell-disable-extensions.service
|
||||
%{_userunitdir}/org.gnome.Shell.target
|
||||
%{_userunitdir}/org.gnome.Shell@wayland.service
|
||||
%{_userunitdir}/org.gnome.Shell@x11.service
|
||||
# Co own directory instead of pulling in xdg-desktop-portal - we
|
||||
# are providing a backend to the portal, not depending on it
|
||||
%dir %{_datadir}/xdg-desktop-portal/portals/
|
||||
%{_datadir}/xdg-desktop-portal/portals/gnome-shell.portal
|
||||
%{_libdir}/gnome-shell/
|
||||
%{_libexecdir}/gnome-shell-calendar-server
|
||||
%{_libexecdir}/gnome-shell-perf-helper
|
||||
%{_libexecdir}/gnome-shell-hotplug-sniffer
|
||||
%{_libexecdir}/gnome-shell-portal-helper
|
||||
%{_mandir}/man1/gnome-extensions.1*
|
||||
%{_mandir}/man1/gnome-shell.1*
|
||||
|
||||
%changelog
|
||||
%autochangelog
|
||||
File diff suppressed because it is too large
Load diff
|
|
@ -1,227 +0,0 @@
|
|||
gnome-shell-2.31.5.tar.bz2
|
||||
/gnome-shell-2.91.0.tar.bz2
|
||||
/gnome-shell-2.91.1.tar.bz2
|
||||
/gnome-shell-2.91.2.tar.bz2
|
||||
/gnome-shell-2.91.3.tar.bz2
|
||||
/gnome-shell-2.91.4.tar.bz2
|
||||
/gnome-shell-2.91.5.tar.bz2
|
||||
/gnome-shell-2.91.6.tar.bz2
|
||||
/gnome-shell-2.91.90.tar.bz2
|
||||
/gnome-shell-2.91.91.tar.bz2
|
||||
/gnome-shell-2.91.92.tar.bz2
|
||||
/gnome-shell-2.91.93.tar.bz2
|
||||
/gnome-shell-3.0.0.tar.bz2
|
||||
/gnome-shell-3.0.0.1.tar.bz2
|
||||
/gnome-shell-3.0.0.2.tar.bz2
|
||||
/gnome-shell-3.0.1.tar.bz2
|
||||
/gnome-shell-3.0.2.tar.bz2
|
||||
/gnome-shell-3.1.3.tar.bz2
|
||||
/gnome-shell-3.1.4.tar.xz
|
||||
/gnome-shell-3.1.4-gite7b9933.tar.bz2
|
||||
/gnome-shell-3.1.90.1.tar.xz
|
||||
/gnome-shell-3.1.91.tar.xz
|
||||
/gnome-shell-3.1.91.1.tar.xz
|
||||
/gnome-shell-3.1.92.tar.xz
|
||||
/gnome-shell-3.2.0.tar.xz
|
||||
/gnome-shell-3.2.1.tar.xz
|
||||
/gnome-shell-3.3.2.tar.xz
|
||||
/gnome-shell-3.3.3.tar.xz
|
||||
/gnome-shell-3.3.4.tar.xz
|
||||
/gnome-shell-3.3.5.tar.xz
|
||||
/gnome-shell-3.3.90.tar.xz
|
||||
/gnome-shell-3.3.92.tar.xz
|
||||
/gnome-shell-3.4.0.tar.xz
|
||||
/gnome-shell-3.4.1.tar.xz
|
||||
/gnome-shell-3.5.2.tar.xz
|
||||
/gnome-shell-3.5.3.tar.xz
|
||||
/gnome-shell-3.5.4.tar.xz
|
||||
/gnome-shell-3.5.5.tar.xz
|
||||
/gnome-shell-3.5.90.tar.xz
|
||||
/gnome-shell-3.5.91.tar.xz
|
||||
/gnome-shell-3.5.92.tar.xz
|
||||
/gnome-shell-3.6.0.tar.xz
|
||||
/gnome-shell-3.6.1.tar.xz
|
||||
/gnome-shell-3.7.1.tar.xz
|
||||
/gnome-shell-3.7.2.tar.xz
|
||||
/gnome-shell-3.7.3.tar.xz
|
||||
/gnome-shell-3.7.3.1.tar.xz
|
||||
/gnome-shell-3.7.4.tar.xz
|
||||
/gnome-shell-3.7.4.1.tar.xz
|
||||
/gnome-shell-3.7.5.tar.xz
|
||||
/gnome-shell-3.7.90.tar.xz
|
||||
/gnome-shell-3.7.91.tar.xz
|
||||
/gnome-shell-3.7.92.tar.xz
|
||||
/gnome-shell-3.8.0.tar.xz
|
||||
/gnome-shell-3.8.0.1.tar.xz
|
||||
/gnome-shell-3.8.1.tar.xz
|
||||
/gnome-shell-3.9.1.tar.xz
|
||||
/gnome-shell-3.9.2.tar.xz
|
||||
/gnome-shell-3.9.3.tar.xz
|
||||
/gnome-shell-3.9.4.tar.xz
|
||||
/gnome-shell-3.9.5.tar.xz
|
||||
/gnome-shell-3.9.90.tar.xz
|
||||
/gnome-shell-3.9.91.tar.xz
|
||||
/gnome-shell-3.9.92.tar.xz
|
||||
/gnome-shell-3.10.0.tar.xz
|
||||
/gnome-shell-3.10.0.1.tar.xz
|
||||
/gnome-shell-3.10.1.tar.xz
|
||||
/gnome-shell-3.11.1.tar.xz
|
||||
/gnome-shell-3.11.2.tar.xz
|
||||
/gnome-shell-3.11.3.tar.xz
|
||||
/gnome-shell-3.11.4.tar.xz
|
||||
/gnome-shell-3.11.5.tar.xz
|
||||
/gnome-shell-3.11.90.tar.xz
|
||||
/gnome-shell-3.11.91.tar.xz
|
||||
/gnome-shell-3.11.92.tar.xz
|
||||
/gnome-shell-3.12.0.tar.xz
|
||||
/gnome-shell-3.12.1.tar.xz
|
||||
/gnome-shell-3.13.1.tar.xz
|
||||
/gnome-shell-3.13.2.tar.xz
|
||||
/gnome-shell-3.13.3.tar.xz
|
||||
/gnome-shell-3.13.4.tar.xz
|
||||
/gnome-shell-3.13.90.tar.xz
|
||||
/gnome-shell-3.13.91.tar.xz
|
||||
/gnome-shell-3.13.92.tar.xz
|
||||
/gnome-shell-3.14.0.tar.xz
|
||||
/gnome-shell-3.14.1.tar.xz
|
||||
/gnome-shell-3.15.1.tar.xz
|
||||
/gnome-shell-3.15.2.tar.xz
|
||||
/gnome-shell-3.15.3.tar.xz
|
||||
/gnome-shell-3.15.4.tar.xz
|
||||
/gnome-shell-3.15.90.tar.xz
|
||||
/gnome-shell-3.15.91.tar.xz
|
||||
/gnome-shell-3.15.92.tar.xz
|
||||
/gnome-shell-3.16.0.tar.xz
|
||||
/gnome-shell-3.16.1.tar.xz
|
||||
/gnome-shell-3.17.1.tar.xz
|
||||
/gnome-shell-3.17.2.tar.xz
|
||||
/gnome-shell-3.17.3.tar.xz
|
||||
/gnome-shell-3.17.4.tar.xz
|
||||
/gnome-shell-3.17.90.tar.xz
|
||||
/gnome-shell-3.17.91.tar.xz
|
||||
/gnome-shell-3.17.92.tar.xz
|
||||
/gnome-shell-3.18.0.tar.xz
|
||||
/gnome-shell-3.18.1.tar.xz
|
||||
/gnome-shell-3.19.1.tar.xz
|
||||
/gnome-shell-3.19.2.tar.xz
|
||||
/gnome-shell-3.19.3.tar.xz
|
||||
/gnome-shell-3.19.4.tar.xz
|
||||
/gnome-shell-3.19.90.tar.xz
|
||||
/gnome-shell-3.19.91.tar.xz
|
||||
/gnome-shell-3.19.92.tar.xz
|
||||
/gnome-shell-3.20.0.tar.xz
|
||||
/gnome-shell-3.20.1.tar.xz
|
||||
/gnome-shell-3.21.1.tar.xz
|
||||
/gnome-shell-3.21.2.tar.xz
|
||||
/gnome-shell-3.21.3.tar.xz
|
||||
/gnome-shell-3.21.4.tar.xz
|
||||
/gnome-shell-3.21.90.tar.xz
|
||||
/gnome-shell-3.21.90.1.tar.xz
|
||||
/gnome-shell-3.21.91.tar.xz
|
||||
/gnome-shell-3.21.92.tar.xz
|
||||
/gnome-shell-3.22.0.tar.xz
|
||||
/gnome-shell-3.22.1.tar.xz
|
||||
/gnome-shell-3.23.1.tar.xz
|
||||
/gnome-shell-3.23.2.tar.xz
|
||||
/gnome-shell-3.23.3.tar.xz
|
||||
/gnome-shell-3.23.90.tar.xz
|
||||
/gnome-shell-3.23.91.tar.xz
|
||||
/gnome-shell-3.23.92.tar.xz
|
||||
/gnome-shell-3.24.0.tar.xz
|
||||
/gnome-shell-3.24.1.tar.xz
|
||||
/gnome-shell-3.25.1.tar.xz
|
||||
/gnome-shell-3.25.2.tar.xz
|
||||
/gnome-shell-3.25.3.tar.xz
|
||||
/gnome-shell-3.25.4.tar.xz
|
||||
/gnome-shell-3.25.90.tar.xz
|
||||
/gnome-shell-3.25.91.tar.xz
|
||||
/gnome-shell-3.26.0.tar.xz
|
||||
/gnome-shell-3.26.1.tar.xz
|
||||
/gnome-shell-3.27.1.tar.xz
|
||||
/gnome-shell-3.27.91.tar.xz
|
||||
/gnome-shell-3.27.92.tar.xz
|
||||
/gnome-shell-3.28.0.tar.xz
|
||||
/gnome-shell-3.28.1.tar.xz
|
||||
/gnome-shell-3.29.1.tar.xz
|
||||
/gnome-shell-3.29.2.tar.xz
|
||||
/gnome-shell-3.29.4.tar.xz
|
||||
/gnome-shell-3.29.90.tar.xz
|
||||
/gnome-shell-3.29.91.tar.xz
|
||||
/gnome-shell-3.29.92.tar.xz
|
||||
/gnome-shell-3.30.0.tar.xz
|
||||
/gnome-shell-3.30.1.tar.xz
|
||||
/gnome-shell-3.31.2.tar.xz
|
||||
/gnome-shell-3.31.4.tar.xz
|
||||
/gnome-shell-3.31.90.tar.xz
|
||||
/gnome-shell-3.31.91.tar.xz
|
||||
/gnome-shell-3.31.92.tar.xz
|
||||
/gnome-shell-3.32.0.tar.xz
|
||||
/gnome-shell-3.32.1.tar.xz
|
||||
/gnome-shell-3.33.1.tar.xz
|
||||
/gnome-shell-3.33.2.tar.xz
|
||||
/gnome-shell-3.33.3.tar.xz
|
||||
/gnome-shell-3.33.4.tar.xz
|
||||
/gnome-shell-3.33.90.tar.xz
|
||||
/gnome-shell-3.33.91.tar.xz
|
||||
/gnome-shell-3.33.92.tar.xz
|
||||
/gnome-shell-3.34.0.tar.xz
|
||||
/gnome-shell-3.34.1.tar.xz
|
||||
/gnome-shell-3.35.1.tar.xz
|
||||
/gnome-shell-3.35.2.tar.xz
|
||||
/gnome-shell-3.35.3.tar.xz
|
||||
/gnome-shell-3.35.90.tar.xz
|
||||
/gnome-shell-3.35.91.tar.xz
|
||||
/gnome-shell-3.35.92.tar.xz
|
||||
/gnome-shell-3.36.0.tar.xz
|
||||
/gnome-shell-3.36.1.tar.xz
|
||||
/gnome-shell-3.37.1.tar.xz
|
||||
/gnome-shell-3.37.2.tar.xz
|
||||
/gnome-shell-3.37.3.tar.xz
|
||||
/gnome-shell-3.37.90.tar.xz
|
||||
/gnome-shell-3.37.91.tar.xz
|
||||
/gnome-shell-3.37.92.tar.xz
|
||||
/gnome-shell-3.38.0.tar.xz
|
||||
/gnome-shell-3.38.1.tar.xz
|
||||
/gnome-shell-40.alpha.tar.xz
|
||||
/gnome-shell-40.alpha.1.tar.xz
|
||||
/gnome-shell-40.alpha.1.1.tar.xz
|
||||
/gnome-shell-40.alpha.1.1-94-g9ce666ac1.tar.xz
|
||||
/gnome-shell-40.alpha.1.1-228-g829a096ba.tar.xz
|
||||
/gnome-shell-40.beta.tar.xz
|
||||
/gnome-shell-40.beta-79-g7a57528bd.tar.xz
|
||||
/gnome-shell-40.rc.tar.xz
|
||||
/gnome-shell-40.0.tar.xz
|
||||
/gnome-shell-40.1.tar.xz
|
||||
/gnome-shell-40.2.tar.xz
|
||||
/gnome-shell-40.3.tar.xz
|
||||
/gnome-shell-41.beta.tar.xz
|
||||
/gnome-shell-41.rc.tar.xz
|
||||
/gnome-shell-41.rc.1.tar.xz
|
||||
/gnome-shell-41.0.tar.xz
|
||||
/gnome-shell-42.alpha.tar.xz
|
||||
/gnome-shell-42.beta.tar.xz
|
||||
/gnome-shell-42.rc.tar.xz
|
||||
/gnome-shell-42.0.tar.xz
|
||||
/gnome-shell-42.1.tar.xz
|
||||
/gnome-shell-42.2.tar.xz
|
||||
/gnome-shell-43.alpha.tar.xz
|
||||
/gnome-shell-43.beta.tar.xz
|
||||
/gnome-shell-43.rc.tar.xz
|
||||
/gnome-shell-43.0.tar.xz
|
||||
/gnome-shell-43.1.tar.xz
|
||||
/gnome-shell-44.beta.tar.xz
|
||||
/gnome-shell-44.rc.tar.xz
|
||||
/gnome-shell-44.0.tar.xz
|
||||
/gnome-shell-44.1.tar.xz
|
||||
/gnome-shell-44.2.tar.xz
|
||||
/gnome-shell-45.alpha.tar.xz
|
||||
/gnome-shell-45.beta.tar.xz
|
||||
/gnome-shell-45.beta.1.tar.xz
|
||||
/gnome-shell-45.rc.tar.xz
|
||||
/gnome-shell-45.0.tar.xz
|
||||
/gnome-shell-45.1.tar.xz
|
||||
/gnome-shell-45.2.tar.xz
|
||||
/gnome-shell-46.alpha.tar.xz
|
||||
/gnome-shell-46.beta.tar.xz
|
||||
/gnome-shell-46.rc.tar.xz
|
||||
/gnome-shell-46.0.tar.xz
|
||||
|
|
@ -1,38 +0,0 @@
|
|||
From 551b8979483e127471c726fd1db1d52e063a7d81 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Florian=20M=C3=BCllner?= <fmuellner@gnome.org>
|
||||
Date: Wed, 17 Sep 2014 07:11:12 +0200
|
||||
Subject: [PATCH] Replace Web with Firefox in default favorites
|
||||
|
||||
---
|
||||
data/org.gnome.shell.gschema.xml.in | 2 +-
|
||||
js/ui/appFavorites.js | 1 +
|
||||
2 files changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/data/org.gnome.shell.gschema.xml.in b/data/org.gnome.shell.gschema.xml.in
|
||||
index f4fa86d013..86b4bf85ee 100644
|
||||
--- a/data/org.gnome.shell.gschema.xml.in
|
||||
+++ b/data/org.gnome.shell.gschema.xml.in
|
||||
@@ -50,7 +50,7 @@
|
||||
</description>
|
||||
</key>
|
||||
<key name="favorite-apps" type="as">
|
||||
- <default>[ 'org.gnome.Epiphany.desktop', 'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop', 'org.gnome.TextEditor.desktop']</default>
|
||||
+ <default>[ 'org.mozilla.firefox.desktop', 'org.gnome.Calendar.desktop', 'org.gnome.Music.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.Software.desktop', 'org.gnome.TextEditor.desktop']</default>
|
||||
<summary>List of desktop file IDs for favorite applications</summary>
|
||||
<description>
|
||||
The applications corresponding to these identifiers
|
||||
diff --git a/js/ui/appFavorites.js b/js/ui/appFavorites.js
|
||||
index 576df3800d..1f55a3c881 100644
|
||||
--- a/js/ui/appFavorites.js
|
||||
+++ b/js/ui/appFavorites.js
|
||||
@@ -51,6 +51,7 @@ const RENAMED_DESKTOP_IDS = {
|
||||
'gnotski.desktop': 'org.gnome.Klotski.desktop',
|
||||
'gtali.desktop': 'org.gnome.Tali.desktop',
|
||||
'iagno.desktop': 'org.gnome.Reversi.desktop',
|
||||
+ 'firefox.desktop': 'org.mozilla.firefox.desktop',
|
||||
'nautilus.desktop': 'org.gnome.Nautilus.desktop',
|
||||
'org.gnome.gnome-2048.desktop': 'org.gnome.TwentyFortyEight.desktop',
|
||||
'org.gnome.taquin.desktop': 'org.gnome.Taquin.desktop',
|
||||
--
|
||||
2.43.0
|
||||
|
||||
|
|
@ -1,263 +0,0 @@
|
|||
%global tarball_version %%(echo %{version} | tr '~' '.')
|
||||
# renovate: datasource=yum repo=fedora-41-x86_64-updates pkg=gnome-shell
|
||||
%global major_version 47
|
||||
%global minor_version 2
|
||||
|
||||
%if 0%{?rhel}
|
||||
%global portal_helper 0
|
||||
%else
|
||||
%global portal_helper 1
|
||||
%endif
|
||||
|
||||
Name: gnome-shell
|
||||
Version: %{major_version}.%{minor_version}
|
||||
Release: %autorelease.switcheroo.{{{ git_dir_version }}}
|
||||
Summary: Window management and application launching for GNOME
|
||||
|
||||
License: GPL-2.0-or-later
|
||||
URL: https://wiki.gnome.org/Projects/GnomeShell
|
||||
Source0: https://download.gnome.org/sources/gnome-shell/%{major_version}/%{name}-%{tarball_version}.tar.xz
|
||||
|
||||
# Replace Epiphany with Firefox in the default favourite apps list
|
||||
Patch: gnome-shell-favourite-apps-firefox.patch
|
||||
|
||||
# Some users might have a broken PAM config, so we really need this
|
||||
# downstream patch to stop trying on configuration errors.
|
||||
Patch: 0001-gdm-Work-around-failing-fingerprint-auth.patch
|
||||
|
||||
Patch: 0001-status-keyboard-Add-a-catch-around-reload-call.patch
|
||||
Patch: 0002-status-keyboard-Load-keyboard-from-system-settings-i.patch
|
||||
Patch: 0003-status-keyboard-Use-gnome-desktop-API-for-getting-de.patch
|
||||
|
||||
# shell-app: improve discrete GPU detection
|
||||
# https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/3193
|
||||
Patch: 3193.patch
|
||||
|
||||
%define eds_version 3.45.1
|
||||
%define gnome_desktop_version 44.0-7
|
||||
%define glib2_version 2.79.2
|
||||
%define gobject_introspection_version 1.49.1
|
||||
%define gjs_version 1.73.1
|
||||
%define gtk4_version 4.0.0
|
||||
%define adwaita_version 1.5.0
|
||||
%define mutter_version 47.0
|
||||
%define polkit_version 0.100
|
||||
%define gsettings_desktop_schemas_version 47~alpha
|
||||
%define ibus_version 1.5.2
|
||||
%define gnome_bluetooth_version 1:42.3
|
||||
%define gstreamer_version 1.4.5
|
||||
%define pipewire_version 0.3.0
|
||||
%define gnome_settings_daemon_version 3.37.1
|
||||
|
||||
BuildRequires: pkgconfig(bash-completion)
|
||||
BuildRequires: gcc
|
||||
BuildRequires: meson
|
||||
BuildRequires: git
|
||||
BuildRequires: pkgconfig(ibus-1.0) >= %{ibus_version}
|
||||
BuildRequires: desktop-file-utils
|
||||
BuildRequires: pkgconfig(libedataserver-1.2) >= %{eds_version}
|
||||
BuildRequires: pkgconfig(gcr-4)
|
||||
BuildRequires: pkgconfig(gjs-1.0) >= %{gjs_version}
|
||||
BuildRequires: pkgconfig(gio-2.0) >= %{glib2_version}
|
||||
BuildRequires: pkgconfig(gnome-autoar-0)
|
||||
BuildRequires: pkgconfig(gnome-desktop-4) >= %{gnome_desktop_version}
|
||||
BuildRequires: pkgconfig(gobject-introspection-1.0) >= %{gobject_introspection_version}
|
||||
BuildRequires: mesa-libGL-devel
|
||||
BuildRequires: mesa-libEGL-devel
|
||||
BuildRequires: pkgconfig(libnm)
|
||||
BuildRequires: pkgconfig(polkit-agent-1) >= %{polkit_version}
|
||||
BuildRequires: pkgconfig(libstartup-notification-1.0)
|
||||
BuildRequires: pkgconfig(libsystemd)
|
||||
# for screencast recorder functionality
|
||||
BuildRequires: pkgconfig(gstreamer-base-1.0) >= %{gstreamer_version}
|
||||
BuildRequires: pkgconfig(libpipewire-0.3) >= %{pipewire_version}
|
||||
BuildRequires: pkgconfig(gtk4) >= %{gtk4_version}
|
||||
BuildRequires: gettext >= 0.19.6
|
||||
BuildRequires: python3
|
||||
|
||||
# for rst2man
|
||||
BuildRequires: python3-docutils
|
||||
# for barriers
|
||||
BuildRequires: libXfixes-devel >= 5.0
|
||||
# used in unused BigThemeImage
|
||||
BuildRequires: librsvg2-devel
|
||||
BuildRequires: mutter-devel >= %{mutter_version}
|
||||
BuildRequires: pkgconfig(libpulse)
|
||||
%ifnarch s390 s390x ppc ppc64 ppc64p7
|
||||
BuildRequires: gnome-bluetooth-libs-devel >= %{gnome_bluetooth_version}
|
||||
%endif
|
||||
# Bootstrap requirements
|
||||
BuildRequires: gtk-doc
|
||||
%ifnarch s390 s390x
|
||||
Recommends: gnome-bluetooth%{?_isa} >= %{gnome_bluetooth_version}
|
||||
%endif
|
||||
Requires: gnome-desktop3%{?_isa} >= %{gnome_desktop_version}
|
||||
Requires: gcr%{?_isa}
|
||||
Requires: gobject-introspection%{?_isa} >= %{gobject_introspection_version}
|
||||
Requires: gjs%{?_isa} >= %{gjs_version}
|
||||
Requires: gtk4%{?_isa} >= %{gtk4_version}
|
||||
Requires: libadwaita%{_isa} >= %{adwaita_version}
|
||||
Requires: libnma-gtk4%{?_isa}
|
||||
# needed for loading SVG's via gdk-pixbuf
|
||||
Requires: librsvg2%{?_isa}
|
||||
Requires: mutter%{?_isa} >= %{mutter_version}
|
||||
Requires: upower%{?_isa}
|
||||
Requires: polkit%{?_isa} >= %{polkit_version}
|
||||
Requires: gnome-desktop4%{?_isa} >= %{gnome_desktop_version}
|
||||
Requires: glib2%{?_isa} >= %{glib2_version}
|
||||
Requires: gsettings-desktop-schemas%{?_isa} >= %{gsettings_desktop_schemas_version}
|
||||
Requires: gnome-settings-daemon%{?_isa} >= %{gnome_settings_daemon_version}
|
||||
Requires: gstreamer1%{?_isa} >= %{gstreamer_version}
|
||||
# needed for screen recorder
|
||||
Requires: gstreamer1-plugins-good%{?_isa}
|
||||
Requires: pipewire-gstreamer%{?_isa}
|
||||
Requires: xdg-user-dirs-gtk
|
||||
# needed for schemas
|
||||
Requires: at-spi2-atk%{?_isa}
|
||||
# needed for on-screen keyboard
|
||||
Requires: ibus%{?_isa} >= %{ibus_version}
|
||||
# needed for "show keyboard layout"
|
||||
Requires: tecla
|
||||
# needed for the user menu
|
||||
Requires: accountsservice-libs%{?_isa}
|
||||
Requires: gdm-libs%{?_isa}
|
||||
# needed for settings items in menus
|
||||
Requires: gnome-control-center
|
||||
# needed by some utilities
|
||||
Requires: python3%{_isa}
|
||||
# needed for the dual-GPU launch menu
|
||||
Requires: switcheroo-control
|
||||
# needed for clocks/weather integration
|
||||
Requires: geoclue2-libs%{?_isa}
|
||||
Requires: libgweather4%{?_isa}
|
||||
# for gnome-extensions CLI tool
|
||||
Requires: gettext
|
||||
# needed for thunderbolt support
|
||||
Recommends: bolt%{?_isa}
|
||||
# Needed for launching flatpak apps etc
|
||||
# 1.8.0 is needed for source type support in the screencast portal.
|
||||
Requires: xdg-desktop-portal-gtk >= 1.8.0
|
||||
Requires: xdg-desktop-portal-gnome
|
||||
# needed by the welcome dialog
|
||||
Recommends: gnome-tour
|
||||
|
||||
%if %{portal_helper}
|
||||
# needed for captive portal helper
|
||||
Requires: webkitgtk6.0%{?_isa}
|
||||
%endif
|
||||
|
||||
# https://github.com/containers/composefs/pull/229#issuecomment-1838735764
|
||||
%if 0%{?rhel} >= 10
|
||||
ExcludeArch: %{ix86}
|
||||
%endif
|
||||
|
||||
Provides: desktop-notification-daemon = %{version}-%{release}
|
||||
Provides: PolicyKit-authentication-agent = %{version}-%{release}
|
||||
Provides: bundled(gvc)
|
||||
Provides: bundled(libcroco) = 0.6.13
|
||||
|
||||
%if 0%{?rhel}
|
||||
# In Fedora, fedora-obsolete-packages obsoletes caribou
|
||||
Obsoletes: caribou < 0.4.21-10
|
||||
Obsoletes: caribou-antler < 0.4.21-10
|
||||
Obsoletes: caribou-devel < 0.4.21-10
|
||||
Obsoletes: caribou-gtk2-module < 0.4.21-10
|
||||
Obsoletes: caribou-gtk3-module < 0.4.21-10
|
||||
Obsoletes: python-caribou < 0.4.21-10
|
||||
Obsoletes: python2-caribou < 0.4.21-10
|
||||
Obsoletes: python3-caribou < 0.4.21-10
|
||||
%endif
|
||||
|
||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1740897
|
||||
Conflicts: gnome-shell-extension-background-logo < 3.34.0
|
||||
|
||||
%description
|
||||
GNOME Shell provides core user interface functions for the GNOME 3 desktop,
|
||||
like switching to windows and launching applications. GNOME Shell takes
|
||||
advantage of the capabilities of modern graphics hardware and introduces
|
||||
innovative user interface concepts to provide a visually attractive and
|
||||
easy to use experience.
|
||||
|
||||
%prep
|
||||
%autosetup -S git -n %{name}-%{tarball_version}
|
||||
|
||||
%build
|
||||
%meson \
|
||||
-Dextensions_app=false \
|
||||
%if %{portal_helper}
|
||||
-Dportal_helper=true \
|
||||
%else
|
||||
-Dportal_helper=false \
|
||||
%endif
|
||||
%{nil}
|
||||
%meson_build
|
||||
|
||||
%install
|
||||
%meson_install
|
||||
|
||||
# Create empty directories where other packages can drop extensions
|
||||
mkdir -p %{buildroot}%{_datadir}/gnome-shell/extensions
|
||||
mkdir -p %{buildroot}%{_datadir}/gnome-shell/search-providers
|
||||
|
||||
%find_lang %{name}
|
||||
|
||||
%check
|
||||
desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Shell.desktop
|
||||
desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Shell.Extensions.desktop
|
||||
|
||||
%if %{portal_helper}
|
||||
desktop-file-validate %{buildroot}%{_datadir}/applications/org.gnome.Shell.PortalHelper.desktop
|
||||
%endif
|
||||
|
||||
%files -f %{name}.lang
|
||||
%license COPYING
|
||||
%doc NEWS README.md
|
||||
%{_bindir}/gnome-shell
|
||||
%{_bindir}/gnome-extensions
|
||||
%{_bindir}/gnome-shell-extension-tool
|
||||
%{_bindir}/gnome-shell-test-tool
|
||||
%{_datadir}/glib-2.0/schemas/*.xml
|
||||
%{_datadir}/glib-2.0/schemas/00_org.gnome.shell.gschema.override
|
||||
%{_datadir}/applications/org.gnome.Shell.Extensions.desktop
|
||||
%{_datadir}/applications/org.gnome.Shell.desktop
|
||||
%{_datadir}/bash-completion/completions/gnome-extensions
|
||||
%{_datadir}/gnome-control-center/keybindings/50-gnome-shell-launchers.xml
|
||||
%{_datadir}/gnome-control-center/keybindings/50-gnome-shell-screenshots.xml
|
||||
%{_datadir}/gnome-control-center/keybindings/50-gnome-shell-system.xml
|
||||
%{_datadir}/gnome-shell/
|
||||
%{_datadir}/dbus-1/services/org.gnome.ScreenSaver.service
|
||||
%{_datadir}/dbus-1/services/org.gnome.Shell.CalendarServer.service
|
||||
%{_datadir}/dbus-1/services/org.gnome.Shell.Extensions.service
|
||||
%{_datadir}/dbus-1/services/org.gnome.Shell.HotplugSniffer.service
|
||||
%{_datadir}/dbus-1/services/org.gnome.Shell.Notifications.service
|
||||
%{_datadir}/dbus-1/services/org.gnome.Shell.Screencast.service
|
||||
%{_datadir}/dbus-1/interfaces/org.gnome.Shell.Extensions.xml
|
||||
%{_datadir}/dbus-1/interfaces/org.gnome.Shell.Introspect.xml
|
||||
%{_datadir}/dbus-1/interfaces/org.gnome.Shell.PadOsd.xml
|
||||
%{_datadir}/dbus-1/interfaces/org.gnome.Shell.Screencast.xml
|
||||
%{_datadir}/dbus-1/interfaces/org.gnome.Shell.Screenshot.xml
|
||||
%{_datadir}/dbus-1/interfaces/org.gnome.ShellSearchProvider.xml
|
||||
%{_datadir}/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml
|
||||
%{_datadir}/icons/hicolor/scalable/apps/org.gnome.Shell.Extensions.svg
|
||||
%{_datadir}/icons/hicolor/symbolic/apps/org.gnome.Shell.Extensions-symbolic.svg
|
||||
%{_userunitdir}/org.gnome.Shell-disable-extensions.service
|
||||
%{_userunitdir}/org.gnome.Shell.target
|
||||
%{_userunitdir}/org.gnome.Shell@wayland.service
|
||||
%{_userunitdir}/org.gnome.Shell@x11.service
|
||||
%{_libdir}/gnome-shell/
|
||||
%{_libexecdir}/gnome-shell-calendar-server
|
||||
%{_libexecdir}/gnome-shell-perf-helper
|
||||
%{_libexecdir}/gnome-shell-hotplug-sniffer
|
||||
%{_mandir}/man1/gnome-extensions.1*
|
||||
%{_mandir}/man1/gnome-shell.1*
|
||||
|
||||
%if %{portal_helper}
|
||||
%{_datadir}/applications/org.gnome.Shell.PortalHelper.desktop
|
||||
%{_datadir}/dbus-1/services/org.gnome.Shell.PortalHelper.service
|
||||
%{_datadir}/icons/hicolor/scalable/apps/org.gnome.Shell.CaptivePortal.svg
|
||||
%{_datadir}/icons/hicolor/symbolic/apps/org.gnome.Shell.CaptivePortal-symbolic.svg
|
||||
%{_libexecdir}/gnome-shell-portal-helper
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
%autochangelog
|
||||
Loading…
Reference in a new issue