[Bug 1782122] Update Released
The verification of the Stable Release Update for vala has completed successfully and the package has now been released to -updates. Subsequently, the Ubuntu Stable Release Updates Team is being unsubscribed and will not receive messages about this bug report. In the event that you encounter a regression using the package from -updates please report a new bug using ubuntu-bug and tag the bug report regression-update so we can easily find any regressions. -- You received this bug notification because you are a member of Ubuntu Desktop, which is subscribed to the bug report. https://bugs.launchpad.net/bugs/1782122 Title: [SRU] Update vala in bionic to 0.40.8 To manage notifications about this bug go to: https://bugs.launchpad.net/ubuntu/+source/vala/+bug/1782122/+subscriptions -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~didrocks/ubuntu/+source/gnome-shell:resolve-gdm-symlink into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master
The proposal to merge ~didrocks/ubuntu/+source/gnome-shell:resolve-gdm-symlink into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~didrocks/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/357609 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~didrocks/ubuntu/+source/gnome-shell:resolve-gdm-symlink into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/gnome-session:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master
Marco Trevisan (Treviño) has proposed merging ~3v1n0/ubuntu/+source/gnome-session:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master. Requested reviews: Ubuntu Desktop (ubuntu-desktop) Related bugs: Bug #1799205 in gnome-session (Ubuntu): "Ubuntu wayland sessions are not migrated to yaru" https://bugs.launchpad.net/ubuntu/+source/gnome-session/+bug/1799205 For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-session/+git/gnome-session/+merge/357620 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/gnome-session:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master. diff --git a/debian/changelog b/debian/changelog index 3e9254f..d9a8a44 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +gnome-session (3.30.0-0ubuntu5) UNRELEASED; urgency=medium + + * debian/ubuntu-settings-migrate-to-defaults.18.10.0.py: +- renamed to ubuntu-settings-migrate-to-defaults.18.10.1.py + + Also run in ubuntu-wayland desktop session (LP: #1799205) + + -- Marco Trevisan (Treviño) Mon, 22 Oct 2018 13:30:47 +0200 + gnome-session (3.30.0-0ubuntu4) cosmic; urgency=medium * Make {ubuntu,gnome}-session Arch: all and remove qualification on xwayland diff --git a/debian/ubuntu-settings-migrate-to-defaults.18.10.0.py b/debian/ubuntu-settings-migrate-to-defaults.18.10.1.py index 7e4e663..d0dad7e 100755 --- a/debian/ubuntu-settings-migrate-to-defaults.18.10.0.py +++ b/debian/ubuntu-settings-migrate-to-defaults.18.10.1.py @@ -33,7 +33,7 @@ OLD_DEFAULTS = { } } -if os.getenv('DESKTOP_SESSION') != 'ubuntu': +if os.getenv('DESKTOP_SESSION') not in ['ubuntu', 'ubuntu-wayland']: sys.exit(0) any_changed = False -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/gnome-session:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master
The proposal to merge ~3v1n0/ubuntu/+source/gnome-session:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-session/+git/gnome-session/+merge/357620 -- Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~3v1n0/ubuntu/+source/gnome-session:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master
Thanks for looking and thinking about changing the script name! LGTM. -- https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-session/+git/gnome-session/+merge/357620 Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/gnome-session:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~didrocks/ubuntu/+source/gnome-shell:resolve-gdm-symlink into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master
I'd avoid to do the C changes, while you can just use something like this: try { while (GLib.file_test(path, GLib.FileTest.IS_SYMLINK)) path = GLib.file_read_link(path) } catch (e) {} Or even avoiding the file_test check (and replacing it with `true`, since the catch will stop the while anyway). Another option, just using GFile is instead: while (true) { let info = stylesheet.query_info(Gio.FILE_ATTRIBUTE_STANDARD_IS_SYMLINK+","+ Gio.FILE_ATTRIBUTE_STANDARD_SYMLINK_TARGET, Gio.FileQueryInfoFlags.NONE, null) if (!info.get_is_symlink()) break; stylesheet = Gio.file_new_for_path(info.get_symlink_target()) } So we have less stuff touched and we keep using the glib way. Also please mention in the patch msg that this could be removed when we've a session refactor as part of this https://gitlab.gnome.org/GNOME/gdm/merge_requests/33 -- https://code.launchpad.net/~didrocks/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/357609 Your team Ubuntu Desktop is requested to review the proposed merge of ~didrocks/ubuntu/+source/gnome-shell:resolve-gdm-symlink into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/gnome-session:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master
The proposal to merge ~3v1n0/ubuntu/+source/gnome-session:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-session/+git/gnome-session/+merge/357620 -- Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~didrocks/ubuntu/+source/gnome-shell:resolve-gdm-symlink into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master
Also, wondering if having this inside st-theme instead of js would make sense, so that once the stylesheet is loaded then we refer resources related to that path. It's something *maybe* upstreamable. Although probably still not :| -- https://code.launchpad.net/~didrocks/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/357609 Your team Ubuntu Desktop is requested to review the proposed merge of ~didrocks/ubuntu/+source/gnome-shell:resolve-gdm-symlink into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~3v1n0/ubuntu/+source/gnome-session:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master
Review: Approve -- https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-session/+git/gnome-session/+merge/357620 Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~didrocks/ubuntu/+source/gnome-shell:resolve-gdm-symlink into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master
Didier Roche has proposed merging ~didrocks/ubuntu/+source/gnome-shell:resolve-gdm-symlink into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master. Requested reviews: Ubuntu Desktop (ubuntu-desktop) For more details, see: https://code.launchpad.net/~didrocks/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/357609 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~didrocks/ubuntu/+source/gnome-shell:resolve-gdm-symlink into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master. diff --git a/debian/changelog b/debian/changelog index c86e666..ecf0df1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,9 @@ gnome-shell (3.30.1-2ubuntu2) UNRELEASED; urgency=medium * debian/patches/ubuntu/background_login.patch: - match Yaru theme in the ubuntu session instead of our previous GDM background (LP: #1789356) + * debian/patches/ubuntu/resolve_alternate_theme_path.patch: +- ensure we resolve finale theme file path to correctly load assets + under gdm (LP: #1798747) -- Didier Roche Wed, 17 Oct 2018 14:58:42 +0200 diff --git a/debian/patches/series b/debian/patches/series index 7397e65..2d27e92 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -19,3 +19,4 @@ sessionMode-add-support-for-debugFlags-parameter.patch st-scroll-view-Handle-the-case-where-scrollbars-are-NULL.patch st-scroll-view-Remove-scrollbars-references-on-dispose.patch ubuntu/search-call-XUbuntuCancel-method-on-providers-when-no-dat.patch +ubuntu/resolve_alternate_theme_path.patch diff --git a/debian/patches/ubuntu/resolve_alternate_theme_path.patch b/debian/patches/ubuntu/resolve_alternate_theme_path.patch new file mode 100644 index 000..74132bf --- /dev/null +++ b/debian/patches/ubuntu/resolve_alternate_theme_path.patch @@ -0,0 +1,74 @@ +From: Didier Roche +Date: Mon, 22 Oct 2019 10:22:06 +0100 +Subject: Resolve real path name for theme file + + We are using alternative theme paths. Some of them are symlinks like + gdm3.css. It points to a different directory and we need to ensure + assets are loaded from the real theme path then (assets path are + relative to it). + Expose thus realpath() to gjs and ensure we use the original file + itself when loading the stylesheet. +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1798747 +Forwarded: Not-needed (upstream doesn't support officially theming) +Index: gnome-shell-3.30.1/src/shell-global.c +=== +--- gnome-shell-3.30.1.orig/src/shell-global.c gnome-shell-3.30.1/src/shell-global.c +@@ -1908,3 +1908,23 @@ shell_global_set_debug_flags (ShellGloba + g_object_notify (G_OBJECT (global), "debug-flags"); + } + } ++ ++/** ++ * shell_global_realpath: ++ * @global: A #ShellGlobal ++ * @path: Path to call realpath on ++ * ++ * Returns: the realpath call on the path argument. Returns the caller ++ * unchanged if already the canonicalized filename is given, or if ++ * realpath() returned any error. ++ */ ++const char* ++shell_global_realpath (ShellGlobal *global, ++ const char *path) ++{ ++ char *res = realpath (path, NULL); ++ ++ if (!res) ++return path; ++ return res; ++} +\ No newline at end of file +Index: gnome-shell-3.30.1/src/shell-global.h +=== +--- gnome-shell-3.30.1.orig/src/shell-global.h gnome-shell-3.30.1/src/shell-global.h +@@ -37,6 +37,9 @@ voidshell_global_get_pointer + int *y, + ClutterModifierType *mods); + ++const char* shell_global_realpath (ShellGlobal *global, ++ const char *path); ++ + typedef struct { + guint glibc_uordblks; + +Index: gnome-shell-3.30.1/js/ui/main.js +=== +--- gnome-shell-3.30.1.orig/js/ui/main.js gnome-shell-3.30.1/js/ui/main.js +@@ -262,12 +262,12 @@ function _getStylesheet(name) { + let dataDirs = GLib.get_system_data_dirs(); + for (let i = 0; i < dataDirs.length; i++) { + let path = GLib.build_filenamev([dataDirs[i], 'gnome-shell', 'theme', name]); +-let stylesheet = Gio.file_new_for_path(path); ++let stylesheet = Gio.file_new_for_path(global.realpath(path)); + if (stylesheet.query_exists(null)) + return stylesheet; + } + +-stylesheet = Gio.File.new_for_path(global.datadir + '/theme/' + name); ++stylesheet = Gio.File.new_for_path(global.realpath(global.datadir + '/theme/' + name)); + if (stylesheet.query_exists(null)) + return stylesheet; + -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~didrocks/ubuntu/+source/gnome-shell:resolve-gdm-symlink into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master
Went with the first approach you proposed, which is the more readable IMHO. Thanks! -- https://code.launchpad.net/~didrocks/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/357609 Your team Ubuntu Desktop is requested to review the proposed merge of ~didrocks/ubuntu/+source/gnome-shell:resolve-gdm-symlink into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop