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,78 +1,77 @@ # 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 MAINTAINER= gnome@FreeBSD.org COMMENT= Next generation GNOME desktop shell LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= ${LOCALBASE}/share/bash-completion/bash_completion.sh:shells/bash-completion \ a2x:textproc/asciidoc \ docbook-xsl>=0:textproc/docbook-xsl \ gnome-control-center:sysutils/gnome-control-center \ sassc:textproc/sassc LIB_DEPENDS= libatk-bridge-2.0.so:accessibility/at-spi2-atk \ libcanberra-gtk3.so:audio/libcanberra-gtk3 \ libcanberra.so:audio/libcanberra \ libcroco-0.6.so:textproc/libcroco \ libdrm.so:graphics/libdrm \ libgcr-base-3.so:security/gcr \ libgjs.so:lang/gjs \ libgnome-autoar-0.so:archivers/gnome-autoar \ libgraphene-1.0.so:graphics/graphene \ 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 \ libsecret-1.so:security/libsecret \ libsoup-2.4.so:devel/libsoup \ libstartup-notification-1.so:x11/startup-notification RUN_DEPENDS= gdm:x11/gdm \ gkbd-keyboard-display:x11/libgnomekbd \ gnome-control-center:sysutils/gnome-control-center PORTSCOUT= limitw:1,even USES= compiler:c11 cpe gettext gl gnome libtool localbase meson \ pathfix perl5 pkgconfig python:3.4+ shebangfix tar:xz \ webplugin:native xorg USE_GNOME= cairo evolutiondataserver3 gdkpixbuf2 gnomedesktop3 gtk40 \ introspection libxml2 libxslt:build USE_XORG= x11 xcomposite xdamage xext xfixes xi xrandr xtst USE_GL= egl gbm USE_GSTREAMER1= yes USE_PERL5= build USE_LDCONFIG= yes SHEBANG_FILES= src/gnome-shell-extension-tool.in src/gnome-shell-perf-tool.in BINARY_ALIAS= python3=${PYTHON_CMD} WEBPLUGIN_NAME= libgnome-shell-browser-plugin.so WEBPLUGIN_DIR= ${PREFIX}/lib/mozilla/plugins/ WEBPLUGIN_FILES= libgnome-shell-browser-plugin.so MESON_ARGS= -Dnetworkmanager=false \ -Dsystemd=false \ -Dtests=false CPE_VENDOR= gnome GLIB_SCHEMAS= 00_org.gnome.shell.gschema.override \ org.gnome.shell.gschema.xml post-extract: ${CP} ${FILESDIR}/*.xml ${WRKSRC}/data/dbus-interfaces post-patch: ${REINPLACE_CMD} -e "s,python3,${PYTHON_VERSION},g" \ ${WRKSRC}/meson.build .include 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,119 +1,128 @@ -$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 @@ -14,6 +14,12 @@ const SystemdLoginManager = Gio.DBusProxy.makeProxyWra const SystemdLoginSession = Gio.DBusProxy.makeProxyWrapper(SystemdLoginSessionIface); const SystemdLoginUser = Gio.DBusProxy.makeProxyWrapper(SystemdLoginUserIface); +const ConsoleKitManagerIface = loadInterfaceXML('org.freedesktop.ConsoleKit.Manager'); +const ConsoleKitSessionIface = loadInterfaceXML('org.freedesktop.ConsoleKit.Session'); + +const ConsoleKitManager = Gio.DBusProxy.makeProxyWrapper(ConsoleKitManagerIface); +const ConsoleKitSession = Gio.DBusProxy.makeProxyWrapper(ConsoleKitSessionIface); + function haveSystemd() { return GLib.access("/run/systemd/seats", 0) >= 0; } @@ -43,7 +49,7 @@ function canLock() { -1, null); let version = result.deep_unpack()[0].deep_unpack(); - return haveSystemd() && versionCompare('3.5.91', version); + return versionCompare('3.5.91', version); } catch (e) { return false; } -@@ -84,7 +90,7 @@ function getLoginManager() { +@@ -81,7 +87,7 @@ function getLoginManager() { if (haveSystemd()) _loginManager = new LoginManagerSystemd(); else - _loginManager = new LoginManagerDummy(); + _loginManager = new LoginManagerConsoleKit(); } 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, + 'org.freedesktop.ConsoleKit', + '/org/freedesktop/ConsoleKit/Manager'); + this._proxy.connectSignal('PrepareForSleep', + this._prepareForSleep.bind(this)); + } + + // Having this function is a bit of a hack since the Systemd and ConsoleKit + // session objects have different interfaces - but in both cases there are + // Lock/Unlock signals, and that's all we count upon at the moment. + + + getCurrentSessionProxy(callback) { + if (this._currentSession) { + callback (this._currentSession); + return; + } + + this._proxy.GetCurrentSessionRemote((result, error) => { + if (error) { + logError(error, 'Could not get a proxy for the current session'); + } else { + this._currentSession = new ConsoleKitSession(Gio.DBus.system, + 'org.freedesktop.ConsoleKit', + result[0]); + callback(this._currentSession); + } + }); + } + + canSuspend(asyncCallback) { + this._proxy.CanSuspendRemote((result, error) => { + if (error) { + asyncCallback(false, false); + } else { -+ asyncCallback(result[0], false); ++ let needsAuth = result[0] == 'challenge'; ++ let canSuspend = needsAuth || result[0] == 'yes'; ++ asyncCallback(canSuspend, needsAuth); + } + }); + } + + listSessions(asyncCallback) { + asyncCallback([]); + } + + suspend() { + 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]) { + this.emit('prepare-for-sleep', aboutToSuspend); + } +} +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,41 +1,40 @@ -$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( - (canRebootToBootLoaderMenu, unusedNeedsAuth) => { - this._canRebootToBootLoaderMenu = canRebootToBootLoaderMenu; - }); - 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; - this._rebootButtonAlt = this.addButton({ - action: () => { - this.close(true); - let signalId = this.connect('closed', () => { - this.disconnect(signalId); - this._confirmRebootToBootLoaderMenu(); - }); - }, - 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,27 +1,25 @@ -$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 }); } + + // fallback: retrieve input source from current locale if we don't + // support the org.freedesktop.locale1 interface + if (sourcesList.length == 0) { + let _keyboardManagerLayout = KeyboardManager.getKeyboardManager()._getLocaleLayout(); + if (_keyboardManagerLayout) { + let _kMLid = _keyboardManagerLayout.layout; + if (!!_keyboardManagerLayout.variant) + _kMLid = _kMLid + '+' + _keyboardManagerLayout.variant; + sourcesList.push({ type: INPUT_SOURCE_TYPE_XKB, id: _kMLid }); + } + } + return sourcesList; } 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,17 +1,15 @@ -$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 --- subprojects/extensions-tool/man/meson.build.orig +++ subprojects/extensions-tool/man/meson.build @@ -1,7 +1,7 @@ custom_target('gnome-extensions.1', - input: ['gnome-extensions.txt', 'stylesheet.xsl'], + input: 'gnome-extensions.txt', output: 'gnome-extensions.1', - command: [a2x, '-D', '@OUTDIR@', '--xsl-file', '@INPUT1@', '-f', 'manpage', '@INPUT0@'], + command: [a2x, '-D', '@OUTDIR@', '-f', 'manpage', '@INPUT0@'], install_dir: mandir + '/man1', install: true ) 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 @@ -1,154 +1,156 @@ bin/gnome-extensions bin/gnome-extensions-app bin/gnome-shell bin/gnome-shell-extension-prefs bin/gnome-shell-extension-tool bin/gnome-shell-perf-tool etc/xdg/autostart/gnome-shell-overrides-migration.desktop lib/gnome-shell/Gvc-1.0.typelib lib/gnome-shell/Shell-0.1.typelib lib/gnome-shell/St-1.0.typelib lib/gnome-shell/girepository-1.0/Shew-0.typelib lib/gnome-shell/libgnome-shell-menu.so lib/gnome-shell/libgnome-shell.so lib/gnome-shell/libgvc.so lib/gnome-shell/libshew-0.so lib/gnome-shell/libst-1.0.so libexec/gnome-shell-calendar-server libexec/gnome-shell-hotplug-sniffer libexec/gnome-shell-overrides-migration.sh libexec/gnome-shell-perf-helper man/man1/gnome-extensions.1.gz man/man1/gnome-shell.1.gz share/applications/evolution-calendar.desktop share/applications/org.gnome.Extensions.desktop share/applications/org.gnome.Shell.Extensions.desktop share/applications/org.gnome.Shell.desktop share/bash-completion/completions/gnome-extensions share/dbus-1/interfaces/org.gnome.Shell.Extensions.xml share/dbus-1/interfaces/org.gnome.Shell.Introspect.xml share/dbus-1/interfaces/org.gnome.Shell.PadOsd.xml share/dbus-1/interfaces/org.gnome.Shell.Screencast.xml share/dbus-1/interfaces/org.gnome.Shell.Screenshot.xml share/dbus-1/interfaces/org.gnome.ShellSearchProvider.xml share/dbus-1/interfaces/org.gnome.ShellSearchProvider2.xml share/dbus-1/services/org.gnome.Extensions.service share/dbus-1/services/org.gnome.ScreenSaver.service share/dbus-1/services/org.gnome.Shell.CalendarServer.service share/dbus-1/services/org.gnome.Shell.Extensions.service 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 %%DATADIR%%/org.gnome.Extensions.data.gresource %%DATADIR%%/org.gnome.Extensions.src.gresource %%DATADIR%%/org.gnome.ScreenSaver %%DATADIR%%/org.gnome.ScreenSaver.src.gresource %%DATADIR%%/org.gnome.Shell.Extensions %%DATADIR%%/org.gnome.Shell.Extensions.src.gresource %%DATADIR%%/org.gnome.Shell.Notifications %%DATADIR%%/org.gnome.Shell.Notifications.src.gresource %%DATADIR%%/org.gnome.Shell.Screencast %%DATADIR%%/org.gnome.Shell.Screencast.src.gresource %%DATADIR%%/perf-background.xml share/icons/hicolor/scalable/apps/org.gnome.Extensions.Devel.svg share/icons/hicolor/scalable/apps/org.gnome.Extensions.svg share/icons/hicolor/scalable/apps/org.gnome.Shell.Extensions.svg share/icons/hicolor/symbolic/apps/org.gnome.Extensions-symbolic.svg share/icons/hicolor/symbolic/apps/org.gnome.Shell.Extensions-symbolic.svg share/locale/af/LC_MESSAGES/gnome-shell.mo share/locale/an/LC_MESSAGES/gnome-shell.mo share/locale/ar/LC_MESSAGES/gnome-shell.mo share/locale/as/LC_MESSAGES/gnome-shell.mo share/locale/ast/LC_MESSAGES/gnome-shell.mo share/locale/be/LC_MESSAGES/gnome-shell.mo share/locale/bg/LC_MESSAGES/gnome-shell.mo share/locale/bn/LC_MESSAGES/gnome-shell.mo share/locale/bn_IN/LC_MESSAGES/gnome-shell.mo share/locale/bs/LC_MESSAGES/gnome-shell.mo share/locale/ca/LC_MESSAGES/gnome-shell.mo share/locale/ca@valencia/LC_MESSAGES/gnome-shell.mo share/locale/ckb/LC_MESSAGES/gnome-shell.mo share/locale/cs/LC_MESSAGES/gnome-shell.mo share/locale/da/LC_MESSAGES/gnome-shell.mo share/locale/de/LC_MESSAGES/gnome-shell.mo share/locale/el/LC_MESSAGES/gnome-shell.mo share/locale/en_GB/LC_MESSAGES/gnome-shell.mo share/locale/eo/LC_MESSAGES/gnome-shell.mo share/locale/es/LC_MESSAGES/gnome-shell.mo share/locale/et/LC_MESSAGES/gnome-shell.mo share/locale/eu/LC_MESSAGES/gnome-shell.mo share/locale/fa/LC_MESSAGES/gnome-shell.mo share/locale/fi/LC_MESSAGES/gnome-shell.mo share/locale/fr/LC_MESSAGES/gnome-shell.mo share/locale/fur/LC_MESSAGES/gnome-shell.mo share/locale/fy/LC_MESSAGES/gnome-shell.mo share/locale/ga/LC_MESSAGES/gnome-shell.mo share/locale/gd/LC_MESSAGES/gnome-shell.mo share/locale/gl/LC_MESSAGES/gnome-shell.mo share/locale/gu/LC_MESSAGES/gnome-shell.mo share/locale/he/LC_MESSAGES/gnome-shell.mo share/locale/hi/LC_MESSAGES/gnome-shell.mo share/locale/hr/LC_MESSAGES/gnome-shell.mo share/locale/hu/LC_MESSAGES/gnome-shell.mo share/locale/ia/LC_MESSAGES/gnome-shell.mo share/locale/id/LC_MESSAGES/gnome-shell.mo share/locale/is/LC_MESSAGES/gnome-shell.mo share/locale/it/LC_MESSAGES/gnome-shell.mo share/locale/ja/LC_MESSAGES/gnome-shell.mo share/locale/kab/LC_MESSAGES/gnome-shell.mo share/locale/kk/LC_MESSAGES/gnome-shell.mo share/locale/km/LC_MESSAGES/gnome-shell.mo share/locale/kn/LC_MESSAGES/gnome-shell.mo share/locale/ko/LC_MESSAGES/gnome-shell.mo share/locale/ku/LC_MESSAGES/gnome-shell.mo share/locale/ky/LC_MESSAGES/gnome-shell.mo share/locale/lt/LC_MESSAGES/gnome-shell.mo share/locale/lv/LC_MESSAGES/gnome-shell.mo share/locale/mjw/LC_MESSAGES/gnome-shell.mo share/locale/mk/LC_MESSAGES/gnome-shell.mo share/locale/ml/LC_MESSAGES/gnome-shell.mo share/locale/mr/LC_MESSAGES/gnome-shell.mo share/locale/ms/LC_MESSAGES/gnome-shell.mo share/locale/nb/LC_MESSAGES/gnome-shell.mo share/locale/ne/LC_MESSAGES/gnome-shell.mo share/locale/nl/LC_MESSAGES/gnome-shell.mo share/locale/nn/LC_MESSAGES/gnome-shell.mo share/locale/oc/LC_MESSAGES/gnome-shell.mo share/locale/or/LC_MESSAGES/gnome-shell.mo share/locale/os/LC_MESSAGES/gnome-shell.mo share/locale/pa/LC_MESSAGES/gnome-shell.mo share/locale/pl/LC_MESSAGES/gnome-shell.mo share/locale/pt/LC_MESSAGES/gnome-shell.mo share/locale/pt_BR/LC_MESSAGES/gnome-shell.mo share/locale/ro/LC_MESSAGES/gnome-shell.mo share/locale/ru/LC_MESSAGES/gnome-shell.mo share/locale/si/LC_MESSAGES/gnome-shell.mo share/locale/sk/LC_MESSAGES/gnome-shell.mo share/locale/sl/LC_MESSAGES/gnome-shell.mo share/locale/sr/LC_MESSAGES/gnome-shell.mo share/locale/sr@latin/LC_MESSAGES/gnome-shell.mo share/locale/sv/LC_MESSAGES/gnome-shell.mo share/locale/ta/LC_MESSAGES/gnome-shell.mo share/locale/te/LC_MESSAGES/gnome-shell.mo share/locale/tg/LC_MESSAGES/gnome-shell.mo share/locale/th/LC_MESSAGES/gnome-shell.mo share/locale/tr/LC_MESSAGES/gnome-shell.mo share/locale/ug/LC_MESSAGES/gnome-shell.mo share/locale/uk/LC_MESSAGES/gnome-shell.mo share/locale/uz@cyrillic/LC_MESSAGES/gnome-shell.mo share/locale/vi/LC_MESSAGES/gnome-shell.mo share/locale/zh_CN/LC_MESSAGES/gnome-shell.mo share/locale/zh_HK/LC_MESSAGES/gnome-shell.mo share/locale/zh_TW/LC_MESSAGES/gnome-shell.mo share/metainfo/org.gnome.Extensions.metainfo.xml share/xdg-desktop-portal/portals/gnome-shell.portal