Re: [Merge] ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master
GJS version we depend on is at https://code.launchpad.net/~3v1n0/ubuntu/+source/gjs/+git/gjs/+ref/ubuntu/master -- https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/379843 Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/master 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/nautilus:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic
Marco Trevisan (Treviño) has proposed merging
~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic into
~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic.
Commit message:
Sync VCS with packaging
Requested reviews:
Ubuntu Server Dev import team (usd-import-team)
Related bugs:
Bug #1767817 in nautilus (Ubuntu): "Full text search does not work"
https://bugs.launchpad.net/ubuntu/+source/nautilus/+bug/1767817
For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/nautilus/+git/nautilus/+merge/374710
--
Your team Ubuntu Desktop is subscribed to branch
~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic.
diff --git a/debian/changelog b/debian/changelog
index 17553e8..ad6d1f5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+nautilus (1:3.26.4-0~ubuntu18.04.4) bionic; urgency=medium
+
+ * d/p/0015-tracker-search-engine-don-t-start-it-if-not-availabl.patch:
+- update the patch to fix a logic error in the code which made tracker
+ never being used even if it's installed (lp: #1767817)
+
+ -- Sebastien Bacher Wed, 06 Mar 2019 17:31:08 +0100
+
nautilus (1:3.26.4-0~ubuntu18.04.3) bionic; urgency=medium
* debian/patches/git_captions_order.patch
diff --git a/debian/patches/0015-tracker-search-engine-don-t-start-it-if-not-availabl.patch b/debian/patches/0015-tracker-search-engine-don-t-start-it-if-not-availabl.patch
index 4cc55ed..d24e83c 100644
--- a/debian/patches/0015-tracker-search-engine-don-t-start-it-if-not-availabl.patch
+++ b/debian/patches/0015-tracker-search-engine-don-t-start-it-if-not-availabl.patch
@@ -6,10 +6,10 @@ Subject: tracker-search-engine: don't start it if not available on system
src/nautilus-search-engine-tracker.c | 24
1 file changed, 20 insertions(+), 4 deletions(-)
-diff --git a/src/nautilus-search-engine-tracker.c b/src/nautilus-search-engine-tracker.c
-index 8885ca4..050716d 100644
a/src/nautilus-search-engine-tracker.c
-+++ b/src/nautilus-search-engine-tracker.c
+Index: nautilus-3.26.4/src/nautilus-search-engine-tracker.c
+===
+--- nautilus-3.26.4.orig/src/nautilus-search-engine-tracker.c
nautilus-3.26.4/src/nautilus-search-engine-tracker.c
@@ -42,6 +42,7 @@ struct _NautilusSearchEngineTracker
gboolean query_pending;
GQueue *hits_pending;
@@ -18,7 +18,7 @@ index 8885ca4..050716d 100644
gboolean recursive;
gboolean fts_enabled;
-@@ -304,8 +305,15 @@ nautilus_search_engine_tracker_start (NautilusSearchProvider *provider)
+@@ -304,8 +305,15 @@ nautilus_search_engine_tracker_start (Na
return;
}
@@ -35,7 +35,7 @@ index 8885ca4..050716d 100644
tracker->query_pending = TRUE;
g_object_notify (G_OBJECT (provider), "running");
-@@ -471,6 +479,9 @@ nautilus_search_engine_tracker_set_query (NautilusSearchProvider *provider,
+@@ -471,6 +479,9 @@ nautilus_search_engine_tracker_set_query
g_clear_object (&tracker->query);
@@ -45,7 +45,7 @@ index 8885ca4..050716d 100644
tracker->query = g_object_ref (query);
tracker->recursive = is_recursive_search (NAUTILUS_SEARCH_ENGINE_TYPE_INDEXED,
nautilus_query_get_recursive (query),
-@@ -539,16 +550,21 @@ static void
+@@ -539,16 +550,23 @@ static void
nautilus_search_engine_tracker_init (NautilusSearchEngineTracker *engine)
{
GError *error = NULL;
@@ -54,8 +54,10 @@ index 8885ca4..050716d 100644
-engine->hits_pending = g_queue_new ();
-
-engine->connection = tracker_sparql_connection_get (NULL, &error);
-+if (!tracker_available)
++if (tracker_available)
+engine->connection = tracker_sparql_connection_get (NULL, &error);
++else
++return;
if (error)
{
--
ubuntu-desktop mailing list
ubuntu-desktop@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic-xubuntu-cancel-search into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic
Ok, I've finally rebased this. -- https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/358477 Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic-xubuntu-cancel-search into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic
Marco Trevisan (Treviño) has proposed merging
~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic-xubuntu-cancel-search into
~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic with
~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic as a prerequisite.
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
Related bugs:
Bug #1756826 in nautilus (Ubuntu): "hangs when remote search provider
performs expensive operation"
https://bugs.launchpad.net/ubuntu/+source/nautilus/+bug/1756826
Bug #1767817 in nautilus (Ubuntu): "Full text search does not work"
https://bugs.launchpad.net/ubuntu/+source/nautilus/+bug/1767817
For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/nautilus/+git/nautilus/+merge/374711
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic-xubuntu-cancel-search into
~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic.
diff --git a/debian/changelog b/debian/changelog
index ad6d1f5..abea57d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+nautilus (1:3.26.4-0~ubuntu18.04.5) bionic; urgency=medium
+
+ * d/p/ubuntu/shell-search-provider-implement-XUbuntuCancel-to-request-.patch:
+- shell-search-provider: implement XUbuntuCancel to request pending search
+ cancellation from gnome-shell (LP: #1756826)
+
+ -- Marco Trevisan (Treviño) Fri, 25 Oct 2019 05:38:04 +0200
+
nautilus (1:3.26.4-0~ubuntu18.04.4) bionic; urgency=medium
* d/p/0015-tracker-search-engine-don-t-start-it-if-not-availabl.patch:
diff --git a/debian/patches/series b/debian/patches/series
index 9417da4..3ec0d73 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -26,3 +26,4 @@ appstream-compulsory.patch
nautilusgtkplacesview-show-error-if-volume-is-not-mo.patch
file-view-Always-unset-pending_selection-after-freeing-it.patch
git_captions_order.patch
+ubuntu/shell-search-provider-implement-XUbuntuCancel-to-request-.patch
diff --git a/debian/patches/ubuntu/shell-search-provider-implement-XUbuntuCancel-to-request-.patch b/debian/patches/ubuntu/shell-search-provider-implement-XUbuntuCancel-to-request-.patch
new file mode 100644
index 000..85fa0c2
--- /dev/null
+++ b/debian/patches/ubuntu/shell-search-provider-implement-XUbuntuCancel-to-request-.patch
@@ -0,0 +1,213 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?=
+Date: Tue, 28 Aug 2018 01:44:49 +0200
+Subject: shell-search-provider: implement XUbuntuCancel to request search
+ cancellation
+
+Stop search and Metadata fetching on XUbuntuCancel dbus method call.
+Only allow this if the caller is the same who triggered the actual event.
+
+Bug-GNOME: https://gitlab.gnome.org/GNOME/gnome-shell/issues/183
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/bionic/+source/nautilus/+bug/1756826
+Forwarded: not-needed
+---
+ data/shell-search-provider-dbus-interfaces.xml | 1 +
+ src/nautilus-shell-search-provider.c | 96 +++---
+ 2 files changed, 88 insertions(+), 9 deletions(-)
+
+diff --git a/data/shell-search-provider-dbus-interfaces.xml b/data/shell-search-provider-dbus-interfaces.xml
+index f6840e2..4529c1e 100644
+--- a/data/shell-search-provider-dbus-interfaces.xml
b/data/shell-search-provider-dbus-interfaces.xml
+@@ -40,5 +40,6 @@
+
+
+
++
+
+
+diff --git a/src/nautilus-shell-search-provider.c b/src/nautilus-shell-search-provider.c
+index ffc2b7f..58864d6 100644
+--- a/src/nautilus-shell-search-provider.c
b/src/nautilus-shell-search-provider.c
+@@ -60,6 +60,7 @@ struct _NautilusShellSearchProvider
+
+ PendingSearch *current_search;
+
++GList *metas_requests;
+ GHashTable *metas_cache;
+ };
+
+@@ -143,11 +144,25 @@ pending_search_finish (PendingSearch *search,
+ }
+
+ static void
+-cancel_current_search (NautilusShellSearchProvider *self)
++cancel_current_search (NautilusShellSearchProvider *self,
++ gboolean ignore_partial_results)
+ {
+-if (self->current_search != NULL)
++PendingSearch *search = self->current_search;
++
++if (search != NULL)
+ {
+-nautilus_search_provider_stop (NAUTILUS_SEARCH_PROVIDER (self->current_search->engine));
++g_debug ("*** Cancel current search");
++
++nautilus_search_provider_stop (NAUTILUS_SEARCH_PROVIDER (search->engine));
++
++if (ignore_partial_results)
++{
++g_signal_handlers_disconnect_by_data (G_OBJECT (search->engine),
++ search);
++
++pending_search_finish (search, search->invocation,
++ g_variant_new ("(as)", NULL));
++}
+ }
+ }
+
+@@ -451,7 +466,7 @@ execute_search (NautilusShellSearchProvider *self,
+ NautilusQuery *query;
+ PendingSearch *pending_search;
+
+-cancel_current_search (self);
++cancel_current_search (
[Merge] ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic-xubuntu-cancel-search into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic
The proposal to merge ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic-xubuntu-cancel-search into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic has been updated. Status: Needs review => Superseded For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/nautilus/+git/nautilus/+merge/354346 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic-xubuntu-cancel-search into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/mutter:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/master
Marco Trevisan (Treviño) has proposed merging
~3v1n0/ubuntu/+source/mutter:ubuntu/master into
~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/master.
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/mutter/+git/mutter/+merge/374693
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~3v1n0/ubuntu/+source/mutter:ubuntu/master into
~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/master.
diff --git a/clutter/clutter/clutter-actor-private.h b/clutter/clutter/clutter-actor-private.h
index 119ec42..fa2d4c3 100644
--- a/clutter/clutter/clutter-actor-private.h
+++ b/clutter/clutter/clutter-actor-private.h
@@ -274,6 +274,9 @@ void_clutter_actor_set_enable_paint_unmapped
void_clutter_actor_set_has_pointer (ClutterActor *self,
gboolean has_pointer);
+void_clutter_actor_set_has_key_focus(ClutterActor *self,
+ gboolean has_key_focus);
+
void_clutter_actor_queue_redraw_with_clip (ClutterActor *self,
ClutterRedrawFlagsflags,
const ClutterPaintVolume *clip_volume);
diff --git a/clutter/clutter/clutter-actor.c b/clutter/clutter/clutter-actor.c
index e763291..ecf9a59 100644
--- a/clutter/clutter/clutter-actor.c
+++ b/clutter/clutter/clutter-actor.c
@@ -835,6 +835,7 @@ struct _ClutterActorPrivate
guint enable_model_view_transform : 1;
guint enable_paint_unmapped : 1;
guint has_pointer : 1;
+ guint has_key_focus : 1;
guint propagated_one_redraw : 1;
guint paint_volume_valid : 1;
guint last_paint_volume_valid : 1;
@@ -1692,6 +1693,20 @@ clutter_actor_is_mapped (ClutterActor *self)
}
static void
+maybe_unset_key_focus (ClutterActor *self)
+{
+ ClutterActor *stage;
+
+ if (!self->priv->has_key_focus)
+return;
+
+ stage = _clutter_actor_get_stage_internal (self);
+
+ if (stage)
+clutter_stage_set_key_focus (CLUTTER_STAGE (stage), NULL);
+}
+
+static void
clutter_actor_real_unmap (ClutterActor *self)
{
ClutterActorPrivate *priv = self->priv;
@@ -1724,17 +1739,7 @@ clutter_actor_real_unmap (ClutterActor *self)
/* relinquish keyboard focus if we were unmapped while owning it */
if (!CLUTTER_ACTOR_IS_TOPLEVEL (self))
-{
- ClutterStage *stage;
-
- stage = CLUTTER_STAGE (_clutter_actor_get_stage_internal (self));
-
- if (stage != NULL &&
- clutter_stage_get_key_focus (stage) == self)
-{
- clutter_stage_set_key_focus (stage, NULL);
-}
-}
+maybe_unset_key_focus (self);
}
/**
@@ -6064,6 +6069,8 @@ clutter_actor_dispose (GObject *object)
object->ref_count,
g_type_name (G_OBJECT_TYPE (self)));
+ maybe_unset_key_focus (self);
+
/* Stop the emission of any property change */
g_object_freeze_notify (object);
@@ -15979,6 +15986,9 @@ clutter_actor_grab_key_focus (ClutterActor *self)
g_return_if_fail (CLUTTER_IS_ACTOR (self));
+ if (self->priv->has_key_focus)
+return;
+
stage = _clutter_actor_get_stage_internal (self);
if (stage != NULL)
clutter_stage_set_key_focus (CLUTTER_STAGE (stage), self);
@@ -16768,6 +16778,23 @@ _clutter_actor_set_has_pointer (ClutterActor *self,
}
}
+void
+_clutter_actor_set_has_key_focus (ClutterActor *self,
+ gboolean has_key_focus)
+{
+ ClutterActorPrivate *priv = self->priv;
+
+ if (priv->has_key_focus != has_key_focus)
+{
+ priv->has_key_focus = has_key_focus;
+
+ if (has_key_focus)
+g_signal_emit (self, actor_signals[KEY_FOCUS_IN], 0);
+ else
+g_signal_emit (self, actor_signals[KEY_FOCUS_OUT], 0);
+}
+}
+
/**
* clutter_actor_get_text_direction:
* @self: a #ClutterActor
@@ -17616,15 +17643,9 @@ clutter_actor_clear_effects (ClutterActor *self)
gboolean
clutter_actor_has_key_focus (ClutterActor *self)
{
- ClutterActor *stage;
-
g_return_val_if_fail (CLUTTER_IS_ACTOR (self), FALSE);
- stage = _clutter_actor_get_stage_internal (self);
- if (stage == NULL)
-return FALSE;
-
- return clutter_stage_get_key_focus (CLUTTER_STAGE (stage)) == self;
+ return self->priv->has_key_focus;
}
static gboolean
diff --git a/clutter/clutter/clutter-shader-effect.c b/clutter/clutter/clutter-shader-effect.c
index a5ae1ee..c659dab 100644
--- a/clutter/clutter/clutter-shader-effect.c
+++ b/clutter/clutter
Re: [Merge] ~vanvugt/ubuntu/+source/mutter:fix-lp1847551 into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/master
Sorry, I should have had replied to the comment on IRC but I think I read it when you were already off. Anyways, we'll get more fixes all together :) -- https://code.launchpad.net/~vanvugt/ubuntu/+source/mutter/+git/mutter/+merge/374507 Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] lp:~khurshid-alam/unity-control-center/use-usd-schemas into lp:unity-control-center
The proposal to merge lp:~khurshid-alam/unity-control-center/use-usd-schemas into lp:unity-control-center has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~khurshid-alam/unity-control-center/use-usd-schemas/+merge/372174 -- Your team Unity Control Center development team is subscribed to branch lp:unity-control-center. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] lp:~khurshid-alam/unity-settings-daemon/use-usd-schemas into lp:unity-settings-daemon
Review: Needs Fixing As per comments in https://code.launchpad.net/~khurshid-alam/ubuntu/+source/ubuntu-settings/+git/ubuntu-settings/+merge/372202, update the screensaver keybinding. Diff comments: > > === added file > 'data/com.canonical.unity.settings-daemon.plugins.media-keys.gschema.xml.in.in' > --- > data/com.canonical.unity.settings-daemon.plugins.media-keys.gschema.xml.in.in > 1970-01-01 00:00:00 + > +++ > data/com.canonical.unity.settings-daemon.plugins.media-keys.gschema.xml.in.in > 2019-09-04 12:49:16 + > @@ -0,0 +1,228 @@ > + > + > + id="com.canonical.unity.settings-daemon.plugins.media-keys" > path="/com/canonical/unity/settings-daemon/plugins/media-keys/"> > + > + 0 > + Priority to use for this plugin > + Priority to use for this plugin in unity-settings-daemon > startup queue > + > + > + true > + Activation of this plugin > + Whether this plugin would be activated by > unity-settings-daemon or not > + > + > + [] > + Custom keybindings > + List of custom keybindings > + > + > + 'XF86Calculator' > + Launch calculator > + Binding to launch the calculator. > + > + > + 'XF86Tools' > + Launch settings > + Binding to launch GNOME settings. > + > + > + 'XF86Mail' > + Launch email client > + Binding to launch the email client. > + > + > + 'XF86Eject' > + Eject > + Binding to eject an optical disc. > + > + > + '' > + Launch help browser > + Binding to launch the help browser. > + > + > + 'XF86Explorer' > + Home folder > + Binding to open the Home folder. > + > + > + 'XF86AudioMedia' > + Launch media player > + Binding to launch the media player. > + > + > + 'XF86AudioNext' > + Next track > + Binding to skip to next track. > + > + > + 'XF86AudioPause' > + Pause playback > + Binding to pause playback. > + > + > + 'XF86AudioPlay' > + Play (or play/pause) > + Binding to start playback (or toggle > play/pause). > + > + > + 'Delete' > + Log out > + Binding to log out. > + > + > + 'XF86AudioPrev' > + Previous track > + Binding to skip to previous track. > + > + > + ' l' As follow up, change this to the unity's (alternative) default Ctrl+Alt+L: https://code.launchpad.net/~khurshid-alam/ubuntu/+source/ubuntu-settings/+git/ubuntu-settings/+merge/372202 > + Lock screen > + Binding to lock the screen. > + > + > + 'XF86Search' > + Search > + Binding to launch the search tool. > + > + > + 'XF86AudioStop' > + Stop playback > + Binding to stop playback. > + > + > + ' p' > + Video output > + Binding to switch the video output device. > + > + > + 'XF86AudioLowerVolume' > + Volume down > + Binding to lower the volume. > + > + > + 'XF86AudioMute' > + Volume mute/unmute > + Binding to mute/unmute the volume. > + > + > + 'XF86AudioRaiseVolume' > + Volume up > + Binding to raise the volume. > + > + > + 'XF86AudioMicMute' > + Microphone mute/unmute > + Binding to mute/unmute the microphone. > + > + > + 'Print' > + Take a screenshot > + Binding to take a screenshot. > + > + > + ' Print' > + Take a screenshot of a window > + Binding to take a screenshot of a window. > + > + > + ' Print' > + Take a screenshot of an area > + Binding to take a screenshot of an area. > + > + > + ' Print' > + Copy a screenshot to clipboard > + Binding to copy a screenshot to clipboard. > + > + > + ' Print' > + Copy a screenshot of a window to clipboard > + Binding to copy a screenshot of a window to > clipboard. > + > + > + ' Print' > + Copy a screenshot of an area to clipboard > + Binding to copy a screenshot of an area to > clipboard. > + > + > + ' R' > + Record a short video of the screen > + Binding to record a short video of the > screen > + > + > + ' t' > + Launch terminal > + Binding to launch the terminal. > + > + > + 'XF86WWW' > + Launch web browser > + Binding to launch the web browser. > + > + > + ' 8' > + Toggle magnifier > + Binding to show the screen magnifier > + > + > + ' s' > + Toggle screen reader > + Binding to start the screen reader > + > + > + '' > + Toggle on-screen keyboard > + Binding to show the on-screen keyboard > + > + > + '' > + Increase text size > + Binding to
[Merge] lp:~khurshid-alam/unity-settings-daemon/use-usd-schemas into lp:unity-settings-daemon
The proposal to merge lp:~khurshid-alam/unity-settings-daemon/use-usd-schemas into lp:unity-settings-daemon has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~khurshid-alam/unity-settings-daemon/use-usd-schemas/+merge/372154 -- Your team Unity Settings Daemon Development Team is subscribed to branch lp:unity-settings-daemon. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~khurshid-alam/ubuntu/+source/ubuntu-settings:usd-schemas into ~ubuntu-desktop/ubuntu/+source/ubuntu-settings:master
Review: Approve LGTM -- https://code.launchpad.net/~khurshid-alam/ubuntu/+source/ubuntu-settings/+git/ubuntu-settings/+merge/372202 Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/ubuntu-settings:master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] lp:~khurshid-alam/unity-control-center/use-usd-schemas into lp:unity-control-center
Review: Approve All good -- https://code.launchpad.net/~khurshid-alam/unity-control-center/use-usd-schemas/+merge/372174 Your team Unity Control Center development team is subscribed to branch lp:unity-control-center. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~khurshid-alam/ubuntu/+source/ubuntu-settings:usd-schemas into ~ubuntu-desktop/ubuntu/+source/ubuntu-settings:master
Review: Disapprove Mh, since such settings are now handled in unity schema, wouldn't be better to just remove this override from unity settings (code is now in git though, at https://code.launchpad.net/~ubuntu-desktop/ubuntu/+source/ubuntu-settings/+git/ubuntu-settings/+ref/master). So, I'd just remove this from ubuntu-settings and move it at https://code.launchpad.net/~khurshid-alam/unity-settings-daemon/use-usd-schemas/+merge/372154 -- https://code.launchpad.net/~khurshid-alam/ubuntu/+source/ubuntu-settings/+git/ubuntu-settings/+merge/372202 Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/ubuntu-settings:master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] lp:~khurshid-alam/unity-settings-daemon/use-usd-schemas into lp:unity-settings-daemon
Review: Approve -- https://code.launchpad.net/~khurshid-alam/unity-settings-daemon/use-usd-schemas/+merge/372154 Your team Unity Settings Daemon Development Team is subscribed to branch lp:unity-settings-daemon. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] lp:~khurshid-alam/unity-settings-daemon/use-usd-schemas into lp:unity-settings-daemon
Review: Approve Looks good to me, would have been nice in a further iteration to change the settings/gsettings naming to something clearer, but not a fault of this MR. -- https://code.launchpad.net/~khurshid-alam/unity-settings-daemon/use-usd-schemas/+merge/372154 Your team Unity Settings Daemon Development Team is subscribed to branch lp:unity-settings-daemon. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/ubuntu-settings:master into ~ubuntu-desktop/ubuntu/+source/ubuntu-settings:master
Marco Trevisan (Treviño) has proposed merging ~3v1n0/ubuntu/+source/ubuntu-settings:master into ~ubuntu-desktop/ubuntu/+source/ubuntu-settings:master. Requested reviews: Ubuntu Desktop (ubuntu-desktop) For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/ubuntu-settings/+git/ubuntu-settings/+merge/371500 Update settings override to reflect upstream -- Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/ubuntu-settings:master into ~ubuntu-desktop/ubuntu/+source/ubuntu-settings:master. diff --git a/debian/changelog b/debian/changelog index 0f28d26..f20e018 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +ubuntu-settings (19.04.4ubuntu1) UNRELEASED; urgency=medium + + * ubuntu-settings.override: Move enable-hot-corners to interface + + -- Marco Trevisan (Treviño) Tue, 20 Aug 2019 10:17:37 +0200 + ubuntu-settings (19.04.4) eoan; urgency=medium * ubuntu-settings.gsettings-override: diff --git a/debian/ubuntu-settings.gsettings-override b/debian/ubuntu-settings.gsettings-override index 1744687..8bd2025 100644 --- a/debian/ubuntu-settings.gsettings-override +++ b/debian/ubuntu-settings.gsettings-override @@ -63,7 +63,6 @@ logo='/usr/share/plymouth/ubuntu-logo.png' [org.gnome.shell:ubuntu] always-show-log-out = true -enable-hot-corners = false [org.gnome.desktop.background:ubuntu] show-desktop-icons = true @@ -75,6 +74,7 @@ cursor-theme = "Yaru" font-name = "Ubuntu 11" monospace-font-name = "Ubuntu Mono 13" document-font-name = "Sans 11" +enable-hot-corners = false [org.gtk.Settings.FileChooser:ubuntu] sort-directories-first = true -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/mutter:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic
Marco Trevisan (Treviño) has proposed merging
~3v1n0/ubuntu/+source/mutter:ubuntu/bionic into
~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic.
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/mutter/+git/mutter/+merge/370304
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~3v1n0/ubuntu/+source/mutter:ubuntu/bionic into
~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic.
diff --git a/debian/changelog b/debian/changelog
index a7cee5b..c2545c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,7 @@ mutter (3.28.4-0ubuntu18.04.2) bionic; urgency=medium
d/p/window-x11-Don-t-double-check-for-unmanaging-windows.patch,
d/p/window-x11-Focus-the-default-window-with-delay-while-wait.patch,
d/p/window-x11-Use-any-focusable-window-as-fallback-delayed-f.patch,
+d/p/window-x11-Focus-a-window-in-the-active-workspace-as-take.patch,
d/p/workspace-Focus-only-ancestors-that-are-focusable.patch:
- Workspace: Take-Input windows focus fixes (LP: #1791574)
* debian/libmutter-2-0.symbols: Update with new symbols
diff --git a/debian/patches/series b/debian/patches/series
index 8165334..094e978 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -20,6 +20,7 @@ window-x11-Don-t-double-check-for-unmanaging-windows.patch
window-x11-Accept-any-focusable-window-as-fallback-focus.patch
stack-Add-a-function-to-get-a-sorted-list-of-focus-candid.patch
window-x11-Use-any-focusable-window-as-fallback-delayed-f.patch
+window-x11-Focus-a-window-in-the-active-workspace-as-take.patch
lp1763892-a-renderer-native-Add-hardware-presentation-timing.patch
lp1763892-b-renderer-native-Advertise-_FEATURE_SWAP_THROTTLE.patch
debian/synaptics-support.patch
diff --git a/debian/patches/window-x11-Focus-a-window-in-the-active-workspace-as-take.patch b/debian/patches/window-x11-Focus-a-window-in-the-active-workspace-as-take.patch
new file mode 100644
index 000..7a12ac5
--- /dev/null
+++ b/debian/patches/window-x11-Focus-a-window-in-the-active-workspace-as-take.patch
@@ -0,0 +1,68 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?=
+Date: Wed, 17 Jul 2019 01:13:48 +0200
+Subject: window-x11: Focus a window in the active workspace as take-focus
+ fallback
+
+Starting with commit 2db94e2e we try to focus a fallback default focus window
+if no take-focus window candidate gets the input focus when we request it and
+we limit the focus candidates to the current window's workspace.
+
+However, if the window is unmanaging, the workspace might be unset, and we could
+end up in deferencing a NULL pointer causing a crash.
+
+So, in case the window's workspace is unset, just use the currently active
+workspace for the display.
+
+Closes https://gitlab.gnome.org/GNOME/mutter/issues/687
+
+https://gitlab.gnome.org/GNOME/mutter/merge_requests/688
+
+(cherry picked from commit 5ca0ef078d39548edda1a97e9066d44aa8f38108)
+
+Origin: https://gitlab.gnome.org/GNOME/mutter/merge_requests/688
+Applied-Upstream: 3.28.5
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1791574
+Bug-GNOME: https://gitlab.gnome.org/GNOME/mutter/issues/687
+---
+ src/x11/window-x11.c | 16 +++-
+ 1 file changed, 11 insertions(+), 5 deletions(-)
+
+diff --git a/src/x11/window-x11.c b/src/x11/window-x11.c
+index 60b121f..7ca51da 100644
+--- a/src/x11/window-x11.c
b/src/x11/window-x11.c
+@@ -834,15 +834,21 @@ meta_window_x11_maybe_focus_delayed (MetaWindow *window,
+ }
+
+ static void
+-maybe_focus_default_window (MetaWorkspace *workspace,
+-MetaWindow*not_this_one,
+-guint32timestamp)
++maybe_focus_default_window (MetaScreen *screen,
++MetaWindow *not_this_one,
++guint32 timestamp)
+ {
+- MetaStack *stack = workspace->screen->stack;
++ MetaWorkspace *workspace;
++ MetaStack *stack = screen->stack;
+ g_autoptr (GList) focusable_windows = NULL;
+ g_autoptr (GQueue) focus_candidates = NULL;
+ GList *l;
+
++ if (not_this_one && not_this_one->workspace)
++workspace = not_this_one->workspace;
++ else
++workspace = screen->active_workspace;
++
+/* Go through all the focusable windows and try to focus them
+ * in order, waiting for a delay. The first one that replies to
+ * the request (in case of take focus windows) changing the display
+@@ -936,7 +942,7 @@ meta_window_x11_focus (MetaWindow *window,
+ meta_display_focus_the_no_focus_window (window->display,
+ window->screen,
+ timestamp);
+- maybe_focus_default_window (window->workspace, window,
++ maybe_focus_default_window (window->screen, window,
+
[Merge] ~3v1n0/ubuntu/+source/mutter:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic
The proposal to merge ~3v1n0/ubuntu/+source/mutter:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic has been updated. Description changed to: Upstream cherry-picks and crash fix For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/mutter/+git/mutter/+merge/369334 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/mutter:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic
Marco Trevisan (Treviño) has proposed merging
~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic into
~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic.
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
Related bugs:
Bug #1832875 in gnome-shell (Ubuntu): "On-screen keyboard lacks several
French layouts"
https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1832875
For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/369345
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic into
~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic.
diff --git a/debian/changelog b/debian/changelog
index 1e6d367..5d4715d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gnome-shell (3.28.4-0ubuntu18.04.2) UNRELEASED; urgency=medium
+
+ * d/p/osk-layouts-Fix-French-layout.patch:
+- osk-layouts: Fix French layout (LP: #1832875)
+
+ -- Marco Trevisan (Treviño) Wed, 26 Jun 2019 17:21:31 +0200
+
gnome-shell (3.28.4-0ubuntu18.04.1) bionic; urgency=medium
* New upstream stable release
diff --git a/debian/patches/osk-layouts-Fix-French-layout.patch b/debian/patches/osk-layouts-Fix-French-layout.patch
new file mode 100644
index 000..f8175da
--- /dev/null
+++ b/debian/patches/osk-layouts-Fix-French-layout.patch
@@ -0,0 +1,827 @@
+From: =?utf-8?q?Florian_M=C3=BCllner?=
+Date: Wed, 27 Feb 2019 20:11:35 +0100
+Subject: osk-layouts: Fix French layout
+
+The script to convert XML keyboard layouts to json has a small bug
+that causes the French-Canadian layout to end up as French.
+
+https://gitlab.gnome.org/GNOME/gnome-shell/issues/997
+
+Origin: https://gitlab.gnome.org/GNOME/gnome-shell/commit/161beb71
+Bug-GNOME: https://gitlab.gnome.org/GNOME/gnome-shell/issues/997
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1832875
+Applied-Upstream: 3.28.5
+
+(cherry picked from commit 859aef78c4d2472b2545ce9ecc889c00b9893494)
+---
+ data/gnome-shell-osk-layouts.gresource.xml | 1 +
+ data/osk-layouts/ca.json | 599 +
+ data/osk-layouts/fr.json | 89 +++--
+ 3 files changed, 652 insertions(+), 37 deletions(-)
+ create mode 100644 data/osk-layouts/ca.json
+
+diff --git a/data/gnome-shell-osk-layouts.gresource.xml b/data/gnome-shell-osk-layouts.gresource.xml
+index 86d6cb9..0fab4e5 100644
+--- a/data/gnome-shell-osk-layouts.gresource.xml
b/data/gnome-shell-osk-layouts.gresource.xml
+@@ -6,6 +6,7 @@
+ be.json
+ bg.json
+ by.json
++ca.json
+ cz.json
+ de.json
+ dk.json
+diff --git a/data/osk-layouts/ca.json b/data/osk-layouts/ca.json
+new file mode 100644
+index 000..2b2bedc
+--- /dev/null
b/data/osk-layouts/ca.json
+@@ -0,0 +1,599 @@
++{
++ "levels": [
++{
++ "level": "",
++ "mode": "default",
++ "rows": [
++[
++ [
++"q"
++ ],
++ [
++"w"
++ ],
++ [
++"e",
++"é",
++"è",
++"ê",
++"ë",
++"%",
++"ę",
++"ė",
++"ē"
++ ],
++ [
++"r"
++ ],
++ [
++"t"
++ ],
++ [
++"y",
++"%",
++"ÿ"
++ ],
++ [
++"u",
++"ù",
++"û",
++"%",
++"ü",
++"ú",
++"ū"
++ ],
++ [
++"i",
++"î",
++"%",
++"ï",
++"ì",
++"í",
++"į",
++"ī"
++ ],
++ [
++"o",
++"ô",
++"œ",
++"%",
++"ö",
++"ò",
++"ó",
++"õ",
++"ø",
++"ō",
++"º"
++ ],
++ [
++"p"
++ ]
++],
++[
++ [
++"a",
++"à",
++"â",
++"%",
++"æ",
++"á",
++"ä",
++"ã",
++"å",
++"ā",
++"ª"
++ ],
++ [
++"s"
++ ],
++
[Merge] ~3v1n0/ubuntu/+source/mutter:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic
Marco Trevisan (Treviño) has proposed merging
~3v1n0/ubuntu/+source/mutter:ubuntu/bionic into
~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic.
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
Related bugs:
Bug #1791574 in gnome-shell (Ubuntu): "gnome-shell crashed with SIGABRT:
assertion failed "window->display->focus_window != window" in
meta_window_unmanage"
https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1791574
Bug #1832869 in gnome-shell (Ubuntu): "gnome-shell crashed with SIGSEGV in
g_hash_table_iter_next → meta_display_list_windows →
meta_workspace_list_windows → ffi_call_SYSV → ffi_call()"
https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1832869
For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/mutter/+git/mutter/+merge/369334
Upstream cherry-picks and crash fix
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~3v1n0/ubuntu/+source/mutter:ubuntu/bionic into
~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic.
diff --git a/debian/changelog b/debian/changelog
index 62c0624..8ab7c4c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,28 @@
+mutter (3.28.4-0ubuntu18.04.2) UNRELEASED; urgency=medium
+
+ * d/p/cogl-pipeline-Don-t-try-to-access-to-free-d-pointer-data.patch,
+d/p/cursor-renderer-native-Free-MetaCursorNativePrivate-struc.patch:
+- Fix memory errors causing tests to fail
+ * d/p/debian/skip-failing-tests-325.patch,
+d/p/debian/skip-failing-tests.patch:
+- Refreshed and enabled 'actor-pick' test as it doesn't fail anymore as
+ the errors are fixed by the patches above
+ * d/p/test-runner-Add-assert_focused-command.patch,
+d/p/test-runner-Add-dispatch-command.patch,
+d/p/test-runner-Add-sleep-command.patch,
+d/p/tests-Add-accept_focus-command-to-runner-and-client.patch,
+d/p/tests-Add-can_take_focus-command-to-runner-and-client.patch,
+d/p/tests-Verify-focused-window-in-closed-transient-tests.patch,
+d/p/tests-stacking-Add-tests-with-no-input-and-no-take-focus-.patch,
+d/p/window-x11-Focus-the-default-window-with-delay-while-wait.patch,
+d/p/workspace-Focus-only-ancestors-that-are-focusable.patch:
+- Don't crash when try to focus unfocusable windows (LP: #1791574)
+ * d/p/screen-Destroy-window-actors-after-windows-while-unmanagi.patch,
+ d/p/screen-Unset-the-active-workspace-and-remove-workspaces-o.patch:
+ - Unmanage window actors before destroying screen (LP: #1832869)
+
+ -- Marco Trevisan (Treviño) Wed, 26 Jun 2019 13:24:18 +0200
+
mutter (3.28.4-0ubuntu18.04.1) bionic; urgency=medium
* New upstream release:
diff --git a/debian/patches/cogl-pipeline-Don-t-try-to-access-to-free-d-pointer-data.patch b/debian/patches/cogl-pipeline-Don-t-try-to-access-to-free-d-pointer-data.patch
new file mode 100644
index 000..9dca63c
--- /dev/null
+++ b/debian/patches/cogl-pipeline-Don-t-try-to-access-to-free-d-pointer-data.patch
@@ -0,0 +1,46 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?=
+Date: Fri, 17 May 2019 21:35:46 +0200
+Subject: cogl/pipeline: Don't try to access to free'd pointer data
+
+When free'ing a pipeline we destroy the BigState first and then the fragment and
+vertex snippets lists using the big state pointer which is now invalid.
+This causes a crash when G_SLICE=always-malloc is set and using MALLOC_CHECK_.
+
+So, invert the operations by free'ing the snippet lists first, and the big state
+afterwards.
+
+https://gitlab.gnome.org/GNOME/mutter/merge_requests/581
+
+(cherry picked from commit 7e0d185120ea116c91a8db60276971d3fecece80)
+
+Origin: https://gitlab.gnome.org/GNOME/mutter/commit/8d936a41
+GNOME-Bug: https://gitlab.gnome.org/GNOME/mutter/merge_requests/581
+Applied-Upstream: 3.28.5
+---
+ cogl/cogl/cogl-pipeline.c | 6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/cogl/cogl/cogl-pipeline.c b/cogl/cogl/cogl-pipeline.c
+index da2d2ce..6a77cda 100644
+--- a/cogl/cogl/cogl-pipeline.c
b/cogl/cogl/cogl-pipeline.c
+@@ -492,9 +492,6 @@ _cogl_pipeline_free (CoglPipeline *pipeline)
+ _cogl_bitmask_destroy (&uniforms_state->changed_mask);
+ }
+
+- if (pipeline->differences & COGL_PIPELINE_STATE_NEEDS_BIG_STATE)
+-g_slice_free (CoglPipelineBigState, pipeline->big_state);
+-
+ if (pipeline->differences & COGL_PIPELINE_STATE_LAYERS)
+ {
+ g_list_foreach (pipeline->layer_differences,
+@@ -508,6 +505,9 @@ _cogl_pipeline_free (CoglPipeline *pipeline)
+ if (pipeline->differences & COGL_PIPELINE_STATE_FRAGMENT_SNIPPETS)
+ _cogl_pipeline_snippet_list_free (&pipeline->big_state->fragment_snippets);
+
++ if (pipeline->differences & COGL_PIPELINE_STATE_NEEDS_BIG_STATE)
++g_slice_free (CoglPipelineBigState, pipeline->big_state);
++
+ g_list_free (pipeline->deprecated_get_layers_list);
+
+ recursive
[Merge] ~3v1n0/ubuntu/+source/mutter:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic
The proposal to merge ~3v1n0/ubuntu/+source/mutter:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic has been updated. Commit message changed to: For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/mutter/+git/mutter/+merge/369334 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/mutter:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/disco into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/disco
This can be rejected since it's going to be overridden by 3.32.2 -- https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/366944 Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/disco into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/disco. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~vanvugt/ubuntu/+source/mutter:fix-lp1832138 into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic
Ouch, I still had an old kernel in my vm, updating it to standard disco worked even without this patch. -- https://code.launchpad.net/~vanvugt/ubuntu/+source/mutter/+git/mutter/+merge/369083 Your team Ubuntu Desktop is requested to review the proposed merge of ~vanvugt/ubuntu/+source/mutter:fix-lp1832138 into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~vanvugt/ubuntu/+source/mutter:fix-lp1832138 into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic
Review: Approve The workaround works for me, even in disco. So, if the kernel doesn't get updated earlier, we should land this in both disco and bionic -- https://code.launchpad.net/~vanvugt/ubuntu/+source/mutter/+git/mutter/+merge/369083 Your team Ubuntu Desktop is requested to review the proposed merge of ~vanvugt/ubuntu/+source/mutter:fix-lp1832138 into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~vanvugt/ubuntu/+source/mutter:fix-1809407-eoan into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/master
Review: Approve This LGTM -- https://code.launchpad.net/~vanvugt/ubuntu/+source/mutter/+git/mutter/+merge/368536 Your team Ubuntu Desktop is requested to review the proposed merge of ~vanvugt/ubuntu/+source/mutter:fix-1809407-eoan into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/mutter:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic
The proposal to merge ~3v1n0/ubuntu/+source/mutter:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic has been updated. Description changed to: Re-update the changelog as per upstream 3.28.4 version, not major changes a part from patches removal. I didn't added a new changelog entry as still not SRU'ed, so if we beat release team... -- I assume pristine-tar and upstream/3.28.x merged in salsa, otherwise get them from my lp repo For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/mutter/+git/mutter/+merge/367673 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/mutter:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic
Marco Trevisan (Treviño) has proposed merging
~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic into
~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic.
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/367674
Re-update the changelog as per upstream 3.28.4 version, not major changes a
part from patches removal.
I didn't added a new changelog entry as still not SRU'ed, so if we beat release
team...
--
I assume pristine-tar and upstream/3.28.x merged in salsa, otherwise get them
from my lp repo
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic into
~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic.
diff --git a/NEWS b/NEWS
index 6e2b0f9..accf3d0 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,30 @@
+3.28.4
+==
+* Fix wrong window positions in overview on wayland [Marco; #776588]
+* overview: Fix handling of confirmation dialogs on wayland [verdre; !180]
+* Avoid some full relayout/redraws [Carlos; !197]
+* Keep workspace switcher slid out when workspaces are in use [Florian; !161]
+* Cancel search on overview hiding [Marco; !205]
+* Fix disappearing network icon [Iain; #140]
+* Improve performance of app icon animations [Daniel; !253]
+* notifications: Support icon theme names in 'image-path' hint [Marco; !285]
+* Avoid focus changes when updating keyboard options [Takao; #391]
+* Fix unresponsive-app dialog blocking input in other windows [Florian; #273]
+* Fix ellipsization in dialog subtitles/bodies [Marco; !531]
+* Misc. bug fixes [Marco, Andrea, Florian, Jasper, Sam, verdre, Jonas,
+ Cosimo, Carlos; #792681, #372, !112, !162, #414, #663461, #72, #787260,
+ !188, #791233, #602, #632, !305, !286, !314, #781, #693, #618, #430, #799,
+ #783, !293, #298, #1015, #539, #1270]
+
+Contributors:
+ Jonas Ådahl, Andrea Azzarone, Cosimo Cecchi, Takao Fujiwara, Carlos Garnacho,
+ Iain Lane, Florian Müllner, Georges Basile Stavracas Neto, Jasper St. Pierre,
+ Sam Spilsbury, Ray Strode, Will Thompson, Marco Trevisan (Treviño), verdre,
+ Daniel van Vugt
+
+Translators:
+ Marek Černocký [cs]
+
3.28.3
==
* Fix lagging pointer when zoomed [Daniel; #682013]
diff --git a/debian/changelog b/debian/changelog
index 57eb92d..1e6d367 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,20 +1,21 @@
-gnome-shell (3.28.3+git20190124-0ubuntu18.04.3) bionic; urgency=medium
+gnome-shell (3.28.4-0ubuntu18.04.1) bionic; urgency=medium
+ * New upstream stable release
+- Fix ellipsization in dialog subtitles/bodies (LP: #1809788)
+- dnd: Only handle touch events in wayland (LP: #1817020)
+- windowManager: listen actively to windows being destroyed during WS switch
+ (LP: #1812527)
+- Fix unresponsive-app dialog blocking input in other windows (LP: #1740869)
+- Fix regression on missing spread animation (LP: #1827284)
+ * d/p/js-fix-invalid-access-errors.patch,
+d/p/js-ui-Choose-some-actors-to-cache-on-the-GPU.patch:
+- Refreshed
* d/p/switchMonitor-switch-to-next-config-upon-initial-keypress.patch
- Ensure switch display mode is cyclic (LP: #1772811)
* debian/control:
-- Depends on mutter 3.28.3+git20190124-0ubuntu18.04.3
- * d/p/dnd-Only-handle-touch-events-in-wayland.patch:
-- dnd: Only handle touch events in wayland (LP: #1817020)
+- Depends on mutter 3.28.4-0ubuntu18.04.1
* d/p/st-widget-Add-missing-g_return_val_if_fail.patch:
- st-widget: Protect from NULL obj in get_theme_node (LP: #1796606)
- * d/p/windowManager-listen-actively-to-windows-being-destroyed-.patch:
-- windowManager: listen actively to windows being destroyed during WS switch
- (LP: #1812527)
- * d/p/dialog-Really-set-ellipsize-mode-in-subtitle-and-body.patch:
-- Really set ellipsize mode in subtitle and body (LP: #1809788)
- * d/p/st-adjustment-Mark-all-properties-as-EXPLICIT_NOTIFY.patch:
-- Fix regression on missing spread animation (LP: #1827284)
-- Marco Trevisan (Treviño) Fri, 10 May 2019 11:43:10 +0100
diff --git a/debian/control b/debian/control
index 7b29d44..5d292d1 100644
--- a/debian/control
+++ b/debian/control
@@ -2,6 +2,7 @@
#
# Modifications should be made to debian/control.in instead.
# This file is regenerated automatically in the clean target.
+
Source: gnome-shell
Section: gnome
Priority: optional
@@ -83,7 +84,7 @@ Depends: ${gir:Depends},
gir1.2-gtk-3.0 (>= 3.16),
gir1.2-gweather-3.0,
gir1.2-ibus-1.0 (>= 1.5.2),
- gir1.2-mutter-2 (>= 3.28.3+git20190124-0ubuntu18.04.3),
+ gir1.2-mutter-2 (>= 3.28.4-0ubuntu18.04.1),
gir1.2-nm-1.0 [linux-any],
gir1.2-nma-1.0 [linux-any],
gir1.2-pango-1.0,
@@ -96,7 +97,7 @@ Depends: ${gir:Depends},
gnome-shell-common (= ${source:Version}),
ubuntu-wallpapers,
[Merge] ~3v1n0/ubuntu/+source/mutter:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic
The proposal to merge ~3v1n0/ubuntu/+source/mutter:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/mutter/+git/mutter/+merge/366676 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/mutter:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic
Marco Trevisan (Treviño) has proposed merging
~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic into
~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic.
Requested reviews:
Ubuntu Server Dev import team (usd-import-team)
Related bugs:
Bug #1827284 in gnome-shell (Ubuntu): "[regression] No window spread
animation in gnome-shell 3.28.3+git20190124"
https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1827284
For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/367149
--
Your team Ubuntu Desktop is subscribed to branch
~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic.
diff --git a/debian/changelog b/debian/changelog
index 24ac316..ab73a62 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gnome-shell (3.28.3+git20190124-0ubuntu18.04.4) UNRELEASED; urgency=medium
+
+ * d/p/st-adjustment-Mark-all-properties-as-EXPLICIT_NOTIFY.patch:
+- Fix regression on missing spread animation (LP: #1827284)
+ * Refreshed patches
+
+ -- Marco Trevisan (Treviño) Wed, 08 May 2019 14:49:43 -0500
+
gnome-shell (3.28.3+git20190124-0ubuntu18.04.3) bionic; urgency=medium
* d/p/switchMonitor-switch-to-next-config-upon-initial-keypress.patch
diff --git a/debian/patches/CVE-2019-3820-1.patch b/debian/patches/CVE-2019-3820-1.patch
index b637c27..f704252 100644
--- a/debian/patches/CVE-2019-3820-1.patch
+++ b/debian/patches/CVE-2019-3820-1.patch
@@ -1,5 +1,4 @@
-From 511e8c658445377b044c6dfb241709142c97a8ce Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Florian=20M=C3=BCllner?=
+From: =?utf-8?q?Florian_M=C3=BCllner?=
Date: Wed, 23 Jan 2019 23:55:12 +0100
Subject: [PATCH] panel: Don't allow opening hidden menus via keybindings
@@ -13,10 +12,10 @@ https://gitlab.gnome.org/GNOME/gnome-shell/issues/851
js/ui/panel.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
-Index: gnome-shell-3.28.3+git20190124/js/ui/panel.js
-===
gnome-shell-3.28.3+git20190124.orig/js/ui/panel.js
-+++ gnome-shell-3.28.3+git20190124/js/ui/panel.js
+diff --git a/js/ui/panel.js b/js/ui/panel.js
+index a76916b..85572e2 100644
+--- a/js/ui/panel.js
b/js/ui/panel.js
@@ -992,8 +992,8 @@ var Panel = new Lang.Class({
},
diff --git a/debian/patches/CVE-2019-3820-2.patch b/debian/patches/CVE-2019-3820-2.patch
index 51a8297..dc6e562 100644
--- a/debian/patches/CVE-2019-3820-2.patch
+++ b/debian/patches/CVE-2019-3820-2.patch
@@ -1,4 +1,3 @@
-From e23f4d6c7c300e579db21bb9dffeeaace6f39959 Mon Sep 17 00:00:00 2001
From: Ray Strode
Date: Wed, 23 Jan 2019 15:59:42 -0500
Subject: [PATCH] shellActionModes: disable POPUP keybindings in unlock screen
@@ -30,10 +29,10 @@ Closes https://gitlab.gnome.org/GNOME/gnome-shell/issues/851
js/ui/shellEntry.js | 6 --
3 files changed, 8 insertions(+), 4 deletions(-)
-Index: gnome-shell-3.28.3/js/gdm/authPrompt.js
-===
gnome-shell-3.28.3.orig/js/gdm/authPrompt.js
-+++ gnome-shell-3.28.3/js/gdm/authPrompt.js
+diff --git a/js/gdm/authPrompt.js b/js/gdm/authPrompt.js
+index a0a4a21..78e0454 100644
+--- a/js/gdm/authPrompt.js
b/js/gdm/authPrompt.js
@@ -11,6 +11,7 @@ const Animation = imports.ui.animation;
const Batch = imports.gdm.batch;
const GdmUtil = imports.gdm.util;
@@ -51,10 +50,10 @@ Index: gnome-shell-3.28.3/js/gdm/authPrompt.js
this.actor.add(this._entry,
{ expand: true,
-Index: gnome-shell-3.28.3/js/gdm/loginDialog.js
-===
gnome-shell-3.28.3.orig/js/gdm/loginDialog.js
-+++ gnome-shell-3.28.3/js/gdm/loginDialog.js
+diff --git a/js/gdm/loginDialog.js b/js/gdm/loginDialog.js
+index 4a93545..5ab8525 100644
+--- a/js/gdm/loginDialog.js
b/js/gdm/loginDialog.js
@@ -338,7 +338,8 @@ var SessionMenuButton = new Lang.Class({
this._button.remove_style_pseudo_class('active');
});
@@ -65,11 +64,11 @@ Index: gnome-shell-3.28.3/js/gdm/loginDialog.js
this._manager.addMenu(this._menu);
this._button.connect('clicked', () => { this._menu.toggle(); });
-Index: gnome-shell-3.28.3/js/ui/shellEntry.js
-===
gnome-shell-3.28.3.orig/js/ui/shellEntry.js
-+++ gnome-shell-3.28.3/js/ui/shellEntry.js
-@@ -9,6 +9,7 @@ const BoxPointer = imports.ui.boxpointer
+diff --git a/js/ui/shellEntry.js b/js/ui/shellEntry.js
+index 9db5136..09bb9bb 100644
+--- a/js/ui/shellEntry.js
b/js/ui/shellEntry.js
+@@ -9,6 +9,7 @@ const BoxPointer = imports.ui.boxpointer;
const Main = imports.ui.main;
const Params = imports.misc.params;
const PopupMenu = imports.ui.popupMenu;
diff --git a/debian/patches/series b/debian/patches/series
index 0cea11a..944c446 100644
--- a/debian/patches/series
+++ b/debian/patches/se
[Merge] ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master
Marco Trevisan (Treviño) has proposed merging
~3v1n0/ubuntu/+source/gnome-shell:ubuntu/master into
~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master.
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
Related bugs:
Bug #1809788 in OEM Priority Project: "Shell dialog messages are truncated
and ellipsized..."
https://bugs.launchpad.net/oem-priority/+bug/1809788
For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/366941
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~3v1n0/ubuntu/+source/gnome-shell:ubuntu/master into
~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master.
diff --git a/debian/changelog b/debian/changelog
index 53e0239..607e23e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gnome-shell (3.32.1-1ubuntu2) UNRELEASED; urgency=medium
+
+ * d/p/dialog-Really-set-ellipsize-mode-in-subtitle-and-body.patch:
+- Really set ellipsize mode in subtitle and body (LP: #1809788)
+
+ -- Marco Trevisan (Treviño) Fri, 03 May 2019 16:49:55 -0500
+
gnome-shell (3.32.1-1ubuntu1) eoan; urgency=medium
[ Marco Trevisan (Treviño) ]
diff --git a/debian/patches/dialog-Really-set-ellipsize-mode-in-subtitle-and-body.patch b/debian/patches/dialog-Really-set-ellipsize-mode-in-subtitle-and-body.patch
new file mode 100644
index 000..07395fb
--- /dev/null
+++ b/debian/patches/dialog-Really-set-ellipsize-mode-in-subtitle-and-body.patch
@@ -0,0 +1,38 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?=
+Date: Fri, 3 May 2019 15:27:13 -0500
+Subject: dialog: Really set ellipsize mode in subtitle and body
+
+Dialog's subtitle or body could not be properly wrapped, while it's ellipsized
+when the text's width doesn't exceed the container size.
+
+Clutter text has an `ellipsize` property, however in dialog's subtitle and body
+we have been setting the `ellipsize-mode` property to Pango.EllipsizeMode.NONE
+that is not present in the underlying GObject.
+
+Not being an error in javascript, gjs didn't warn us about this, while at the
+same time the St.Label's default Pango.EllipsizeMode.END was used.
+
+Fixes https://gitlab.gnome.org/GNOME/gnome-shell/issues/922
+
+https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/531
+
+Origin: https://gitlab.gnome.org/GNOME/gnome-shell/commit/3121c9aa
+Bug-Ubuntu: https://bugs.launchpad.net/oem-priority/+bug/1809788
+Applied: 3.33.1
+---
+ js/ui/dialog.js | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/js/ui/dialog.js b/js/ui/dialog.js
+index 809acff..41a0763 100644
+--- a/js/ui/dialog.js
b/js/ui/dialog.js
+@@ -175,7 +175,7 @@ var MessageDialogContent = GObject.registerClass({
+ this[`_${prop}`].add_style_class_name(`message-dialog-${prop}`);
+ });
+
+-let textProps = { ellipsize_mode: Pango.EllipsizeMode.NONE,
++let textProps = { ellipsize: Pango.EllipsizeMode.NONE,
+ line_wrap: true };
+ Object.assign(this._subtitle.clutter_text, textProps);
+ Object.assign(this._body.clutter_text, textProps);
diff --git a/debian/patches/series b/debian/patches/series
index adbf4d0..166f74b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,5 +15,6 @@ 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
magnifier-Show-cursor-when-magnifier-is-enabled-and-scale.patch
+dialog-Really-set-ellipsize-mode-in-subtitle-and-body.patch
ubuntu/search-call-XUbuntuCancel-method-on-providers-when-no-dat.patch
ubuntu/resolve_alternate_theme_path.patch
--
ubuntu-desktop mailing list
ubuntu-desktop@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~vanvugt/ubuntu/+source/mutter:fix-lp1763892-bionic into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic
Review: Approve I've merged this one in https://code.launchpad.net/~3v1n0/ubuntu/+source/mutter/+git/mutter/+merge/366676 So I guess we can close this. -- https://code.launchpad.net/~vanvugt/ubuntu/+source/mutter/+git/mutter/+merge/364362 Your team Ubuntu Desktop is requested to review the proposed merge of ~vanvugt/ubuntu/+source/mutter:fix-lp1763892-bionic into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/disco into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master
Marco Trevisan (Treviño) has proposed merging
~3v1n0/ubuntu/+source/gnome-shell:ubuntu/disco into
~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master.
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
Related bugs:
Bug #1809788 in OEM Priority Project: "Shell dialog messages are truncated
and ellipsized..."
https://bugs.launchpad.net/oem-priority/+bug/1809788
For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/366943
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~3v1n0/ubuntu/+source/gnome-shell:ubuntu/disco into
~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master.
diff --git a/debian/changelog b/debian/changelog
index 53e0239..349bd96 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+gnome-shell (3.32.1-1ubuntu1~19.04.2) UNRELEASED; urgency=medium
+
+ * d/p/dialog-Really-set-ellipsize-mode-in-subtitle-and-body.patch:
+- Really set ellipsize mode in subtitle and body (LP: #1809788)
+
+ -- Marco Trevisan (Treviño) Fri, 03 May 2019 16:49:55 -0500
+
+gnome-shell (3.32.1-1ubuntu1~19.04.1) disco; urgency=medium
+
+ * Backport from eoan to disco
+ * Update VCS metadata
+
+ -- Iain Lane Wed, 01 May 2019 11:16:07 +0100
+
gnome-shell (3.32.1-1ubuntu1) eoan; urgency=medium
[ Marco Trevisan (Treviño) ]
diff --git a/debian/control b/debian/control
index 44350fd..74a1f76 100644
--- a/debian/control
+++ b/debian/control
@@ -59,7 +59,7 @@ Standards-Version: 4.3.0
Homepage: https://wiki.gnome.org/Projects/GnomeShell
XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-shell
XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-shell.git
-Vcs-Git: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-shell
+Vcs-Git: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-shell -b ubuntu/disco
Vcs-Browser: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-shell
Package: gnome-shell
diff --git a/debian/control.in b/debian/control.in
index 7ffe4b6..cc1080c 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -55,7 +55,7 @@ Standards-Version: 4.3.0
Homepage: https://wiki.gnome.org/Projects/GnomeShell
XS-Debian-Vcs-Browser: https://salsa.debian.org/gnome-team/gnome-shell
XS-Debian-Vcs-Git: https://salsa.debian.org/gnome-team/gnome-shell.git
-Vcs-Git: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-shell
+Vcs-Git: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-shell -b ubuntu/disco
Vcs-Browser: https://git.launchpad.net/~ubuntu-desktop/ubuntu/+source/gnome-shell
Package: gnome-shell
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 117f766..d0f86d8 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,6 +1,6 @@
[DEFAULT]
pristine-tar = True
-debian-branch=ubuntu/master
+debian-branch=ubuntu/disco
upstream-branch = upstream/latest
debian-tag=ubuntu/%(version)s
upstream-vcs-tag = %(version)s
diff --git a/debian/patches/dialog-Really-set-ellipsize-mode-in-subtitle-and-body.patch b/debian/patches/dialog-Really-set-ellipsize-mode-in-subtitle-and-body.patch
new file mode 100644
index 000..8a9cf0e
--- /dev/null
+++ b/debian/patches/dialog-Really-set-ellipsize-mode-in-subtitle-and-body.patch
@@ -0,0 +1,40 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?=
+Date: Fri, 3 May 2019 15:27:13 -0500
+Subject: dialog: Really set ellipsize mode in subtitle and body
+
+Dialog's subtitle or body could not be properly wrapped, while it's ellipsized
+when the text's width doesn't exceed the container size.
+
+Clutter text has an `ellipsize` property, however in dialog's subtitle and body
+we have been setting the `ellipsize-mode` property to Pango.EllipsizeMode.NONE
+that is not present in the underlying GObject.
+
+Not being an error in javascript, gjs didn't warn us about this, while at the
+same time the St.Label's default Pango.EllipsizeMode.END was used.
+
+Fixes https://gitlab.gnome.org/GNOME/gnome-shell/issues/922
+
+https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/531
+
+(cherry picked from commit 0539efc8df23909a5396194ca780613f21bb63d8)
+
+Origin: https://gitlab.gnome.org/GNOME/gnome-shell/commit/0539efc8
+Bug-Ubuntu: https://bugs.launchpad.net/oem-priority/+bug/1809788
+Applied: 3.32.2
+---
+ js/ui/dialog.js | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/js/ui/dialog.js b/js/ui/dialog.js
+index 809acff..41a0763 100644
+--- a/js/ui/dialog.js
b/js/ui/dialog.js
+@@ -175,7 +175,7 @@ var MessageDialogContent = GObject.registerClass({
+ this[`_${prop}`].add_style_class_name(`message-dialog-${prop}`);
+ });
+
+-let textProps = { ellipsize_mode: Pango.EllipsizeMode.NONE,
++let textProps = { ellipsize: Pango.EllipsizeMode.NONE,
+ line_wrap: true };
+ Object.assign(this._subtitle.clutter_text, textProps);
+ Object.assign(this
[Merge] ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/disco into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/disco
Marco Trevisan (Treviño) has proposed merging
~3v1n0/ubuntu/+source/gnome-shell:ubuntu/disco into
~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/disco.
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
Related bugs:
Bug #1809788 in OEM Priority Project: "Shell dialog messages are truncated
and ellipsized..."
https://bugs.launchpad.net/oem-priority/+bug/1809788
For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/366944
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~3v1n0/ubuntu/+source/gnome-shell:ubuntu/disco into
~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/disco.
diff --git a/debian/changelog b/debian/changelog
index fd27385..349bd96 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gnome-shell (3.32.1-1ubuntu1~19.04.2) UNRELEASED; urgency=medium
+
+ * d/p/dialog-Really-set-ellipsize-mode-in-subtitle-and-body.patch:
+- Really set ellipsize mode in subtitle and body (LP: #1809788)
+
+ -- Marco Trevisan (Treviño) Fri, 03 May 2019 16:49:55 -0500
+
gnome-shell (3.32.1-1ubuntu1~19.04.1) disco; urgency=medium
* Backport from eoan to disco
diff --git a/debian/patches/dialog-Really-set-ellipsize-mode-in-subtitle-and-body.patch b/debian/patches/dialog-Really-set-ellipsize-mode-in-subtitle-and-body.patch
new file mode 100644
index 000..8a9cf0e
--- /dev/null
+++ b/debian/patches/dialog-Really-set-ellipsize-mode-in-subtitle-and-body.patch
@@ -0,0 +1,40 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?=
+Date: Fri, 3 May 2019 15:27:13 -0500
+Subject: dialog: Really set ellipsize mode in subtitle and body
+
+Dialog's subtitle or body could not be properly wrapped, while it's ellipsized
+when the text's width doesn't exceed the container size.
+
+Clutter text has an `ellipsize` property, however in dialog's subtitle and body
+we have been setting the `ellipsize-mode` property to Pango.EllipsizeMode.NONE
+that is not present in the underlying GObject.
+
+Not being an error in javascript, gjs didn't warn us about this, while at the
+same time the St.Label's default Pango.EllipsizeMode.END was used.
+
+Fixes https://gitlab.gnome.org/GNOME/gnome-shell/issues/922
+
+https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/531
+
+(cherry picked from commit 0539efc8df23909a5396194ca780613f21bb63d8)
+
+Origin: https://gitlab.gnome.org/GNOME/gnome-shell/commit/0539efc8
+Bug-Ubuntu: https://bugs.launchpad.net/oem-priority/+bug/1809788
+Applied: 3.32.2
+---
+ js/ui/dialog.js | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/js/ui/dialog.js b/js/ui/dialog.js
+index 809acff..41a0763 100644
+--- a/js/ui/dialog.js
b/js/ui/dialog.js
+@@ -175,7 +175,7 @@ var MessageDialogContent = GObject.registerClass({
+ this[`_${prop}`].add_style_class_name(`message-dialog-${prop}`);
+ });
+
+-let textProps = { ellipsize_mode: Pango.EllipsizeMode.NONE,
++let textProps = { ellipsize: Pango.EllipsizeMode.NONE,
+ line_wrap: true };
+ Object.assign(this._subtitle.clutter_text, textProps);
+ Object.assign(this._body.clutter_text, textProps);
diff --git a/debian/patches/series b/debian/patches/series
index adbf4d0..166f74b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,5 +15,6 @@ 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
magnifier-Show-cursor-when-magnifier-is-enabled-and-scale.patch
+dialog-Really-set-ellipsize-mode-in-subtitle-and-body.patch
ubuntu/search-call-XUbuntuCancel-method-on-providers-when-no-dat.patch
ubuntu/resolve_alternate_theme_path.patch
--
ubuntu-desktop mailing list
ubuntu-desktop@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~vanvugt/ubuntu/+source/mutter:fix-lp1763892-bionic into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic
See the inline diff for the added-symbol. I'd like to have a SRU upload without it since we don't need to use anywhere else Diff comments: > diff --git a/debian/libmutter-2-0.symbols b/debian/libmutter-2-0.symbols > index 1489074..89b3d01 100644 > --- a/debian/libmutter-2-0.symbols > +++ b/debian/libmutter-2-0.symbols > @@ -549,6 +549,7 @@ libmutter-2.so.0 libmutter-2-0 #MINVER# > meta_gpu_kms_error_quark@Base 3.28.2 > meta_gpu_kms_flip_closure_container_free@Base 3.28.3+git20190124 > meta_gpu_kms_flip_crtc@Base 3.28.2 > + meta_gpu_kms_get_current_time_ns@Base 3.28.3+git20190124-0ubuntu18.04.3 Mhmmh, the fact we've a new symbol would probably be seen as packaging level as something would need an ABI bump... So, since this symbol isn't used anyway, couldn't maybe just make sure this is hidden and not exported (adding some inline things or maybe is just fine to rename is with a leading '_' for this branch)? > meta_gpu_kms_get_fd@Base 3.28.2 > meta_gpu_kms_get_file_path@Base 3.28.2 > meta_gpu_kms_get_max_buffer_size@Base 3.28.2 -- https://code.launchpad.net/~vanvugt/ubuntu/+source/mutter/+git/mutter/+merge/364362 Your team Ubuntu Desktop is requested to review the proposed merge of ~vanvugt/ubuntu/+source/mutter:fix-lp1763892-bionic into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~vanvugt/ubuntu/+source/mutter:fix-lp1763892-bionic into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic
Diff comments: > diff --git a/debian/libmutter-2-0.symbols b/debian/libmutter-2-0.symbols > index 1489074..89b3d01 100644 > --- a/debian/libmutter-2-0.symbols > +++ b/debian/libmutter-2-0.symbols > @@ -549,6 +549,7 @@ libmutter-2.so.0 libmutter-2-0 #MINVER# > meta_gpu_kms_error_quark@Base 3.28.2 > meta_gpu_kms_flip_closure_container_free@Base 3.28.3+git20190124 > meta_gpu_kms_flip_crtc@Base 3.28.2 > + meta_gpu_kms_get_current_time_ns@Base 3.28.3+git20190124-0ubuntu18.04.3 I'm saying that the symbol isn't used outside of mutter (i.e. by the shell), that's why I was saying that could be just not exported. Although could not be a problem either, but was to make the SRU review faster. The symbol version is indeed fine. > meta_gpu_kms_get_fd@Base 3.28.2 > meta_gpu_kms_get_file_path@Base 3.28.2 > meta_gpu_kms_get_max_buffer_size@Base 3.28.2 -- https://code.launchpad.net/~vanvugt/ubuntu/+source/mutter/+git/mutter/+merge/364362 Your team Ubuntu Desktop is requested to review the proposed merge of ~vanvugt/ubuntu/+source/mutter:fix-lp1763892-bionic into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic
Well, I've rebased this. So we can reuse the same PR. This depends on https://code.launchpad.net/~3v1n0/ubuntu/+source/mutter/+git/mutter/+merge/366676 -- https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/362055 Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master
Marco Trevisan (Treviño) has proposed merging
~3v1n0/ubuntu/+source/gnome-shell:ubuntu/master into
~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master.
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
Related bugs:
Bug #1822846 in gnome-shell (Ubuntu): "Icon disappears from favorites in
gnome-shell 3.32 (upstream dock, not the ubuntu-dock)"
https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1822846
Bug #1826176 in gnome-shell (Ubuntu): "Applications do not receive focus in
Wayland sessions"
https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1826176
Bug #1826936 in gnome-shell (Ubuntu): "Upgrade to 3.32.1 and SRU it"
https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1826936
For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/38
Update to 3.32.1
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~3v1n0/ubuntu/+source/gnome-shell:ubuntu/master into
~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master.
diff --git a/NEWS b/NEWS
index a86e5e4..fcfa060 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,34 @@
+3.32.1
+==
+* Fix avatar scaling on login screen [Florian; #1024]
+* Fix distortion of desktop zoom [Florian; #646]
+* Fix mouse cursor visibility when using desktop zoom [Florian, Marco; #1020]
+* Fix screen dimming after wake-up on lock screen [Xiaoguang; #900]
+* Fix Alt+Esc switcher [Florian; #1064]
+* Respect struts for popover placement [Andrea; #1102]
+* Fix app icons updates after theme changes [Florian; #1117]
+* Fix desktop zoom after resolution changes [Marco; #1120]
+* Implement stick-to-finger workspace switch overview gestures [Florian; #516]
+* Make World Clocks offsets relative to local time [Florian; #1157]
+* Fix top app icon disappearing from dash [Florian; #1053]
+* Update switch style to match new Adwaita [Jakub; !496]
+* Ensure CSS units are pixel-aligned when scaling is used [Carlos; #91]
+* Misc. bug fixes and cleanups [Florian, Jakub, Robert, Alex, Carlos, Phil,
+ Marco, Benjamin, AsciiWolf, Ray, verdre; !444, #1016, #1018, !449, #1036,
+ !455, #1094, !440, #1023, #624, #1017, !476, !473, !480, #1130, !485, !481,
+ !490, !489, #1151, !435, #1160, !482, #1150, #1166, !384]
+
+Contributors:
+ AsciiWolf, Andrea Azzarone, Benjamin Berg, Carlos Garnacho, Victor Ibragimov,
+ Robert Mader, Alex Monday, Florian Müllner, Jakub Steiner, Ray Strode,
+ Marco Trevisan (Treviño), verdre, Xiaoguang Wang, Phil Wyett
+
+Translators:
+ Victor Ibragimov [tg, af, et, ja], Bruce Cowan [en_GB], Piotr Drąg [tg],
+ Charles Monzat [fr], Khaled Hosny [ar], Goran Vidović [hr],
+ Cheng-Chia Tseng [zh_TW], Carmen Bianca BAKKER [eo], Daniel Mustieles [es],
+ Dušan Kazik [sk]
+
3.32.0
==
* Fix sizing issues in on-screen-keyboard emoji panel [Carlos; !439]
diff --git a/data/dbus-interfaces/org.gnome.Shell.xml b/data/dbus-interfaces/org.gnome.Shell.xml
index 1fef302..094c294 100644
--- a/data/dbus-interfaces/org.gnome.Shell.xml
+++ b/data/dbus-interfaces/org.gnome.Shell.xml
@@ -9,9 +9,6 @@
-
-
-
diff --git a/data/gnome-shell-theme.gresource.xml b/data/gnome-shell-theme.gresource.xml
index b778254..c05be6b 100644
--- a/data/gnome-shell-theme.gresource.xml
+++ b/data/gnome-shell-theme.gresource.xml
@@ -21,10 +21,8 @@
noise-texture.png
pad-osd.css
process-working.svg
-toggle-off-us.svg
toggle-off-intl.svg
toggle-off-hc.svg
-toggle-on-us.svg
toggle-on-intl.svg
toggle-on-hc.svg
diff --git a/data/theme/gnome-shell-sass/_common.scss b/data/theme/gnome-shell-sass/_common.scss
index c7485ae..a6357ba 100644
--- a/data/theme/gnome-shell-sass/_common.scss
+++ b/data/theme/gnome-shell-sass/_common.scss
@@ -157,18 +157,13 @@ StScrollBar {
/* Switches */
.toggle-switch {
- width: 65px;
+ width: 46px;
height: 22px;
background-size: contain;
+ background-image: url("resource:///org/gnome/shell/theme/toggle-off-intl.svg");
+ &:checked { background-image: url("resource:///org/gnome/shell/theme/toggle-on-intl.svg"); }
}
- @each $v in us, intl {
-.toggle-switch-#{$v} {
- background-image: url("resource:///org/gnome/shell/theme/toggle-off-#{$v}.svg");
- &:checked { background-image: url("resource:///org/gnome/shell/theme/toggle-on-#{$v}.svg"); }
-}
- }
-
/* links */
.shell-link {
color: $link_color;
@@ -1142,6 +1137,12 @@ StScrollBar {
.ripple-box:rtl { border-radius: 0 0 0 52px; } // just a simple change to the border radius position
+// Rubberband for select-area screenshots
+.select-area-rubberband {
+ background-color: transparentize($selected_bg_color,0.7);
+ border: 1px solid $selected_bg_color;
+}
+
// not really top bar only
.popup-menu-arrow { icon-size: 1.09em; }
.popup-menu-icon { icon-size: 1.09em; }
diff --git a/data/theme/toggle-off-intl.svg b
[Merge] ~3v1n0/ubuntu/+source/mutter:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic
Marco Trevisan (Treviño) has proposed merging
~3v1n0/ubuntu/+source/mutter:ubuntu/bionic into
~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic.
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
Related bugs:
Bug #1772811 in gnome-shell (Ubuntu): "[SRU] different behaviors for switch
display mode between xenial and bionic"
https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1772811
For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/mutter/+git/mutter/+merge/366676
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~3v1n0/ubuntu/+source/mutter:ubuntu/bionic into
~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic.
diff --git a/debian/changelog b/debian/changelog
index 99219d6..76d6803 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mutter (3.28.3+git20190124-0ubuntu18.04.3) bionic; urgency=medium
+
+ * d/p/monitor-manager-Don-t-use-switch-config-when-ensuring-con.patch,
+d/p/monitor-manager-use-MonitorsConfig-to-track-switch_config.patch:
+- Ensure switch display mode is cyclic (LP: #1772811)
+
+ -- Marco Trevisan (Treviño) Mon, 29 Apr 2019 23:29:24 -0500
+
mutter (3.28.3+git20190124-0ubuntu18.04.2) bionic; urgency=medium
* control: Add Breaks on budgie-desktop verions broken by this upload.
diff --git a/debian/patches/monitor-manager-Don-t-use-switch-config-when-ensuring-con.patch b/debian/patches/monitor-manager-Don-t-use-switch-config-when-ensuring-con.patch
new file mode 100644
index 000..b8d12d5
--- /dev/null
+++ b/debian/patches/monitor-manager-Don-t-use-switch-config-when-ensuring-con.patch
@@ -0,0 +1,37 @@
+From: =?utf-8?q?Jonas_=C3=85dahl?=
+Date: Thu, 11 Oct 2018 15:16:26 +0200
+Subject: monitor-manager: Don't use switch-config when ensuring configuration
+
+Switch-configs are only to be used in certain circumstances (see
+meta_monitor_manager_can_switch_config()) so when ensuring
+configuration and attempting to create a linear configuration, use the
+linear configuration constructor function directly without going via the
+switch config method, otherwise we might incorrectly fall back to the
+fallback configuration (only enable primary monitor).
+
+This is a regression introduced by 6267732bec97773.
+
+Fixes: https://gitlab.gnome.org/GNOME/mutter/issues/342
+
+Ubuntu-Bug: https://bugs.launchpad.net/ubuntu/+source/mutter/+bug/1772811
+Origin: https://gitlab.gnome.org/GNOME/mutter/merge_requests/262
+Applied-Upstream: yes, 3.32.0
+---
+ src/backends/meta-monitor-manager.c | 4 +---
+ 1 file changed, 1 insertion(+), 3 deletions(-)
+
+diff --git a/src/backends/meta-monitor-manager.c b/src/backends/meta-monitor-manager.c
+index 96d794a..fecbfda 100644
+--- a/src/backends/meta-monitor-manager.c
b/src/backends/meta-monitor-manager.c
+@@ -582,9 +582,7 @@ meta_monitor_manager_ensure_configured (MetaMonitorManager *manager)
+ g_clear_object (&config);
+ }
+
+- config =
+-meta_monitor_config_manager_create_for_switch_config (manager->config_manager,
+- META_MONITOR_SWITCH_CONFIG_ALL_LINEAR);
++ config = meta_monitor_config_manager_create_linear (manager->config_manager);
+ if (config)
+ {
+ if (!meta_monitor_manager_apply_monitors_config (manager,
diff --git a/debian/patches/monitor-manager-use-MonitorsConfig-to-track-switch_config.patch b/debian/patches/monitor-manager-use-MonitorsConfig-to-track-switch_config.patch
new file mode 100644
index 000..780ba05
--- /dev/null
+++ b/debian/patches/monitor-manager-use-MonitorsConfig-to-track-switch_config.patch
@@ -0,0 +1,198 @@
+From: Daniel Drake
+Date: Thu, 30 Aug 2018 08:34:53 +0800
+Subject: monitor-manager: use MonitorsConfig to track switch_config
+
+When constructing MetaMonitorsConfig objects, store which type
+of switch_config they are for (or UNKNOWN if it is not such
+type of config).
+
+Stop unconditionally setting current_switch_config to UNKNOWN when
+handling monitors changed events. Instead, set it to the switch_config
+type stored in the MonitorsConfig in the codepath that updates logical
+state. In addition to being called in the hotplug case along the same
+code flow that generates monitors changed events, this is also called
+in the coldplug case where a secondary monitor was connected before
+mutter was started.
+
+When creating the default linear display config, create it as a
+switch_config so that internal state gets updated to represent
+linear mode when this config is used.
+
+The previous behaviour of unconditionally resetting current_switch_config
+to UNKNOWN was breaking the internal state machine for display config
+switching, causing misbehaviour in gnome-shell's switchMonitor UI when
+using display switch hotkeys. The lack of internal tracking when the
+displays are already in the default "Join Displays" linear mode was
+then causing the first display switch hotkey press to do nothing
+(i
[Merge] ~3v1n0/ubuntu/+source/mutter:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/master
Marco Trevisan (Treviño) has proposed merging
~3v1n0/ubuntu/+source/mutter:ubuntu/master into
~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/master.
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
Related bugs:
Bug #1826176 in gnome-shell (Ubuntu): "Applications do not receive focus in
Wayland sessions"
https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1826176
Bug #1826182 in mutter (Ubuntu): "[DisplayLink][fixed upstream] GNOME
libmutter crash on hotplugging a dock with a monitor"
https://bugs.launchpad.net/ubuntu/+source/mutter/+bug/1826182
Bug #1826933 in gnome-shell (Ubuntu): "gnome-shell crashes in
meta_monitor_mode_get_resolution -> calculate_scale ->
meta_monitor_calculate_mode_scale derive_calculated_global_scale ->
meta_monitor_manager_rebuild_logical_monitors_derived"
https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1826933
Bug #1826936 in gnome-shell (Ubuntu): "Upgrade to 3.32.1 and SRU it"
https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1826936
For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/mutter/+git/mutter/+merge/36
Merge 3.32 with debian, fix scale computation crash.
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~3v1n0/ubuntu/+source/mutter:ubuntu/master into
~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/master.
diff --git a/NEWS b/NEWS
index 720e28d..5606ee4 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,33 @@
+3.32.1
+==
+* Fix fallback app menu on wayland [Florian; #493]
+* Fix elogind support [Tom; !491]
+* Fix startup notifications not timing out [Carlos; #501]
+* Fix keyboard accessibility toggle from keys
+ [Olivier, Carlos; !501, #529, !531]
+* Fix touchscreen input on rotated displays [Carlos; #514]
+* Work around hangul text input bug [Carlos; #1365]
+* Fix blurry wallpaper scaling [Daniel; !505]
+* Fix placement of window menu when using fractional scaling [Jan; #527]
+* Fix repaint issues of offscreen effects on secondary monitors [Daniel; !511]
+* Fix windows not getting focus after launch [Daniel; #505]
+* Properly advertise support for 'underscan' property [Jonas; !507]
+* Improve power-saving handling [Jonas; !506]
+* Fix moving windows by super+touch [Jonas D.; !495]
+* Misc. bug fixes and cleanups [Benjamin, Florian, Adam, Marco, Pablo,
+ Erik, Jonas, Heiher, Pekka, Daniel, Olivier, Carlos; !478, !475, !480,
+ !482, #490, !488, #491, #480, !477, !496, !492, !485, !515, !519, !521,
+ !216, !538, #541, #523]
+
+Contributors:
+ Jonas Ådahl, Pablo Barciela, Benjamin Berg, Tom Briden, Jonas Dreßler,
+ Olivier Fourdan, Carlos Garnacho, Jan Alexander Steffens (heftig), Heiher,
+ Adam Jackson, Erik Kurzinger, Florian Müllner, Pekka Paalanen,
+ Marco Trevisan (Treviño), Daniel van Vugt
+
+Translators:
+ Khaled Hosny [ar], Goran Vidović [hr], Daniel Mustieles [es]
+
3.32.0
==
* Fix deadlock when cancelling a theme sound [Andrea; !474]
diff --git a/clutter/clutter/clutter-device-manager.c b/clutter/clutter/clutter-device-manager.c
index 1800d01..c676384 100644
--- a/clutter/clutter/clutter-device-manager.c
+++ b/clutter/clutter/clutter-device-manager.c
@@ -550,13 +550,7 @@ static gboolean
are_kbd_a11y_settings_equal (ClutterKbdA11ySettings *a,
ClutterKbdA11ySettings *b)
{
- return (a->controls == b->controls &&
- a->slowkeys_delay == b->slowkeys_delay &&
- a->debounce_delay == b->debounce_delay &&
- a->timeout_delay == b->timeout_delay &&
- a->mousekeys_init_delay == b->mousekeys_init_delay &&
- a->mousekeys_max_speed == b->mousekeys_max_speed &&
- a->mousekeys_accel_time == b->mousekeys_accel_time);
+ return (memcmp (a, b, sizeof (ClutterKbdA11ySettings)) == 0);
}
void
diff --git a/clutter/clutter/evdev/clutter-input-device-evdev.c b/clutter/clutter/evdev/clutter-input-device-evdev.c
index b52689e..2ac2e11 100644
--- a/clutter/clutter/evdev/clutter-input-device-evdev.c
+++ b/clutter/clutter/evdev/clutter-input-device-evdev.c
@@ -1132,13 +1132,13 @@ clutter_input_device_evdev_process_kbd_a11y_event (ClutterEvent *e
if (event->key.flags & CLUTTER_EVENT_FLAG_INPUT_METHOD)
goto emit_event;
- if (!(device_evdev->a11y_flags & CLUTTER_A11Y_KEYBOARD_ENABLED))
-goto emit_event;
-
- if (event->type == CLUTTER_KEY_PRESS)
-handle_enablekeys_press (event, device_evdev);
- else
-handle_enablekeys_release (event, device_evdev);
+ if (device_evdev->a11y_flags & CLUTTER_A11Y_KEYBOARD_ENABLED)
+{
+ if (event->type == CLUTTER_KEY_PRESS)
+handle_enablekeys_press (event, device_evdev);
+ else
+handle_enablekeys_release (event, device_evdev);
+}
if (device_evdev->a11y_flags & CLUTTER_A11Y_MOUSE_KEYS_ENABLED)
{
diff --git a/
Re: [Merge] ~gunnarhj/ubuntu/+source/mutter:translation-fix into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/master
Review: Approve LGTM -- https://code.launchpad.net/~gunnarhj/ubuntu/+source/mutter/+git/mutter/+merge/365971 Your team Ubuntu Desktop is requested to review the proposed merge of ~gunnarhj/ubuntu/+source/mutter:translation-fix into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/mutter:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/master
The proposal to merge ~3v1n0/ubuntu/+source/mutter:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/master has been updated. Description changed to: Prepared packages at https://bileto.ubuntu.com/#/ticket/3699 For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/mutter/+git/mutter/+merge/365833 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/mutter:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master
The proposal to merge ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master has been updated. Description changed to: Prepared packages at https://bileto.ubuntu.com/#/ticket/3699 As per theme changes, yaru isn't affected by neither https://gitlab.gnome.org/GNOME/gnome-shell/issues/1036 and https://gitlab.gnome.org/GNOME/gnome-shell/issues/1016 (which the relevant changes touch) For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/365834 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/master 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-shell:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master
> Diff 18486 lines (+4062/-3431) > > Are you sure that's correct? Got the right branch? Yep, it's just that this contains both upstream and downstream diffs. To be sure just do `git diff de6512 marco/ubuntu/master --stat` or `git diff salsa/debian/master marco/ubuntu/master` (assuming your remote for lp:~3v1n0/ubuntu/+source/gnome-shell is called marco, and you've the salsa one too) To save you to do this: $ git diff de6512 ubuntu/master --stat .gitignore | 83 - .gitlab-ci.yml | 86 - .gitlab-ci/Dockerfile | 19 - .gitlab-ci/Dockerfile.extension-ci | 18 - .gitlab-ci/check-commit-log.sh | 31 - .gitlab-ci/checkout-mutter.sh | 31 - .gitmodules|3 - debian/README.Ubuntu | 61 + debian/changelog | 4130 debian/control | 149 + debian/control.in | 145 + debian/copyright | 52 + debian/gbp.conf| 18 + debian/gnome-shell-common.dirs |1 + debian/gnome-shell-common.install | 10 + debian/gnome-shell-common.postinst | 10 + debian/gnome-shell-common.preinst | 12 + debian/gnome-shell-common.prerm| 12 + debian/gnome-shell.docs|2 + debian/gnome-shell.gsettings-override |2 + debian/gnome-shell.install |7 + debian/gnome-shell.lintian-overrides |6 + debian/gnome-shell.postinst| 18 + ...e-possible-to-set-debug-flags-dynamically.patch | 238 ++ ...ursor-when-magnifier-is-enabled-and-scale.patch | 172 + ...d-backtrace-crashes-all-and-backtrace-all.patch | 47 + ...e-granularity-of-backtraces-in-SHELL_DEBU.patch | 170 + ...how-an-error-message-on-gnome-shell-crash.patch | 30 + debian/patches/optional-hot-corner.patch | 60 + debian/patches/series | 19 + ...Mode-add-support-for-debugFlags-parameter.patch | 42 + ...Handle-the-case-where-scrollbars-are-NULL.patch | 38 + ...w-Remove-scrollbars-references-on-dispose.patch | 33 + ...dlers-on-target-and-remove-them-on-destro.patch | 103 + debian/patches/ubuntu/background_login.patch | 58 + .../ubuntu/block_mode_extension_update.patch | 118 + debian/patches/ubuntu/desktop_detect.patch | 85 + debian/patches/ubuntu/gdm_alternatives.patch | 24 + debian/patches/ubuntu/lightdm-user-switching.patch | 80 + debian/patches/ubuntu/lock_on_suspend.patch| 48 + .../ubuntu/resolve_alternate_theme_path.patch | 50 + ...ntuCancel-method-on-providers-when-no-dat.patch | 167 + .../volume-Add-back-sound-feedback-on-scroll.patch | 111 + debian/rules | 41 + debian/shlibs.local|1 + debian/source/format |1 + debian/source_gnome-shell.py | 27 + debian/ubuntu-session-mods/ubuntu.json |6 + debian/watch |3 + subprojects/gvc|1 - subprojects/gvc/Makefile.am| 64 + subprojects/gvc/Makefile.tests | 43 + subprojects/gvc/README.md | 12 + subprojects/gvc/gvc-channel-map-private.h | 39 + subprojects/gvc/gvc-channel-map.c | 247 ++ subprojects/gvc/gvc-channel-map.h | 73 + subprojects/gvc/gvc-mixer-card-private.h | 35 + subprojects/gvc/gvc-mixer-card.c | 575 +++ subprojects/gvc/gvc-mixer-card.h | 102 + subprojects/gvc/gvc-mixer-control-private.h| 35 + subprojects/gvc/gvc-mixer-control.c| 3740 ++ subprojects/gvc/gvc-mixer-control.h| 155 + subprojects/gvc/gvc-mixer-event-role.c | 228 ++ subprojects/gvc/gvc-mixer-event-role.h | 57 + subprojects/gvc/gvc-mixer-sink-input.c | 159 + subprojects/gvc/gvc-mixer-sink-input.h | 57 + subprojects/gvc/gvc-mixer-sink.c | 189 + subprojects/gvc/gvc-mixer-sink.h | 57 + subprojects/gvc/gvc-mixer-source-output.c | 160 + subprojects/gvc/gvc-mixer-source-output.h | 57 + subprojects/gvc/gvc-mixer-source.c | 189 + subprojects/gvc/gvc-mixer-source.h | 57 + subprojects/gvc/gvc-mixer-stream-private.h | 34 + subprojects/gvc/gvc-mixer-stream.c
Re: [Merge] ~3v1n0/ubuntu/+source/mutter:ubuntu/xrandr-scaling into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/master
> The fix for bug 1822616 isn't working yet, at least: > > https://bugs.launchpad.net/ubuntu/+source/budgie- > desktop/+bug/1822616/comments/11 This was also the check I wanted to add, but before I wanted to be sure we rebuilt all the monitor modes. Anyways, I've added this further check too, so it's now all fine. -- https://code.launchpad.net/~3v1n0/ubuntu/+source/mutter/+git/mutter/+merge/365624 Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/mutter:ubuntu/xrandr-scaling into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/mutter:ubuntu/xrandr-scaling into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/master
Marco Trevisan (Treviño) has proposed merging ~3v1n0/ubuntu/+source/mutter:ubuntu/xrandr-scaling into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/master. Requested reviews: Ubuntu Desktop (ubuntu-desktop) Related bugs: Bug #1822616 in budgie-desktop (Ubuntu): "[regression][nvidia] gnome-shell/budgie-wm crashed with SIGABRT "assertion failed: (width > 0 && height > 0 && scale > 0)" in meta_monitor_manager_xrandr_update_screen_size" https://bugs.launchpad.net/ubuntu/+source/budgie-desktop/+bug/1822616 Bug #1823485 in mutter (Ubuntu): "X11: switching integer scaling values when fractional is enabled doesn't always work" https://bugs.launchpad.net/ubuntu/+source/mutter/+bug/1823485 For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/mutter/+git/mutter/+merge/365624 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/mutter:ubuntu/xrandr-scaling into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/master. diff --git a/debian/changelog b/debian/changelog index 67c17c0..f60a939 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,10 @@ mutter (3.32.0-1ubuntu2) UNRELEASED; urgency=medium * debian/patches/x11-Add-support-for-fractional-scaling-using-Randr.patch: - Don't invert the screen size when rotation is enabled (LP: #1822513) - Remove unneeded cleanup changes +- Update screen size only after monitors modes have been derived + (LP: #1822616) +- Trigger a monitors rebuild only if scale has changed (LP: #1823485) +- Only update UI scaling when output scaling is enabled (LP: #1822478) -- Marco Trevisan (Treviño) Wed, 03 Apr 2019 19:19:59 -0400 diff --git a/debian/patches/x11-Add-support-for-fractional-scaling-using-Randr.patch b/debian/patches/x11-Add-support-for-fractional-scaling-using-Randr.patch index ea6c35f..28df9a3 100644 --- a/debian/patches/x11-Add-support-for-fractional-scaling-using-Randr.patch +++ b/debian/patches/x11-Add-support-for-fractional-scaling-using-Randr.patch @@ -5,7 +5,6 @@ MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit -commit ed760c44b1998fc5fadde18186c51e74525038cc Author: Marco Trevisan (Treviño) Date: Wed Apr 3 18:57:28 2019 -0400 @@ -19,31 +18,31 @@ Forwarded: No, forwarding is in progress and planned though data/org.gnome.mutter.gschema.xml.in | 5 + data/org.gnome.mutter.x11.gschema.xml.in | 30 ++ src/backends/meta-crtc.h | 1 + - src/backends/meta-monitor-config-manager.c | 150 +- + src/backends/meta-monitor-config-manager.c | 150 +++- src/backends/meta-monitor-config-migration.c | 15 +- src/backends/meta-monitor-config-store.c | 1 + src/backends/meta-monitor-manager-dummy.c | 24 +- - src/backends/meta-monitor-manager-private.h| 28 +- - src/backends/meta-monitor-manager.c| 349 ++--- - src/backends/meta-monitor.c| 60 ++-- + src/backends/meta-monitor-manager-private.h| 34 +- + src/backends/meta-monitor-manager.c| 353 -- + src/backends/meta-monitor.c| 60 +-- src/backends/meta-monitor.h| 6 +- src/backends/meta-settings-private.h | 9 + - src/backends/meta-settings.c | 76 - + src/backends/meta-settings.c | 76 +++- src/backends/native/meta-monitor-manager-kms.c | 44 ++- - src/backends/x11/meta-crtc-xrandr.c| 87 +- + src/backends/x11/meta-crtc-xrandr.c| 87 - src/backends/x11/meta-crtc-xrandr.h| 13 +- - src/backends/x11/meta-gpu-xrandr.c | 89 +- + src/backends/x11/meta-gpu-xrandr.c | 89 - src/backends/x11/meta-gpu-xrandr.h | 4 + - src/backends/x11/meta-monitor-manager-xrandr.c | 399 + + src/backends/x11/meta-monitor-manager-xrandr.c | 493 ++--- src/backends/x11/meta-monitor-manager-xrandr.h | 4 +- src/backends/x11/meta-output-xrandr.c | 5 +- - src/compositor/compositor.c| 54 + src/compositor/compositor.c| 54 +++ src/core/boxes-private.h | 4 + src/core/boxes.c | 21 ++ - src/core/window.c | 19 ++ + src/core/window.c | 19 + src/org.gnome.Mutter.DisplayConfig.xml | 5 + src/tests/meta-monitor-manager-test.c | 14 +- - 28 files changed, 1269 insertions(+), 254 deletions(-) + 28 files changed, 1367 insertions(+), 260 deletions(-) create mode 100644 data/org.gnome.mutter.x11.gschema.xml.in diff --git a/data/meson.build b/data/meson.build @@ -630,7 +629,7 @@ index 46c3b8c..29fde36 100644 settings,
[Merge] ~3v1n0/ubuntu/+source/gnome-control-center:ubuntu/xrandr-scaling into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master
Marco Trevisan (Treviño) has proposed merging
~3v1n0/ubuntu/+source/gnome-control-center:ubuntu/xrandr-scaling into
~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master.
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
Related bugs:
Bug #1823488 in gnome-control-center (Ubuntu): "X11: When fractional-scaling
is enabled switching to single to multi-monitor leads to un-appliable config"
https://bugs.launchpad.net/ubuntu/+source/gnome-control-center/+bug/1823488
For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-control-center/+git/gnome-control-center/+merge/365623
Fixed initial disposition when switching from one to multiple monitors (and one
is scaled)
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~3v1n0/ubuntu/+source/gnome-control-center:ubuntu/xrandr-scaling into
~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master.
diff --git a/debian/changelog b/debian/changelog
index f1d9438..92f7eb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gnome-control-center (1:3.32.1-1ubuntu2) UNRELEASED; urgency=medium
+
+ * debian/patches/display-Support-UI-scaled-logical-monitor-mode.patch:
+- Take care of global UI scaled logical monitors width (LP: #1823488)
+
+ -- Marco Trevisan (Treviño) Sat, 06 Apr 2019 15:43:01 -0400
+
gnome-control-center (1:3.32.1-1ubuntu1) disco; urgency=medium
* New upstream stable version, based on the Debian update
diff --git a/debian/patches/display-Support-UI-scaled-logical-monitor-mode.patch b/debian/patches/display-Support-UI-scaled-logical-monitor-mode.patch
index d97584f..db6d4b6 100644
--- a/debian/patches/display-Support-UI-scaled-logical-monitor-mode.patch
+++ b/debian/patches/display-Support-UI-scaled-logical-monitor-mode.patch
@@ -10,16 +10,16 @@ Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/mutter/+bug/1820850
Forwarded: No, MPs will follow shortly
---
panels/display/cc-display-arrangement.c | 45 +
- panels/display/cc-display-config-dbus.c | 16 +---
+ panels/display/cc-display-config-dbus.c | 41 +++---
panels/display/cc-display-config.c | 6 +
panels/display/cc-display-config.h | 2 ++
- 4 files changed, 61 insertions(+), 8 deletions(-)
+ 4 files changed, 86 insertions(+), 8 deletions(-)
-Index: gnome-control-center-3.32.1/panels/display/cc-display-arrangement.c
-===
gnome-control-center-3.32.1.orig/panels/display/cc-display-arrangement.c
-+++ gnome-control-center-3.32.1/panels/display/cc-display-arrangement.c
-@@ -95,10 +95,31 @@ apply_rotation_to_geometry (CcDisplayMon
+diff --git a/panels/display/cc-display-arrangement.c b/panels/display/cc-display-arrangement.c
+index adbbcbc..7080bf6 100644
+--- a/panels/display/cc-display-arrangement.c
b/panels/display/cc-display-arrangement.c
+@@ -95,10 +95,31 @@ apply_rotation_to_geometry (CcDisplayMonitor *output,
}
}
@@ -51,18 +51,18 @@ Index: gnome-control-center-3.32.1/panels/display/cc-display-arrangement.c
int *x,
int *y,
int *w,
-@@ -117,6 +138,10 @@ get_scaled_geometry (CcDisplayConfig *c
+@@ -117,6 +138,10 @@ get_scaled_geometry (CcDisplayConfig *config,
if (cc_display_config_is_layout_logical (config))
{
double scale = cc_display_monitor_get_scale (output);
+
+ if (cc_display_config_layout_use_ui_scale (config))
-+scale /= ceilf (max_scale);
++scale /= ceil (max_scale);
+
*w = round (*w / scale);
*h = round (*h / scale);
}
-@@ -134,6 +159,7 @@ get_bounding_box (CcDisplayConfig *confi
+@@ -134,6 +159,7 @@ get_bounding_box (CcDisplayConfig *config,
gint*max_h)
{
GList *outputs, *l;
@@ -70,7 +70,7 @@ Index: gnome-control-center-3.32.1/panels/display/cc-display-arrangement.c
g_assert (x1 && y1 && x2 && y2);
-@@ -141,6 +167,7 @@ get_bounding_box (CcDisplayConfig *confi
+@@ -141,6 +167,7 @@ get_bounding_box (CcDisplayConfig *config,
*x2 = *y2 = G_MININT;
*max_w = 0;
*max_h = 0;
@@ -78,7 +78,7 @@ Index: gnome-control-center-3.32.1/panels/display/cc-display-arrangement.c
outputs = cc_display_config_get_monitors (config);
for (l = outputs; l; l = l->next)
-@@ -151,7 +178,7 @@ get_bounding_box (CcDisplayConfig *confi
+@@ -151,7 +178,7 @@ get_bounding_box (CcDisplayConfig *config,
if (!cc_display_monitor_is_useful (output))
continue;
@@ -87,7 +87,7 @@ Index: gnome-control-center-3.32.1/panels/display/cc-display-arrangement.c
*x1 = MIN (*x1, x);
*y1 = MIN (*y1, y);
-@@ -171,8 +198,10 @@ monitor_get_drawing_rect (CcDisplayArran
+@@ -171,8 +198,10 @@ monitor_get_drawing_rect (CcDisplayArrangement *s
Re: [Merge] ~3v1n0/ubuntu/+source/mutter:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/master
> Although it's never easy to read the diff-of-a-diff, the fact that the patch > is shrinking is also good. In such cases I suggest you to fetch the ubuntu-desktop ubuntu/master branch and do: gbp pq import Fetch my branch locally (say you call it marco-ubuntu), and there again gbp pq import Then you can easily diff things with git diff patch-queue/ubuntu/master patch-queue/marco-ubuntu/master -- https://code.launchpad.net/~3v1n0/ubuntu/+source/mutter/+git/mutter/+merge/365502 Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/mutter:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/mutter:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/master
Marco Trevisan (Treviño) has proposed merging
~3v1n0/ubuntu/+source/mutter:ubuntu/master into
~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/master.
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
Related bugs:
Bug #1822513 in mutter (Ubuntu): "[regression] gnome-shell aspect ratio
doesn't rotate with the rest of the screen"
https://bugs.launchpad.net/ubuntu/+source/mutter/+bug/1822513
For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/mutter/+git/mutter/+merge/365502
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~3v1n0/ubuntu/+source/mutter:ubuntu/master into
~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/master.
diff --git a/debian/changelog b/debian/changelog
index d096e50..f5d8eb5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mutter (3.32.0-1ubuntu2) UNRELEASED; urgency=medium
+
+ * debian/patches/x11-Add-support-for-fractional-scaling-using-Randr.patch:
+- Don't invert the screen size when rotation is enabled (LP: #1822513)
+
+ -- Marco Trevisan (Treviño) Wed, 03 Apr 2019 19:19:59 -0400
+
mutter (3.32.0-1ubuntu1) disco; urgency=medium
* debian/control:
diff --git a/debian/patches/x11-Add-support-for-fractional-scaling-using-Randr.patch b/debian/patches/x11-Add-support-for-fractional-scaling-using-Randr.patch
index 987f4f9..16281ae 100644
--- a/debian/patches/x11-Add-support-for-fractional-scaling-using-Randr.patch
+++ b/debian/patches/x11-Add-support-for-fractional-scaling-using-Randr.patch
@@ -1,6 +1,13 @@
-From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?=
-Date: Wed, 27 Mar 2019 06:44:56 +0100
-Subject: X11: Add support for fractional scaling using Randr
+From: Ubuntu Developers
+Date: Wed, 3 Apr 2019 19:18:03 -0400
+Subject: x11-Add-support-for-fractional-scaling-using-Randr
+MIME-Version: 1.0
+Content-Type: text/plain; charset="utf-8"
+Content-Transfer-Encoding: 8bit
+
+commit ed760c44b1998fc5fadde18186c51e74525038cc
+Author: Marco Trevisan (Treviño)
+Date: Wed Apr 3 18:57:28 2019 -0400
Add scaling support using randr under x11.
@@ -13,7 +20,7 @@ Forwarded: No, forwarding is in progress and planned though
meson.build| 2 +-
src/backends/meta-crtc.h | 1 +
src/backends/meta-logical-monitor.c| 36 +--
- src/backends/meta-monitor-config-manager.c | 150 -
+ src/backends/meta-monitor-config-manager.c | 150 +-
src/backends/meta-monitor-config-migration.c | 15 +-
src/backends/meta-monitor-config-store.c | 1 +
src/backends/meta-monitor-manager-dummy.c | 24 +-
@@ -22,13 +29,13 @@ Forwarded: No, forwarding is in progress and planned though
src/backends/meta-monitor.c| 60 ++--
src/backends/meta-monitor.h| 6 +-
src/backends/meta-settings-private.h | 9 +
- src/backends/meta-settings.c | 80 -
+ src/backends/meta-settings.c | 76 -
src/backends/native/meta-monitor-manager-kms.c | 44 ++-
src/backends/x11/meta-crtc-xrandr.c| 87 +-
src/backends/x11/meta-crtc-xrandr.h| 13 +-
src/backends/x11/meta-gpu-xrandr.c | 89 +-
src/backends/x11/meta-gpu-xrandr.h | 4 +
- src/backends/x11/meta-monitor-manager-xrandr.c | 407 +
+ src/backends/x11/meta-monitor-manager-xrandr.c | 399 +
src/backends/x11/meta-monitor-manager-xrandr.h | 4 +-
src/backends/x11/meta-output-xrandr.c | 5 +-
src/compositor/compositor-private.h| 2 +
@@ -41,7 +48,7 @@ Forwarded: No, forwarding is in progress and planned though
src/meta/display.h | 8 +-
src/org.gnome.Mutter.DisplayConfig.xml | 5 +
src/tests/meta-monitor-manager-test.c | 14 +-
- 34 files changed, 1366 insertions(+), 303 deletions(-)
+ 34 files changed, 1354 insertions(+), 303 deletions(-)
create mode 100644 data/org.gnome.mutter.x11.gschema.xml.in
diff --git a/data/meson.build b/data/meson.build
@@ -774,7 +781,7 @@ index 3b951c6..3b375a0 100644
meta_monitor_manager_get_capabilities (MetaMonitorManager *manager);
diff --git a/src/backends/meta-monitor-manager.c b/src/backends/meta-monitor-manager.c
-index c4ed245..7cb3415 100644
+index c4ed245..8b5b983 100644
--- a/src/backends/meta-monitor-manager.c
+++ b/src/backends/meta-monitor-manager.c
@@ -104,8 +104,18 @@ static gboolean
@@ -1196,7 +1203,7 @@ index c4ed245..7cb3415 100644
+{
+ MetaLogicalMonitorConfig *logical_monitor_config = l->data;
+
-+ if (logical_monitor_config->scale != scale)
++ if (fabs (logical_monitor_config->scale - scale) > FLT_EPSILON)
+return FALSE;
+}
+
@@ -1509,7 +1516,7 @@ index 619de17..8d20b88 100644
#endif /* META_SETTINGS_PRIVATE_H */
diff --git a/src/ba
[Merge] ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master
Marco Trevisan (Treviño) has proposed merging
~3v1n0/ubuntu/+source/gnome-shell:ubuntu/master into
~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master.
Commit message:
magnifier: Show cursor when magnifier is enabled and scale it properly
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
Related bugs:
Bug #1818790 in gnome-shell (Ubuntu): "[regression] Desktop zoom is missing
the mouse pointer"
https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1818790
For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/365180
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~3v1n0/ubuntu/+source/gnome-shell:ubuntu/master into
~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master.
diff --git a/debian/changelog b/debian/changelog
index 027f211..aa59db3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gnome-shell (3.32.0-1ubuntu2) UNRELEASED; urgency=medium
+
+ * d/p/magnifier-Show-cursor-when-magnifier-is-enabled-and-scale.patch:
+- magnifier: Show cursor when magnifier is enabled and scale it to
+ match monitor scaling (LP: #1818790)
+
+ -- Marco Trevisan (Treviño) Wed, 27 Mar 2019 16:51:27 +0100
+
gnome-shell (3.32.0-1ubuntu1) disco; urgency=medium
* Merge with debian, remaining changes:
diff --git a/debian/patches/magnifier-Show-cursor-when-magnifier-is-enabled-and-scale.patch b/debian/patches/magnifier-Show-cursor-when-magnifier-is-enabled-and-scale.patch
new file mode 100644
index 000..0bb6c71
--- /dev/null
+++ b/debian/patches/magnifier-Show-cursor-when-magnifier-is-enabled-and-scale.patch
@@ -0,0 +1,216 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?=
+Date: Wed, 27 Mar 2019 16:14:39 +0100
+Subject: magnifier: Show cursor when magnifier is enabled and scale it
+ properly
+
+Show the cursor when using the magnifier and apply the proper monitor scaling
+to it.
+
+GNOME-Bug: https://gitlab.gnome.org/GNOME/gnome-shell/issues/1020
+Ubuntu-Bug: https://bugs.launchpad.net/bugs/1818790
+Origin: https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/454
+Applied-Upstream: no
+Forwarded: yes
+---
+ js/ui/layout.js| 24 ++---
+ js/ui/magnifier.js | 76 +++---
+ 2 files changed, 87 insertions(+), 13 deletions(-)
+
+diff --git a/js/ui/layout.js b/js/ui/layout.js
+index 27a3099..376a585 100644
+--- a/js/ui/layout.js
b/js/ui/layout.js
+@@ -930,22 +930,38 @@ var LayoutManager = GObject.registerClass({
+ return ws.get_work_area_for_monitor(monitorIndex);
+ }
+
++_findIndexForRect(x, y, width, height) {
++let rect = new Meta.Rectangle({
++x: Math.floor(x),
++y: Math.floor(y),
++width: Math.ceil(x + width) - Math.floor(x),
++height: Math.ceil(y + height) - Math.floor(y)
++});
++return global.display.get_monitor_index_for_rect(rect);
++}
++
+ // This call guarantees that we return some monitor to simplify usage of it
+ // In practice all tracked actors should be visible on some monitor anyway
+ findIndexForActor(actor) {
+ let [x, y] = actor.get_transformed_position();
+ let [w, h] = actor.get_transformed_size();
+-let rect = new Meta.Rectangle({ x: x, y: y, width: w, height: h });
+-return global.display.get_monitor_index_for_rect(rect);
++return this._findIndexForRect(x, y, w, h);
+ }
+
+-findMonitorForActor(actor) {
+-let index = this.findIndexForActor(actor);
++_findMonitorForIndex(index) {
+ if (index >= 0 && index < this.monitors.length)
+ return this.monitors[index];
+ return null;
+ }
+
++findMonitorForActor(actor) {
++return this._findMonitorForIndex(this.findIndexForActor(actor));
++}
++
++findMonitorForPoint(x, y) {
++return this._findMonitorForIndex(this._findIndexForRect(x, y, 1, 1));
++}
++
+ _queueUpdateRegions() {
+ if (this._startingUp)
+ return;
+diff --git a/js/ui/magnifier.js b/js/ui/magnifier.js
+index 546ab1d..c77e47f 100644
+--- a/js/ui/magnifier.js
b/js/ui/magnifier.js
+@@ -51,31 +51,58 @@ var MouseSpriteContent = GObject.registerClass({
+ }, class MouseSpriteContent extends GObject.Object {
+ _init() {
+ super._init();
++this._scale = 1.0;
++this._monitorScale = 1.0;
+ this._texture = null;
+ }
+
+ vfunc_get_preferred_size() {
+ if (!this._texture)
+-return [0, 0];
++return [false, 0, 0];
+
+-return [this._texture.get_width(), this._texture.get_height()];
++let width = this._texture.get_width() / this._scale;
++let height = this._texture.get_height() / this._scale;
++
++return [true, width, height];
+ }
+
+ vfunc_paint_content(actor, node) {
+ if (!this._textu
[Merge] ~3v1n0/ubuntu/+source/gnome-control-center:ubuntu/xrandr-scaling into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master
Marco Trevisan (Treviño) has proposed merging
~3v1n0/ubuntu/+source/gnome-control-center:ubuntu/xrandr-scaling into
~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master.
Commit message:
display: support UI scaled logical displays mode for X11 randr scaling
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
Related bugs:
Bug #1820850 in mutter (Ubuntu): "[FFe] Distro patch GNOME hi-dpi support for
x11 sessions"
https://bugs.launchpad.net/ubuntu/+source/mutter/+bug/1820850
For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-control-center/+git/gnome-control-center/+merge/365150
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~3v1n0/ubuntu/+source/gnome-control-center:ubuntu/xrandr-scaling into
~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master.
diff --git a/debian/changelog b/debian/changelog
index 89af966..ab949c9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+gnome-control-center (1:3.32.0.1-1ubuntu6) disco; urgency=medium
+
+ * debian/patches/display-Don-t-always-set-the-primary-monitor-to-the-first.patch:
+- Make sure the display panel primary monitor matches configured one
+ * debian/patches/display-Support-UI-scaled-logical-monitor-mode.patch:
+- Support scaled logical monitors using UI scale as it could happen when
+ using the X11 Randr scaling (LP: #1820850)
+
+ -- Marco Trevisan (Treviño) Wed, 27 Mar 2019 06:10:59 +0100
+
gnome-control-center (1:3.32.0.1-1ubuntu5) disco; urgency=medium
* debian/patches/0001-sound-Fix-crash-when-sound-device-set-to-NULL.patch:
diff --git a/debian/patches/display-Don-t-always-set-the-primary-monitor-to-the-first.patch b/debian/patches/display-Don-t-always-set-the-primary-monitor-to-the-first.patch
new file mode 100644
index 000..5df1bc6
--- /dev/null
+++ b/debian/patches/display-Don-t-always-set-the-primary-monitor-to-the-first.patch
@@ -0,0 +1,33 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?=
+Date: Mon, 18 Mar 2019 02:00:49 +0100
+Subject: display: Don't always set the primary monitor to the first in list
+
+As per the binding that we have between the list store and the combo-box, when
+the first element is added to the list-store, the combo box set this value as
+the selected-index, and this leads to a call to cc_display_monitor_set_primary
+which set the first-listed monitor as primary and unset the real primary monitor.
+
+To avoid this, just ignore the binding when rebuilding the UI, since in this
+phase control-center should just reflect the actual state without changing
+anything.
+
+Fixes https://gitlab.gnome.org/GNOME/gnome-control-center/issues/419
+Origin: https://gitlab.gnome.org/GNOME/gnome-control-center/merge_requests/436
+Applied-Upstream: yes, 3.32.1
+---
+ panels/display/cc-display-panel.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/panels/display/cc-display-panel.c b/panels/display/cc-display-panel.c
+index 9604883..85ea4ce 100644
+--- a/panels/display/cc-display-panel.c
b/panels/display/cc-display-panel.c
+@@ -550,7 +550,7 @@ on_primary_display_selected_index_changed_cb (CcDisplayPanel *panel)
+ gint idx = hdy_combo_row_get_selected_index (panel->primary_display_row);
+ g_autoptr(CcDisplayMonitor) output = NULL;
+
+- if (idx < 0)
++ if (idx < 0 || panel->rebuilding)
+ return;
+
+ output = g_list_model_get_item (G_LIST_MODEL (panel->primary_display_list), idx);
diff --git a/debian/patches/display-Support-UI-scaled-logical-monitor-mode.patch b/debian/patches/display-Support-UI-scaled-logical-monitor-mode.patch
new file mode 100644
index 000..c9609a2
--- /dev/null
+++ b/debian/patches/display-Support-UI-scaled-logical-monitor-mode.patch
@@ -0,0 +1,233 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?=
+Date: Wed, 27 Mar 2019 05:42:41 +0100
+Subject: display: Support UI scaled logical monitor mode
+
+When this mode is selected we need to assume that all the monitors are scaled
+by their scaling and the global UI scale.
+
+Origin: https://gitlab.gnome.org/3v1n0/gnome-control-center/commits/layout-global-scale
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/mutter/+bug/1820850
+Forwarded: No, MPs will follow shortly
+---
+ panels/display/cc-display-arrangement.c | 45 +
+ panels/display/cc-display-config-dbus.c | 16 +---
+ panels/display/cc-display-config.c | 6 +
+ panels/display/cc-display-config.h | 2 ++
+ 4 files changed, 61 insertions(+), 8 deletions(-)
+
+diff --git a/panels/display/cc-display-arrangement.c b/panels/display/cc-display-arrangement.c
+index adbbcbc..c3b14e4 100644
+--- a/panels/display/cc-display-arrangement.c
b/panels/display/cc-display-arrangement.c
+@@ -95,10 +95,31 @@ apply_rotation_to_geometry (CcDisplayMonitor *output,
+ }
+ }
+
++static double
++get_maximum_scale (CcDisplayConfig *config)
++{
++ GList *outputs,
[Merge] ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master
Marco Trevisan (Treviño) has proposed merging
~3v1n0/ubuntu/+source/gnome-shell:ubuntu/master into
~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master.
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
Related bugs:
Bug #1745032 in linux (Ubuntu): "AC adapter status not detected on Asus
ZenBook UX410UAK"
https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1745032
Bug #1812266 in gnome-settings-daemon (Ubuntu): "Keyboard layout indicator
does not indicate current layout (18.04 Bionic beaver)"
https://bugs.launchpad.net/ubuntu/+source/gnome-settings-daemon/+bug/1812266
For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/362224
In alternative to this, debian branch [1] can be released, and this branch
merged with debian again.
[1] https://salsa.debian.org/gnome-team/gnome-shell/merge_requests/14/
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~3v1n0/ubuntu/+source/gnome-shell:ubuntu/master into
~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master.
diff --git a/debian/changelog b/debian/changelog
index beb0740..904b4ad 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+gnome-shell (3.30.2-1ubuntu2) UNRELEASED; urgency=medium
+
+ * d/p/power-Label-the-PENDING_CHARGE-state-as-Not-Charging.patch:
+- Label the PENDING_CHARGE state as "Not Charging" (LP: #1745032)
+ * d/p/ibusManager-Don-t-pass-undefined-callback-to-ibus.patch:
+- Fix missing icon in keyboard indicator (LP: #1812266)
+
+ -- Marco Trevisan (Treviño) Fri, 25 Jan 2019 00:09:21 +
+
gnome-shell (3.30.2-1ubuntu1) disco; urgency=medium
* Merge with debian, remaining changes:
diff --git a/debian/patches/ibusManager-Don-t-pass-undefined-callback-to-ibus.patch b/debian/patches/ibusManager-Don-t-pass-undefined-callback-to-ibus.patch
new file mode 100644
index 000..604404e
--- /dev/null
+++ b/debian/patches/ibusManager-Don-t-pass-undefined-callback-to-ibus.patch
@@ -0,0 +1,32 @@
+From: =?utf-8?q?Florian_M=C3=BCllner?=
+Date: Thu, 15 Nov 2018 18:47:55 +0100
+Subject: ibusManager: Don't pass undefined callback to ibus
+
+Since commit 551e8278416, we don't always pass a callback parameter.
+However passing it on as undefined to ibus doesn't work, as gjs doesn't
+accept that as a valid callback value and throw an error. As a result,
+we can end up with no layout selected in the keyboard menu and an "empty"
+indicator. Fix this by explicitly passing null if no callback has been
+provided.
+
+https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/293
+
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1812266/
+Origin: https://gitlab.gnome.org/GNOME/gnome-shell/commit/74bb9e62492bacda3
+---
+ js/misc/ibusManager.js | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/js/misc/ibusManager.js b/js/misc/ibusManager.js
+index 34f198c..33ad877 100644
+--- a/js/misc/ibusManager.js
b/js/misc/ibusManager.js
+@@ -210,7 +210,7 @@ var IBusManager = new Lang.Class({
+ }
+
+ this._ibus.set_global_engine_async(id, this._MAX_INPUT_SOURCE_ACTIVATION_TIME,
+- null, callback);
++ null, callback || null);
+ },
+
+ preloadEngines(ids) {
diff --git a/debian/patches/power-Label-the-PENDING_CHARGE-state-as-Not-Charging.patch b/debian/patches/power-Label-the-PENDING_CHARGE-state-as-Not-Charging.patch
new file mode 100644
index 000..1b40015
--- /dev/null
+++ b/debian/patches/power-Label-the-PENDING_CHARGE-state-as-Not-Charging.patch
@@ -0,0 +1,213 @@
+From: =?utf-8?q?Jo=C3=A3o_Paulo_Rechi_Vita?=
+Date: Fri, 2 Nov 2018 21:51:33 +0100
+Subject: power: Label the PENDING_CHARGE state as "Not Charging"
+
+The pending-charge state means AC power is on but the battery is not
+being charged. This can happen because its charge is above a certain
+threshold, to avoid short charging cycles and prolong the battery's
+life, or because the PSU is not powerful enough to charge the batteries.
+
+Instead of lying to the user about something being estimated, we should
+simply tell the truth and set the label to "Not Charging".
+
+Closes: #701.
+
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1745032
+Bug-GNOME: https://gitlab.gnome.org/GNOME/gnome-shell/issues/701
+Origin: https://gitlab.gnome.org/GNOME/gnome-shell/commit/52c59ac0dd7ddbe064
+Applied-Upstream: 3.31.4
+---
+ js/ui/status/power.js | 4 +++-
+ po/ca.po | 4
+ po/de.po | 4
+ po/el.po | 4
+ po/eo.po | 4
+ po/es.po | 4
+ po/fur.po | 4
+ po/it.po | 4
+ po/ja.po | 4
+ po/sl.po | 4
+ po/sv.po | 4
+ po/tr.po | 4
+ 12 files changed, 47 inser
[Merge] ~3v1n0/ubuntu/+source/gnome-control-center:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/bionic
Marco Trevisan (Treviño) has proposed merging
~3v1n0/ubuntu/+source/gnome-control-center:ubuntu/bionic into
~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/bionic.
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
Related bugs:
Bug #1745032 in linux (Ubuntu): "AC adapter status not detected on Asus
ZenBook UX410UAK"
https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1745032
Bug #1779051 in gnome-control-center (Ubuntu):
"/usr/bin/gnome-control-center:11:gtk_container_remove:update_output_settings:on_amplify_changed:g_closure_invoke:signal_emit_unlocked_R"
https://bugs.launchpad.net/ubuntu/+source/gnome-control-center/+bug/1779051
For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-control-center/+git/gnome-control-center/+merge/362226
Synced also vcs with ubuntu
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~3v1n0/ubuntu/+source/gnome-control-center:ubuntu/bionic into
~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/bionic.
diff --git a/debian/changelog b/debian/changelog
index 3c0e09e..3a24f3a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+gnome-control-center (1:3.28.2-0ubuntu0.18.04.3) UNRELEASED; urgency=medium
+
+ * debian/patches/power-Label-the-PENDING_CHARGING-state-as-Not-Charging.patch:
+- Label the PENDING_CHARGING state as "Not Charging" (LP: #1745032)
+
+ -- Marco Trevisan (Treviño) Fri, 25 Jan 2019 01:17:15 +
+
+gnome-control-center (1:3.28.2-0ubuntu0.18.04.2) bionic; urgency=medium
+
+ * debian/patches/70_allow_sound_above_100.patch:
+- Fix crash when settings changed after panel closed (LP: #1779051)
+
+ -- Robert Ancell Wed, 08 Aug 2018 11:48:27 +1200
+
gnome-control-center (1:3.28.2-0ubuntu0.18.04.1) bionic; urgency=medium
* New bugfix version (lp: #1780280)
diff --git a/debian/patches/70_allow_sound_above_100.patch b/debian/patches/70_allow_sound_above_100.patch
index 041cdc2..39a0cef 100644
--- a/debian/patches/70_allow_sound_above_100.patch
+++ b/debian/patches/70_allow_sound_above_100.patch
@@ -215,3 +215,11 @@ Index: gnome-control-center-3.27.90/panels/sound/gvc-mixer-dialog.c
dialog->settings = g_settings_new (KEY_SOUNDS_SCHEMA);
g_signal_connect (dialog->settings, "changed::allow-volume-above-100-percent",
G_CALLBACK (allow_volume_above_100_percent_cb), dialog);
+@@ -1939,6 +2064,7 @@ gvc_mixer_dialog_finalize (GObject *object)
+ mixer_dialog = GVC_MIXER_DIALOG (object);
+
+ g_return_if_fail (mixer_dialog != NULL);
++g_clear_object (&mixer_dialog->ubuntu_sound_settings);
+ g_clear_object (&mixer_dialog->settings);
+ G_OBJECT_CLASS (gvc_mixer_dialog_parent_class)->finalize (object);
+ }
diff --git a/debian/patches/power-Label-the-PENDING_CHARGING-state-as-Not-Charging.patch b/debian/patches/power-Label-the-PENDING_CHARGING-state-as-Not-Charging.patch
new file mode 100644
index 000..5df4f40
--- /dev/null
+++ b/debian/patches/power-Label-the-PENDING_CHARGING-state-as-Not-Charging.patch
@@ -0,0 +1,256 @@
+From: =?utf-8?q?Jo=C3=A3o_Paulo_Rechi_Vita?=
+Date: Sat, 20 Oct 2018 00:34:56 +0200
+Subject: power: Label the PENDING_CHARGING state as "Not Charging"
+
+The pending-charge state means AC power is on but the battery is not
+being charged. This can happen because its charge is above a certain
+threshold, to avoid short charging cycles and prolong the battery's
+life, or because the PSU is not powerful enough to charge the batteries.
+
+Instead of lying to the user about something being estimated, we should
+simply tell the truth and set the label to "Not Charging".
+
+Closes: #249.
+
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1745032
+Bug-GNOME: https://gitlab.gnome.org/GNOME/gnome-control-center/issues/249
+Origin: https://gitlab.gnome.org/GNOME/gnome-control-center/commit/6efaf85e
+Applied-Upstream: yes, 3.31.2
+---
+ panels/power/cc-power-panel.c | 10 --
+ po/de.po | 7 ++-
+ po/el.po | 8 +++-
+ po/eo.po | 7 ++-
+ po/es.po | 7 ++-
+ po/fur.po | 7 ++-
+ po/it.po | 7 ++-
+ po/ja.po | 7 ++-
+ po/sl.po | 7 ++-
+ po/sv.po | 7 ++-
+ po/tr.po | 8 +++-
+ 11 files changed, 70 insertions(+), 12 deletions(-)
+
+diff --git a/panels/power/cc-power-panel.c b/panels/power/cc-power-panel.c
+index f9b67a4..d8c87c7 100644
+--- a/panels/power/cc-power-panel.c
b/panels/power/cc-power-panel.c
+@@ -295,7 +295,6 @@ get_details_string (gdouble percentage, UpDeviceState state, guint64 time)
+ switch (state)
+ {
+ case UP_DEVICE_STATE_CHARGING:
+- case UP_DEVICE
Re: [Merge] ~3v1n0/ubuntu/+source/gnome-settings-daemon:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon:ubuntu/bionic
I've already a silo almost ready here https://launchpad.net/~ci-train-ppa-service/+archive/ubuntu/3597/+packages -- https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-settings-daemon/+git/gnome-settings-daemon/+merge/362049 Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/gnome-control-center:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/bionic
The proposal to merge ~3v1n0/ubuntu/+source/gnome-control-center:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/bionic has been updated. Description changed to: Synced also vcs with ubuntu, so please pull tags For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-control-center/+git/gnome-control-center/+merge/362226 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/gnome-control-center:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/gnome-control-center:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master
Marco Trevisan (Treviño) has proposed merging
~3v1n0/ubuntu/+source/gnome-control-center:ubuntu/master into
~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master.
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
Related bugs:
Bug #1745032 in linux (Ubuntu): "AC adapter status not detected on Asus
ZenBook UX410UAK"
https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1745032
For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-control-center/+git/gnome-control-center/+merge/362225
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~3v1n0/ubuntu/+source/gnome-control-center:ubuntu/master into
~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master.
diff --git a/debian/changelog b/debian/changelog
index d452e13..60439e4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gnome-control-center (1:3.30.2-3ubuntu2) UNRELEASED; urgency=medium
+
+ * debian/patches/power-Label-the-PENDING_CHARGING-state-as-Not-Charging.patch:
+- Label the PENDING_CHARGING state as "Not Charging" (LP: #1745032)
+
+ -- Marco Trevisan (Treviño) Fri, 25 Jan 2019 00:53:03 +
+
gnome-control-center (1:3.30.2-3ubuntu1) disco; urgency=medium
* Merge with debian unstable. Remaining changes:
diff --git a/debian/patches/power-Label-the-PENDING_CHARGING-state-as-Not-Charging.patch b/debian/patches/power-Label-the-PENDING_CHARGING-state-as-Not-Charging.patch
new file mode 100644
index 000..c7a2bab
--- /dev/null
+++ b/debian/patches/power-Label-the-PENDING_CHARGING-state-as-Not-Charging.patch
@@ -0,0 +1,254 @@
+From: =?utf-8?q?Jo=C3=A3o_Paulo_Rechi_Vita?=
+Date: Sat, 20 Oct 2018 00:34:56 +0200
+Subject: power: Label the PENDING_CHARGING state as "Not Charging"
+
+The pending-charge state means AC power is on but the battery is not
+being charged. This can happen because its charge is above a certain
+threshold, to avoid short charging cycles and prolong the battery's
+life, or because the PSU is not powerful enough to charge the batteries.
+
+Instead of lying to the user about something being estimated, we should
+simply tell the truth and set the label to "Not Charging".
+
+Closes: #249.
+
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1745032
+Bug-GNOME: https://gitlab.gnome.org/GNOME/gnome-control-center/issues/249
+Origin: https://gitlab.gnome.org/GNOME/gnome-control-center/commit/6efaf85e
+Applied-Upstream: yes, 3.31.2
+---
+ panels/power/cc-power-panel.c | 10 --
+ po/de.po | 7 ++-
+ po/el.po | 8 +++-
+ po/eo.po | 7 ++-
+ po/es.po | 7 ++-
+ po/fur.po | 7 ++-
+ po/it.po | 5 +
+ po/ja.po | 7 ++-
+ po/sl.po | 7 ++-
+ po/sv.po | 7 ++-
+ po/tr.po | 8 +++-
+ 11 files changed, 69 insertions(+), 11 deletions(-)
+
+diff --git a/panels/power/cc-power-panel.c b/panels/power/cc-power-panel.c
+index 298c2bf..882d469 100644
+--- a/panels/power/cc-power-panel.c
b/panels/power/cc-power-panel.c
+@@ -302,7 +302,6 @@ get_details_string (gdouble percentage, UpDeviceState state, guint64 time)
+ switch (state)
+ {
+ case UP_DEVICE_STATE_CHARGING:
+- case UP_DEVICE_STATE_PENDING_CHARGE:
+ /* TRANSLATORS: %1 is a time string, e.g. "1 hour 5 minutes" */
+ details = g_strdup_printf (_("%s until fully charged"), time_string);
+ break;
+@@ -323,6 +322,10 @@ get_details_string (gdouble percentage, UpDeviceState state, guint64 time)
+ /* TRANSLATORS: primary battery */
+ details = g_strdup (_("Fully charged"));
+ break;
++ case UP_DEVICE_STATE_PENDING_CHARGE:
++/* TRANSLATORS: primary battery */
++details = g_strdup (_("Not charging"));
++break;
+ case UP_DEVICE_STATE_EMPTY:
+ /* TRANSLATORS: primary battery */
+ details = g_strdup (_("Empty"));
+@@ -337,7 +340,6 @@ get_details_string (gdouble percentage, UpDeviceState state, guint64 time)
+ switch (state)
+ {
+ case UP_DEVICE_STATE_CHARGING:
+- case UP_DEVICE_STATE_PENDING_CHARGE:
+ /* TRANSLATORS: primary battery */
+ details = g_strdup (_("Charging"));
+ break;
+@@ -350,6 +352,10 @@ get_details_string (gdouble percentage, UpDeviceState state, guint64 time)
+ /* TRANSLATORS: primary battery */
+ details = g_strdup (_("Fully charged"));
+ break;
++ case UP_DEVICE_STATE_PENDING_CHARGE:
++/* TRANSLATORS: primary battery */
++details = g_strdup (_("Not charging"));
++
[Merge] ~3v1n0/ubuntu/+source/gnome-shell:upstream/3.28.x into ~ubuntu-desktop/ubuntu/+source/gnome-shell:upstream/3.28.x
Marco Trevisan (Treviño) has proposed merging
~3v1n0/ubuntu/+source/gnome-shell:upstream/3.28.x into
~ubuntu-desktop/ubuntu/+source/gnome-shell:upstream/3.28.x.
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/362054
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~3v1n0/ubuntu/+source/gnome-shell:upstream/3.28.x into
~ubuntu-desktop/ubuntu/+source/gnome-shell:upstream/3.28.x.
diff --git a/js/gdm/authPrompt.js b/js/gdm/authPrompt.js
index 481cd3a..a0a4a21 100644
--- a/js/gdm/authPrompt.js
+++ b/js/gdm/authPrompt.js
@@ -242,11 +242,11 @@ var AuthPrompt = new Lang.Class({
this.emit('prompted');
},
-_onVerificationFailed() {
+_onVerificationFailed(userVerifier, canRetry) {
this._queryingService = null;
this.clear();
-this.updateSensitivity(true);
+this.updateSensitivity(canRetry);
this.setActorInDefaultButtonWell(null);
this.verificationStatus = AuthPromptStatus.VERIFICATION_FAILED;
},
@@ -439,6 +439,7 @@ var AuthPrompt = new Lang.Class({
this.verificationStatus = AuthPromptStatus.NOT_VERIFYING;
this.cancelButton.reactive = true;
this.nextButton.label = _("Next");
+this._preemptiveAnswer = null;
if (this._userVerifier)
this._userVerifier.cancel();
diff --git a/js/gdm/util.js b/js/gdm/util.js
index 261e1e4..105a320 100644
--- a/js/gdm/util.js
+++ b/js/gdm/util.js
@@ -534,12 +534,13 @@ var ShellUserVerifier = new Lang.Class({
_verificationFailed(retry) {
// For Not Listed / enterprise logins, immediately reset
// the dialog
-// Otherwise, we allow ALLOWED_FAILURES attempts. After that, we
-// go back to the welcome screen.
+// Otherwise, when in login mode we allow ALLOWED_FAILURES attempts.
+// After that, we go back to the welcome screen.
this._failCounter++;
let canRetry = retry && this._userName &&
-this._failCounter < this._settings.get_int(ALLOWED_FAILURES_KEY);
+(this._reauthOnly ||
+ this._failCounter < this._settings.get_int(ALLOWED_FAILURES_KEY));
if (canRetry) {
if (!this.hasPendingMessages) {
@@ -562,7 +563,7 @@ var ShellUserVerifier = new Lang.Class({
}
}
-this.emit('verification-failed');
+this.emit('verification-failed', canRetry);
},
_onConversationStopped(client, serviceName) {
diff --git a/js/misc/objectManager.js b/js/misc/objectManager.js
index 1ce4f83..1442e3d 100644
--- a/js/misc/objectManager.js
+++ b/js/misc/objectManager.js
@@ -236,11 +236,12 @@ var ObjectManager = new Lang.Class({
_onNameVanished() {
let objectPaths = Object.keys(this._objects);
for (let i = 0; i < objectPaths.length; i++) {
-let object = this._objects[objectPaths];
+let objectPath = objectPaths[i];
+let object = this._objects[objectPath];
let interfaceNames = Object.keys(object);
-for (let j = 0; i < interfaceNames.length; i++) {
-let interfaceName = interfaceNames[i];
+for (let j = 0; j < interfaceNames.length; j++) {
+let interfaceName = interfaceNames[j];
if (object[interfaceName])
this._removeInterface(objectPath, interfaceName);
diff --git a/js/ui/calendar.js b/js/ui/calendar.js
index 651aac6..fd133cc 100644
--- a/js/ui/calendar.js
+++ b/js/ui/calendar.js
@@ -802,6 +802,8 @@ var NotificationMessage = new Lang.Class({
},
_onDestroy() {
+this.parent();
+
if (this._updatedId)
this.notification.disconnect(this._updatedId);
this._updatedId = 0;
diff --git a/js/ui/components/automountManager.js b/js/ui/components/automountManager.js
index 2d8f3f8..a6cd857 100644
--- a/js/ui/components/automountManager.js
+++ b/js/ui/components/automountManager.js
@@ -210,6 +210,10 @@ var AutomountManager = new Lang.Class({
},
_onVolumeRemoved(monitor, volume) {
+if (volume._allowAutorunExpireId && volume._allowAutorunExpireId > 0) {
+Mainloop.source_remove(volume._allowAutorunExpireId);
+delete volume._allowAutorunExpireId;
+}
this._volumeQueue =
this._volumeQueue.filter(element => (element != volume));
},
@@ -234,8 +238,10 @@ var AutomountManager = new Lang.Class({
_allowAutorunExpire(volume) {
let id = Mainloop.timeout_add_seconds(AUTORUN_EXPIRE_TIMEOUT_SECS, () => {
volume.allowAutorun = false;
+delete volume._allowAutorunExpireId;
return GLib.SOURCE_REMOVE;
});
+volume._allowAutorunExpireId = id;
GLib.Source
Re: [Merge] ~3v1n0/ubuntu/+source/mutter:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic
> Also, the fix for bug 1767648 (and hence bug 1779615) is not in disco or > cosmic yet(?) For both I'm preparing a landing in disco, don't worry (that's why I'm delaying the fixes on this a bit), so they were planned to land in disco already in the coming upload. -- https://code.launchpad.net/~3v1n0/ubuntu/+source/mutter/+git/mutter/+merge/361811 Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic
Marco Trevisan (Treviño) has proposed merging ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic with ~3v1n0/ubuntu/+source/gnome-shell:upstream/3.28.x as a prerequisite. Requested reviews: Ubuntu Desktop (ubuntu-desktop) Related bugs: Bug #1745032 in linux (Ubuntu): "AC adapter status not detected on Asus ZenBook UX410UAK" https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1745032 Bug #1772677 in gnome-shell (Ubuntu): "gnome-shell filling up syslog with thousands/millions of entries with stack traces ending in osdWindow.js (lines 206/207 in bionic, lines 223/224 in cosmic)" https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1772677 Bug #1811900 in mutter (Ubuntu): "SRU 3.28 latest git to bionic" https://bugs.launchpad.net/ubuntu/+source/mutter/+bug/1811900 Bug #1811908 in gnome-shell (Ubuntu): "gnome-shell: JS ERROR: ReferenceError: GLib is not defined" https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1811908 Bug #1812266 in gnome-settings-daemon (Ubuntu): "Keyboard layout indicator does not indicate current layout (18.04 Bionic beaver)" https://bugs.launchpad.net/ubuntu/+source/gnome-settings-daemon/+bug/1812266 Bug #1812735 in gnome-shell (Ubuntu): "Andyrock has to update this placeholder bug :)" https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1812735 For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/362055 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic. diff --git a/debian/changelog b/debian/changelog index 58f19e1..4e3a2d0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,35 @@ +gnome-shell (3.28.3+git20190116-0ubuntu18.04.1) UNRELEASED; urgency=medium + + * New git snapshot release up to commit 24cdcc56d (LP: #1811900) +- Don't fill journal with osdWindow errors (LP: #1772677) + * d/p/authPrompt-Do-not-enable-sensitivity-if-retries-are-disal.patch, +d/p/authPrompt-Unset-preemptiveAnswer-on-reset.patch, +d/p/gdm-util-Always-allow-to-retry-login-in-unlock-mode.patch, +d/p/ibus-set-content-type-no-holdKeyboard.patch, +d/p/popupMenu-Don-t-handle-key-presses-directly-if-there-are-.patch, +d/p/st-button-Ignore-pointer-emulated-touch-events.patch, +d/p/shell-ignore-invalid-window-monitor-index.patch, +d/p/workspace-fix-repositioned-windows-in-activities.patch: +- Removed patches applied upstream + * d/p/StIcon-only-compute-shadow-pipeline-when-the-texture-is-p.patch, +d/p/js-fix-invalid-access-errors.patch, +d/p/js-ui-Choose-some-actors-to-cache-on-the-GPU.patch, +d/p/optional-hot-corner.patch, +d/p/st-texture-cache-Cancel-sliced-image-loading-on-target-ac.patch, +d/p/workaround_crasher_fractional_scaling.patch: +- Refreshed as per upstream changes + * d/p/ibusManager-Don-t-pass-undefined-callback-to-ibus.patch: +- Fix missing icon in keyboard indicator (LP: #1812266) + * d/p/keyboard-Filter-redundant-FocusTracker-position-changed-s.patch, +d/p/keyboard-Listen-to-IbusPanelService-focus-in-out-to-track.patch: +- Fix OSK activation on X11 (LP: #1812735) + * d/p/power-Label-the-PENDING_CHARGE-state-as-Not-Charging.patch: +- Label the PENDING_CHARGE state as "Not Charging" (LP: #1745032) + * d/p/debian/patches/volume-Add-back-sound-feedback-on-scroll.patch: +- Add missing include (LP: #1811908) + + -- Marco Trevisan (Treviño) Tue, 22 Jan 2019 01:53:57 +0100 + gnome-shell (3.28.3-0ubuntu0.18.04.4) bionic; urgency=medium * debian/patches/ibus-set-content-type-no-holdKeyboard.patch: diff --git a/debian/patches/StIcon-only-compute-shadow-pipeline-when-the-texture-is-p.patch b/debian/patches/StIcon-only-compute-shadow-pipeline-when-the-texture-is-p.patch index 96b2cf0..3264a5c 100644 --- a/debian/patches/StIcon-only-compute-shadow-pipeline-when-the-texture-is-p.patch +++ b/debian/patches/StIcon-only-compute-shadow-pipeline-when-the-texture-is-p.patch @@ -1,5 +1,5 @@ From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= -Date: Wed, 18 Oct 2017 05:32:22 -0500 +Date: Wed, 18 Oct 2017 12:32:22 +0200 Subject: StIcon: only compute shadow pipeline when the texture is properly allocated diff --git a/debian/patches/authPrompt-Do-not-enable-sensitivity-if-retries-are-disal.patch b/debian/patches/authPrompt-Do-not-enable-sensitivity-if-retries-are-disal.patch deleted file mode 100644 index ff98dda..000 --- a/debian/patches/authPrompt-Do-not-enable-sensitivity-if-retries-are-disal.patch +++ /dev/null @@ -1,48 +0,0 @@ -From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?= -Date: Tue, 29 May 2018 02:00:04 +0200 -Subject: authPrompt: Do not enable sensitivity if retries are disallowed - -Set the sensitivity of the UI
[Merge] ~3v1n0/ubuntu/+source/gnome-settings-daemon:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon:ubuntu/bionic
Marco Trevisan (Treviño) has proposed merging
~3v1n0/ubuntu/+source/gnome-settings-daemon:ubuntu/bionic into
~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon:ubuntu/bionic.
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
Related bugs:
Bug #1812735 in gnome-shell (Ubuntu): "Andyrock has to update this
placeholder bug :)"
https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1812735
For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-settings-daemon/+git/gnome-settings-daemon/+merge/362049
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~3v1n0/ubuntu/+source/gnome-settings-daemon:ubuntu/bionic into
~ubuntu-desktop/ubuntu/+source/gnome-settings-daemon:ubuntu/bionic.
diff --git a/debian/changelog b/debian/changelog
index bb73cc0..f30bf0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gnome-settings-daemon (3.28.1-0ubuntu1.2) UNRELEASED; urgency=medium
+
+ * debian/patches/keyboard-Enable-ibus-for-OSK-purposes.patch:
+- Enable IBus for OSK (LP: #1812735)
+
+ -- Marco Trevisan (Treviño) Mon, 21 Jan 2019 20:26:58 +0100
+
gnome-settings-daemon (3.28.1-0ubuntu1.1) bionic; urgency=medium
* debian/patches/git_binary_encoding.patch:
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 000..52f9b83
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,17 @@
+[DEFAULT]
+pristine-tar = True
+debian-branch = debian/bionic
+upstream-branch = upstream/3.28.x
+upstream-vcs-tag = %(version)s
+
+[buildpackage]
+sign-tags = True
+
+[dch]
+multimaint-merge = True
+
+[import-orig]
+postimport = dch -v%(version)s New upstream release; git add debian/changelog; debcommit
+
+[pq]
+patch-numbers = False
diff --git a/debian/patches/keyboard-Enable-ibus-for-OSK-purposes.patch b/debian/patches/keyboard-Enable-ibus-for-OSK-purposes.patch
new file mode 100644
index 000..88f8437
--- /dev/null
+++ b/debian/patches/keyboard-Enable-ibus-for-OSK-purposes.patch
@@ -0,0 +1,199 @@
+From: Carlos Garnacho
+Date: Tue, 25 Sep 2018 20:19:39 +0200
+Subject: keyboard: Enable ibus for OSK purposes
+
+As gnome-shell relies on IBus for focus tracking, enable this IM whenever
+the conditions for OSK popping up might arise.
+
+Closes: https://gitlab.gnome.org/GNOME/gnome-settings-daemon/issues/95
+
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-settings-daemon/+bug/1812735
+Bug-GNOME: https://gitlab.gnome.org/GNOME/gnome-settings-daemon/issues/95
+Origin: https://gitlab.gnome.org/GNOME/gnome-settings-daemon/commit/b7e1d69593
+---
+ plugins/keyboard/gsd-keyboard-manager.c | 82 +++--
+ 1 file changed, 69 insertions(+), 13 deletions(-)
+
+diff --git a/plugins/keyboard/gsd-keyboard-manager.c b/plugins/keyboard/gsd-keyboard-manager.c
+index 343b049..480e735 100644
+--- a/plugins/keyboard/gsd-keyboard-manager.c
b/plugins/keyboard/gsd-keyboard-manager.c
+@@ -80,11 +80,15 @@
+
+ #define DEFAULT_LAYOUT "us"
+
++#define GNOME_A11Y_APPLICATIONS_INTERFACE_DIR "org.gnome.desktop.a11y.applications"
++#define KEY_OSK_ENABLED "screen-keyboard-enabled"
++
+ struct GsdKeyboardManagerPrivate
+ {
+ guint start_idle_id;
+ GSettings *settings;
+ GSettings *input_sources_settings;
++GSettings *a11y_settings;
+ GDBusProxy *localed;
+ GCancellable *cancellable;
+
+@@ -92,12 +96,15 @@ struct GsdKeyboardManagerPrivate
+ GsdNumLockState old_state;
+ GdkDeviceManager *device_manager;
+ guint device_added_id;
++guint device_removed_id;
+ };
+
+ static void gsd_keyboard_manager_class_init (GsdKeyboardManagerClass *klass);
+ static void gsd_keyboard_manager_init(GsdKeyboardManager *keyboard_manager);
+ static void gsd_keyboard_manager_finalize(GObject *object);
+
++static void update_gtk_im_module (GsdKeyboardManager *manager);
++
+ G_DEFINE_TYPE (GsdKeyboardManager, gsd_keyboard_manager, G_TYPE_OBJECT)
+
+ static gpointer manager_object = NULL;
+@@ -417,9 +424,23 @@ device_added_cb (GdkDeviceManager *device_manager,
+ if (source == GDK_SOURCE_KEYBOARD) {
+ g_debug ("New keyboard plugged in, applying all settings");
+ apply_numlock (manager);
++} else if (source == GDK_SOURCE_TOUCHSCREEN) {
++update_gtk_im_module (manager);
+ }
+ }
+
++static void
++device_removed_cb (GdkDeviceManager *device_manager,
++ GdkDevice *device,
++ GsdKeyboardManager *manager)
++{
++GdkInputSource source;
++
++source = gdk_device_get_source (device);
++if (source == GDK_SOURCE_TOUCHSCREEN)
++update_gtk_im_module (manager);
++}
++
+ static void
+ set_devicepresence_handler (GsdKeyboardManager *manager)
+ {
+@@ -432,6 +453,8 @@ set_devicepresence_handler (GsdKeyboardManager *ma
[Merge] ~3v1n0/ubuntu/+source/mutter:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic
Marco Trevisan (Treviño) has proposed merging
~3v1n0/ubuntu/+source/mutter:ubuntu/bionic into
~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic with
~3v1n0/ubuntu/+source/mutter:upstream/3.28.x as a prerequisite.
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/mutter/+git/mutter/+merge/361811
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~3v1n0/ubuntu/+source/mutter:ubuntu/bionic into
~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic.
diff --git a/debian/changelog b/debian/changelog
index 360eba4..07fdbda 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,21 @@
+mutter (3.28.3+git20181011~ubuntu18.04.3) UNRELEASED; urgency=medium
+
+ * New upstream git snapshot based on 3.28.3 plus commits up to 1b78ca8c5
+(LP: #1811900, LP: #1765269, LP: #1790525, LP: #1795774)
+ * d/p/gpu-kms-Don-t-crash-if-drmModeGetResources-returns-N.patch,
+d/p/native-gpu-Handle-drmModeSetCrtc-failing-gracefully.patch,
+d/p/monitor-manager-Filter-out-low-screen-resolutions.patch,
+d/p/window-wayland-Always-update-monitor-for-non-user-ops.patch,
+d/p/window-Don-t-refuse-to-move-focus-to-the-grab-window.patch,
+d/p/window-Explicitly-exclude-unmanaging-window-from-focus-ag.patch,
+d/p/monitor-Use-current-monitor-mode-to-check-whether-active.patch,
+d/p/core-Return-1-if-meta_window_get_monitor-is-called-on-an-.patch,
+d/p/renderer-native-Fallback-to-non-planar-API-if-gbm_bo_get_.patch,
+d/p/clutter-x11-Implement-keycode-lookup-from-keysyms-on-virt.patch:
+- Removed as applied upstream
+
+ -- Marco Trevisan (Treviño) Tue, 15 Jan 2019 23:33:23 +0100
+
mutter (3.28.3-2~ubuntu18.04.2) bionic; urgency=medium
* d/p/renderer-native-Fallback-to-non-planar-API-if-gbm_bo_get_.patch:
diff --git a/debian/patches/bgo768531_workaround-startup-notifications.patch b/debian/patches/bgo768531_workaround-startup-notifications.patch
index bc6b697..26ac823 100644
--- a/debian/patches/bgo768531_workaround-startup-notifications.patch
+++ b/debian/patches/bgo768531_workaround-startup-notifications.patch
@@ -16,10 +16,10 @@ Applied-upstream: no
1 file changed, 10 insertions(+)
diff --git a/src/wayland/meta-wayland-gtk-shell.c b/src/wayland/meta-wayland-gtk-shell.c
-index 0ef9b83..891109a 100644
+index 474595b..5837567 100644
--- a/src/wayland/meta-wayland-gtk-shell.c
+++ b/src/wayland/meta-wayland-gtk-shell.c
-@@ -312,11 +312,21 @@ gtk_shell_set_startup_id (struct wl_client *client,
+@@ -321,11 +321,21 @@ gtk_shell_set_startup_id (struct wl_client *client,
struct wl_resource *resource,
const char *startup_id)
{
diff --git a/debian/patches/clutter-x11-Implement-keycode-lookup-from-keysyms-on-virt.patch b/debian/patches/clutter-x11-Implement-keycode-lookup-from-keysyms-on-virt.patch
deleted file mode 100644
index ccb4263..000
--- a/debian/patches/clutter-x11-Implement-keycode-lookup-from-keysyms-on-virt.patch
+++ /dev/null
@@ -1,316 +0,0 @@
-From: Carlos Garnacho
-Date: Fri, 29 Jun 2018 14:31:23 +0200
-Subject: clutter/x11: Implement keycode lookup from keysyms on virtual key
- devices
-
-Unfortunately XKeysymToKeycode() falls short in that it coalesces keysyms
-into keycodes pertaining to the first level (i.e. lowercase). Add a
-ClutterKeymapX11 method (much alike its GdkKeymap counterpart) to look up
-all matches for the given keysym.
-
-Two other helper methods have been added so the virtual device can fetch
-the current keyboard group, and latch modifiers for key emission. Combining
-all this, the virtual device is now able to handle keycodes in further
-levels.
-
-Closes: https://gitlab.gnome.org/GNOME/gnome-shell/issues/135
-
-(cherry picked from commit 85284acb000ddc70afcf716b6c198b4b5bf5741e)
-
-Ubuntu-Bug: https://bugs.launchpad.net/oem-priority/+bug/1730211
-Applied-Upstream: yes, 3.28.4
- clutter/clutter/x11/clutter-keymap-x11.c | 178 -
- clutter/clutter/x11/clutter-keymap-x11.h | 8 +
- .../clutter/x11/clutter-virtual-input-device-x11.c | 22 ++-
- 3 files changed, 204 insertions(+), 4 deletions(-)
-
-diff --git a/clutter/clutter/x11/clutter-keymap-x11.c b/clutter/clutter/x11/clutter-keymap-x11.c
-index 914e314..c34e676 100644
a/clutter/clutter/x11/clutter-keymap-x11.c
-+++ b/clutter/clutter/x11/clutter-keymap-x11.c
-@@ -38,6 +38,14 @@
-
- typedef struct _ClutterKeymapX11Class ClutterKeymapX11Class;
- typedef struct _DirectionCacheEntry DirectionCacheEntry;
-+typedef struct _ClutterKeymapKeyClutterKeymapKey;
-+
-+struct _ClutterKeymapKey
-+{
-+ guint keycode;
-+ guint group;
-+ guint level;
-+};
-
- struct _DirectionCacheEntry
- {
-@@ -59,6 +67,7 @@ struct _ClutterKeymapX11
-
- ClutterModifierType num_lock_mask;
- ClutterModifierType scroll_lock_mask;
-+ ClutterModifierType level3_shift_mask;
-
- PangoDirection
[Merge] ~3v1n0/ubuntu/+source/mutter:pristine-tar into ~ubuntu-desktop/ubuntu/+source/mutter:pristine-tar
Marco Trevisan (Treviño) has proposed merging ~3v1n0/ubuntu/+source/mutter:pristine-tar into ~ubuntu-desktop/ubuntu/+source/mutter:pristine-tar. Commit message: Update pristine-tar with tarball for mutter-3.28.3 git snapshot Requested reviews: Ubuntu Desktop (ubuntu-desktop) For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/mutter/+git/mutter/+merge/361809 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/mutter:pristine-tar into ~ubuntu-desktop/ubuntu/+source/mutter:pristine-tar. diff --git a/mutter_3.28.3+git20181011.orig.tar.xz.delta b/mutter_3.28.3+git20181011.orig.tar.xz.delta new file mode 100644 index 000..2bfa518 Binary files /dev/null and b/mutter_3.28.3+git20181011.orig.tar.xz.delta differ diff --git a/mutter_3.28.3+git20181011.orig.tar.xz.id b/mutter_3.28.3+git20181011.orig.tar.xz.id new file mode 100644 index 000..9a7c0c0 --- /dev/null +++ b/mutter_3.28.3+git20181011.orig.tar.xz.id @@ -0,0 +1 @@ +1ce8b486a7862097dbd79f6012a924a5ebaa2a9b diff --git a/mutter_3.29.91.orig.tar.xz.delta b/mutter_3.29.91.orig.tar.xz.delta new file mode 100644 index 000..8d6c6c5 Binary files /dev/null and b/mutter_3.29.91.orig.tar.xz.delta differ diff --git a/mutter_3.29.91.orig.tar.xz.id b/mutter_3.29.91.orig.tar.xz.id new file mode 100644 index 000..a19b6b2 --- /dev/null +++ b/mutter_3.29.91.orig.tar.xz.id @@ -0,0 +1 @@ +4aa1fd8fcbe932f6836acd64f73cde95fc347200 diff --git a/mutter_3.29.92.orig.tar.xz.delta b/mutter_3.29.92.orig.tar.xz.delta new file mode 100644 index 000..8cc6a92 Binary files /dev/null and b/mutter_3.29.92.orig.tar.xz.delta differ diff --git a/mutter_3.29.92.orig.tar.xz.id b/mutter_3.29.92.orig.tar.xz.id new file mode 100644 index 000..5e3cda6 --- /dev/null +++ b/mutter_3.29.92.orig.tar.xz.id @@ -0,0 +1 @@ +cb78cdcfe48949f4e9ecb4fa2e3cf52e950c0c9f -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/mutter:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic
The proposal to merge ~3v1n0/ubuntu/+source/mutter:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic has been updated. Status: Needs review => Superseded For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/mutter/+git/mutter/+merge/361810 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/mutter:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] lp:~khurshid-alam/unity-control-center/update-logo-for-cosmic into lp:unity-control-center/18.10
The proposal to merge lp:~khurshid-alam/unity-control-center/update-logo-for-cosmic into lp:unity-control-center/18.10 has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~khurshid-alam/unity-control-center/update-logo-for-cosmic/+merge/361457 -- Your team Unity Control Center development team is subscribed to branch lp:unity-control-center/18.10. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] lp:~khurshid-alam/unity-control-center/update-logo-for-cosmic into lp:unity-control-center/18.10
Marco Trevisan (Treviño) has proposed merging lp:~khurshid-alam/unity-control-center/update-logo-for-cosmic into lp:unity-control-center/18.10. Commit message: Update logo for cosmic. Requested reviews: Marco Trevisan (Treviño) (3v1n0) Related bugs: Bug #1799008 in unity-control-center (Ubuntu): "[SRU] Update logo for cosmic" https://bugs.launchpad.net/ubuntu/+source/unity-control-center/+bug/1799008 For more details, see: https://code.launchpad.net/~khurshid-alam/unity-control-center/update-logo-for-cosmic/+merge/361457 -- Your team Unity Control Center development team is subscribed to branch lp:unity-control-center/18.10. === modified file 'debian/rules' --- debian/rules 2017-12-06 13:16:43 + +++ debian/rules 2019-01-07 17:56:22 + @@ -18,6 +18,6 @@ DEB_DH_MAKESHLIBS_ARGS_libunity-control-center1 += -- -c4 binary-post-install/unity-control-center:: - ./panels/info/logo-generator --logo panels/info/UbuntuLogoBlank.png --text "ubuntu 18.04 LTS" --output debian/unity-control-center/usr/share/unity-control-center/ui/UbuntuLogo.png + ./panels/info/logo-generator --logo panels/info/UbuntuLogoBlank.png --text "ubuntu 18.10" --output debian/unity-control-center/usr/share/unity-control-center/ui/UbuntuLogo.png common-binary-post-install-arch:: list-missing -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] lp:~khurshid-alam/unity-control-center/update-logo-for-cosmic into lp:unity-control-center
The proposal to merge lp:~khurshid-alam/unity-control-center/update-logo-for-cosmic into lp:unity-control-center has been updated. Status: Approved => Superseded For more details, see: https://code.launchpad.net/~khurshid-alam/unity-control-center/update-logo-for-cosmic/+merge/357530 -- Your team Unity Control Center development team is subscribed to branch lp:unity-control-center. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] lp:~khurshid-alam/unity-control-center/update-logo-for-cosmic into lp:unity-control-center/18.10
Review: Approve -- https://code.launchpad.net/~khurshid-alam/unity-control-center/update-logo-for-cosmic/+merge/361457 Your team Unity Control Center development team is subscribed to branch lp:unity-control-center/18.10. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/gjs:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gjs:ubuntu/bionic
Marco Trevisan (Treviño) has proposed merging ~3v1n0/ubuntu/+source/gjs:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gjs:ubuntu/bionic. Requested reviews: Ubuntu Desktop (ubuntu-desktop) Related bugs: Bug #1803271 in gjs (Ubuntu): "[regression] Much higher CPU during some gnome-shell operations" https://bugs.launchpad.net/ubuntu/+source/gjs/+bug/1803271 For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/gjs/+git/gjs/+merge/361167 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/gjs:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gjs:ubuntu/bionic. diff --git a/Makefile.in b/Makefile.in index fea2a6b..ed5566b 100644 --- a/Makefile.in +++ b/Makefile.in @@ -756,9 +756,8 @@ am__DIST_COMMON = $(srcdir)/Makefile-examples.am \ $(srcdir)/config.h.in $(srcdir)/gjs-1.0.pc.in \ $(srcdir)/gjs-modules-srcs.mk $(srcdir)/gjs-srcs.mk \ $(top_srcdir)/win32/config.h.win32.in AUTHORS COPYING \ - ChangeLog INSTALL NEWS README compile config.guess \ - config.rpath config.sub depcomp install-sh ltmain.sh missing \ - tap-driver.sh + ChangeLog INSTALL NEWS README compile config.guess config.sub \ + depcomp install-sh ltmain.sh missing tap-driver.sh DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) distdir = $(PACKAGE)-$(VERSION) top_distdir = $(distdir) diff --git a/NEWS b/NEWS index 43feb1f..1e33aa5 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,76 @@ +Version 1.52.5 +-- + +- This release includes the "Big Hammer" patch from GNOME 3.30 to reduce memory + usage. For more information, read the blog post at + https://feaneron.com/2018/04/20/the-infamous-gnome-shell-memory-leak/ + It was not originally intended to be backported to GNOME 3.28, but in practice + several Linux distributions already backported it, and it has been working + well to reduce memory usage, and the bugs have been ironed out of it. + + It does decrease performance somewhat, so if you don't want that then don't + install this update. + +- Closed bugs and merge requests: + + * Ensure not to miss the force_gc flag [#150, !132, Carlos Garnacho] + * Make GC much more aggressive [#62, !50, Giovanni Campagna, Georges Basile +Stavracas Neto, Philip Chimento] + * Queue GC when a GObject reference is toggled down [#140, !114, !127, Georges +Basile Stavracas Neto] + * Reduce memory overhead of g_object_weak_ref() [#144, !122, Carlos Garnacho, +Philip Chimento] + * context: Defer and therefore batch forced GC runs [performance] [!236, +Daniel van Vugt] + * context: use timeout with seconds to schedule a gc trigger [!239, Marco +Trevisan] + * Use compacting GC on RSS size growth [!133, #151, Carlos Garnacho] + * GType memleak fixes [!244, Marco Trevisan] + +Version 1.52.4 +-- + +- Closed bugs and merge requests: + + * `ARGV` encoding issues [#22, !108, Evan Welsh] + * Segfault on enumeration of GjSFileImporter properties when a searchpath +entry contains a symlink [#154, !144, Ole Jørgen Brønner] + * Possible refcounting bug around GtkListbox signal handlers [#24, !154, +Philip Chimento] + * Fix up GJS_DISABLE_JIT flag now the JIT is enabled by default in +SpiderMonkey [!159, Christopher Wheeldon] + * Expose GObject static property symbols. [!197, Evan Welsh] + * Do not run linters on tagged commits [!181, Claudio André] + * gjs-1.52.0 fails to compile against x86_64 musl systems [#132, !214, Philip +Chimento] + * gjs no longer builds after recent autoconf-archive updates [#149, !217, +Philip Chimento] + +Version 1.52.3 +-- + +- Closed bugs and merge requests: + + * Include calc.js example from Seed [!130, William Barath, Philip Chimento] + * CI: Un-pin the Fedora Docker image [#141, !131, Claudio André] + * Reduce overhead of wrapped objects [#142, !121, Carlos Garnacho, Philip +Chimento] + * Various CI changes [!134, !136, Claudio André] + +Version 1.52.2 +-- + +- This is an unscheuled release in order to revert a commit that causes a crash + on exit, with some Cairo versions. + +- Closed bugs and merge requests: + + * CI: pinned Fedora to old tag [!119, Claudio André] + * heapgraph.py: adjust terminal output style [!120, Andy Holmes] + * CI: small tweaks [!123, Claudio André] + * Warn about compilation warnings [!125, Claudio André] + * Miscellaneous commits [Philip Chimento, Jason Hicks] + Version 1.52.1 -- diff --git a/config.rpath b/config.rpath deleted file mode 100644 index e69de29..000 --- a/config.rpath +++ /dev/null diff --git a/configure b/configure index 8410fb2..b79e278 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for gjs 1.52.1. +# Generated by GNU Autoconf 2.69 for gjs 1.52.5. # # Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gjs&g
Re: [Merge] ~juliank/ubuntu/+source/nautilus/+git/nautilus:fix-double-deref into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master
Review: Approve Right, thanks... Since we use the autoptr here, while in the upstream change we removed it. If you'd like, would be also possible to sync with what proposed here https://gitlab.gnome.org/GNOME/nautilus/merge_requests/323/ (and about to merge). -- https://code.launchpad.net/~juliank/ubuntu/+source/nautilus/+git/nautilus/+merge/359188 Your team Ubuntu Desktop is requested to review the proposed merge of ~juliank/ubuntu/+source/nautilus/+git/nautilus:fix-double-deref into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] lp:~khurshid-alam/unity-control-center/sharing-panel into lp:unity-control-center
Diff comments: > > === modified file 'debian/control' > --- debian/control2018-02-16 13:07:36 + > +++ debian/control2018-11-20 08:50:32 + > @@ -24,6 +24,7 @@ > libdbus-glib-1-dev (>= 0.32), > libgdk-pixbuf2.0-dev (>= 2.23.0), > libgeonames-dev, > + libgirepository1.0-dev, Mh, is this needed here too? > libglib2.0-dev (>= 2.31.2), > libgnome-bluetooth-dev (>= 3.3.4), > libgnome-desktop-3-dev (>= 3.27.3), -- https://code.launchpad.net/~khurshid-alam/unity-control-center/sharing-panel/+merge/341306 Your team Unity Control Center development team is subscribed to branch lp:unity-control-center. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic-xubuntu-cancel-search into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic
I totally hope the same. I just wish the upstream issue I opened to move with a proper fix will move, because I can't do much other than propose stuff, and ask for some discussion. -- https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/358477 Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/gnome-software:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-software:ubuntu/master
The proposal to merge ~3v1n0/ubuntu/+source/gnome-software:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-software:ubuntu/master has been updated. Status: Needs review => Superseded For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-software/+git/gnome-software/+merge/358488 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/gnome-software:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-software:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/gnome-software:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-software:ubuntu/master
Marco Trevisan (Treviño) has proposed merging ~3v1n0/ubuntu/+source/gnome-software:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-software:ubuntu/master. Requested reviews: Ubuntu Desktop (ubuntu-desktop) Related bugs: Bug #1719797 in gnome-software (Ubuntu): "Firmware update seemingly not working" https://bugs.launchpad.net/ubuntu/+source/gnome-software/+bug/1719797 Bug #1754864 in gnome-software (Ubuntu): "Flatpak related refs are not installed when using GNOME Software on Ubuntu 18.04" https://bugs.launchpad.net/ubuntu/+source/gnome-software/+bug/1754864 Bug #1756379 in gnome-software (Ubuntu): "Delay start of gnome-software service" https://bugs.launchpad.net/ubuntu/+source/gnome-software/+bug/1756379 Bug #1756826 in nautilus (Ubuntu): "hangs when remote search provider performs expensive operation" https://bugs.launchpad.net/ubuntu/+source/nautilus/+bug/1756826 Bug #1798228 in gnome-software (Ubuntu): "Snap search results not in the same order as command line" https://bugs.launchpad.net/ubuntu/+source/gnome-software/+bug/1798228 Bug #1798470 in gnome-software (Ubuntu): "gnome-software can't handle composite CAB files" https://bugs.launchpad.net/ubuntu/+source/gnome-software/+bug/1798470 For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-software/+git/gnome-software/+merge/358488 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/gnome-software:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-software:ubuntu/master. diff --git a/debian/changelog b/debian/changelog index 3a663a4..8dcdc3a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,4 @@ +<<<<<<< debian/changelog gnome-software (3.30.2-0ubuntu8) cosmic; urgency=medium * debian/patches/0001-Revert-ef15f51d.patch: @@ -147,20 +148,79 @@ gnome-software (3.29.1-0ubuntu1) cosmic; urgency=medium -- Robert Ancell Wed, 23 May 2018 11:55:28 +1200 gnome-software (3.28.1-0ubuntu6) cosmic; urgency=medium +=== +gnome-software (3.28.1-0ubuntu4.18.04.6) bionic; urgency=medium +>>>>>>> debian/changelog + * debian/patches/0026-shell-search-provider-implement-XUbuntuCancel.patch +- implement XUbuntuCancel to request pending search cancellation from + gnome-shell (LP: #1756826) + + -- Marco Trevisan (Treviño) Thu, 08 Nov 2018 03:32:00 -0600 + +gnome-software (3.28.1-0ubuntu4.18.04.5) bionic; urgency=medium + + * debian/patches/0023-Revert-Revert-flatpak-Use-list-of-related-apps-for-i.patch: + * debian/patches/0024-flatpak-Check-if-a-related-app-is-installed-even-whe.patch: + * debian/patches/0025-flatpak-Include-related-refs-to-the-app-s-runtime-on.patch: +- Pull related flatpak refs (LP: #1754864) + * debian/patches/0003-Sort-snaps-before-other-apps.patch: +- Fix snap search result ordering (LP: #1798228) + * debian/patches/0001-Set-reboot-notifications-as-urgent-to-avoid-them-tim.patch: +- Stop reboot notification from timing out (LP: #1719797) + * debian/patches/0001-lib-Allow-opening-CAB-files-that-resolve-more-than-o.patch: +- Support composite CAB files (LP: #1798470) + + -- Robert Ancell Mon, 29 Oct 2018 16:06:34 +1300 + +gnome-software (3.28.1-0ubuntu4.18.04.4) bionic; urgency=medium + + * debian/control: +- Bump build-dependency on libsnapd-glib-dev + * debian/patches/0020-Show-verified-developers.patch: +- Show verified developers (LP: #1789336) * debian/patches/0011-Support-snap-channels.patch: -- Make snap channel selection list scrollable (LP: #1768779) -- Fix channel branches all showing the same name (LP: #1768794) -- Alphabetically sort channel branch names (LP: #1769556) + * debian/patches/0021-snap-Use-wide-scope-when-searching.patch: +- Use wide scope searching (LP: #1789338) + * debian/patches/0022-Delay-startup-of-GNOME-Software-to-allow-the-Shell-t.patch: +- Delay startup of service to allow the shell to load first (LP: #1756379) + -- Robert Ancell Wed, 19 Sep 2018 16:27:38 +0200 + +gnome-software (3.28.1-0ubuntu4.18.04.3) bionic; urgency=medium + +<<<<<<< debian/changelog -- Robert Ancell Mon, 07 May 2018 16:31:46 +1200 +=== + * debian/patches/0006-packagekit-Disable-updates.patch: +- also disable offline updates in refresh plugin (LP: #1775226) +>>>>>>> debian/changelog + + -- Olivier Tilloy Thu, 02 Aug 2018 12:25:36 +0200 -gnome-software (3.28.1-0ubuntu5) cosmic; urgency=medium +gnome-software (3.28.1-0ubuntu4.18.04.2) bionic; urgency=medium + + [ Robert Ancell ] + * debian/patches/0014-Add-a-basic-permissions-system.patch: +- Fix crash when have plugs with multiple slots available (LP: #1778160) + + [ Andrea Azzarone ] + * debian/patches/0001-snap-plugin-segfault.patch: +- don't segfault on null snap installation date (lp: #178199
[Merge] ~3v1n0/ubuntu/+source/gnome-software:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-software:ubuntu/bionic
Marco Trevisan (Treviño) has proposed merging
~3v1n0/ubuntu/+source/gnome-software:ubuntu/bionic into
~ubuntu-desktop/ubuntu/+source/gnome-software:ubuntu/bionic.
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
Related bugs:
Bug #1756826 in nautilus (Ubuntu): "hangs when remote search provider
performs expensive operation"
https://bugs.launchpad.net/ubuntu/+source/nautilus/+bug/1756826
For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-software/+git/gnome-software/+merge/358489
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~3v1n0/ubuntu/+source/gnome-software:ubuntu/bionic into
~ubuntu-desktop/ubuntu/+source/gnome-software:ubuntu/bionic.
diff --git a/debian/changelog b/debian/changelog
index 3aa0dbe..a258de6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gnome-software (3.28.1-0ubuntu4.18.04.6) bionic; urgency=medium
+
+ * debian/patches/0026-shell-search-provider-implement-XUbuntuCancel.patch
+- implement XUbuntuCancel to request pending search cancellation from
+ gnome-shell (LP: #1756826)
+
+ -- Marco Trevisan (Treviño) Thu, 08 Nov 2018 03:32:00 -0600
+
gnome-software (3.28.1-0ubuntu4.18.04.5) bionic; urgency=medium
* debian/patches/0023-Revert-Revert-flatpak-Use-list-of-related-apps-for-i.patch:
diff --git a/debian/patches/0026-shell-search-provider-implement-XUbuntuCancel.patch b/debian/patches/0026-shell-search-provider-implement-XUbuntuCancel.patch
new file mode 100644
index 000..f914b22
--- /dev/null
+++ b/debian/patches/0026-shell-search-provider-implement-XUbuntuCancel.patch
@@ -0,0 +1,176 @@
+From 2ac5ea28829ecaff2f8a180f2ef7eefbb07602d9 Mon Sep 17 00:00:00 2001
+From: Andrea Azzarone
+Date: Fri, 7 Sep 2018 19:58:00 +0200
+Subject: [PATCH 24/26] shell-search-provider: implement XUbuntuCancel
+
+Implement XUbuntuCancel to request search cancellation. This is used by
+gnome-shell to cancel the current search e.g. if the search overview is
+closed.
+---
+ src/gs-shell-search-provider.c| 74 +++
+ src/shell-search-provider-dbus-interfaces.xml | 1 +
+ 2 files changed, 60 insertions(+), 15 deletions(-)
+
+diff --git a/src/gs-shell-search-provider.c b/src/gs-shell-search-provider.c
+index c01d72cb..8c1e0fda 100644
+--- a/src/gs-shell-search-provider.c
b/src/gs-shell-search-provider.c
+@@ -45,6 +45,8 @@ struct _GsShellSearchProvider {
+ GsPluginLoader *plugin_loader;
+ GCancellable *cancellable;
+
++ PendingSearch *current_search;
++
+ GHashTable *metas_cache;
+ GsAppList *search_results;
+ };
+@@ -58,6 +60,17 @@ pending_search_free (PendingSearch *search)
+ g_slice_free (PendingSearch, search);
+ }
+
++static void
++cancel_current_search (GsShellSearchProvider *self)
++{
++ g_debug ("*** Cancel current search");
++
++ if (self->cancellable != NULL) {
++ g_cancellable_cancel (self->cancellable);
++ g_clear_object (&self->cancellable);
++ }
++}
++
+ static gint
+ search_sort_by_kudo_cb (GsApp *app1, GsApp *app2, gpointer user_data)
+ {
+@@ -71,6 +84,23 @@ search_sort_by_kudo_cb (GsApp *app1, GsApp *app2, gpointer user_data)
+ return 0;
+ }
+
++static void
++pending_search_finish (PendingSearch *search,
++ GDBusMethodInvocation *invocation,
++ GVariant *result)
++{
++ GsShellSearchProvider *self = search->provider;
++
++ g_dbus_method_invocation_return_value (invocation, result);
++
++ if (search == self->current_search) {
++ self->current_search = NULL;
++ }
++
++ pending_search_free (search);
++ g_application_release (g_application_get_default ());
++}
++
+ static void
+ search_done_cb (GObject *source,
+ GAsyncResult *res,
+@@ -87,10 +117,9 @@ search_done_cb (GObject *source,
+
+ list = gs_plugin_loader_job_process_finish (self->plugin_loader, res, NULL);
+ if (list == NULL) {
+- g_dbus_method_invocation_return_value (search->invocation, g_variant_new ("(as)", NULL));
+- pending_search_free (search);
+- g_application_release (g_application_get_default ());
+- return;
++ pending_search_finish (search, search->invocation,
++ g_variant_new ("(as)", NULL));
++ return;
+ }
+
+ /* sort by kudos, as there is no ratings data by default */
+@@ -106,10 +135,8 @@ search_done_cb (GObject *source,
+ /* cache this in case we need the app in GetResultMetas */
+ gs_app_list_add (self->search_results, app);
+ }
+- g_dbus_method_invocation_return_value (search->invocation, g_variant_new ("(as)", &builder));
+
+- pending_search_free (search);
+- g_application_release (g_application_get_default ());
++ pending_search_finish (search, search->invocation, g_variant_new ("(as)", &builder));
+ }
+
+ static gchar *
+@@ -167,10 +194,7 @@ execute_search (GsShellSearchProvider *self,
+
+ value = g_strjoinv (" ", terms);
+
+- if (self->cancellable != NULL) {
+- g_cancellable_
[Merge] ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic-xubuntu-cancel-search into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic
Marco Trevisan (Treviño) has proposed merging
~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic-xubuntu-cancel-search into
~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic.
Requested reviews:
Iain Lane (laney)
Related bugs:
Bug #1756826 in nautilus (Ubuntu): "hangs when remote search provider
performs expensive operation"
https://bugs.launchpad.net/ubuntu/+source/nautilus/+bug/1756826
For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/358477
Reproposing after the revert...
--
Your team Ubuntu Desktop is subscribed to branch
~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic.
diff --git a/debian/changelog b/debian/changelog
index 2d2d1df..526692c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+gnome-shell (3.28.3-0ubuntu0.18.04.4) UNRELEASED; urgency=medium
+
+ * d/p/search-Cancel-search-provider-operations-on-clear.patch,
+d/p/search-Ignore-search-provider-results-metas-if-search-is-.patch,
+d/p/viewSelector-Cancel-search-on-overview-hidden.patch,
+d/p/ubuntu/search-call-XUbuntuCancel-method-on-providers-when-no-dat.patch:
+- Add support for cancelling remote search providers when the overlay
+ is closed (and actually stop searches when requested from UI, LP: #1756826)
+
+ -- Marco Trevisan (Treviño) Thu, 08 Nov 2018 01:15:02 -0500
+
gnome-shell (3.28.3-0ubuntu0.18.04.3) bionic; urgency=medium
* debian/ubuntu.css:
diff --git a/debian/patches/search-Cancel-search-provider-operations-on-clear.patch b/debian/patches/search-Cancel-search-provider-operations-on-clear.patch
new file mode 100644
index 000..052ee8a
--- /dev/null
+++ b/debian/patches/search-Cancel-search-provider-operations-on-clear.patch
@@ -0,0 +1,29 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?=
+Date: Thu, 23 Aug 2018 18:14:38 +0200
+Subject: search: Cancel search provider operations on clear
+
+Ensure that the search provider operations (just getResultMetas requests in the
+current implementation) in progress are properly cancelled when we clear the UI,
+otherwise returned results might still be added when not needed.
+
+This is triggered for each provider by the SearchResults reset.
+
+Bug-GNOME: https://gitlab.gnome.org/GNOME/gnome-shell/issues/183
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/bionic/+source/gnome-shell/+bug/1756826
+Forwarded: https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/205
+---
+ js/ui/search.js | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/js/ui/search.js b/js/ui/search.js
+index 1fb54b4..804be95 100644
+--- a/js/ui/search.js
b/js/ui/search.js
+@@ -192,6 +192,7 @@ var SearchResultsBase = new Lang.Class({
+ },
+
+ clear() {
++this._cancellable.cancel();
+ for (let resultId in this._resultDisplays)
+ this._resultDisplays[resultId].actor.destroy();
+ this._resultDisplays = {};
diff --git a/debian/patches/search-Ignore-search-provider-results-metas-if-search-is-.patch b/debian/patches/search-Ignore-search-provider-results-metas-if-search-is-.patch
new file mode 100644
index 000..27645a5
--- /dev/null
+++ b/debian/patches/search-Ignore-search-provider-results-metas-if-search-is-.patch
@@ -0,0 +1,30 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?=
+Date: Thu, 30 Aug 2018 07:11:24 +0200
+Subject: search: Ignore search provider results metas if search is cancelled
+
+Call updateSearch callback with no results when the search provider has been
+cancelled, without doing any logging.
+
+Bug-GNOME: https://gitlab.gnome.org/GNOME/gnome-shell/issues/183
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/bionic/+source/gnome-shell/+bug/1756826
+Forwarded: https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/205
+---
+ js/ui/search.js | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/js/ui/search.js b/js/ui/search.js
+index 804be95..dd4bfad 100644
+--- a/js/ui/search.js
b/js/ui/search.js
+@@ -227,8 +227,9 @@ var SearchResultsBase = new Lang.Class({
+
+ this.provider.getResultMetas(metasNeeded, metas => {
+ if (metas.length != metasNeeded.length) {
+-log('Wrong number of result metas returned by search provider ' + this.provider.id +
+-': expected ' + metasNeeded.length + ' but got ' + metas.length);
++if (!this._cancellable.is_cancelled())
++log(`Wrong number of result metas returned by search provider ${this.provider.id}` +
++`: expected ${metasNeeded.length} but got ${metas.length}`);
+ callback(false);
+ return;
+ }
diff --git a/debian/patches/series b/debian/patches/series
index 6a12345..02a323d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -25,3 +25,7 @@ popupMenu-Don-t-handle-key-presses-directly-if
[Merge] ~3v1n0/ubuntu/+source/nautilus:ubuntu/master-recent-files-crashes-fix into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master
Marco Trevisan (Treviño) has proposed merging
~3v1n0/ubuntu/+source/nautilus:ubuntu/master-recent-files-crashes-fix into
~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master.
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
Related bugs:
Bug #1760569 in nautilus (Ubuntu): "Nautilus crashes in g_free ->
g_bookmark_file_move_item -> gtk_recent_manager_move_item ->
nautilus_recent_update_file_moved"
https://bugs.launchpad.net/ubuntu/+source/nautilus/+bug/1760569
Bug #1774587 in nautilus (Ubuntu): "nautilus crashes in recent_thread_func ->
is_file_valid_recursive -> g_local_file_query_info -> free(): invalid pointer"
https://bugs.launchpad.net/ubuntu/+source/nautilus/+bug/1774587
For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/nautilus/+git/nautilus/+merge/358484
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~3v1n0/ubuntu/+source/nautilus:ubuntu/master-recent-files-crashes-fix into
~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master.
diff --git a/debian/changelog b/debian/changelog
index aea1b84..f255ee3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+nautilus (1:3.26.4-0ubuntu8) UNRELEASED; urgency=medium
+
+ * d/p/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch:
+- Don't start a new search thread until the one running is over
+ (LP: #1774587)
+ * d/p/0017-recent-add-function-to-update-manager-on-file-rename.patch:
+- Do not try to update the position of a recent file if it didn't change
+ (LP: #1760569)
+
+ -- Marco Trevisan (Treviño) Thu, 08 Nov 2018 02:32:03 -0600
+
nautilus (1:3.26.4-0ubuntu7) cosmic; urgency=medium
* d/p/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch:
diff --git a/debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch b/debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch
index 56ab309..c4be530 100644
--- a/debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch
+++ b/debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch
@@ -1,5 +1,5 @@
From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?=
-Date: Wed, 21 Feb 2018 17:05:51 +0100
+Date: Wed, 21 Feb 2018 10:05:51 -0600
Subject: search-engine: add a recent-search-engine listing GtkRecentManager
entries
@@ -17,10 +17,10 @@ Applied-Upstream: 3.30.0, https://gitlab.gnome.org/GNOME/nautilus/commit/6968637
Forwarded: yes, https://gitlab.gnome.org/GNOME/nautilus/merge_requests/335
---
src/meson.build | 2 +
- src/nautilus-search-engine-recent.c | 440
+ src/nautilus-search-engine-recent.c | 433
src/nautilus-search-engine-recent.h | 36 +++
src/nautilus-search-engine.c| 11 +
- 4 files changed, 489 insertions(+)
+ 4 files changed, 482 insertions(+)
create mode 100644 src/nautilus-search-engine-recent.c
create mode 100644 src/nautilus-search-engine-recent.h
@@ -39,10 +39,10 @@ index 73aafe9..213b35f 100644
'nautilus-search-hit.c',
diff --git a/src/nautilus-search-engine-recent.c b/src/nautilus-search-engine-recent.c
new file mode 100644
-index 000..40cf7e0
+index 000..95d8c21
--- /dev/null
+++ b/src/nautilus-search-engine-recent.c
-@@ -0,0 +1,440 @@
+@@ -0,0 +1,433 @@
+/*
+ * Copyright (C) 2018 Canonical Ltd
+ *
@@ -141,7 +141,7 @@ index 000..40cf7e0
+search_thread_add_hits_idle (gpointer user_data)
+{
+SearchHitsData *search_hits = user_data;
-+NautilusSearchEngineRecent *self = search_hits->recent;
++g_autoptr (NautilusSearchEngineRecent) self = search_hits->recent;
+NautilusSearchProvider *provider = NAUTILUS_SEARCH_PROVIDER (self);
+
+self->add_hits_idle_id = 0;
@@ -160,8 +160,6 @@ index 000..40cf7e0
+ NAUTILUS_SEARCH_PROVIDER_STATUS_NORMAL);
+g_object_notify (G_OBJECT (provider), "running");
+
-+g_object_unref (self);
-+
+return FALSE;
+}
+
@@ -173,6 +171,7 @@ index 000..40cf7e0
+
+if (self->add_hits_idle_id != 0)
+{
++g_list_free_full (hits, g_object_unref);
+return;
+}
+
@@ -231,7 +230,7 @@ index 000..40cf7e0
+static gpointer
+recent_thread_func (gpointer user_data)
+{
-+NautilusSearchEngineRecent *self = NAUTILUS_SEARCH_ENGINE_RECENT (user_data);
++g_autoptr (NautilusSearchEngineRecent) self = NAUTILUS_SEARCH_ENGINE_RECENT (user_data);
+g_autoptr (GPtrArray) date_range = NULL;
+g_autoptr (GFile) query_location = NULL;
+GList *recent_items;
@@ -263,28 +262,6 @@ index 000..40cf7e0
+continue;
+}
+
-+if (gtk_recent_info_is_local (info))
-+{
-+g_autoptr (GError) error = NULL;
-+
-+if (!is_file_valid_recursive (self, file, &error))
-+
[Merge] ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic-sru3 into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic
The proposal to merge ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic-sru3 into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic has been updated. Description changed to: Reverting XUbuntuCancel patches, we will do them soon after this For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/358010 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic-sru3 into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/mutter:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic
Marco Trevisan (Treviño) has proposed merging
~3v1n0/ubuntu/+source/mutter:ubuntu/bionic into
~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic.
Commit message:
Fix already in cosmic, no need to port there.
Requested reviews:
Ubuntu Server Dev import team (usd-import-team)
Related bugs:
Bug #1727356 in mutter (Ubuntu): "Login screen never appears on early
generation Intel GPUs (Core2 and Atom etc)"
https://bugs.launchpad.net/ubuntu/+source/mutter/+bug/1727356
For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/mutter/+git/mutter/+merge/358007
--
Your team Ubuntu Desktop is subscribed to branch
~ubuntu-desktop/ubuntu/+source/mutter:ubuntu/bionic.
diff --git a/debian/changelog b/debian/changelog
index 9c9690f..50adac6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mutter (3.28.3-2~ubuntu18.04.2) UNRELEASED; urgency=medium
+
+ * d/p/renderer-native-Fallback-to-non-planar-API-if-gbm_bo_get_.patch:
+- Create back buffers in early intel GPU generations (LP: #1727356)
+
+ -- Marco Trevisan (Treviño) Tue, 30 Oct 2018 12:25:42 +0100
+
mutter (3.28.3-2~ubuntu18.04.1) bionic; urgency=medium
* No-change backport from unstable to bionic
diff --git a/debian/patches/renderer-native-Fallback-to-non-planar-API-if-gbm_bo_get_.patch b/debian/patches/renderer-native-Fallback-to-non-planar-API-if-gbm_bo_get_.patch
new file mode 100644
index 000..a25fca3
--- /dev/null
+++ b/debian/patches/renderer-native-Fallback-to-non-planar-API-if-gbm_bo_get_.patch
@@ -0,0 +1,63 @@
+From: =?utf-8?q?Alex_Villac=C3=ADs_Lasso?=
+Date: Fri, 27 Jul 2018 16:08:52 +
+Subject: renderer/native: Fallback to non-planar API if
+ gbm_bo_get_handle_for_plane fails
+
+Commit c0d9b08ef9bf2be865aad9bf1bc74ba24c655d9f replaced the old GBM API calls
+with the multi-plane GBM API. However, the call to gbm_bo_get_handle_for_plane
+fails for some DRI drivers (in particular i915). Due to missing error checks,
+the subsequent call to drmModeAddFB[2] fails and the screen output locks up.
+
+This commit adds the missing error checks and falls back to the old GBM API
+(non-planar) if necessary.
+
+v5: test success of gbm_bo_get_handle_for_plane instead of errno
+
+This commit adopts solution proposed by Daniel van Vugt to check the return
+value of gbm_bo_get_handle_for_plane on plane 0 and fall back to old
+non-planar method if the call fails. This removes the errno check (for
+ENOSYS) that could abort if mesa ever sets a different value.
+
+Related to: https://gitlab.gnome.org/GNOME/mutter/issues/127
+
+(cherry picked from commit f7af32a3eaefabbea3ebbda3a93eff98dd105ab9)
+
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/mutter/+bug/1727356
+Applied-Upstream: yes, 3.28.4
+---
+ src/backends/native/meta-renderer-native.c | 21 -
+ 1 file changed, 16 insertions(+), 5 deletions(-)
+
+diff --git a/src/backends/native/meta-renderer-native.c b/src/backends/native/meta-renderer-native.c
+index fc6b223..59003b3 100644
+--- a/src/backends/native/meta-renderer-native.c
b/src/backends/native/meta-renderer-native.c
+@@ -1607,12 +1607,23 @@ gbm_get_next_fb_id (MetaGpuKms *gpu_kms,
+ return FALSE;
+ }
+
+- for (i = 0; i < gbm_bo_get_plane_count (next_bo); i++)
++ if (gbm_bo_get_handle_for_plane (next_bo, 0).s32 == -1)
+ {
+- strides[i] = gbm_bo_get_stride_for_plane (next_bo, i);
+- handles[i] = gbm_bo_get_handle_for_plane (next_bo, i).u32;
+- offsets[i] = gbm_bo_get_offset (next_bo, i);
+- modifiers[i] = gbm_bo_get_modifier (next_bo);
++ /* Failed to fetch handle to plane, falling back to old method */
++ strides[0] = gbm_bo_get_stride (next_bo);
++ handles[0] = gbm_bo_get_handle (next_bo).u32;
++ offsets[0] = 0;
++ modifiers[0] = DRM_FORMAT_MOD_INVALID;
++}
++ else
++{
++ for (i = 0; i < gbm_bo_get_plane_count (next_bo); i++)
++{
++ strides[i] = gbm_bo_get_stride_for_plane (next_bo, i);
++ handles[i] = gbm_bo_get_handle_for_plane (next_bo, i).u32;
++ offsets[i] = gbm_bo_get_offset (next_bo, i);
++ modifiers[i] = gbm_bo_get_modifier (next_bo);
++}
+ }
+
+ kms_fd = meta_gpu_kms_get_fd (gpu_kms);
diff --git a/debian/patches/series b/debian/patches/series
index 860ee4c..98e9337 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,6 +10,7 @@ theme-load-icons-as-Gtk-does-with-fallback-and-RTL-suppor.patch
clutter-Smooth-out-master-clock-to-smooth-visuals.patch
core-Return-1-if-meta_window_get_monitor-is-called-on-an-.patch
bgo768531_workaround-startup-notifications.patch
+renderer-native-Fallback-to-non-planar-API-if-gbm_bo_get_.patch
debian/synaptics-support.patch
debian/skip-failing-tests.patch
debian/skip-failing-tests-325.patch
--
ubuntu-desktop mailing list
ubuntu-desktop@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic-sru3 into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic
Marco Trevisan (Treviño) has proposed merging
~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic-sru3 into
~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic with
~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic-touch-two-clicks-fix as a
prerequisite.
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
Related bugs:
Bug #1725312 in gnome-shell (Ubuntu): "gnome-shell crashed with SIGSEGV in
st_widget_style_changed() from st_scroll_view_style_changed()"
https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1725312
Bug #1739931 in gnome-shell (Ubuntu): "Separator lines in shell popup menus
are too faint to see"
https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1739931
Bug #1743058 in gnome-shell (Ubuntu): "Input field height changes slightly
when entering in st password fields."
https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1743058
Bug #1745888 in gnome-shell (Ubuntu): "Two instances of a program launch
whenever you touch a favorites icon"
https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1745888
For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/358010
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic-sru3 into
~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic.
diff --git a/debian/changelog b/debian/changelog
index c6ad925..c43929d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,16 +1,13 @@
gnome-shell (3.28.3-0ubuntu0.18.04.3) UNRELEASED; urgency=medium
- * d/p/search-Cancel-search-provider-operations-on-clear.patch,
-d/p/search-Ignore-search-provider-results-metas-if-search-is-.patch,
-d/p/viewSelector-Cancel-search-on-overview-hidden.patch,
-d/p/ubuntu/search-call-XUbuntuCancel-method-on-providers-when-no-dat.patch:
-- Add support for cancelling remote search providers when the overlay
- is closed (and actually stop searches when requested from UI, LP: #1756826)
* debian/ubuntu.css:
- use defined color for menu separators (LP: #1739931)
- set StEntry minimun height to work properly with Ubuntu font (LP: #1743058)
* debian/patches/st-button-Ignore-pointer-emulated-touch-events.patch:
- Don't emit two click events on touch under X11 (LP: #1745888)
+ * d/p/st-scroll-view-Handle-the-case-where-scrollbars-are-NULL.patch,
+d/p/st-scroll-view-Remove-scrollbars-references-on-dispose.patch:
+- Handle NULL scroll bars in st-scroll-view (LP: #1725312)
-- Marco Trevisan (Treviño) Wed, 03 Oct 2018 00:50:42 +0200
diff --git a/debian/patches/search-Cancel-search-provider-operations-on-clear.patch b/debian/patches/search-Cancel-search-provider-operations-on-clear.patch
deleted file mode 100644
index 052ee8a..000
--- a/debian/patches/search-Cancel-search-provider-operations-on-clear.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?=
-Date: Thu, 23 Aug 2018 18:14:38 +0200
-Subject: search: Cancel search provider operations on clear
-
-Ensure that the search provider operations (just getResultMetas requests in the
-current implementation) in progress are properly cancelled when we clear the UI,
-otherwise returned results might still be added when not needed.
-
-This is triggered for each provider by the SearchResults reset.
-
-Bug-GNOME: https://gitlab.gnome.org/GNOME/gnome-shell/issues/183
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/bionic/+source/gnome-shell/+bug/1756826
-Forwarded: https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/205
- js/ui/search.js | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/js/ui/search.js b/js/ui/search.js
-index 1fb54b4..804be95 100644
a/js/ui/search.js
-+++ b/js/ui/search.js
-@@ -192,6 +192,7 @@ var SearchResultsBase = new Lang.Class({
- },
-
- clear() {
-+this._cancellable.cancel();
- for (let resultId in this._resultDisplays)
- this._resultDisplays[resultId].actor.destroy();
- this._resultDisplays = {};
diff --git a/debian/patches/search-Ignore-search-provider-results-metas-if-search-is-.patch b/debian/patches/search-Ignore-search-provider-results-metas-if-search-is-.patch
deleted file mode 100644
index 27645a5..000
--- a/debian/patches/search-Ignore-search-provider-results-metas-if-search-is-.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?=
-Date: Thu, 30 Aug 2018 07:11:24 +0200
-Subject: search: Ignore search provider results metas if search is cancelled
-
-Call updateSearch callback with no results when the search provider has been
-cancelled, without doing any logging.
-
-Bug-GNOME: https://gitlab.gnome.org/GNOME/gnome-shell/issues/183
-Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/bionic/+source/gnome-shell/+bug/1756826
-Forwarded: https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/205
-
[Merge] ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master
Marco Trevisan (Treviño) has proposed merging
~3v1n0/ubuntu/+source/gnome-shell:ubuntu/master into
~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master.
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
Related bugs:
Bug #1745888 in gnome-shell (Ubuntu): "Two instances of a program launch
whenever you touch a favorites icon"
https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1745888
For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/357992
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~3v1n0/ubuntu/+source/gnome-shell:ubuntu/master into
~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master.
diff --git a/debian/changelog b/debian/changelog
index ecf0df1..1bcb1a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
gnome-shell (3.30.1-2ubuntu2) UNRELEASED; urgency=medium
+ [ Didier Roche ]
* debian/patches/ubuntu/background_login.patch:
- match Yaru theme in the ubuntu session instead of our previous GDM
background (LP: #1789356)
@@ -7,6 +8,10 @@ gnome-shell (3.30.1-2ubuntu2) UNRELEASED; urgency=medium
- ensure we resolve finale theme file path to correctly load assets
under gdm (LP: #1798747)
+ [ Marco Trevisan (Treviño) ]
+ * debian/patches/st-button-Ignore-pointer-emulated-touch-events.patch:
+- Don't emit two click events on touch under X11 (LP: #1745888)
+
-- Didier Roche Wed, 17 Oct 2018 14:58:42 +0200
gnome-shell (3.30.1-2ubuntu1) cosmic; urgency=medium
diff --git a/debian/patches/series b/debian/patches/series
index 2d27e92..8a58fee 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,5 +18,6 @@ main-add-backtrace-crashes-all-and-backtrace-all.patch
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
+st-button-Ignore-pointer-emulated-touch-events.patch
ubuntu/search-call-XUbuntuCancel-method-on-providers-when-no-dat.patch
ubuntu/resolve_alternate_theme_path.patch
diff --git a/debian/patches/st-button-Ignore-pointer-emulated-touch-events.patch b/debian/patches/st-button-Ignore-pointer-emulated-touch-events.patch
new file mode 100644
index 000..538bb17
--- /dev/null
+++ b/debian/patches/st-button-Ignore-pointer-emulated-touch-events.patch
@@ -0,0 +1,42 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?=
+Date: Thu, 25 Oct 2018 06:35:25 +0200
+Subject: st-button: Ignore pointer emulated touch events
+
+In X11, pointer emulated touch events are replicated with normal PRESS, RELEASE
+pair events which are generated by the server. Thus for a single tap we get:
+ - TOUCH_BEGIN -> TOUCH_END, PRESS -> RELEASE
+
+This will cause st-button to send two "clicked" signals, instead of just one,
+breaking extensions (like dash-to-dock) that show buttons in the main stage
+which will be checked two times or that will receive the same signal two times.
+
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1745888
+Forwarded: yes, https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/272
+---
+ src/st/st-button.c | 7 +--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/st/st-button.c b/src/st/st-button.c
+index 8f5c492..a3a7b24 100644
+--- a/src/st/st-button.c
b/src/st/st-button.c
+@@ -248,14 +248,17 @@ st_button_touch_event (ClutterActor *actor,
+ if (event->type == CLUTTER_TOUCH_BEGIN && !priv->press_sequence)
+ {
+ clutter_input_device_sequence_grab (device, sequence, actor);
+- st_button_press (button, device, 0, sequence);
++ if (!clutter_event_is_pointer_emulated ((ClutterEvent*) event))
++st_button_press (button, device, 0, sequence);
+ return CLUTTER_EVENT_STOP;
+ }
+ else if (event->type == CLUTTER_TOUCH_END &&
+priv->device == device &&
+priv->press_sequence == sequence)
+ {
+- st_button_release (button, device, mask, 0, sequence);
++ if (!clutter_event_is_pointer_emulated ((ClutterEvent*) event))
++st_button_release (button, device, mask, 0, sequence);
++
+ clutter_input_device_sequence_ungrab (device, sequence);
+ return CLUTTER_EVENT_STOP;
+ }
--
ubuntu-desktop mailing list
ubuntu-desktop@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic-touch-two-clicks-fix into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic
Marco Trevisan (Treviño) has proposed merging
~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic-touch-two-clicks-fix into
~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic with
~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic-theming-fixes as a prerequisite.
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
Related bugs:
Bug #1739931 in gnome-shell (Ubuntu): "Separator lines in shell popup menus
are too faint to see"
https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1739931
Bug #1743058 in gnome-shell (Ubuntu): "Input field height changes slightly
when entering in st password fields."
https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1743058
Bug #1745888 in gnome-shell (Ubuntu): "Two instances of a program launch
whenever you touch a favorites icon"
https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1745888
For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/357993
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic-touch-two-clicks-fix into
~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic.
diff --git a/debian/changelog b/debian/changelog
index 0ce4a7d..c6ad925 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ gnome-shell (3.28.3-0ubuntu0.18.04.3) UNRELEASED; urgency=medium
* debian/ubuntu.css:
- use defined color for menu separators (LP: #1739931)
- set StEntry minimun height to work properly with Ubuntu font (LP: #1743058)
+ * debian/patches/st-button-Ignore-pointer-emulated-touch-events.patch:
+- Don't emit two click events on touch under X11 (LP: #1745888)
-- Marco Trevisan (Treviño) Wed, 03 Oct 2018 00:50:42 +0200
diff --git a/debian/patches/series b/debian/patches/series
index ad2c4be..217740f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -25,4 +25,5 @@ popupMenu-Don-t-handle-key-presses-directly-if-there-are-.patch
viewSelector-Cancel-search-on-overview-hidden.patch
search-Cancel-search-provider-operations-on-clear.patch
search-Ignore-search-provider-results-metas-if-search-is-.patch
+st-button-Ignore-pointer-emulated-touch-events.patch
ubuntu/search-call-XUbuntuCancel-method-on-providers-when-no-dat.patch
diff --git a/debian/patches/st-button-Ignore-pointer-emulated-touch-events.patch b/debian/patches/st-button-Ignore-pointer-emulated-touch-events.patch
new file mode 100644
index 000..538bb17
--- /dev/null
+++ b/debian/patches/st-button-Ignore-pointer-emulated-touch-events.patch
@@ -0,0 +1,42 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?=
+Date: Thu, 25 Oct 2018 06:35:25 +0200
+Subject: st-button: Ignore pointer emulated touch events
+
+In X11, pointer emulated touch events are replicated with normal PRESS, RELEASE
+pair events which are generated by the server. Thus for a single tap we get:
+ - TOUCH_BEGIN -> TOUCH_END, PRESS -> RELEASE
+
+This will cause st-button to send two "clicked" signals, instead of just one,
+breaking extensions (like dash-to-dock) that show buttons in the main stage
+which will be checked two times or that will receive the same signal two times.
+
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1745888
+Forwarded: yes, https://gitlab.gnome.org/GNOME/gnome-shell/merge_requests/272
+---
+ src/st/st-button.c | 7 +--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/st/st-button.c b/src/st/st-button.c
+index 8f5c492..a3a7b24 100644
+--- a/src/st/st-button.c
b/src/st/st-button.c
+@@ -248,14 +248,17 @@ st_button_touch_event (ClutterActor *actor,
+ if (event->type == CLUTTER_TOUCH_BEGIN && !priv->press_sequence)
+ {
+ clutter_input_device_sequence_grab (device, sequence, actor);
+- st_button_press (button, device, 0, sequence);
++ if (!clutter_event_is_pointer_emulated ((ClutterEvent*) event))
++st_button_press (button, device, 0, sequence);
+ return CLUTTER_EVENT_STOP;
+ }
+ else if (event->type == CLUTTER_TOUCH_END &&
+priv->device == device &&
+priv->press_sequence == sequence)
+ {
+- st_button_release (button, device, mask, 0, sequence);
++ if (!clutter_event_is_pointer_emulated ((ClutterEvent*) event))
++st_button_release (button, device, mask, 0, sequence);
++
+ clutter_input_device_sequence_ungrab (device, sequence);
+ return CLUTTER_EVENT_STOP;
+ }
--
ubuntu-desktop mailing list
ubuntu-desktop@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] lp:~khurshid-alam/unity-control-center/update-logo-for-cosmic into lp:unity-control-center
Review: Approve LGTM -- https://code.launchpad.net/~khurshid-alam/unity-control-center/update-logo-for-cosmic/+merge/357530 Your team Unity Control Center development team is subscribed to branch lp:unity-control-center. -- 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
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
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
[Merge] ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic
Marco Trevisan (Treviño) has proposed merging ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic. Requested reviews: Ubuntu Desktop (ubuntu-desktop) For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/nautilus/+git/nautilus/+merge/356988 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic. diff --git a/debian/changelog b/debian/changelog index 1ae1d9a..4b9813a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,16 +1,9 @@ -nautilus (1:3.26.4-0~ubuntu18.04.3) bionic; urgency=medium - - * d/p/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch: -- Fix unpaired unref on search engine (LP: #1795028) - - -- Marco Trevisan (Treviño) Mon, 15 Oct 2018 15:23:29 +0200 - -nautilus (1:3.26.4-0~ubuntu18.04.2) bionic; urgency=medium +nautilus (1:3.26.4-0~ubuntu18.04.2) UNRELEASED; urgency=medium * d/p/search-engine-Query-file-system-to-determine-remoteness.patch: - Fix remote filesystem check on file during search (LP: #1795028) * d/p/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch: -- Refreshed to add memory leak and potential crash fixes +- Refreshed to add memory leak and potential crash fixes (LP: #1798426) -- Marco Trevisan (Treviño) Mon, 08 Oct 2018 18:30:01 +0200 -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/gdm3:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/master
Marco Trevisan (Treviño) has proposed merging
~3v1n0/ubuntu/+source/gdm3:ubuntu/master into
~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/master.
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
Related bugs:
Bug #1794280 in gdm3 (Ubuntu): "gdm doesn't start on a fresh installation of
Cosmic Desktop"
https://bugs.launchpad.net/ubuntu/+source/gdm3/+bug/1794280
For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/gdm3/+git/gdm3/+merge/356861
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~3v1n0/ubuntu/+source/gdm3:ubuntu/master into
~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/master.
diff --git a/debian/changelog b/debian/changelog
index 29491af..9b30904 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+gdm3 (3.30.1-1ubuntu4) UNRELEASED; urgency=medium
+
+ * d/p/u/gdm3.service-wait-for-drm-device-before-trying-to-start-i.patch:
+- Wait for the first valid gdm device on pre-start (LP: #1794280)
++ debian/control:
+ - Add build-depends on libgudev-1.0-dev
+
+ -- Marco Trevisan (Treviño) Tue, 16 Oct 2018 14:08:32 -0500
+
gdm3 (3.30.1-1ubuntu3) cosmic; urgency=medium
* Build-Depend on gjs so that we don't produce uninstallable packages
diff --git a/debian/patches/series b/debian/patches/series
index b7dd121..cab417d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@ ubuntu_config_error_dialog.patch
ubuntu_dont_set_language_env.patch
ubuntu_prefer_ubuntu_session_fallback.patch
ubuntu_revert_nvidia_wayland_blacklist.patch
+ubuntu/gdm3.service-wait-for-drm-device-before-trying-to-start-i.patch
diff --git a/debian/patches/ubuntu/gdm3.service-wait-for-drm-device-before-trying-to-start-i.patch b/debian/patches/ubuntu/gdm3.service-wait-for-drm-device-before-trying-to-start-i.patch
new file mode 100644
index 000..b33510e
--- /dev/null
+++ b/debian/patches/ubuntu/gdm3.service-wait-for-drm-device-before-trying-to-start-i.patch
@@ -0,0 +1,169 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?=
+Date: Tue, 16 Oct 2018 20:59:23 +0200
+Subject: gdm3.service: wait for drm device before trying to start it
+
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gdm3/+bug/1794280
+Forwarded: not-needed
+---
+ configure.ac | 1 +
+ data/Makefile.am | 1 +
+ data/gdm.service.in | 4 +++
+ utils/Makefile.am| 9 +
+ utils/gdm-wait-for-drm.c | 85
+ 5 files changed, 100 insertions(+)
+ create mode 100644 utils/gdm-wait-for-drm.c
+
+diff --git a/configure.ac b/configure.ac
+index f763632..37fa2ec 100644
+--- a/configure.ac
b/configure.ac
+@@ -76,6 +76,7 @@ PKG_CHECK_MODULES(COMMON,
+ gobject-2.0 >= $GLIB_REQUIRED_VERSION
+ gio-2.0 >= $GLIB_REQUIRED_VERSION
+ gio-unix-2.0 >= $GLIB_REQUIRED_VERSION
++gudev-1.0
+ )
+ AC_SUBST(COMMON_CFLAGS)
+ AC_SUBST(COMMON_LIBS)
+diff --git a/data/Makefile.am b/data/Makefile.am
+index 4aae042..f5b185a 100644
+--- a/data/Makefile.am
b/data/Makefile.am
+@@ -208,6 +208,7 @@ systemdsystemunit =
+ gdm.service: $(srcdir)/gdm.service.in
+ $(AM_V_GEN)sed \
+ -e 's,[@]sbindir[@],$(sbindir),g' \
++ -e 's,[@]libexecdir[@],$(libexecdir),g' \
+ -e 's,[@]GDM_INITIAL_VT[@],$(GDM_INITIAL_VT),g' \
+ -e 's,[@]LANG_CONFIG_FILE[@],$(LANG_CONFIG_FILE),g' \
+ -e 's,[@]PLYMOUTH_QUIT_SERVICE[@],$(PLYMOUTH_QUIT_SERVICE),g' \
+diff --git a/data/gdm.service.in b/data/gdm.service.in
+index 446e173..89c0bbc 100644
+--- a/data/gdm.service.in
b/data/gdm.service.in
+@@ -32,3 +32,7 @@ StandardError=inherit
+ EnvironmentFile=-@LANG_CONFIG_FILE@
+ ExecReload=/usr/share/gdm/generate-config
+ ExecReload=/bin/kill -SIGHUP $MAINPID
++ExecStartPre=@libexecdir@/gdm-wait-for-drm
++
++[Install]
++Alias=display-manager.service
+diff --git a/utils/Makefile.am b/utils/Makefile.am
+index babe890..3eb43c3 100644
+--- a/utils/Makefile.am
b/utils/Makefile.am
+@@ -35,6 +35,7 @@ bin_PROGRAMS = \
+
+ libexec_PROGRAMS = \
+ gdm-disable-wayland \
++ gdm-wait-for-drm \
+ $(NULL)
+
+ gdmflexiserver_LDADD = \
+@@ -63,6 +64,14 @@ gdm_disable_wayland_SOURCES = \
+ gdm-disable-wayland.c \
+ $(NULL)
+
++gdm_wait_for_drm_LDADD = \
++ $(COMMON_LIBS) \
++ $(NULL)
++
++gdm_wait_for_drm_SOURCES = \
++ gdm-wait-for-drm.c \
++ $(NULL)
++
+ CLEANFILES = \
+ $(NULL)
+
+diff --git a/utils/gdm-wait-for-drm.c b/utils/gdm-wait-for-drm.c
+new file mode 100644
+index 000..741134e
+--- /dev/null
b/utils/gdm-wait-for-drm.c
+@@ -0,0 +1,85 @@
++#include
++#include
++
++static gboolean
++handle_device (GUdevDevice *device)
++{
++const gchar * const * tags;
++tags = g_udev_device_get_tags (device);
++g_debug ("%s\n", g_udev_device_get_name (device));
++if (g_strv_contains (tags, "master-of-seat"))
++{
++g_d
[Merge] ~3v1n0/ubuntu/+source/nautilus:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master
Marco Trevisan (Treviño) has proposed merging ~3v1n0/ubuntu/+source/nautilus:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master. Requested reviews: Sebastien Bacher (seb128) Related bugs: Bug #1797851 in nautilus (Ubuntu): "/usr/bin/nautilus:11:g_type_check_instance_cast:NAUTILUS_SEARCH_PROVIDER:nautilus_search_engine_stop:stop_search:disconnect_model_handlers" https://bugs.launchpad.net/ubuntu/+source/nautilus/+bug/1797851 For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/nautilus/+git/nautilus/+merge/356725 -- Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master. diff --git a/debian/changelog b/debian/changelog index 4238695..14a1f2e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +nautilus (1:3.26.4-0ubuntu7) UNRELEASED; urgency=medium + + * search-engine-add-a-recent-search-engine-listing-GtkRecen.patch: +- Fix unpaired unref on search engine (LP: #1797851) + + -- Marco Trevisan (Treviño) Mon, 15 Oct 2018 13:57:46 +0200 + nautilus (1:3.26.4-0ubuntu6) cosmic; urgency=medium * d/p/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch: diff --git a/debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch b/debian/patches/search-engine-add-a-recent-search-engine-listing-GtkRecen.patch index d2c1db5..56ab309 100644 --- a/debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch +++ b/debian/patches/search-engine-add-a-recent-search-engine-listing-GtkRecen.patch @@ -14,7 +14,7 @@ just a waste. Origin: upstream Applied-Upstream: 3.30.0, https://gitlab.gnome.org/GNOME/nautilus/commit/69686372fd6e6 -Forwarded: yes, https://gitlab.gnome.org/GNOME/nautilus/merge_requests/323 +Forwarded: yes, https://gitlab.gnome.org/GNOME/nautilus/merge_requests/335 --- src/meson.build | 2 + src/nautilus-search-engine-recent.c | 440 @@ -39,7 +39,7 @@ index 73aafe9..213b35f 100644 'nautilus-search-hit.c', diff --git a/src/nautilus-search-engine-recent.c b/src/nautilus-search-engine-recent.c new file mode 100644 -index 000..bdd130d +index 000..40cf7e0 --- /dev/null +++ b/src/nautilus-search-engine-recent.c @@ -0,0 +1,440 @@ @@ -177,7 +177,7 @@ index 000..bdd130d +} + +search_hits = g_new0 (SearchHitsData, 1); -+search_hits->recent = self; ++search_hits->recent = g_object_ref (self); +search_hits->hits = hits; + +self->add_hits_idle_id = g_idle_add (search_thread_add_hits_idle, search_hits); @@ -234,7 +234,6 @@ index 000..bdd130d +NautilusSearchEngineRecent *self = NAUTILUS_SEARCH_ENGINE_RECENT (user_data); +g_autoptr (GPtrArray) date_range = NULL; +g_autoptr (GFile) query_location = NULL; -+SearchHitsData *search_hits; +GList *recent_items; +GList *mime_types; +GList *hits; @@ -368,6 +367,7 @@ index 000..bdd130d + +g_list_free_full (recent_items, (GDestroyNotify) gtk_recent_info_unref); +g_list_free_full (mime_types, g_free); ++g_object_unref (self); + +return NULL; +} diff --git a/debian/patches/series b/debian/patches/series index d0bf55c..5b5e74c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -14,12 +14,10 @@ zg_activity_logging.patch ubuntu_infobars_color.patch ubuntu_backspace_behaviour.patch 0001-Respect-gtk-dialogs-use-header-for-all-dialogs.patch -#Needs updating -#16_unity_new_documents.patch query-add-recursive-flags-and-use-it-in-search-engines.patch search-engine-Query-file-system-to-determine-remoteness.patch 0015-tracker-search-engine-don-t-start-it-if-not-availabl.patch -0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch +search-engine-add-a-recent-search-engine-listing-GtkRecen.patch 0017-recent-add-function-to-update-manager-on-file-rename.patch 0018-search-engine-add-locate-based-search-engine.patch appstream-compulsory.patch -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic
Marco Trevisan (Treviño) has proposed merging ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic. Requested reviews: Ubuntu Desktop (ubuntu-desktop) Related bugs: Bug #1797851 in nautilus (Ubuntu): "/usr/bin/nautilus:11:g_type_check_instance_cast:NAUTILUS_SEARCH_PROVIDER:nautilus_search_engine_stop:stop_search:disconnect_model_handlers" https://bugs.launchpad.net/ubuntu/+source/nautilus/+bug/1797851 For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/nautilus/+git/nautilus/+merge/356726 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic. diff --git a/debian/changelog b/debian/changelog index b5e373c..3f70525 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +nautilus (1:3.26.4-0~ubuntu18.04.3) UNRELEASED; urgency=medium + + * search-engine-add-a-recent-search-engine-listing-GtkRecen.patch: +- Fix unpaired unref on search engine (LP: #1797851) + + -- Marco Trevisan (Treviño) Mon, 15 Oct 2018 14:05:37 +0200 + nautilus (1:3.26.4-0~ubuntu18.04.2) bionic; urgency=medium * d/p/search-engine-Query-file-system-to-determine-remoteness.patch: diff --git a/debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch b/debian/patches/search-engine-add-a-recent-search-engine-listing-GtkRecen.patch index d2c1db5..56ab309 100644 --- a/debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch +++ b/debian/patches/search-engine-add-a-recent-search-engine-listing-GtkRecen.patch @@ -14,7 +14,7 @@ just a waste. Origin: upstream Applied-Upstream: 3.30.0, https://gitlab.gnome.org/GNOME/nautilus/commit/69686372fd6e6 -Forwarded: yes, https://gitlab.gnome.org/GNOME/nautilus/merge_requests/323 +Forwarded: yes, https://gitlab.gnome.org/GNOME/nautilus/merge_requests/335 --- src/meson.build | 2 + src/nautilus-search-engine-recent.c | 440 @@ -39,7 +39,7 @@ index 73aafe9..213b35f 100644 'nautilus-search-hit.c', diff --git a/src/nautilus-search-engine-recent.c b/src/nautilus-search-engine-recent.c new file mode 100644 -index 000..bdd130d +index 000..40cf7e0 --- /dev/null +++ b/src/nautilus-search-engine-recent.c @@ -0,0 +1,440 @@ @@ -177,7 +177,7 @@ index 000..bdd130d +} + +search_hits = g_new0 (SearchHitsData, 1); -+search_hits->recent = self; ++search_hits->recent = g_object_ref (self); +search_hits->hits = hits; + +self->add_hits_idle_id = g_idle_add (search_thread_add_hits_idle, search_hits); @@ -234,7 +234,6 @@ index 000..bdd130d +NautilusSearchEngineRecent *self = NAUTILUS_SEARCH_ENGINE_RECENT (user_data); +g_autoptr (GPtrArray) date_range = NULL; +g_autoptr (GFile) query_location = NULL; -+SearchHitsData *search_hits; +GList *recent_items; +GList *mime_types; +GList *hits; @@ -368,6 +367,7 @@ index 000..bdd130d + +g_list_free_full (recent_items, (GDestroyNotify) gtk_recent_info_unref); +g_list_free_full (mime_types, g_free); ++g_object_unref (self); + +return NULL; +} diff --git a/debian/patches/series b/debian/patches/series index 2942ff8..c7781c7 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -19,7 +19,7 @@ ubuntu_backspace_behaviour.patch query-add-recursive-flags-and-use-it-in-search-engines.patch search-engine-Query-file-system-to-determine-remoteness.patch 0015-tracker-search-engine-don-t-start-it-if-not-availabl.patch -0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch +search-engine-add-a-recent-search-engine-listing-GtkRecen.patch 0017-recent-add-function-to-update-manager-on-file-rename.patch 0018-search-engine-add-locate-based-search-engine.patch appstream-compulsory.patch -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic-recent-search-memory-fixes into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic
Marco Trevisan (Treviño) has proposed merging
~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic-recent-search-memory-fixes into
~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic with
~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic-fix-file-remote-type-search-crash
as a prerequisite.
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
Related bugs:
Bug #1795028 in nautilus (Ubuntu): "Nautilus crashes during search in
is_recursive_search (search-engine)"
https://bugs.launchpad.net/ubuntu/+source/nautilus/+bug/1795028
For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/nautilus/+git/nautilus/+merge/356149
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic-recent-search-memory-fixes into
~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic.
diff --git a/debian/changelog b/debian/changelog
index 1d1673f..7adf210 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,11 @@
-nautilus (1:3.26.4-0~ubuntu18.04.2) bionic; urgency=medium
+nautilus (1:3.26.4-0~ubuntu18.04.2) UNRELEASED; urgency=medium
* d/p/search-engine-Query-file-system-to-determine-remoteness.patch:
- Fix remote filesystem check on file during search (LP: #1795028)
+ * d/p/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch:
+- Refreshed to add memory leak and potential crash fixes
- -- Marco Trevisan (Treviño) Thu, 04 Oct 2018 16:15:08 +0200
+ -- Marco Trevisan (Treviño) Thu, 04 Oct 2018 19:09:47 +0200
nautilus (1:3.26.4-0~ubuntu18.04.1) bionic; urgency=medium
diff --git a/debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch b/debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch
index 20e597c..d2c1db5 100644
--- a/debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch
+++ b/debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch
@@ -13,13 +13,14 @@ simple engine will be already fast enough, while running this engine could be
just a waste.
Origin: upstream
-Applied-Upstream: https://gitlab.gnome.org/GNOME/nautilus/commit/69686372fd6e6
+Applied-Upstream: 3.30.0, https://gitlab.gnome.org/GNOME/nautilus/commit/69686372fd6e6
+Forwarded: yes, https://gitlab.gnome.org/GNOME/nautilus/merge_requests/323
---
src/meson.build | 2 +
- src/nautilus-search-engine-recent.c | 427
+ src/nautilus-search-engine-recent.c | 440
src/nautilus-search-engine-recent.h | 36 +++
src/nautilus-search-engine.c| 11 +
- 4 files changed, 476 insertions(+)
+ 4 files changed, 489 insertions(+)
create mode 100644 src/nautilus-search-engine-recent.c
create mode 100644 src/nautilus-search-engine-recent.h
@@ -38,10 +39,10 @@ index 73aafe9..213b35f 100644
'nautilus-search-hit.c',
diff --git a/src/nautilus-search-engine-recent.c b/src/nautilus-search-engine-recent.c
new file mode 100644
-index 000..bbd0d82
+index 000..bdd130d
--- /dev/null
+++ b/src/nautilus-search-engine-recent.c
-@@ -0,0 +1,427 @@
+@@ -0,0 +1,440 @@
+/*
+ * Copyright (C) 2018 Canonical Ltd
+ *
@@ -86,6 +87,7 @@ index 000..bbd0d82
+NautilusQuery *query;
+GCancellable *cancellable;
+GtkRecentManager *recent_manager;
++guint add_hits_idle_id;
+};
+
+static void nautilus_search_provider_init (NautilusSearchProviderInterface *iface);
@@ -115,11 +117,13 @@ index 000..bbd0d82
+{
+NautilusSearchEngineRecent *self = NAUTILUS_SEARCH_ENGINE_RECENT (object);
+
-+if (self->cancellable)
++if (self->add_hits_idle_id != 0)
+{
-+g_cancellable_cancel (self->cancellable);
++g_source_remove (self->add_hits_idle_id);
+}
+
++g_cancellable_cancel (self->cancellable);
++
+g_clear_object (&self->query);
+g_clear_object (&self->cancellable);
+
@@ -140,6 +144,8 @@ index 000..bbd0d82
+NautilusSearchEngineRecent *self = search_hits->recent;
+NautilusSearchProvider *provider = NAUTILUS_SEARCH_PROVIDER (self);
+
++self->add_hits_idle_id = 0;
++
+if (!g_cancellable_is_cancelled (self->cancellable))
+{
+nautilus_search_provider_hits_added (provider, search_hits->hits);
@@ -147,18 +153,36 @@ index 000..bbd0d82
+}
+
+g_list_free_full (search_hits->hits, g_object_unref);
-+g_object_unref (self->query);
+g_clear_object (&self->cancellable);
-+g_object_unref (self);
+g_free (search_hits);
+
+nautilus_search_provider_finished (provider,
+ NAUTILUS_SEARCH_PROVIDER_STATUS_NORMAL);
+g_object_notify (G_OBJECT (provider), "running");
+
++g_object_unref (self);
++
+return FALSE;
+}
+
++static void
++search_add_hits_idle (NautilusSearchEngineRecent *self,
++ GList
[Merge] ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic-fix-file-remote-type-search-crash into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic
The proposal to merge ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic-fix-file-remote-type-search-crash into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic has been updated. Status: Needs review => Superseded For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/nautilus/+git/nautilus/+merge/355859 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic-fix-file-remote-type-search-crash into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/nautilus:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master
Marco Trevisan (Treviño) has proposed merging
~3v1n0/ubuntu/+source/nautilus:ubuntu/master into
~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master.
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/nautilus/+git/nautilus/+merge/356146
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~3v1n0/ubuntu/+source/nautilus:ubuntu/master into
~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master.
diff --git a/debian/changelog b/debian/changelog
index 10b8325..371cb1e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+nautilus (1:3.26.4-0ubuntu6) UNRELEASED; urgency=medium
+
+ * d/p/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch:
+- Refreshed to add memory leak and potential crash fixes
+
+ -- Marco Trevisan (Treviño) Thu, 04 Oct 2018 18:41:10 +0200
+
nautilus (1:3.26.4-0ubuntu5) cosmic; urgency=medium
* d/p/search-engine-Query-file-system-to-determine-remoteness.patch:
diff --git a/debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch b/debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch
index 20e597c..d2c1db5 100644
--- a/debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch
+++ b/debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch
@@ -13,13 +13,14 @@ simple engine will be already fast enough, while running this engine could be
just a waste.
Origin: upstream
-Applied-Upstream: https://gitlab.gnome.org/GNOME/nautilus/commit/69686372fd6e6
+Applied-Upstream: 3.30.0, https://gitlab.gnome.org/GNOME/nautilus/commit/69686372fd6e6
+Forwarded: yes, https://gitlab.gnome.org/GNOME/nautilus/merge_requests/323
---
src/meson.build | 2 +
- src/nautilus-search-engine-recent.c | 427
+ src/nautilus-search-engine-recent.c | 440
src/nautilus-search-engine-recent.h | 36 +++
src/nautilus-search-engine.c| 11 +
- 4 files changed, 476 insertions(+)
+ 4 files changed, 489 insertions(+)
create mode 100644 src/nautilus-search-engine-recent.c
create mode 100644 src/nautilus-search-engine-recent.h
@@ -38,10 +39,10 @@ index 73aafe9..213b35f 100644
'nautilus-search-hit.c',
diff --git a/src/nautilus-search-engine-recent.c b/src/nautilus-search-engine-recent.c
new file mode 100644
-index 000..bbd0d82
+index 000..bdd130d
--- /dev/null
+++ b/src/nautilus-search-engine-recent.c
-@@ -0,0 +1,427 @@
+@@ -0,0 +1,440 @@
+/*
+ * Copyright (C) 2018 Canonical Ltd
+ *
@@ -86,6 +87,7 @@ index 000..bbd0d82
+NautilusQuery *query;
+GCancellable *cancellable;
+GtkRecentManager *recent_manager;
++guint add_hits_idle_id;
+};
+
+static void nautilus_search_provider_init (NautilusSearchProviderInterface *iface);
@@ -115,11 +117,13 @@ index 000..bbd0d82
+{
+NautilusSearchEngineRecent *self = NAUTILUS_SEARCH_ENGINE_RECENT (object);
+
-+if (self->cancellable)
++if (self->add_hits_idle_id != 0)
+{
-+g_cancellable_cancel (self->cancellable);
++g_source_remove (self->add_hits_idle_id);
+}
+
++g_cancellable_cancel (self->cancellable);
++
+g_clear_object (&self->query);
+g_clear_object (&self->cancellable);
+
@@ -140,6 +144,8 @@ index 000..bbd0d82
+NautilusSearchEngineRecent *self = search_hits->recent;
+NautilusSearchProvider *provider = NAUTILUS_SEARCH_PROVIDER (self);
+
++self->add_hits_idle_id = 0;
++
+if (!g_cancellable_is_cancelled (self->cancellable))
+{
+nautilus_search_provider_hits_added (provider, search_hits->hits);
@@ -147,18 +153,36 @@ index 000..bbd0d82
+}
+
+g_list_free_full (search_hits->hits, g_object_unref);
-+g_object_unref (self->query);
+g_clear_object (&self->cancellable);
-+g_object_unref (self);
+g_free (search_hits);
+
+nautilus_search_provider_finished (provider,
+ NAUTILUS_SEARCH_PROVIDER_STATUS_NORMAL);
+g_object_notify (G_OBJECT (provider), "running");
+
++g_object_unref (self);
++
+return FALSE;
+}
+
++static void
++search_add_hits_idle (NautilusSearchEngineRecent *self,
++ GList *hits)
++{
++SearchHitsData *search_hits;
++
++if (self->add_hits_idle_id != 0)
++{
++return;
++}
++
++search_hits = g_new0 (SearchHitsData, 1);
++search_hits->recent = self;
++search_hits->hits = hits;
++
++self->add_hits_idle_id = g_idle_add (search_thread_add_hits_idle, search_hits);
++}
++
+static gboolean
+is_file_valid_recursive (NautilusSearchEngineRecent *self,
+ GFile *file,
@@ -272,8 +296,8 @@ index 000..bbd0d82
+
+
[Merge] lp:~khurshid-alam/unity-settings-daemon/sharing-plugin into lp:unity-settings-daemon
The proposal to merge lp:~khurshid-alam/unity-settings-daemon/sharing-plugin into lp:unity-settings-daemon has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~khurshid-alam/unity-settings-daemon/sharing-plugin/+merge/355887 -- Your team Unity Settings Daemon Development Team is subscribed to branch lp:unity-settings-daemon. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] lp:~khurshid-alam/unity-control-center/sharing-panel into lp:unity-control-center
I can't global approve this, but it's fine for me. -- https://code.launchpad.net/~khurshid-alam/unity-control-center/sharing-panel/+merge/341306 Your team Unity Control Center development team is subscribed to branch lp:unity-control-center. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] lp:~khurshid-alam/unity-settings-daemon/sharing-plugin into lp:unity-settings-daemon
Review: Approve -- https://code.launchpad.net/~khurshid-alam/unity-settings-daemon/sharing-plugin/+merge/355887 Your team Unity Settings Daemon Development Team is subscribed to branch lp:unity-settings-daemon. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] lp:~khurshid-alam/unity-control-center/sharing-panel into lp:unity-control-center
Review: Approve -- https://code.launchpad.net/~khurshid-alam/unity-control-center/sharing-panel/+merge/341306 Your team Unity Control Center development team is subscribed to branch lp:unity-control-center. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic-fix-file-remote-type-search-crash into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic
The proposal to merge ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic-fix-file-remote-type-search-crash into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic has been updated. Description changed to: Bileto ticket at https://bileto.ubuntu.com/#/ticket/3455 For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/nautilus/+git/nautilus/+merge/356136 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic-fix-file-remote-type-search-crash into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic-fix-file-remote-type-search-crash into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic
Marco Trevisan (Treviño) has proposed merging ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic-fix-file-remote-type-search-crash into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic. Requested reviews: Ubuntu Desktop (ubuntu-desktop) Related bugs: Bug #1795028 in nautilus (Ubuntu): "Nautilus crashes during search in is_recursive_search (search-engine)" https://bugs.launchpad.net/ubuntu/+source/nautilus/+bug/1795028 For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/nautilus/+git/nautilus/+merge/356136 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic-fix-file-remote-type-search-crash into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic. diff --git a/debian/changelog b/debian/changelog index 62b7833..1d1673f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +nautilus (1:3.26.4-0~ubuntu18.04.2) bionic; urgency=medium + + * d/p/search-engine-Query-file-system-to-determine-remoteness.patch: +- Fix remote filesystem check on file during search (LP: #1795028) + + -- Marco Trevisan (Treviño) Thu, 04 Oct 2018 16:15:08 +0200 + nautilus (1:3.26.4-0~ubuntu18.04.1) bionic; urgency=medium * New upstream release: 3.26.4 (LP: #1782681, LP: #1765776) diff --git a/debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch b/debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch index f80997f..20e597c 100644 --- a/debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch +++ b/debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch @@ -512,7 +512,7 @@ index 000..bcd73b9 + +#endif /* __NAUTILUS_SEARCH_ENGINE_RECENT_H__ */ diff --git a/src/nautilus-search-engine.c b/src/nautilus-search-engine.c -index 3a0c9d4..793b831 100644 +index 28863f7..a4c6007 100644 --- a/src/nautilus-search-engine.c +++ b/src/nautilus-search-engine.c @@ -30,11 +30,13 @@ diff --git a/debian/patches/0017-recent-add-function-to-update-manager-on-file-rename.patch b/debian/patches/0017-recent-add-function-to-update-manager-on-file-rename.patch index e6185da..ad248da 100644 --- a/debian/patches/0017-recent-add-function-to-update-manager-on-file-rename.patch +++ b/debian/patches/0017-recent-add-function-to-update-manager-on-file-rename.patch @@ -49,7 +49,7 @@ index 19316e8..9bb5460 100644 /* Now send out the changed and added signals for existing file objects. */ diff --git a/src/nautilus-file.c b/src/nautilus-file.c -index 63413a6..9416214 100644 +index 28b5a13..7886d1f 100644 --- a/src/nautilus-file.c +++ b/src/nautilus-file.c @@ -34,6 +34,7 @@ diff --git a/debian/patches/0018-search-engine-add-locate-based-search-engine.patch b/debian/patches/0018-search-engine-add-locate-based-search-engine.patch index 91a7ec0..158b448 100644 --- a/debian/patches/0018-search-engine-add-locate-based-search-engine.patch +++ b/debian/patches/0018-search-engine-add-locate-based-search-engine.patch @@ -678,7 +678,7 @@ index 000..ac5e3fc + +#endif /* __NAUTILUS_SEARCH_ENGINE_LOCATE_H__ */ diff --git a/src/nautilus-search-engine.c b/src/nautilus-search-engine.c -index 793b831..902d483 100644 +index a4c6007..475a432 100644 --- a/src/nautilus-search-engine.c +++ b/src/nautilus-search-engine.c @@ -29,6 +29,7 @@ diff --git a/debian/patches/query-add-recursive-flags-and-use-it-in-search-engines.patch b/debian/patches/query-add-recursive-flags-and-use-it-in-search-engines.patch index fddae3e..3c89693 100644 --- a/debian/patches/query-add-recursive-flags-and-use-it-in-search-engines.patch +++ b/debian/patches/query-add-recursive-flags-and-use-it-in-search-engines.patch @@ -198,7 +198,7 @@ index b567611..b165d63 100644 + #endif /* NAUTILUS_FILE_UTILITIES_H */ diff --git a/src/nautilus-file.c b/src/nautilus-file.c -index 3f6a69f..63413a6 100644 +index 22ea199..e30d791 100644 --- a/src/nautilus-file.c +++ b/src/nautilus-file.c @@ -4975,6 +4975,29 @@ nautilus_file_get_filesystem_type (NautilusFile *file) diff --git a/debian/patches/search-engine-Query-file-system-to-determine-remoteness.patch b/debian/patches/search-engine-Query-file-system-to-determine-remoteness.patch new file mode 100644 index 000..1b7f874 --- /dev/null +++ b/debian/patches/search-engine-Query-file-system-to-determine-remoteness.patch @@ -0,0 +1,127 @@ +From: Ernestas Kulik +Date: Fri, 14 Sep 2018 12:52:11 +0200 +Subject: search-engine: Query file system to determine remoteness + +Querying the file cache in is_recursive_search() does not guarantee that +the file system field will be populated with a value, and somehow +results in data races, in turn resulting in random crashes/file list +corruption. + +Hopefully fixes https://gitlab.gnome.org/GNOME/nautilus/issues/640, +closes https://gitlab.gnome.org/GNOME/nautilus/issues/632 and resolves +https://gitlab.gnome.org/GNOME/nautilus/issues/602 + +Bug-Ubuntu: https://bugs.launchpad.net/ubun
[Merge] ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic-theming-fixes into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic
Marco Trevisan (Treviño) has proposed merging
~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic-theming-fixes into
~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic.
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
Related bugs:
Bug #1739931 in gnome-shell (Ubuntu): "Separator lines in shell popup menus
are too faint to see"
https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1739931
Bug #1743058 in gnome-shell (Ubuntu): "Input field height changes slightly
when entering in st password fields."
https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1743058
For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/356023
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic-theming-fixes into
~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic.
diff --git a/debian/changelog b/debian/changelog
index 610ea63..0ce4a7d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,11 @@ gnome-shell (3.28.3-0ubuntu0.18.04.3) UNRELEASED; urgency=medium
d/p/ubuntu/search-call-XUbuntuCancel-method-on-providers-when-no-dat.patch:
- Add support for cancelling remote search providers when the overlay
is closed (and actually stop searches when requested from UI, LP: #1756826)
+ * debian/ubuntu.css:
+- use defined color for menu separators (LP: #1739931)
+- set StEntry minimun height to work properly with Ubuntu font (LP: #1743058)
- -- Marco Trevisan (Treviño) Wed, 05 Sep 2018 14:31:58 +0200
+ -- Marco Trevisan (Treviño) Wed, 03 Oct 2018 00:50:42 +0200
gnome-shell (3.28.3-0ubuntu0.18.04.2) bionic; urgency=medium
diff --git a/debian/ubuntu-session-mods/ubuntu.css b/debian/ubuntu-session-mods/ubuntu.css
index da34f04..4bb58e4 100644
--- a/debian/ubuntu-session-mods/ubuntu.css
+++ b/debian/ubuntu-session-mods/ubuntu.css
@@ -519,7 +519,7 @@ StScrollBar {
height: 1px;
margin: 6px 64px;
background-color: transparent;
- border-color: #3a3a34;
+ border-color: #2c2c28;
border-bottom-width: 1px;
border-bottom-style: solid; }
@@ -1911,6 +1911,11 @@ stage {
font-family: Ubuntu, Cantarell, Sans-Serif;
}
+/* Set minimum height as per Ubuntu font usage, fixes password entries (LP: #1743058) */
+StEntry {
+ min-height: 19px;
+}
+
/* switch colors */
.toggle-switch-us:checked {
background-image: url("ubuntu-toggle-on-us.svg");
--
ubuntu-desktop mailing list
ubuntu-desktop@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/gnome-calculator:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-calculator:ubuntu/master
Marco Trevisan (Treviño) has proposed merging
~3v1n0/ubuntu/+source/gnome-calculator:ubuntu/master into
~ubuntu-desktop/ubuntu/+source/gnome-calculator:ubuntu/master.
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
Related bugs:
Bug #1795399 in gnome-calculator (Ubuntu): "gnome-calculator-search-provider
aborts in search_provider_solve_equation_co"
https://bugs.launchpad.net/ubuntu/+source/gnome-calculator/+bug/1795399
For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-calculator/+git/gnome-calculator/+merge/355919
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~3v1n0/ubuntu/+source/gnome-calculator:ubuntu/master into
~ubuntu-desktop/ubuntu/+source/gnome-calculator:ubuntu/master.
diff --git a/debian/changelog b/debian/changelog
index 2ced402..5c2d059 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,13 @@ gnome-calculator (1:3.30.0-1ubuntu2) UNRELEASED; urgency=medium
* debian/control:
- Use Ubuntu Vcs-* URIs, and move debian's to XS-Debian-Vcs-*
+ * debian/patches/search-provider-Handle-errors-gracefully.patch:
+- Add patch to avoid exiting with fatal errors when a spawn error occurred
+ (LP: #1795399)
+ * debian/patches: refreshed mentioning when applied
+ * debian/gbp.conf: add debian default's suggested settings
- -- Marco Trevisan (Treviño) Wed, 05 Sep 2018 15:35:38 +0200
+ -- Marco Trevisan (Treviño) Mon, 01 Oct 2018 15:30:25 +0200
gnome-calculator (1:3.30.0-1ubuntu1) cosmic; urgency=medium
diff --git a/debian/gbp.conf b/debian/gbp.conf
index 6062590..7fed487 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -4,3 +4,15 @@ debian-branch=ubuntu/master
debian-tag=ubuntu/%(version)s
upstream-branch=upstream/latest
upstream-vcs-tag = %(version)s
+
+[buildpackage]
+sign-tags = True
+
+[dch]
+multimaint-merge = True
+
+[import-orig]
+postimport = dch -v%(version)s New upstream release; git add debian/changelog; debcommit
+
+[pq]
+patch-numbers = False
diff --git a/debian/patches/search-provider-Handle-errors-gracefully.patch b/debian/patches/search-provider-Handle-errors-gracefully.patch
new file mode 100644
index 000..f78c54b
--- /dev/null
+++ b/debian/patches/search-provider-Handle-errors-gracefully.patch
@@ -0,0 +1,108 @@
+From: =?utf-8?b?Ik1hcmNvIFRyZXZpc2FuIChUcmV2acOxbyki?=
+Date: Wed, 5 Sep 2018 17:11:27 +0200
+Subject: search-provider: Handle errors gracefully
+
+Instead of exiting immediately if a spawn error occurred, inform our dbus
+client about it with a proper spawn error.
+
+As bonus, get rid of the compile warning.
+
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-calculator/+bug/1795399
+Forwarded: https://gitlab.gnome.org/GNOME/gnome-calculator/merge_requests/10
+Applied-Upstream: yes, 3.31.1
+---
+ search-provider/search-provider.vala | 24 +---
+ 1 file changed, 13 insertions(+), 11 deletions(-)
+
+diff --git a/search-provider/search-provider.vala b/search-provider/search-provider.vala
+index fc72128..a48c440 100644
+--- a/search-provider/search-provider.vala
b/search-provider/search-provider.vala
+@@ -63,7 +63,7 @@ public class SearchProvider : Object
+ }
+ catch (Error e)
+ {
+-error ("Failed to spawn Calculator: %s", e.message);
++throw e;
+ }
+
+ if (cancellable == null)
+@@ -79,7 +79,7 @@ public class SearchProvider : Object
+ return subprocess;
+ }
+
+-private async bool solve_equation (string equation)
++private async bool solve_equation (string equation) throws DBusError
+ {
+ string? result;
+
+@@ -112,7 +112,8 @@ public class SearchProvider : Object
+ }
+ catch (SpawnError e)
+ {
+-error ("Failed to spawn Calculator: %s", e.message);
++critical ("Failed to spawn Calculator: %s", e.message);
++throw new DBusError.SPAWN_FAILED (e.message);
+ }
+ catch (Error e)
+ {
+@@ -128,7 +129,7 @@ public class SearchProvider : Object
+ return true;
+ }
+
+-private async string[] get_result_identifier (string[] terms)
++private async string[] get_result_identifier (string[] terms) throws Error
+ {
+ /* We have at most one result: the search terms as one string */
+ var equation = terms_to_equation (terms);
+@@ -138,17 +139,17 @@ public class SearchProvider : Object
+ return new string[0];
+ }
+
+-public async string[] get_initial_result_set (string[] terms)
++public async string[] get_initial_result_set (string[] terms) throws Error
+ {
+ return yield get_result_identifier (terms);
+ }
+
+-public async string[] get_subsearch_result_set (string[] previous_results, string[] terms)
++public async string[] get_subsearch_result_set (string[] previous_results, string[] terms) throws Error
+ {
+
[Merge] ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic-fix-file-remote-type-search-crash into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master
Marco Trevisan (Treviño) has proposed merging ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic-fix-file-remote-type-search-crash into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master with ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic-xubuntu-cancel-search as a prerequisite. Requested reviews: Ubuntu Desktop (ubuntu-desktop) Related bugs: Bug #1713581 in nautilus (Ubuntu): "nautilus crashed with SIGSEGV in g_type_check_instance_is_fundamentally_a()" https://bugs.launchpad.net/ubuntu/+source/nautilus/+bug/1713581 Bug #1756826 in nautilus (Ubuntu): "hangs when remote search provider performs expensive operation" https://bugs.launchpad.net/ubuntu/+source/nautilus/+bug/1756826 Bug #1795028 in nautilus (Ubuntu): "Nautilus crashes during search in is_recursive_search (search-engine)" https://bugs.launchpad.net/ubuntu/+source/nautilus/+bug/1795028 For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/nautilus/+git/nautilus/+merge/355858 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic-fix-file-remote-type-search-crash into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master. diff --git a/debian/changelog b/debian/changelog index 0d739a6..a68c9a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,8 +18,8 @@ nautilus (1:3.26.4-0~ubuntu18.04.2) UNRELEASED; urgency=medium * d/p/ubuntu/shell-search-provider-implement-XUbuntuCancel-to-request-.patch: shell-search-provider: implement XUbuntuCancel to request pending search cancellation from gnome-shell (LP: #1756826) - <<<<<<< debian/changelog + -- Marco Trevisan (Treviño) Thu, 30 Aug 2018 18:15:24 -0500 nautilus (1:3.26.4-0ubuntu2) cosmic; urgency=medium @@ -43,6 +43,9 @@ nautilus (1:3.26.4-0ubuntu2) cosmic; urgency=medium nautilus (1:3.26.4-0ubuntu1) cosmic; urgency=medium === + * d/p/search-engine-Query-file-system-to-determine-remoteness.patch: +- Fix remote filesystem check on file during search (LP: #1795028) + -- Marco Trevisan (Treviño) Wed, 05 Sep 2018 18:03:14 +0200 nautilus (1:3.26.4-0~ubuntu18.04.1) bionic; urgency=medium diff --git a/debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch b/debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch index f80997f..193c6e2 100644 --- a/debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch +++ b/debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch @@ -512,7 +512,11 @@ index 000..bcd73b9 + +#endif /* __NAUTILUS_SEARCH_ENGINE_RECENT_H__ */ diff --git a/src/nautilus-search-engine.c b/src/nautilus-search-engine.c +<<<<<<< debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch index 3a0c9d4..793b831 100644 +=== +index 28863f7..a4c6007 100644 +>>>>>>> debian/patches/0016-search-engine-add-a-recent-search-engine-listing-Gtk.patch --- a/src/nautilus-search-engine.c +++ b/src/nautilus-search-engine.c @@ -30,11 +30,13 @@ diff --git a/debian/patches/0017-recent-add-function-to-update-manager-on-file-rename.patch b/debian/patches/0017-recent-add-function-to-update-manager-on-file-rename.patch index e6185da..8e3d059 100644 --- a/debian/patches/0017-recent-add-function-to-update-manager-on-file-rename.patch +++ b/debian/patches/0017-recent-add-function-to-update-manager-on-file-rename.patch @@ -49,7 +49,11 @@ index 19316e8..9bb5460 100644 /* Now send out the changed and added signals for existing file objects. */ diff --git a/src/nautilus-file.c b/src/nautilus-file.c +<<<<<<< debian/patches/0017-recent-add-function-to-update-manager-on-file-rename.patch index 63413a6..9416214 100644 +=== +index 28b5a13..7886d1f 100644 +>>>>>>> debian/patches/0017-recent-add-function-to-update-manager-on-file-rename.patch --- a/src/nautilus-file.c +++ b/src/nautilus-file.c @@ -34,6 +34,7 @@ diff --git a/debian/patches/0018-search-engine-add-locate-based-search-engine.patch b/debian/patches/0018-search-engine-add-locate-based-search-engine.patch index 91a7ec0..1135ad8 100644 --- a/debian/patches/0018-search-engine-add-locate-based-search-engine.patch +++ b/debian/patches/0018-search-engine-add-locate-based-search-engine.patch @@ -678,7 +678,11 @@ index 000..ac5e3fc + +#endif /* __NAUTILUS_SEARCH_ENGINE_LOCATE_H__ */ diff --git a/src/nautilus-search-engine.c b/src/nautilus-search-engine.c +<<<<<<< debian/patches/0018-search-engine-add-locate-based-search-engine.patch index 793b831..902d483 100644 +=== +index a4c6007..475a432 100644 +>>>>>>> debian/patches/0018-search-engine-add-locate-based-search-engine.patch --- a/src/nautilus-search-engine.c +++ b/src/nautilus-search-engine.c @@ -29,6 +29,7 @@ diff --git a/debian/patches/query-add-recursiv
