From bf14c29db4702b7be612df80a76994d792b99804 Mon Sep 17 00:00:00 2001 From: Rick Calixte <10281587+rcalixte@users.noreply.github.com> Date: Wed, 7 Aug 2024 13:31:46 -0400 Subject: [PATCH] Remove gtk-layer-shell (#3443) Remove gtk-layer-shell until it can be implemented without regressions. Ref: #3349 Closes linuxmint/wayland#102 Closes #3439 --- config.h.meson.in | 2 -- debian/control | 1 - debian/rules | 3 +-- meson.build | 7 ------- meson_options.txt | 2 -- src/meson.build | 4 ---- src/nemo-desktop-main.c | 8 +------- src/nemo-window.c | 16 ---------------- 8 files changed, 2 insertions(+), 41 deletions(-) diff --git a/config.h.meson.in b/config.h.meson.in index 910413897..8b49bbd10 100644 --- a/config.h.meson.in +++ b/config.h.meson.in @@ -19,8 +19,6 @@ #mesondefine HAVE_SELINUX // Define to enable pango-1.44 fixes #mesondefine HAVE_PANGO_144 -// Define to use gtk-layer-shell -#mesondefine HAVE_GTK_LAYER_SHELL diff --git a/debian/control b/debian/control index 9cfe73464..e69374c52 100644 --- a/debian/control +++ b/debian/control @@ -21,7 +21,6 @@ Build-Depends: libgsf-1-dev, libgtk-3-dev (>= 3.10), libgtk-3-doc, - libgtk-layer-shell-dev, libjson-glib-dev (>= 1.6), libpango1.0-dev, libx11-dev, diff --git a/debian/rules b/debian/rules index 8d45f4f39..6c68fb92b 100755 --- a/debian/rules +++ b/debian/rules @@ -8,8 +8,7 @@ CONFIGURE_EXTRA_FLAGS = \ --buildtype=debugoptimized \ -D deprecated_warnings=false \ -D gtk_doc=true \ - -D selinux=false \ - -D gtk_layer_shell=true + -D selinux=false export DEB_LDFLAGS_MAINT_APPEND = -Wl,-z,defs -Wl,-O1 -Wl,--as-needed export DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow diff --git a/meson.build b/meson.build index f70ddd964..3ce1a758f 100644 --- a/meson.build +++ b/meson.build @@ -134,12 +134,6 @@ if libselinux_enabled endif conf.set('HAVE_SELINUX', libselinux_enabled) -gtk_layer_shell_enabled = get_option('gtk_layer_shell') -if gtk_layer_shell_enabled - gtk_layer_shell = dependency('gtk-layer-shell-0', version: '>=0.8', required: false) - conf.set('HAVE_GTK_LAYER_SHELL', gtk_layer_shell.found()) -endif - # make sure pango development files are installed pango = dependency('pango', version: '>=1.40.0') # check for newer pango for necessary workarounds @@ -208,7 +202,6 @@ message('\n'.join(['', ' exempi support: @0@'.format(exempi_enabled), ' Tracker support: @0@'.format(tracker_enabled), ' Wayland support: @0@'.format(cc.has_header('gdk/gdkwayland.h', dependencies: gtk)), -' gtk-layer-shell-0: @0@'.format(gtk_layer_shell_enabled and gtk_layer_shell.found()), '', ' nemo-extension documentation: @0@'.format(gtkdoc_enabled), ' nemo-extension introspection: @0@'.format(true), diff --git a/meson_options.txt b/meson_options.txt index c3122fc2a..68814d64d 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -12,5 +12,3 @@ option('empty_view', type : 'boolean', value : false, description: 'Enable empty view') option('tracker',type : 'combo', choices : ['true', 'false', 'auto'], value : 'false', description: 'Tracker support') -option('gtk_layer_shell', type : 'boolean', value : false, - description: 'Use gtk-layer-shell to draw desktop on wayland') diff --git a/src/meson.build b/src/meson.build index 0516c0970..29554244e 100644 --- a/src/meson.build +++ b/src/meson.build @@ -113,10 +113,6 @@ if libexif_enabled nemo_deps += libexif endif -if gtk_layer_shell_enabled - nemo_deps += gtk_layer_shell -endif - nemo = executable('nemo', nemoCommon_sources + nemoWindow_sources, include_directories: [ rootInclude ], diff --git a/src/nemo-desktop-main.c b/src/nemo-desktop-main.c index 7a095ff6e..7055019e4 100644 --- a/src/nemo-desktop-main.c +++ b/src/nemo-desktop-main.c @@ -93,13 +93,7 @@ main (int argc, char *argv[]) g_set_prgname ("nemo-desktop"); -#ifdef HAVE_GTK_LAYER_SHELL - if (gtk_layer_is_supported()) - gdk_set_allowed_backends ("wayland"); - else -#else - gdk_set_allowed_backends ("x11"); -#endif + gdk_set_allowed_backends ("x11"); #ifdef HAVE_EXEMPI xmp_init(); diff --git a/src/nemo-window.c b/src/nemo-window.c index 74daca6bc..3abb8f964 100644 --- a/src/nemo-window.c +++ b/src/nemo-window.c @@ -77,10 +77,6 @@ #include #include -#ifdef HAVE_GTK_LAYER_SHELL -#include -#endif - #define MAX_TITLE_LENGTH 180 /* Forward and back buttons on the mouse */ @@ -623,18 +619,6 @@ nemo_window_constructed (GObject *self) window = NEMO_WINDOW (self); application = nemo_application_get_singleton (); -#ifdef HAVE_GTK_LAYER_SHELL - if (gtk_layer_is_supported() && window->details->disable_chrome) { - gtk_layer_init_for_window(GTK_WINDOW(window)); - gtk_layer_set_namespace(GTK_WINDOW(window), _("Nemo")); - gtk_layer_set_layer(GTK_WINDOW(window), GTK_LAYER_SHELL_LAYER_BOTTOM); - gtk_layer_set_margin(GTK_WINDOW(window), GTK_LAYER_SHELL_EDGE_TOP, 0); - for (int anchor = 0; anchor < 4; anchor++) { - gtk_layer_set_anchor(GTK_WINDOW(window), anchor, 1); - } - } -#endif - G_OBJECT_CLASS (nemo_window_parent_class)->constructed (self); gtk_window_set_application (GTK_WINDOW (window), GTK_APPLICATION (application));