From nobody Fri Apr 15 19:49:33 2022 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 2B2B92D892D; Fri, 15 Apr 2022 19:49:34 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Kg6NZ0Bt2z4kbP; Fri, 15 Apr 2022 19:49:34 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650052174; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wcr7/4l/CrHzJK8yAPW5QKtdndFaVYloL32a8RA9F/Y=; b=qEXhtxcRYhn4Of7au30KYrGysGTY6SSgdSlKyC1l9Z0k4RUwhs3tw+29zdVx3u3JKYlVih AK9j7qLItgAhTxhjF1DfmvoaGtCVXNuaX5HW3cM3xcdmF/RkYQwoUZIa+YKDr23sdS91KP Pgfh9TXFy1r/mfMennYNkm5jRuUg7kcud6FFOgl+MbmukNOzMncKuuPZ6RmmquHZYXl6O/ /dtu/Is5chjwagMHiIle4BKtoFEquQh59rUYchP5rIjMEYiiegmfn86gKR4of1juMomN1u M95Jmruf0Yo5UnBBdm34ohr/QONHEdy4gHF2cpaem40bTVA8SYjtI5W8XoM0Vg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id D29C01B883; Fri, 15 Apr 2022 19:49:33 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23FJnXN1097259; Fri, 15 Apr 2022 19:49:33 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23FJnXZh097258; Fri, 15 Apr 2022 19:49:33 GMT (envelope-from git) Date: Fri, 15 Apr 2022 19:49:33 GMT Message-Id: <202204151949.23FJnXZh097258@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Neel Chauhan Subject: git: 966f2ad02e6f - main - x11/gnome-shell: Update to 42.0 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: nc X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 966f2ad02e6ffc516dee6fbd0019236426f9a558 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650052174; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=wcr7/4l/CrHzJK8yAPW5QKtdndFaVYloL32a8RA9F/Y=; b=euzRhnHCTn4rgqbayP9oLWQ2AGKHO9XUefe+wsJQ4ukH4scaWllYvmhwuXBAzDz6QulDWh fG4jy0nbMtda1jdDfba1AtEEBa+LuTlS0c076Y7CNurHyKk0mZ2C6ByvOqvGG0vWyu1OVY XjmQNMZSVHoHtvh31VlIKqALJCRKIxNbc+dggdI3Q7mZvKlBuVy6I5YxsslJKWAqzbuvms ZqgGn+9Hv/i7l9kTZmkvfdR4hZoRxL/S0PrXDLTZXB/Ta5B1wXz49sdjmPKXjakk3Z74Gr hpTUH5QrUjmeD93MwHzhz8xtp9o5rjTYM4efjGOnZAk1tIDmc/ABiS2K8iVDZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650052174; a=rsa-sha256; cv=none; b=XZbLEaA1bhbD5+9mDqVrcDEN93MJkvfCAF6auPZLR6v3wcD41mxBcHWIc/QXx+b2RatCxo rJaOUo113CrfUzVd6Ahiwh3CPykD1Wad0CizF3HpgfRzIj1FiV/Eej8cqlO58079D6+pXo qCmzpSKDDbuC2vnBP7FZYJax1t2pUl88XPhyjOpyfReiUhjNpMxni+bV4hoAD8r4dlZk3l FfVgxU/ypIK5Gao+tDGPBGyK1lftjuojhc1NilGVpahG3M3lR0NqEcRGqcBwXxQblmAKmN wgd98vsAudswK81BSJRC/sWVhR4vlQ2KjyxZAKKmgEOQcT7aTZiOlcPG2thHrQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by nc: URL: https://cgit.FreeBSD.org/ports/commit/?id=966f2ad02e6ffc516dee6fbd0019236426f9a558 commit 966f2ad02e6ffc516dee6fbd0019236426f9a558 Author: Neel Chauhan AuthorDate: 2022-04-15 19:43:16 +0000 Commit: Neel Chauhan CommitDate: 2022-04-15 19:49:28 +0000 x11/gnome-shell: Update to 42.0 --- x11/gnome-shell/Makefile | 5 +- x11/gnome-shell/distinfo | 6 +-- ...-data_gnome-shell-dbus-interfaces.gresource.xml | 11 ---- ...-data_gnome-shell-dbus-interfaces_gresource_xml | 12 +++++ x11/gnome-shell/files/patch-data_meson_build | 19 ------- .../files/patch-js_misc_loginManager_js | 61 +++++++++++++--------- .../files/patch-js_ui_endSessionDialog_js | 13 +++-- x11/gnome-shell/files/patch-js_ui_environment.js | 10 ---- .../files/patch-js_ui_status_keyboard_js | 4 +- .../files/patch-src_calendar-server_meson_build | 19 ------- x11/gnome-shell/files/patch-src_main_c | 54 +++++++++++++++++++ ...tch-subprojects_extensions-app_data_meson_build | 19 ------- ...ojects_extensions-app_data_metainfo_meson_build | 17 ------ ...tch-subprojects_extensions-tool_man_meson_build | 2 - ...jects_extensions-tool_src_templates_meson_build | 19 ------- x11/gnome-shell/pkg-plist | 2 + 16 files changed, 115 insertions(+), 158 deletions(-) diff --git a/x11/gnome-shell/Makefile b/x11/gnome-shell/Makefile index 746363f8be15..502df3d5dd69 100644 --- a/x11/gnome-shell/Makefile +++ b/x11/gnome-shell/Makefile @@ -1,8 +1,7 @@ # Created by: Pawel Worach PORTNAME= gnome-shell -PORTVERSION= 41.4 -PORTREVISION= 4 +PORTVERSION= 42.0 CATEGORIES= x11 gnome MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/} DIST_SUBDIR= gnome @@ -30,7 +29,7 @@ LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-atk \ libical.so:devel/libical \ libicuuc.so:devel/icu \ libjson-glib-1.0.so:devel/json-glib \ - libmutter-9.so:x11-wm/mutter \ + libmutter-10.so:x11-wm/mutter \ libp11-kit.so:security/p11-kit \ libpolkit-agent-1.so:sysutils/polkit \ libpulse.so:audio/pulseaudio \ diff --git a/x11/gnome-shell/distinfo b/x11/gnome-shell/distinfo index 423afbf9c4e0..94420aaae634 100644 --- a/x11/gnome-shell/distinfo +++ b/x11/gnome-shell/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1646337175 -SHA256 (gnome/gnome-shell-41.4.tar.xz) = c7eef74af304649c03b86db99bd0bac75a011fbff6774c8ee35583dbcdad8af4 -SIZE (gnome/gnome-shell-41.4.tar.xz) = 1899464 +TIMESTAMP = 1650046910 +SHA256 (gnome/gnome-shell-42.0.tar.xz) = 33d404fb3c93b9de42984f0110a2969d6a4a7247c27fe7f5e24c67ecfec75094 +SIZE (gnome/gnome-shell-42.0.tar.xz) = 1918044 diff --git a/x11/gnome-shell/files/patch-data_gnome-shell-dbus-interfaces.gresource.xml b/x11/gnome-shell/files/patch-data_gnome-shell-dbus-interfaces.gresource.xml deleted file mode 100644 index 8f21f70b4ae5..000000000000 --- a/x11/gnome-shell/files/patch-data_gnome-shell-dbus-interfaces.gresource.xml +++ /dev/null @@ -1,11 +0,0 @@ ---- data/gnome-shell-dbus-interfaces.gresource.xml.orig 2020-09-07 20:29:58 UTC -+++ data/gnome-shell-dbus-interfaces.gresource.xml -@@ -12,6 +12,8 @@ - org.freedesktop.impl.portal.Access.xml - org.freedesktop.impl.portal.PermissionStore.xml - org.freedesktop.impl.portal.Request.xml -+ org.freedesktop.ConsoleKit.Manager.xml -+ org.freedesktop.ConsoleKit.Session.xml - org.freedesktop.login1.Manager.xml - org.freedesktop.login1.Session.xml - org.freedesktop.login1.User.xml diff --git a/x11/gnome-shell/files/patch-data_gnome-shell-dbus-interfaces_gresource_xml b/x11/gnome-shell/files/patch-data_gnome-shell-dbus-interfaces_gresource_xml new file mode 100644 index 000000000000..c74b89d42f19 --- /dev/null +++ b/x11/gnome-shell/files/patch-data_gnome-shell-dbus-interfaces_gresource_xml @@ -0,0 +1,12 @@ +Index: data/gnome-shell-dbus-interfaces.gresource.xml +--- data/gnome-shell-dbus-interfaces.gresource.xml.orig ++++ data/gnome-shell-dbus-interfaces.gresource.xml +@@ -8,6 +8,8 @@ + org.freedesktop.Application.xml + org.freedesktop.bolt1.Device.xml + org.freedesktop.bolt1.Manager.xml ++ org.freedesktop.ConsoleKit.Manager.xml ++ org.freedesktop.ConsoleKit.Session.xml + org.freedesktop.DBus.xml + org.freedesktop.GeoClue2.Agent.xml + org.freedesktop.GeoClue2.Manager.xml diff --git a/x11/gnome-shell/files/patch-data_meson_build b/x11/gnome-shell/files/patch-data_meson_build deleted file mode 100644 index ab8c658c1baf..000000000000 --- a/x11/gnome-shell/files/patch-data_meson_build +++ /dev/null @@ -1,19 +0,0 @@ -$OpenBSD: patch-data_meson_build,v 1.2 2022/01/14 07:28:50 ajacoutot Exp $ - -From 65450a836ee9e0722a2d4c3327f52345eae293c6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Florian=20M=C3=BCllner?= -Date: Thu, 23 Dec 2021 17:18:16 +0100 -Subject: [PATCH] build: Drop incorrect positional arg - -Index: data/meson.build ---- data/meson.build.orig -+++ data/meson.build -@@ -16,7 +16,7 @@ desktopconf.set('bindir', bindir) - desktopconf.set('systemd_hidden', have_systemd ? 'true' : 'false') - - foreach desktop_file : desktop_files -- i18n.merge_file('desktop', -+ i18n.merge_file( - input: configure_file( - input: desktop_file + '.in.in', - output: desktop_file + '.in', diff --git a/x11/gnome-shell/files/patch-js_misc_loginManager_js b/x11/gnome-shell/files/patch-js_misc_loginManager_js index 0c29afcbf268..7f82bd3ee259 100644 --- a/x11/gnome-shell/files/patch-js_misc_loginManager_js +++ b/x11/gnome-shell/files/patch-js_misc_loginManager_js @@ -1,5 +1,3 @@ -$OpenBSD: patch-js_misc_loginManager_js,v 1.10 2020/05/14 15:28:46 jasper Exp $ - Index: js/misc/loginManager.js --- js/misc/loginManager.js.orig +++ js/misc/loginManager.js @@ -25,7 +23,7 @@ Index: js/misc/loginManager.js } catch (e) { return false; } -@@ -84,7 +90,7 @@ function getLoginManager() { +@@ -81,7 +87,7 @@ function getLoginManager() { if (haveSystemd()) _loginManager = new LoginManagerSystemd(); else @@ -34,11 +32,10 @@ Index: js/misc/loginManager.js } return _loginManager; -@@ -199,6 +205,82 @@ var LoginManagerSystemd = class { - } +@@ -204,6 +210,79 @@ var LoginManagerSystemd = class { }; Signals.addSignalMethods(LoginManagerSystemd.prototype); -+ + +var LoginManagerConsoleKit = class { + constructor () { + this._proxy = new ConsoleKitManager(Gio.DBus.system, @@ -76,7 +73,9 @@ Index: js/misc/loginManager.js + if (error) { + asyncCallback(false, false); + } else { -+ asyncCallback(result[0], false); ++ let needsAuth = result[0] == 'challenge'; ++ let canSuspend = needsAuth || result[0] == 'yes'; ++ asyncCallback(canSuspend, needsAuth); + } + }); + } @@ -89,24 +88,19 @@ Index: js/misc/loginManager.js + this._proxy.SuspendRemote(true); + } + -+ inhibit(reason, callback) { -+ let inVariant = GLib.Variant.new('(ssss)', -+ ['sleep', -+ 'GNOME Shell', -+ reason, -+ 'delay']); -+ this._proxy.call_with_unix_fd_list('Inhibit', inVariant, 0, -1, null, null, -+ (proxy, result) => { -+ let fd = -1; -+ try { -+ let [outVariant, fdList] = proxy.call_with_unix_fd_list_finish(result); -+ fd = fdList.steal_fds()[0]; -+ callback(new Gio.UnixInputStream({ fd: fd })); -+ } catch(e) { -+ logError(e, "Error getting ConsoleKit inhibitor"); -+ callback(null); -+ } -+ }); ++ async inhibit(reason, callback) { ++ try { ++ const inVariant = new GLib.Variant('(ssss)', ++ ['sleep', 'GNOME Shell', reason, 'delay']); ++ const [outVariant_, fdList] = ++ await this._proxy.call_with_unix_fd_list('Inhibit', ++ inVariant, 0, -1, null, null); ++ const [fd] = fdList.steal_fds(); ++ callback(new Gio.UnixInputStream({ fd })); ++ } catch (e) { ++ logError(e, 'Error getting ConsoleKit inhibitor'); ++ callback(null); ++ } + } + + _prepareForSleep(proxy, sender, [aboutToSuspend]) { @@ -114,6 +108,21 @@ Index: js/misc/loginManager.js + } +} +Signals.addSignalMethods(LoginManagerConsoleKit.prototype); - ++ var LoginManagerDummy = class { getCurrentSessionProxy(_callback) { + // we could return a DummySession object that fakes whatever callers +@@ -213,13 +292,6 @@ var LoginManagerDummy = class { + + canSuspend(asyncCallback) { + asyncCallback(false, false); +- } +- +- canRebootToBootLoaderMenu(asyncCallback) { +- asyncCallback(false, false); +- } +- +- setRebootToBootLoaderMenu() { + } + + listSessions(asyncCallback) { diff --git a/x11/gnome-shell/files/patch-js_ui_endSessionDialog_js b/x11/gnome-shell/files/patch-js_ui_endSessionDialog_js index 48b951d4bfac..f20ed3e02214 100644 --- a/x11/gnome-shell/files/patch-js_ui_endSessionDialog_js +++ b/x11/gnome-shell/files/patch-js_ui_endSessionDialog_js @@ -1,10 +1,8 @@ -$OpenBSD: patch-js_ui_endSessionDialog_js,v 1.1 2020/11/08 09:38:19 ajacoutot Exp $ - Index: js/ui/endSessionDialog.js --- js/ui/endSessionDialog.js.orig +++ js/ui/endSessionDialog.js -@@ -230,11 +230,6 @@ class EndSessionDialog extends ModalDialog.ModalDialog - destroyOnClose: false }); +@@ -234,11 +234,6 @@ class EndSessionDialog extends ModalDialog.ModalDialog + }); this._loginManager = LoginManager.getLoginManager(); - this._loginManager.canRebootToBootLoaderMenu( @@ -15,10 +13,11 @@ Index: js/ui/endSessionDialog.js this._userManager = AccountsService.UserManager.get_default(); this._user = this._userManager.get_user(GLib.get_user_name()); this._updatesPermission = null; -@@ -453,23 +448,6 @@ class EndSessionDialog extends ModalDialog.ModalDialog +@@ -452,24 +447,6 @@ class EndSessionDialog extends ModalDialog.ModalDialog + }, label, }); - +- - // Add Alt "Boot Options" option to the Reboot button - if (this._canRebootToBootLoaderMenu && signal === 'ConfirmedReboot') { - this._rebootButton = button; @@ -33,7 +32,7 @@ Index: js/ui/endSessionDialog.js - label: C_('button', 'Boot Options'), - }); - this._rebootButtonAlt.visible = false; -- this._capturedEventId = global.stage.connect('captured-event', +- this._capturedEventId = this.connect('captured-event', - this._onCapturedEvent.bind(this)); - } } diff --git a/x11/gnome-shell/files/patch-js_ui_environment.js b/x11/gnome-shell/files/patch-js_ui_environment.js deleted file mode 100644 index 0bd7baa7a9ee..000000000000 --- a/x11/gnome-shell/files/patch-js_ui_environment.js +++ /dev/null @@ -1,10 +0,0 @@ ---- js/ui/environment.js.orig 2022-03-27 15:10:52 UTC -+++ js/ui/environment.js -@@ -6,6 +6,7 @@ imports.gi.versions.GdkPixbuf = '2.0'; - imports.gi.versions.Clutter = Config.LIBMUTTER_API_VERSION; - imports.gi.versions.Gio = '2.0'; - imports.gi.versions.GdkPixbuf = '2.0'; -+imports.gi.versions.GnomeDesktop = '3.0'; - imports.gi.versions.Gtk = '3.0'; - imports.gi.versions.Soup = '3.0'; - imports.gi.versions.TelepathyGLib = '0.12'; diff --git a/x11/gnome-shell/files/patch-js_ui_status_keyboard_js b/x11/gnome-shell/files/patch-js_ui_status_keyboard_js index 63f5b04828cb..f279d707abd6 100644 --- a/x11/gnome-shell/files/patch-js_ui_status_keyboard_js +++ b/x11/gnome-shell/files/patch-js_ui_status_keyboard_js @@ -1,12 +1,10 @@ -$OpenBSD: patch-js_ui_status_keyboard_js,v 1.6 2020/05/14 15:28:46 jasper Exp $ - https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=235009 Index: js/ui/status/keyboard.js --- js/ui/status/keyboard.js.orig +++ js/ui/status/keyboard.js @@ -242,6 +242,19 @@ var InputSourceSystemSettings = class extends InputSou - id += '+%s'.format(variants[i]); + id += `+${variants[i]}`; sourcesList.push({ type: INPUT_SOURCE_TYPE_XKB, id }); } + diff --git a/x11/gnome-shell/files/patch-src_calendar-server_meson_build b/x11/gnome-shell/files/patch-src_calendar-server_meson_build deleted file mode 100644 index daa9fcbdeb89..000000000000 --- a/x11/gnome-shell/files/patch-src_calendar-server_meson_build +++ /dev/null @@ -1,19 +0,0 @@ -$OpenBSD: patch-src_calendar-server_meson_build,v 1.2 2022/01/14 07:28:50 ajacoutot Exp $ - -From 65450a836ee9e0722a2d4c3327f52345eae293c6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Florian=20M=C3=BCllner?= -Date: Thu, 23 Dec 2021 17:18:16 +0100 -Subject: [PATCH] build: Drop incorrect positional arg - -Index: src/calendar-server/meson.build ---- src/calendar-server/meson.build.orig -+++ src/calendar-server/meson.build -@@ -27,7 +27,7 @@ configure_file( - install_dir: servicedir - ) - --i18n.merge_file('evolution-calendar.desktop', -+i18n.merge_file( - input: 'evolution-calendar.desktop.in', - output: 'evolution-calendar.desktop', - po_dir: po_dir, diff --git a/x11/gnome-shell/files/patch-src_main_c b/x11/gnome-shell/files/patch-src_main_c new file mode 100644 index 000000000000..6bbf711ff953 --- /dev/null +++ b/x11/gnome-shell/files/patch-src_main_c @@ -0,0 +1,54 @@ +Disable broken signal handler which locks the malloc mutex recursively. + +What's happening here is that gnome-shell wants to print a gjs stack +trace when certain signals are caught, and sets up a signal handler +which uses stdio and malloc. This isn't safe. + +For now, just disable this signal handler, which will always crash +on OpenBSD rather than producing stack trace information, to prevent +gnome-shell from littering home directories with useless core dumps. + +#0 thrkill () at -:3 +#1 0x00000dc8de8ca89e in _libc_abort () at /usr/src/lib/libc/stdlib/abort.c:51 +#2 0x00000dc8de93cbba in _rthread_mutex_timedlock (mutexp=Variable "mutexp" is +not available. +) + at /usr/src/lib/libc/thread/rthread_mutex.c:117 +#3 0x00000dc8de8adf12 in malloc (size=128) + at /usr/src/lib/libc/stdlib/malloc.c:1253 +#4 0x00000dc8de947746 in _libc_vasprintf (str=0xdc9b1be0b08, + fmt=0xdc935649217 "== Stack trace for context %p ==\n", ap=0xdc9b1be0ce0) + at /usr/src/lib/libc/stdio/vasprintf.c:39 +#5 0x00000dc975b5cbbd in g_vasprintf (string=0xdc9b1be0b08, + format=0xdc935649217 "== Stack trace for context %p ==\n", + args=0xdc9b1be0ce0) at ../glib-2.58.3/glib/gprintf.c:330 +#6 0x00000dc975b13661 in g_strdup_vprintf ( + format=0xdc935649217 "== Stack trace for context %p ==\n", + args=0xdc9b1be0ce0) at ../glib-2.58.3/glib/gstrfuncs.c:514 +#7 0x00000dc975aef17f in g_printerr ( + format=0xdc935649217 "== Stack trace for context %p ==\n") + at ../glib-2.58.3/glib/gmessages.c:3247 +#8 0x00000dc935781742 in gjs_context_print_stack_stderr () + from /usr/local/lib/libgjs.so.5.0 +#9 0x00000dc9357817c5 in gjs_dumpstack () from /usr/local/lib/libgjs.so.5.0 +#10 0x00000dc6bd8b62f0 in dump_gjs_stack_on_signal_handler (signo=6) + +Index: src/main.c +--- src/main.c.orig ++++ src/main.c +@@ -356,6 +356,7 @@ dump_gjs_stack_on_signal_handler (int signo) + static void + dump_gjs_stack_on_signal (int signo) + { ++#if 0 /* this handler is disabled because it triggers malloc mutex recursion */ + struct sigaction sa = { + .sa_flags = SA_RESETHAND | SA_NODEFER, + .sa_handler = dump_gjs_stack_on_signal_handler, +@@ -365,6 +366,7 @@ dump_gjs_stack_on_signal (int signo) + + sigaction (signo, &sa, NULL); + _tracked_signals[signo] = TRUE; ++#endif + } + + static gboolean diff --git a/x11/gnome-shell/files/patch-subprojects_extensions-app_data_meson_build b/x11/gnome-shell/files/patch-subprojects_extensions-app_data_meson_build deleted file mode 100644 index 1b1043c226f4..000000000000 --- a/x11/gnome-shell/files/patch-subprojects_extensions-app_data_meson_build +++ /dev/null @@ -1,19 +0,0 @@ -$OpenBSD: patch-subprojects_extensions-app_data_meson_build,v 1.2 2022/01/14 07:28:50 ajacoutot Exp $ - -From 65450a836ee9e0722a2d4c3327f52345eae293c6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Florian=20M=C3=BCllner?= -Date: Thu, 23 Dec 2021 17:18:16 +0100 -Subject: [PATCH] build: Drop incorrect positional arg - -Index: subprojects/extensions-app/data/meson.build ---- subprojects/extensions-app/data/meson.build.orig -+++ subprojects/extensions-app/data/meson.build -@@ -14,7 +14,7 @@ desktopconf.set('bindir', bindir) - desktopconf.set('app_id', app_id) - desktopconf.set('prgname', prgname) - --i18n.merge_file('desktop', -+i18n.merge_file( - input: configure_file( - input: base_id + '.desktop.in.in', - output: desktop_file + '.in', diff --git a/x11/gnome-shell/files/patch-subprojects_extensions-app_data_metainfo_meson_build b/x11/gnome-shell/files/patch-subprojects_extensions-app_data_metainfo_meson_build deleted file mode 100644 index 0afd98fc0d2f..000000000000 --- a/x11/gnome-shell/files/patch-subprojects_extensions-app_data_metainfo_meson_build +++ /dev/null @@ -1,17 +0,0 @@ -$OpenBSD: patch-subprojects_extensions-app_data_metainfo_meson_build,v 1.2 2022/01/14 07:28:50 ajacoutot Exp $ - -From 65450a836ee9e0722a2d4c3327f52345eae293c6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Florian=20M=C3=BCllner?= -Date: Thu, 23 Dec 2021 17:18:16 +0100 -Subject: [PATCH] build: Drop incorrect positional arg - -Index: subprojects/extensions-app/data/metainfo/meson.build ---- subprojects/extensions-app/data/metainfo/meson.build.orig -+++ subprojects/extensions-app/data/metainfo/meson.build -@@ -1,5 +1,5 @@ - metainfo = app_id + '.metainfo.xml' --i18n.merge_file(metainfo, -+i18n.merge_file( - input: base_id + '.metainfo.xml.in', - output: metainfo, - po_dir: po_dir, diff --git a/x11/gnome-shell/files/patch-subprojects_extensions-tool_man_meson_build b/x11/gnome-shell/files/patch-subprojects_extensions-tool_man_meson_build index 66640af5a42d..109d8cb69555 100644 --- a/x11/gnome-shell/files/patch-subprojects_extensions-tool_man_meson_build +++ b/x11/gnome-shell/files/patch-subprojects_extensions-tool_man_meson_build @@ -1,5 +1,3 @@ -$OpenBSD: patch-subprojects_extensions-tool_man_meson_build,v 1.1 2020/05/14 15:28:46 jasper Exp $ - https://gitlab.gnome.org/GNOME/gnome-shell/issues/1854 Index: subprojects/extensions-tool/man/meson.build diff --git a/x11/gnome-shell/files/patch-subprojects_extensions-tool_src_templates_meson_build b/x11/gnome-shell/files/patch-subprojects_extensions-tool_src_templates_meson_build deleted file mode 100644 index f0815d290ed5..000000000000 --- a/x11/gnome-shell/files/patch-subprojects_extensions-tool_src_templates_meson_build +++ /dev/null @@ -1,19 +0,0 @@ -$OpenBSD: patch-subprojects_extensions-tool_src_templates_meson_build,v 1.2 2022/01/14 07:28:50 ajacoutot Exp $ - -From 65450a836ee9e0722a2d4c3327f52345eae293c6 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Florian=20M=C3=BCllner?= -Date: Thu, 23 Dec 2021 17:18:16 +0100 -Subject: [PATCH] build: Drop incorrect positional arg - -Index: subprojects/extensions-tool/src/templates/meson.build ---- subprojects/extensions-tool/src/templates/meson.build.orig -+++ subprojects/extensions-tool/src/templates/meson.build -@@ -4,7 +4,7 @@ template_metas = [ - ] - template_deps = [] - foreach template : template_metas -- template_deps += i18n.merge_file(template, -+ template_deps += i18n.merge_file( - input: template + '.in', - output: template, - po_dir: po_dir, diff --git a/x11/gnome-shell/pkg-plist b/x11/gnome-shell/pkg-plist index 9e170bbd9038..ff37e8bf547e 100644 --- a/x11/gnome-shell/pkg-plist +++ b/x11/gnome-shell/pkg-plist @@ -40,12 +40,14 @@ share/dbus-1/services/org.gnome.Shell.HotplugSniffer.service share/dbus-1/services/org.gnome.Shell.Notifications.service share/dbus-1/services/org.gnome.Shell.Screencast.service share/gnome-control-center/keybindings/50-gnome-shell-launchers.xml +share/gnome-control-center/keybindings/50-gnome-shell-screenshots.xml share/gnome-control-center/keybindings/50-gnome-shell-system.xml %%DATADIR%%/Gvc-1.0.gir %%DATADIR%%/Shell-0.1.gir %%DATADIR%%/St-1.0.gir %%DATADIR%%/gir-1.0/Shew-0.gir %%DATADIR%%/gnome-shell-dbus-interfaces.gresource +%%DATADIR%%/gnome-shell-icons.gresource %%DATADIR%%/gnome-shell-osk-layouts.gresource %%DATADIR%%/gnome-shell-theme.gresource %%DATADIR%%/org.gnome.Extensions