From 9d0503d281a342840366cb17c2de45eaa6468dcc Mon Sep 17 00:00:00 2001 From: Radek Vykydal Date: Mon, 17 May 2021 10:35:41 +0200 Subject: [PATCH] Remove support for metacity Resolves: rhbz#1961104 --- anaconda.spec.in | 1 - data/window-manager/config/Makefile.am | 5 +---- .../config/org.gnome.metacity.gschema.override | 2 -- pyanaconda/display.py | 14 +++----------- 4 files changed, 4 insertions(+), 18 deletions(-) delete mode 100644 data/window-manager/config/org.gnome.metacity.gschema.override diff --git a/anaconda.spec.in b/anaconda.spec.in index 248ff83c8e1d..3b6fbb4cf47a 100644 --- a/anaconda.spec.in +++ b/anaconda.spec.in @@ -255,7 +255,6 @@ Requires: system-logos # Needed to compile the gsettings files BuildRequires: gsettings-desktop-schemas -BuildRequires: metacity %description gui This package contains graphical user interface for the Anaconda installer. diff --git a/data/window-manager/config/Makefile.am b/data/window-manager/config/Makefile.am index 48e04ab48011..90e71d916189 100644 --- a/data/window-manager/config/Makefile.am +++ b/data/window-manager/config/Makefile.am @@ -20,8 +20,7 @@ schemadir = $(pkgdatadir)/window-manager/glib-2.0/schemas # These files need to be compiled by glib-compile-schemas. This is handled # in the spec file scriptlets. dist_schema_DATA = org.gnome.desktop.wm.keybindings.gschema.override \ - org.gnome.desktop.wm.preferences.gschema.override \ - org.gnome.metacity.gschema.override + org.gnome.desktop.wm.preferences.gschema.override # GSettings insists on the override files being in the same directory as the # schemas they modify, so pretend that this is the case with symlinks and @@ -30,8 +29,6 @@ install-data-hook: $(MKDIR_P) $(DESTDIR)$(schemadir) $(LN_S) -f /usr/share/glib-2.0/schemas/org.gnome.desktop.wm.keybindings.gschema.xml $(DESTDIR)$(schemadir) $(LN_S) -f /usr/share/glib-2.0/schemas/org.gnome.desktop.wm.preferences.gschema.xml $(DESTDIR)$(schemadir) - $(LN_S) -f /usr/share/glib-2.0/schemas/org.gnome.metacity.gschema.xml $(DESTDIR)$(schemadir) - $(LN_S) -f /usr/share/glib-2.0/schemas/org.gnome.metacity.enums.xml $(DESTDIR)$(schemadir) $(LN_S) -f /usr/share/glib-2.0/schemas/org.gnome.desktop.enums.xml $(DESTDIR)$(schemadir) glib-compile-schemas --strict $(DESTDIR)$(schemadir) diff --git a/data/window-manager/config/org.gnome.metacity.gschema.override b/data/window-manager/config/org.gnome.metacity.gschema.override deleted file mode 100644 index 94f9b00b4026..000000000000 --- a/data/window-manager/config/org.gnome.metacity.gschema.override +++ /dev/null @@ -1,2 +0,0 @@ -[org.gnome.metacity] - edge-tiling=false diff --git a/pyanaconda/display.py b/pyanaconda/display.py index 9f0ac25ce56c..836354f3fb2e 100644 --- a/pyanaconda/display.py +++ b/pyanaconda/display.py @@ -192,17 +192,9 @@ def do_startup_x11_actions(): else: xdg_data_dirs = datadir + '/window-manager:/usr/share' - vm = "gnome-kiosk" - try: - childproc = util.startProgram(["gnome-kiosk", "--display", ":1", "--sm-disable", "--x11"], - env_add={'XDG_DATA_DIRS': xdg_data_dirs}) - except FileNotFoundError as e: - log.warning("gnome-kiosk not found: %s, trying metacity", e) - vm = "metacity" - childproc = util.startProgram(["metacity", "--display", ":1", "--sm-disable"], - env_add={'XDG_DATA_DIRS': xdg_data_dirs}) - WatchProcesses.watch_process(childproc, vm) - + childproc = util.startProgram(["gnome-kiosk", "--display", ":1", "--sm-disable", "--x11"], + env_add={'XDG_DATA_DIRS': xdg_data_dirs}) + WatchProcesses.watch_process(childproc, "gnome-kiosk") def set_x_resolution(runres): """Set X server screen resolution.