Date: Thu, 3 Mar 2022 20:12:11 GMT From: Neel Chauhan <nc@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 31a538ee6ac4 - main - x11/gnome-shell: Updaet to 41.4 Message-ID: <202203032012.223KCB6i070184@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by nc: URL: https://cgit.FreeBSD.org/ports/commit/?id=31a538ee6ac4c9691583c43a76270afe39a7dba0 commit 31a538ee6ac4c9691583c43a76270afe39a7dba0 Author: Neel Chauhan <nc@FreeBSD.org> AuthorDate: 2022-03-03 20:12:08 +0000 Commit: Neel Chauhan <nc@FreeBSD.org> CommitDate: 2022-03-03 20:12:08 +0000 x11/gnome-shell: Updaet to 41.4 --- x11/gnome-shell/Makefile | 5 +- x11/gnome-shell/distinfo | 8 +- x11/gnome-shell/files/patch-data_meson_build | 19 +++ x11/gnome-shell/files/patch-js_gdm_loginDialog_js | 156 --------------------- .../files/patch-src_calendar-server_meson_build | 19 +++ ...tch-subprojects_extensions-app_data_meson_build | 19 +++ ...ojects_extensions-app_data_metainfo_meson_build | 17 +++ ...tch-subprojects_extensions-tool_man_meson_build | 17 +++ ...jects_extensions-tool_src_templates_meson_build | 19 +++ 9 files changed, 114 insertions(+), 165 deletions(-) diff --git a/x11/gnome-shell/Makefile b/x11/gnome-shell/Makefile index 1b84405c3b28..2e813a059654 100644 --- a/x11/gnome-shell/Makefile +++ b/x11/gnome-shell/Makefile @@ -1,14 +1,11 @@ # Created by: Pawel Worach <pawel.worach@gmail.com> PORTNAME= gnome-shell -PORTVERSION= 41.3 +PORTVERSION= 41.4 CATEGORIES= x11 gnome MASTER_SITES= GNOME/sources/${PORTNAME}/${PORTVERSION:C/^([0-9]+)\..*/\1/} DIST_SUBDIR= gnome -PATCH_SITES= https://gitlab.gnome.org/GNOME/${PORTNAME}/-/commit/ -PATCHFILES+= 65450a836ee9.patch:-p1 # https://gitlab.gnome.org/GNOME/gnome-shell/-/merge_requests/2078 - MAINTAINER= gnome@FreeBSD.org COMMENT= Next generation GNOME desktop shell diff --git a/x11/gnome-shell/distinfo b/x11/gnome-shell/distinfo index a0f1921b5746..423afbf9c4e0 100644 --- a/x11/gnome-shell/distinfo +++ b/x11/gnome-shell/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1642623774 -SHA256 (gnome/gnome-shell-41.3.tar.xz) = 1e3dfa2a0be49454182b4ace77f11d10d3f5b988ef0fcb732b7313573949ded1 -SIZE (gnome/gnome-shell-41.3.tar.xz) = 1897228 -SHA256 (gnome/65450a836ee9.patch) = 9ccd84e3996568cdfd76d23e00954665898848da84b91f1936d5aee723b18ead -SIZE (gnome/65450a836ee9.patch) = 3112 +TIMESTAMP = 1646337175 +SHA256 (gnome/gnome-shell-41.4.tar.xz) = c7eef74af304649c03b86db99bd0bac75a011fbff6774c8ee35583dbcdad8af4 +SIZE (gnome/gnome-shell-41.4.tar.xz) = 1899464 diff --git a/x11/gnome-shell/files/patch-data_meson_build b/x11/gnome-shell/files/patch-data_meson_build new file mode 100644 index 000000000000..ab8c658c1baf --- /dev/null +++ b/x11/gnome-shell/files/patch-data_meson_build @@ -0,0 +1,19 @@ +$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?= <fmuellner@gnome.org> +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_gdm_loginDialog_js b/x11/gnome-shell/files/patch-js_gdm_loginDialog_js deleted file mode 100644 index 620a85197b15..000000000000 --- a/x11/gnome-shell/files/patch-js_gdm_loginDialog_js +++ /dev/null @@ -1,156 +0,0 @@ -$OpenBSD: patch-js_gdm_loginDialog_js,v 1.3 2021/06/14 18:54:25 jasper Exp $ - -Index: js/gdm/loginDialog.js ---- js/gdm/loginDialog.js.orig -+++ js/gdm/loginDialog.js -@@ -42,6 +42,7 @@ var UserListItem = GObject.registerClass({ - _init(user) { - let layout = new St.BoxLayout({ - vertical: true, -+ x_align: Clutter.ActorAlign.START, - }); - super._init({ - style_class: 'login-dialog-user-list-item', -@@ -762,9 +763,6 @@ var LoginDialog = GObject.registerClass({ - - if (this._authPrompt.verificationStatus == AuthPrompt.AuthPromptStatus.NOT_VERIFYING) - this._authPrompt.reset(); -- -- if (this._disableUserList && this._timedLoginUserListHold) -- this._timedLoginUserListHold.release(); - } - } - -@@ -858,7 +856,6 @@ var LoginDialog = GObject.registerClass({ - this._resetGreeterProxy(); - this._sessionMenuButton.updateSensitivity(true); - -- const previousUser = this._user; - this._user = null; - - if (this._nextSignalId) { -@@ -866,11 +863,7 @@ var LoginDialog = GObject.registerClass({ - this._nextSignalId = 0; - } - -- if (previousUser && beginRequest === AuthPrompt.BeginRequestType.REUSE_USERNAME) { -- this._user = previousUser; -- this._authPrompt.setUser(this._user); -- this._authPrompt.begin({ userName: previousUser.get_user_name() }); -- } else if (beginRequest === AuthPrompt.BeginRequestType.PROVIDE_USERNAME) { -+ if (beginRequest == AuthPrompt.BeginRequestType.PROVIDE_USERNAME) { - if (!this._disableUserList) - this._showUserList(); - else -@@ -1051,72 +1044,54 @@ var LoginDialog = GObject.registerClass({ - let loginItem = null; - let animationTime; - -- let tasks = [ -- () => { -- if (this._disableUserList) -- return; -+ let tasks = [() => this._waitForItemForUser(userName), - -- this._timedLoginUserListHold = this._waitForItemForUser(userName); -- }, -+ () => { -+ loginItem = this._userList.getItemFromUserName(userName); - -- () => { -- this._timedLoginUserListHold = null; -+ // If there is an animation running on the item, reset it. -+ loginItem.hideTimedLoginIndicator(); -+ }, - -- if (this._disableUserList) -- loginItem = this._authPrompt; -- else -- loginItem = this._userList.getItemFromUserName(userName); -+ () => { -+ // If we're just starting out, start on the right item. -+ if (!this._userManager.is_loaded) -+ this._userList.jumpToItem(loginItem); -+ }, - -- // If there is an animation running on the item, reset it. -- loginItem.hideTimedLoginIndicator(); -- }, -+ () => { -+ // This blocks the timed login animation until a few -+ // seconds after the user stops interacting with the -+ // login screen. - -- () => { -- if (this._disableUserList) -- return; -+ // We skip this step if the timed login delay is very short. -+ if (delay > _TIMED_LOGIN_IDLE_THRESHOLD) { -+ animationTime = delay - _TIMED_LOGIN_IDLE_THRESHOLD; -+ return this._blockTimedLoginUntilIdle(); -+ } else { -+ animationTime = delay; -+ return null; -+ } -+ }, - -- // If we're just starting out, start on the right item. -- if (!this._userManager.is_loaded) -- this._userList.jumpToItem(loginItem); -- }, -+ () => { -+ // If idle timeout is done, make sure the timed login indicator is shown -+ if (delay > _TIMED_LOGIN_IDLE_THRESHOLD && -+ this._authPrompt.visible) -+ this._authPrompt.cancel(); - -- () => { -- // This blocks the timed login animation until a few -- // seconds after the user stops interacting with the -- // login screen. -+ if (delay > _TIMED_LOGIN_IDLE_THRESHOLD || firstRun) { -+ this._userList.scrollToItem(loginItem); -+ loginItem.grab_key_focus(); -+ } -+ }, - -- // We skip this step if the timed login delay is very short. -- if (delay > _TIMED_LOGIN_IDLE_THRESHOLD) { -- animationTime = delay - _TIMED_LOGIN_IDLE_THRESHOLD; -- return this._blockTimedLoginUntilIdle(); -- } else { -- animationTime = delay; -- return null; -- } -- }, -+ () => loginItem.showTimedLoginIndicator(animationTime), - -- () => { -- if (this._disableUserList) -- return; -- -- // If idle timeout is done, make sure the timed login indicator is shown -- if (delay > _TIMED_LOGIN_IDLE_THRESHOLD && -- this._authPrompt.visible) -- this._authPrompt.cancel(); -- -- if (delay > _TIMED_LOGIN_IDLE_THRESHOLD || firstRun) { -- this._userList.scrollToItem(loginItem); -- loginItem.grab_key_focus(); -- } -- }, -- -- () => loginItem.showTimedLoginIndicator(animationTime), -- -- () => { -- this._timedLoginBatch = null; -- this._greeter.call_begin_auto_login_sync(userName, null); -- }, -- ]; -+ () => { -+ this._timedLoginBatch = null; -+ this._greeter.call_begin_auto_login_sync(userName, null); -+ }]; - - this._timedLoginBatch = new Batch.ConsecutiveBatch(this, tasks); - diff --git a/x11/gnome-shell/files/patch-src_calendar-server_meson_build b/x11/gnome-shell/files/patch-src_calendar-server_meson_build new file mode 100644 index 000000000000..daa9fcbdeb89 --- /dev/null +++ b/x11/gnome-shell/files/patch-src_calendar-server_meson_build @@ -0,0 +1,19 @@ +$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?= <fmuellner@gnome.org> +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-subprojects_extensions-app_data_meson_build b/x11/gnome-shell/files/patch-subprojects_extensions-app_data_meson_build new file mode 100644 index 000000000000..1b1043c226f4 --- /dev/null +++ b/x11/gnome-shell/files/patch-subprojects_extensions-app_data_meson_build @@ -0,0 +1,19 @@ +$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?= <fmuellner@gnome.org> +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 new file mode 100644 index 000000000000..0afd98fc0d2f --- /dev/null +++ b/x11/gnome-shell/files/patch-subprojects_extensions-app_data_metainfo_meson_build @@ -0,0 +1,17 @@ +$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?= <fmuellner@gnome.org> +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 new file mode 100644 index 000000000000..66640af5a42d --- /dev/null +++ b/x11/gnome-shell/files/patch-subprojects_extensions-tool_man_meson_build @@ -0,0 +1,17 @@ +$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 new file mode 100644 index 000000000000..f0815d290ed5 --- /dev/null +++ b/x11/gnome-shell/files/patch-subprojects_extensions-tool_src_templates_meson_build @@ -0,0 +1,19 @@ +$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?= <fmuellner@gnome.org> +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,
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202203032012.223KCB6i070184>