CVS commit: pkgsrc/x11/gnome-shell

["Dan Cirnat" <cirnatdan%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   cirnatdan
Date:           Sat Jul  3 19:12:10 UTC 2021

Modified Files:
        pkgsrc/x11/gnome-shell: DESCR Makefile distinfo
        pkgsrc/x11/gnome-shell/patches: patch-js_ui_main.js
Removed Files:
        pkgsrc/x11/gnome-shell/patches: patch-js_ui_windowManager.js

Log Message:
gnome-shell: Update x11/gnome-shell to 40.2

40.2
====
* Unbreak Xwayland apps when not using systemd in user session [Olivier; !1850]
* Fix distributed man pages [Florian; !1859]
* Avoid unnecessary icon shadow changes [Daniel; !1869]
* Immediately start app grid drags for non-touch devices [Georges; !1872]
* Handle screencast failures more gracefully [Florian; !1878]
* Fixed crashes [Gustavo; !1848]
* Misc. bug fixes [Georges, Florian, Daniel; !1867, !1854, !1860, !1876]

Contributors:
  Olivier Fourdan, Florian Müllner, Georges Basile Stavracas Neto,
  Gustavo Noronha Silva, Daniel van Vugt

Translators:
  Quentin PAGÈS [oc], Cheng-Chia Tseng [zh_TW], Hugo Carvalho [pt]


To generate a diff of this commit:
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/gnome-shell/DESCR
cvs rdiff -u -r1.11 -r1.12 pkgsrc/x11/gnome-shell/Makefile
cvs rdiff -u -r1.2 -r1.3 pkgsrc/x11/gnome-shell/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/x11/gnome-shell/patches/patch-js_ui_main.js
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/x11/gnome-shell/patches/patch-js_ui_windowManager.js

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/x11/gnome-shell/DESCR
diff -u pkgsrc/x11/gnome-shell/DESCR:1.1 pkgsrc/x11/gnome-shell/DESCR:1.2
--- pkgsrc/x11/gnome-shell/DESCR:1.1    Tue Nov 10 12:06:59 2020
+++ pkgsrc/x11/gnome-shell/DESCR        Sat Jul  3 19:12:10 2021
@@ -1,4 +1,4 @@
-GNOME Shell provides core user interface functions for the GNOME 3 desktop,
+GNOME Shell provides core user interface functions for the GNOME 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

Index: pkgsrc/x11/gnome-shell/Makefile
diff -u pkgsrc/x11/gnome-shell/Makefile:1.11 pkgsrc/x11/gnome-shell/Makefile:1.12
--- pkgsrc/x11/gnome-shell/Makefile:1.11        Thu Jun  3 15:11:05 2021
+++ pkgsrc/x11/gnome-shell/Makefile     Sat Jul  3 19:12:10 2021
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2021/06/03 15:11:05 cirnatdan Exp $
+# $NetBSD: Makefile,v 1.12 2021/07/03 19:12:10 cirnatdan Exp $
 
-DISTNAME=      gnome-shell-40.0
+DISTNAME=      gnome-shell-40.2
 CATEGORIES=    x11 gnome
 MASTER_SITES=  ${MASTER_SITE_GNOME:=sources/${PKGBASE}/${PKGVERSION_NOREV:R}/}
 EXTRACT_SUFX=  .tar.xz

Index: pkgsrc/x11/gnome-shell/distinfo
diff -u pkgsrc/x11/gnome-shell/distinfo:1.2 pkgsrc/x11/gnome-shell/distinfo:1.3
--- pkgsrc/x11/gnome-shell/distinfo:1.2 Thu Jun  3 15:11:05 2021
+++ pkgsrc/x11/gnome-shell/distinfo     Sat Jul  3 19:12:10 2021
@@ -1,14 +1,13 @@
-$NetBSD: distinfo,v 1.2 2021/06/03 15:11:05 cirnatdan Exp $
+$NetBSD: distinfo,v 1.3 2021/07/03 19:12:10 cirnatdan Exp $
 
-SHA1 (gnome-shell-40.0.tar.xz) = 85e3e1108c0f2cf95be52268ac47c449e06ad0b3
-RMD160 (gnome-shell-40.0.tar.xz) = 387f3946571df37897f491698e2252a8ea30117c
-SHA512 (gnome-shell-40.0.tar.xz) = fc4ca3fbd3dafd4a81f97a765e53b74fa4902018721e25a767c0d353d127b0cdc69c64171188272e3f5b48f11d6ad52064cc237e35210f5e09dfcd763ceb00c4
-Size (gnome-shell-40.0.tar.xz) = 1863432 bytes
+SHA1 (gnome-shell-40.2.tar.xz) = 54f5f2b8e0567ee6840fbcaecff7950093f8b9f4
+RMD160 (gnome-shell-40.2.tar.xz) = e10a16114035baa5833949398881afada35406c0
+SHA512 (gnome-shell-40.2.tar.xz) = 0df0a68a0e2440f73dfc147045ac2f003e5f133950cdbec7fb07b92e71aa53e2e4f3ce75510552f1043404850623fc84c08aad215b39ce9d33862994ae35ba87
+Size (gnome-shell-40.2.tar.xz) = 1869600 bytes
 SHA1 (patch-data_gnome-shell-dbus-interfaces_gresource_xml) = de2bec04695594c5b1e4b0ecce3284bfd2edfab7
 SHA1 (patch-js_misc_loginManager_js) = d37d17dd8a121d5ef5497fccafea954cc797286c
 SHA1 (patch-js_ui_endSessionDialog.js) = 6971df6ee8b65fa827131d92404f6ae817acd84c
-SHA1 (patch-js_ui_main.js) = ea9940d1308a2f3c5405ff9307ac4d8e18ffac0b
-SHA1 (patch-js_ui_windowManager.js) = 7c3309d90670853430d4637b75edd3e480c5a93a
+SHA1 (patch-js_ui_main.js) = ea2f5b715fac292019438fe9baec074cf90fe686
 SHA1 (patch-meson.build) = e6d2e514dcc64c744e308b08190d9e2e20190ac7
 SHA1 (patch-src_main.c) = d6d109ff7aee58a437aa9389403366e4be241d40
 SHA1 (patch-src_shell-util.c) = 92fbc695162f7fe735b92eb344215cf0c69e65c6

Index: pkgsrc/x11/gnome-shell/patches/patch-js_ui_main.js
diff -u pkgsrc/x11/gnome-shell/patches/patch-js_ui_main.js:1.1 pkgsrc/x11/gnome-shell/patches/patch-js_ui_main.js:1.2
--- pkgsrc/x11/gnome-shell/patches/patch-js_ui_main.js:1.1      Thu Jun  3 15:11:05 2021
+++ pkgsrc/x11/gnome-shell/patches/patch-js_ui_main.js  Sat Jul  3 19:12:10 2021
@@ -1,38 +1,49 @@
-$NetBSD: patch-js_ui_main.js,v 1.1 2021/06/03 15:11:05 cirnatdan Exp $
+$NetBSD: patch-js_ui_main.js,v 1.2 2021/07/03 19:12:10 cirnatdan Exp $
 
-Remove usages of unsupported functions:
-- Gio.Credentials.get_unix_user
-- file.touch_async
+Remove initial-setup and lock screen warning due to unsupported functions
 
---- js/ui/main.js.orig 2021-03-20 12:17:01.417523000 +0000
+--- js/ui/main.js.orig 2021-06-10 11:33:01.609929600 +0000
 +++ js/ui/main.js
-@@ -289,19 +289,11 @@ function _initializeUI() {
-             });
+@@ -290,12 +290,6 @@ function _initializeUI() {
          }
  
--        let credentials = new Gio.Credentials();
+         let credentials = new Gio.Credentials();
 -        if (credentials.get_unix_user() === 0) {
 -            notify(_('Logged in as a privileged user'),
 -                   _('Running a session as a privileged user should be avoided for security reasons. If possible, you should log in as a normal user.'));
--        } else if (sessionMode.currentMode !== 'gdm' &&
-+        if (sessionMode.currentMode !== 'gdm' &&
-                    sessionMode.currentMode !== 'initial-setup') {
-             _handleShowWelcomeScreen();
-         }
+-        } else if (sessionMode.showWelcomeDialog) {
+-            _handleShowWelcomeScreen();
+-        }
  
--        if (sessionMode.currentMode !== 'gdm' &&
--            sessionMode.currentMode !== 'initial-setup')
--            _handleLockScreenWarning();
--
-         LoginManager.registerSessionWithGDM();
+         if (sessionMode.currentMode !== 'gdm' &&
+             sessionMode.currentMode !== 'initial-setup')
+@@ -321,29 +315,6 @@ function _handleShowWelcomeScreen() {
+ }
  
-         let perfModuleName = GLib.getenv("SHELL_PERF_MODULE");
-@@ -324,7 +316,7 @@ function _handleShowWelcomeScreen() {
  async function _handleLockScreenWarning() {
-     const path = '%s/lock-warning-shown'.format(global.userdatadir);
-     const file = Gio.File.new_for_path(path);
+-    const path = '%s/lock-warning-shown'.format(global.userdatadir);
+-    const file = Gio.File.new_for_path(path);
 -
-+return;
-     const hasLockScreen = screenShield !== null;
-     if (hasLockScreen) {
-         try {
+-    const hasLockScreen = screenShield !== null;
+-    if (hasLockScreen) {
+-        try {
+-            await file.delete_async(0, null);
+-        } catch (e) {
+-            if (!e.matches(Gio.IOErrorEnum, Gio.IOErrorEnum.NOT_FOUND))
+-                logError(e);
+-        }
+-    } else {
+-        try {
+-            if (!await file.touch_async())
+-                return;
+-        } catch (e) {
+-            logError(e);
+-        }
+-
+-        notify(
+-            _('Screen Lock disabled'),
+-            _('Screen Locking requires the GNOME display manager.'));
+-    }
+ }
+ 
+ function _getStylesheet(name) {