[Merge] ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic-touch-two-clicks-fix into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic
The proposal to merge ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic-touch-two-clicks-fix into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/357993 -- 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/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
Re: [Merge] ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master
Review: Approve Makes sense, thanks! -- https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/357992 Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic-theming-fixes into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic
The proposal to merge ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic-theming-fixes into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/356023 -- 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
Re: [Merge] ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/bionic
@seb128 This will make sure that the window will be closed but the process will keep running until livepatch is installed (or failed to install). The user will notice nothing different. -- https://code.launchpad.net/~azzar1/ubuntu/+source/gnome-initial-setup/+git/gnome-initial-setup/+merge/354195 Your team Ubuntu Desktop is requested to review the proposed merge of ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup: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
The proposal to merge ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/357992 -- Your team Ubuntu Desktop is subscribed to branch ~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/bionic-touch-two-clicks-fix into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic
Review: Approve Please ensure the bugs is SRU-formatted. LGTM otherwise. -- https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/357993 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
Re: [Merge] ~3v1n0/ubuntu/+source/gnome-shell:ubuntu/bionic-theming-fixes into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/bionic
Review: Approve Please ensure the bugs are SRU-able. LGTM otherwise. -- https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/356023 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-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
- js/ui/search.js | 5 +++--
- 1 file changed, 3
Re: [Merge] ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/bionic
Review: Needs Information The error handling seems fine to me, could you explain what the "quit" changes are about. Is that blocking from closing or from going to the next page until you get feedback from the service? What is the typical delay it creates? -- https://code.launchpad.net/~azzar1/ubuntu/+source/gnome-initial-setup/+git/gnome-initial-setup/+merge/354195 Your team Ubuntu Desktop is requested to review the proposed merge of ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
