diff -Nru gnome-shell-3.36.9/debian/changelog gnome-shell-3.36.9/debian/changelog --- gnome-shell-3.36.9/debian/changelog 2021-05-19 13:49:17.000000000 +0000 +++ gnome-shell-3.36.9/debian/changelog 2023-12-11 19:08:17.000000000 +0000 @@ -1,3 +1,16 @@ +gnome-shell (3.36.9-0ubuntu0.20.04.3) focal; urgency=medium + + [ Marco Trevisan (Treviño) ] + * debian/patches: Cherry-pick upstream calendar-server crash fix + (LP: #1915929) + * debian/patches: Refresh indexes + + [ Daniel van Vugt ] + * Add edgeDragAction-Change-edge-trigger-threshold-to-AFTER.patch + (LP: #2042796) + + -- Marco Trevisan (Treviño) Mon, 11 Dec 2023 20:08:17 +0100 + gnome-shell (3.36.9-0ubuntu0.20.04.2) focal; urgency=medium [ Didier Roche ] diff -Nru gnome-shell-3.36.9/debian/control gnome-shell-3.36.9/debian/control --- gnome-shell-3.36.9/debian/control 2021-05-19 13:49:17.000000000 +0000 +++ gnome-shell-3.36.9/debian/control 2023-12-11 19:08:17.000000000 +0000 @@ -7,7 +7,7 @@ Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian GNOME Maintainers -Uploaders: Iain Lane , Jeremy Bicha +Uploaders: Iain Lane , Laurent Bigonville Build-Depends: appstream, asciidoc-base, bash-completion, diff -Nru gnome-shell-3.36.9/debian/patches/calendar-server-Fix-double-free-detection-abort.patch gnome-shell-3.36.9/debian/patches/calendar-server-Fix-double-free-detection-abort.patch --- gnome-shell-3.36.9/debian/patches/calendar-server-Fix-double-free-detection-abort.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-shell-3.36.9/debian/patches/calendar-server-Fix-double-free-detection-abort.patch 2023-12-11 19:08:17.000000000 +0000 @@ -0,0 +1,37 @@ +From: Gustavo Noronha Silva +Date: Tue, 18 May 2021 15:28:43 -0300 +Subject: calendar-server: Fix double-free detection abort + +app_notify_events_added uses an intermediate builder to construct an +array that is then added to the main variant using g_variant_builder_add +which should clear the intermediate, but doesn't due to the way it is +passed: by value, rather than as a pointer. + +This was debugged with the help of Eduardo Habkost, who believes it +works on x86 due to big structs being passed as pointers. + +Fixed: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/3440 +Part-of: + +(cherry picked from commit 404ca91941226faaf2479609f0109244e66d4bcd) + +Origin: https://gitlab.gnome.org/GNOME/gnome-shell/-/commit/f212512c +Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1915929 +--- + src/calendar-server/gnome-shell-calendar-server.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/calendar-server/gnome-shell-calendar-server.c b/src/calendar-server/gnome-shell-calendar-server.c +index defc4a6..ca2e73f 100644 +--- a/src/calendar-server/gnome-shell-calendar-server.c ++++ b/src/calendar-server/gnome-shell-calendar-server.c +@@ -405,8 +405,7 @@ app_notify_events_added (App *app) + (gboolean) appt->is_all_day, + (gint64) start_time, + (gint64) end_time, +- extras_builder); +- g_variant_builder_clear (&extras_builder); ++ &extras_builder); + } + } + diff -Nru gnome-shell-3.36.9/debian/patches/edgeDragAction-Change-edge-trigger-threshold-to-AFTER.patch gnome-shell-3.36.9/debian/patches/edgeDragAction-Change-edge-trigger-threshold-to-AFTER.patch --- gnome-shell-3.36.9/debian/patches/edgeDragAction-Change-edge-trigger-threshold-to-AFTER.patch 1970-01-01 00:00:00.000000000 +0000 +++ gnome-shell-3.36.9/debian/patches/edgeDragAction-Change-edge-trigger-threshold-to-AFTER.patch 2023-12-11 19:08:17.000000000 +0000 @@ -0,0 +1,30 @@ +From: Carlos Garnacho +Date: Wed, 25 May 2022 20:54:39 +0200 +Subject: edgeDragAction: Change edge trigger threshold to AFTER + +For all instances of this gesture, we want this gesture to +activate after some distance, not to eat button presses/releases +right away. + +Part-of: + +Origin: Upstream commit 1fa5c63307e03d806eacdcf14d31e63afc27af20 +Bug-Ubuntu: https://launchpad.net/bugs/2042796 +Forwarded: not-needed +Last-Update: 2023-12-01 +--- + js/ui/edgeDragAction.js | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/js/ui/edgeDragAction.js b/js/ui/edgeDragAction.js +index 8502170..befe152 100644 +--- a/js/ui/edgeDragAction.js ++++ b/js/ui/edgeDragAction.js +@@ -16,6 +16,7 @@ var EdgeDragAction = GObject.registerClass({ + this._side = side; + this._allowedModes = allowedModes; + this.set_n_touch_points(1); ++ this.set_threshold_trigger_edge(Clutter.GestureTriggerEdge.AFTER); + + global.display.connect('grab-op-begin', () => this.cancel()); + } diff -Nru gnome-shell-3.36.9/debian/patches/series gnome-shell-3.36.9/debian/patches/series --- gnome-shell-3.36.9/debian/patches/series 2021-05-19 13:49:17.000000000 +0000 +++ gnome-shell-3.36.9/debian/patches/series 2023-12-11 19:08:17.000000000 +0000 @@ -33,6 +33,8 @@ authPrompt-Only-wiggle-the-entry-on-failures-coming-from-.patch authPrompt-Wiggle-error-messages-coming-from-the-Fingerpr.patch authPrompt-Bump-the-user-verifier-timeout-when-wiggling-t.patch +calendar-server-Fix-double-free-detection-abort.patch +edgeDragAction-Change-edge-trigger-threshold-to-AFTER.patch ubuntu/search-call-XUbuntuCancel-method-on-providers-when-no-dat.patch ubuntu/resolve_alternate_theme_path.patch ubuntu/secure_mode_extension.patch diff -Nru gnome-shell-3.36.9/debian/patches/ubuntu/configure_login_screen.patch gnome-shell-3.36.9/debian/patches/ubuntu/configure_login_screen.patch --- gnome-shell-3.36.9/debian/patches/ubuntu/configure_login_screen.patch 2021-05-19 13:49:17.000000000 +0000 +++ gnome-shell-3.36.9/debian/patches/ubuntu/configure_login_screen.patch 2023-12-11 19:08:17.000000000 +0000 @@ -9,10 +9,18 @@ Forwarded: https://gitlab.gnome.org/GNOME/gnome-shell/-/issues/680 Bug: https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1918613 Origin: ubuntu -Index: gnome-shell/data/com.ubuntu.login-screen.gschema.xml.in -=================================================================== +--- + data/com.ubuntu.login-screen.gschema.xml.in | 70 +++++++++++++++++++++++++++++ + data/meson.build | 8 +++- + js/ui/screenShield.js | 33 ++++++++++++++ + 3 files changed, 110 insertions(+), 1 deletion(-) + create mode 100644 data/com.ubuntu.login-screen.gschema.xml.in + +diff --git a/data/com.ubuntu.login-screen.gschema.xml.in b/data/com.ubuntu.login-screen.gschema.xml.in +new file mode 100644 +index 0000000..ee8b3a2 --- /dev/null -+++ gnome-shell/data/com.ubuntu.login-screen.gschema.xml.in ++++ b/data/com.ubuntu.login-screen.gschema.xml.in @@ -0,0 +1,70 @@ + + @@ -84,10 +92,10 @@ + + + -Index: gnome-shell/data/meson.build -=================================================================== ---- gnome-shell.orig/data/meson.build -+++ gnome-shell/data/meson.build +diff --git a/data/meson.build b/data/meson.build +index 803e682..8ba713d 100644 +--- a/data/meson.build ++++ b/data/meson.build @@ -85,6 +85,12 @@ schema = configure_file( configuration: schemaconf, install_dir: schemadir @@ -110,11 +118,11 @@ output: 'gschemas.compiled', command: [find_program('glib-compile-schemas'), meson.current_build_dir()], build_by_default: true) -Index: gnome-shell/js/ui/screenShield.js -=================================================================== ---- gnome-shell.orig/js/ui/screenShield.js -+++ gnome-shell/js/ui/screenShield.js -@@ -26,6 +26,12 @@ const DISABLE_LOCK_KEY = 'disable-lock-s +diff --git a/js/ui/screenShield.js b/js/ui/screenShield.js +index 2f0ec8e..1f89812 100644 +--- a/js/ui/screenShield.js ++++ b/js/ui/screenShield.js +@@ -26,6 +26,12 @@ const DISABLE_LOCK_KEY = 'disable-lock-screen'; const LOCKED_STATE_STR = 'screenShield.locked';