Bump version to 47.5

Update NEWS.

.gitlab-ci.yml

@@ -3,8 +3,8 @@
 # SPDX-License-Identifier: GPL-2.0-or-later
 
 include:
-  - remote: 'https://gitlab.gnome.org/Infrastructure/freedesktop-ci-templates/-/raw/bbe5232986c9b98eb1efe62484e07216f7d1a4df/templates/fedora.yml'
+  - remote: 'https://gitlab.gnome.org/Infrastructure/freedesktop-ci-templates/-/raw/master/templates/fedora.yml'
-  - remote: "https://gitlab.gnome.org/Infrastructure/freedesktop-ci-templates/-/raw/bc70242ffb8402243e934659ecc1a2d1c89eca2b/templates/ci-fairy.yml"
+  - remote: "https://gitlab.gnome.org/Infrastructure/freedesktop-ci-templates/-/raw/master/templates/ci-fairy.yml"
   - component: gitlab.gnome.org/GNOME/citemplates/release-service@master
     inputs:
       job-stage: deploy

NEWS

@@ -1,3 +1,18 @@
+47.5
+====
+* Allow disabling the X11 session [Neal; !396, !400]
+
+Contributors:
+  Neal Gompa
+
+47.4
+====
+* window-list: Fix regression in chrome tracking [Florian; !379]
+* Misc. bug fixes and cleanups [Florian; !376]
+
+Contributors:
+  Florian Müllner
+
 47.3
 ====
 * places-menu: Fix opening drives with mount operations [Florian; !361]

data/meson.build

@@ -2,14 +2,19 @@
 #
 # SPDX-License-Identifier: GPL-2.0-or-later
 
+have_x11 = get_option('x11')
+
 session_desktop_base = 'gnome-classic'
 
 session_desktops = [
   session_desktop_base,
-  session_desktop_base + '-xorg',
   session_desktop_base + '-wayland',
 ]
 
+if have_x11
+  session_desktops += [session_desktop_base + '-xorg']
+endif
+
 foreach name : session_desktops
   session_desktop = name + '.desktop'
   if name.endswith('-xorg')
@@ -21,7 +26,7 @@ foreach name : session_desktops
     #        There is a workaround in meson/session-post-install.py until proper
     #        solution arises:
     #        https://github.com/mesonbuild/meson/issues/2416
-    session_instdir = xsessiondir
+    session_instdir = wlsessiondir
   #session_instdir = [ xesssiondir, wlsessiondir ]
   endif
   i18n.merge_file(

extensions/window-list/extension.js

@@ -818,7 +818,7 @@ class WindowList extends St.Widget {
                 this._updateKeyboardAnchor();
             },
             'hidden', () => {
-                Main.layoutManager.trackChrome(this);
+                Main.layoutManager.trackChrome(this, chromeOptions);
                 this.visible = !this._monitor.inFullscreen;
                 this._updateKeyboardAnchor();
             }, this);

meson.build

@@ -4,7 +4,7 @@
 
 project(
   'gnome-shell-extensions',
-  version: '47.3',
+  version: '47.5',
   meson_version: '>= 1.1.0',
   license: 'GPL-2.0-or-later',
 )
@@ -31,6 +31,8 @@ shell_version = ver_arr[0]
 
 uuid_suffix = '@gnome-shell-extensions.gcampax.github.com'
 
+have_x11 = get_option('x11')
+
 classic_extensions = [
   'apps-menu',
   'places-menu',
@@ -86,10 +88,12 @@ endforeach
 
 if classic_mode_enabled
   subdir('data')
-  meson.add_install_script(
+  if have_x11
-    'meson/session-post-install.py',
+    meson.add_install_script(
-    join_paths(get_option('prefix'), datadir),
+      'meson/session-post-install.py',
-  )
+      join_paths(get_option('prefix'), datadir),
+    )
+  endif
 endif
 
 subdir('extensions')

meson.options

@@ -20,3 +20,9 @@ option('classic_mode',
   value: false,
   description: 'Enable installing data files for classic mode.'
 )
+
+option('x11',
+  type: 'boolean',
+  value: true,
+  description: 'Enable X11 session support.'
+)

meson/session-post-install.py

@@ -15,10 +15,10 @@ else:
 
 # FIXME: Meson is unable to copy a generated target file:
 #        https://groups.google.com/forum/#!topic/mesonbuild/3iIoYPrN4P0
-dst_dir = os.path.join(install_root, 'wayland-sessions')
+dst_dir = os.path.join(install_root, 'xsessions')
 if not os.path.exists(dst_dir):
   os.makedirs(dst_dir)
 
-src = os.path.join(install_root, 'xsessions', 'gnome-classic.desktop')
+src = os.path.join(install_root, 'wayland-sessions', 'gnome-classic.desktop')
 dst = os.path.join(dst_dir, 'gnome-classic.desktop')
 shutil.copyfile(src, dst)