[Merge] ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/bionic
The proposal to merge ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/bionic has been updated. Status: Needs review => Approved For more details, see: 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-calculator:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-calculator:ubuntu/bionic
The proposal to merge ~3v1n0/ubuntu/+source/gnome-calculator:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-calculator:ubuntu/bionic has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-calculator/+git/gnome-calculator/+merge/354330 -- Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gnome-calculator: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-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
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
[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
[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
Re: [Merge] ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/bionic
Review: Approve design Thanks for the text fixes -- 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
[Ubuntu-BR] Ubuntu 18.04 LTS runlevel 4
Pessoal, O processo do systemd no Ubuntu 18.04. LTS tem como destino padrão para inicialização do sistema as "target". ┌─┬───┐ │Runlevel │ Target│ ├─┼───┤ │0│ poweroff.target │ ├─┼───┤ │1│ rescue.target │ ├─┼───┤ │2, 3, 4 │ multi-user.target │ ├─┼───┤ │5│ graphical.target │ ├─┼───┤ │6│ reboot.target │ └─┴───┘ Para rodar no Sistema via : RUNLEVEL 3 : é usado a target multi-user.target RUNLEVEL 5 : é usado a target graphical.target Pergunta como executo o Ubuntu 18.04 LTS via RUNLEVEL 4 ? É possivel ? -- Fabio -- Mais sobre o Ubuntu em português: http://www.ubuntu-br.org/comece Lista de discussão Ubuntu Brasil Histórico, descadastramento e outras opções: https://lists.ubuntu.com/mailman/listinfo/ubuntu-br
[Merge] ~didrocks/ubuntu/+source/gnome-shell:resolve-gdm-symlink into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master
The proposal to merge ~didrocks/ubuntu/+source/gnome-shell:resolve-gdm-symlink into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~didrocks/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/357609 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~didrocks/ubuntu/+source/gnome-shell:resolve-gdm-symlink into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/gnome-session:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master
Marco Trevisan (Treviño) has proposed merging
~3v1n0/ubuntu/+source/gnome-session:ubuntu/master into
~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master.
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
Related bugs:
Bug #1799205 in gnome-session (Ubuntu): "Ubuntu wayland sessions are not
migrated to yaru"
https://bugs.launchpad.net/ubuntu/+source/gnome-session/+bug/1799205
For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-session/+git/gnome-session/+merge/357620
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~3v1n0/ubuntu/+source/gnome-session:ubuntu/master into
~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master.
diff --git a/debian/changelog b/debian/changelog
index 3e9254f..d9a8a44 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+gnome-session (3.30.0-0ubuntu5) UNRELEASED; urgency=medium
+
+ * debian/ubuntu-settings-migrate-to-defaults.18.10.0.py:
+- renamed to ubuntu-settings-migrate-to-defaults.18.10.1.py
+ + Also run in ubuntu-wayland desktop session (LP: #1799205)
+
+ -- Marco Trevisan (Treviño) Mon, 22 Oct 2018 13:30:47 +0200
+
gnome-session (3.30.0-0ubuntu4) cosmic; urgency=medium
* Make {ubuntu,gnome}-session Arch: all and remove qualification on xwayland
diff --git a/debian/ubuntu-settings-migrate-to-defaults.18.10.0.py b/debian/ubuntu-settings-migrate-to-defaults.18.10.1.py
index 7e4e663..d0dad7e 100755
--- a/debian/ubuntu-settings-migrate-to-defaults.18.10.0.py
+++ b/debian/ubuntu-settings-migrate-to-defaults.18.10.1.py
@@ -33,7 +33,7 @@ OLD_DEFAULTS = {
}
}
-if os.getenv('DESKTOP_SESSION') != 'ubuntu':
+if os.getenv('DESKTOP_SESSION') not in ['ubuntu', 'ubuntu-wayland']:
sys.exit(0)
any_changed = False
--
ubuntu-desktop mailing list
ubuntu-desktop@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/gnome-session:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master
The proposal to merge ~3v1n0/ubuntu/+source/gnome-session:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master has been updated. Status: Needs review => Approved For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-session/+git/gnome-session/+merge/357620 -- Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~3v1n0/ubuntu/+source/gnome-session:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master
Thanks for looking and thinking about changing the script name! LGTM. -- https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-session/+git/gnome-session/+merge/357620 Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/gnome-session:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~didrocks/ubuntu/+source/gnome-shell:resolve-gdm-symlink into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master
I'd avoid to do the C changes, while you can just use something like this:
try {
while (GLib.file_test(path, GLib.FileTest.IS_SYMLINK))
path = GLib.file_read_link(path)
} catch (e) {}
Or even avoiding the file_test check (and replacing it with `true`, since the
catch will stop the while anyway).
Another option, just using GFile is instead:
while (true) {
let info = stylesheet.query_info(Gio.FILE_ATTRIBUTE_STANDARD_IS_SYMLINK+","+
Gio.FILE_ATTRIBUTE_STANDARD_SYMLINK_TARGET,
Gio.FileQueryInfoFlags.NONE, null)
if (!info.get_is_symlink())
break;
stylesheet = Gio.file_new_for_path(info.get_symlink_target())
}
So we have less stuff touched and we keep using the glib way.
Also please mention in the patch msg that this could be removed when we've a
session refactor as part of this
https://gitlab.gnome.org/GNOME/gdm/merge_requests/33
--
https://code.launchpad.net/~didrocks/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/357609
Your team Ubuntu Desktop is requested to review the proposed merge of
~didrocks/ubuntu/+source/gnome-shell:resolve-gdm-symlink into
~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master.
--
ubuntu-desktop mailing list
ubuntu-desktop@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/gnome-session:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master
The proposal to merge ~3v1n0/ubuntu/+source/gnome-session:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master has been updated. Status: Approved => Merged For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-session/+git/gnome-session/+merge/357620 -- Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~didrocks/ubuntu/+source/gnome-shell:resolve-gdm-symlink into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master
Also, wondering if having this inside st-theme instead of js would make sense, so that once the stylesheet is loaded then we refer resources related to that path. It's something *maybe* upstreamable. Although probably still not :| -- https://code.launchpad.net/~didrocks/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/357609 Your team Ubuntu Desktop is requested to review the proposed merge of ~didrocks/ubuntu/+source/gnome-shell:resolve-gdm-symlink into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~3v1n0/ubuntu/+source/gnome-session:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master
Review: Approve -- https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-session/+git/gnome-session/+merge/357620 Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~didrocks/ubuntu/+source/gnome-shell:resolve-gdm-symlink into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master
Didier Roche has proposed merging
~didrocks/ubuntu/+source/gnome-shell:resolve-gdm-symlink into
~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master.
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
For more details, see:
https://code.launchpad.net/~didrocks/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/357609
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~didrocks/ubuntu/+source/gnome-shell:resolve-gdm-symlink into
~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master.
diff --git a/debian/changelog b/debian/changelog
index c86e666..ecf0df1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ gnome-shell (3.30.1-2ubuntu2) UNRELEASED; urgency=medium
* debian/patches/ubuntu/background_login.patch:
- match Yaru theme in the ubuntu session instead of our previous GDM
background (LP: #1789356)
+ * debian/patches/ubuntu/resolve_alternate_theme_path.patch:
+- ensure we resolve finale theme file path to correctly load assets
+ under gdm (LP: #1798747)
-- Didier Roche Wed, 17 Oct 2018 14:58:42 +0200
diff --git a/debian/patches/series b/debian/patches/series
index 7397e65..2d27e92 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -19,3 +19,4 @@ sessionMode-add-support-for-debugFlags-parameter.patch
st-scroll-view-Handle-the-case-where-scrollbars-are-NULL.patch
st-scroll-view-Remove-scrollbars-references-on-dispose.patch
ubuntu/search-call-XUbuntuCancel-method-on-providers-when-no-dat.patch
+ubuntu/resolve_alternate_theme_path.patch
diff --git a/debian/patches/ubuntu/resolve_alternate_theme_path.patch b/debian/patches/ubuntu/resolve_alternate_theme_path.patch
new file mode 100644
index 000..74132bf
--- /dev/null
+++ b/debian/patches/ubuntu/resolve_alternate_theme_path.patch
@@ -0,0 +1,74 @@
+From: Didier Roche
+Date: Mon, 22 Oct 2019 10:22:06 +0100
+Subject: Resolve real path name for theme file
+
+ We are using alternative theme paths. Some of them are symlinks like
+ gdm3.css. It points to a different directory and we need to ensure
+ assets are loaded from the real theme path then (assets path are
+ relative to it).
+ Expose thus realpath() to gjs and ensure we use the original file
+ itself when loading the stylesheet.
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/gnome-shell/+bug/1798747
+Forwarded: Not-needed (upstream doesn't support officially theming)
+Index: gnome-shell-3.30.1/src/shell-global.c
+===
+--- gnome-shell-3.30.1.orig/src/shell-global.c
gnome-shell-3.30.1/src/shell-global.c
+@@ -1908,3 +1908,23 @@ shell_global_set_debug_flags (ShellGloba
+ g_object_notify (G_OBJECT (global), "debug-flags");
+ }
+ }
++
++/**
++ * shell_global_realpath:
++ * @global: A #ShellGlobal
++ * @path: Path to call realpath on
++ *
++ * Returns: the realpath call on the path argument. Returns the caller
++ * unchanged if already the canonicalized filename is given, or if
++ * realpath() returned any error.
++ */
++const char*
++shell_global_realpath (ShellGlobal *global,
++ const char *path)
++{
++ char *res = realpath (path, NULL);
++
++ if (!res)
++return path;
++ return res;
++}
+\ No newline at end of file
+Index: gnome-shell-3.30.1/src/shell-global.h
+===
+--- gnome-shell-3.30.1.orig/src/shell-global.h
gnome-shell-3.30.1/src/shell-global.h
+@@ -37,6 +37,9 @@ voidshell_global_get_pointer
+ int *y,
+ ClutterModifierType *mods);
+
++const char* shell_global_realpath (ShellGlobal *global,
++ const char *path);
++
+ typedef struct {
+ guint glibc_uordblks;
+
+Index: gnome-shell-3.30.1/js/ui/main.js
+===
+--- gnome-shell-3.30.1.orig/js/ui/main.js
gnome-shell-3.30.1/js/ui/main.js
+@@ -262,12 +262,12 @@ function _getStylesheet(name) {
+ let dataDirs = GLib.get_system_data_dirs();
+ for (let i = 0; i < dataDirs.length; i++) {
+ let path = GLib.build_filenamev([dataDirs[i], 'gnome-shell', 'theme', name]);
+-let stylesheet = Gio.file_new_for_path(path);
++let stylesheet = Gio.file_new_for_path(global.realpath(path));
+ if (stylesheet.query_exists(null))
+ return stylesheet;
+ }
+
+-stylesheet = Gio.File.new_for_path(global.datadir + '/theme/' + name);
++stylesheet = Gio.File.new_for_path(global.realpath(global.datadir + '/theme/' + name));
+ if (stylesheet.query_exists(null))
+ return stylesheet;
+
--
ubuntu-desktop mailing list
ubuntu-desktop@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~didrocks/ubuntu/+source/gnome-shell:resolve-gdm-symlink into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master
Went with the first approach you proposed, which is the more readable IMHO. Thanks! -- https://code.launchpad.net/~didrocks/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/357609 Your team Ubuntu Desktop is requested to review the proposed merge of ~didrocks/ubuntu/+source/gnome-shell:resolve-gdm-symlink into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic
Review: Approve Thanks -- https://code.launchpad.net/~3v1n0/ubuntu/+source/nautilus/+git/nautilus/+merge/356988 Your team Ubuntu Desktop is subscribed to branch ~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] ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master-ubuntu-firstrun into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master
Andrea Azzarone has proposed merging
~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master-ubuntu-firstrun into
~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master.
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
For more details, see:
https://code.launchpad.net/~azzar1/ubuntu/+source/gnome-initial-setup/+git/gnome-initial-setup/+merge/356910
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master-ubuntu-firstrun into
~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master.
diff --git a/debian/changelog b/debian/changelog
index c1bea68..9394f07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gnome-initial-setup (3.30.0-1ubuntu3) UNRELEASED; urgency=medium
+
+ * Populate featured snaps from ubuntu-firstrun category
+
+ -- Andrea Azzarone Wed, 17 Oct 2018 10:25:35 +0100
+
gnome-initial-setup (3.30.0-1ubuntu2) cosmic; urgency=medium
* Add Don-t-show-Facebook-in-Ubuntu.patch:
diff --git a/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch b/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch
index df7bbdb..3de104b 100644
--- a/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch
+++ b/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch
@@ -468,7 +468,7 @@ index 000..0d8dd94
\ No newline at end of file
diff --git a/gnome-initial-setup/pages/apps/gis-apps-page.c b/gnome-initial-setup/pages/apps/gis-apps-page.c
new file mode 100644
-index 000..bcd9462
+index 000..1230c61
--- /dev/null
+++ b/gnome-initial-setup/pages/apps/gis-apps-page.c
@@ -0,0 +1,528 @@
@@ -953,7 +953,7 @@ index 000..bcd9462
+ installed_snaps = snapd_client_list_sync (client, NULL, );
+ if (installed_snaps == NULL)
+g_warning ("Failed to get installed snaps: %s", error->message);
-+ featured_snaps = snapd_client_find_section_sync (client, SNAPD_FIND_FLAGS_NONE, "featured", NULL, NULL, NULL, );
++ featured_snaps = snapd_client_find_section_sync (client, SNAPD_FIND_FLAGS_NONE, "ubuntu-firstrun", NULL, NULL, NULL, );
+ if (featured_snaps != NULL) {
+guint i, n_tiles = 0, n_extra = 0;
+
diff --git a/debian/patches/0001-Make-summary-page-explicitly-request-navigation-butt.patch b/debian/patches/0001-Make-summary-page-explicitly-request-navigation-butt.patch
index 8bad3a5..623f566 100644
--- a/debian/patches/0001-Make-summary-page-explicitly-request-navigation-butt.patch
+++ b/debian/patches/0001-Make-summary-page-explicitly-request-navigation-butt.patch
@@ -166,11 +166,10 @@ index 8564935..64272ba 100644
obj_props[PROP_NEEDS_ACCEPT] =
g_param_spec_boolean ("needs-accept", "", "", FALSE,
G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE);
-@@ -282,6 +293,21 @@ gis_page_set_skippable (GisPage *page, gboolean skippable)
- g_object_notify_by_pspec (G_OBJECT (page), obj_props[PROP_SKIPPABLE]);
+@@ -283,6 +294,21 @@ gis_page_set_skippable (GisPage *page, gboolean skippable)
}
-+gboolean
+ gboolean
+gis_page_get_hide_navigation (GisPage *page)
+{
+ GisPagePrivate *priv = gis_page_get_instance_private (page);
@@ -185,9 +184,10 @@ index 8564935..64272ba 100644
+ g_object_notify_by_pspec (G_OBJECT (page), obj_props[PROP_HIDE_NAVIGATION]);
+}
+
- gboolean
++gboolean
gis_page_get_needs_accept (GisPage *page)
{
+ GisPagePrivate *priv = gis_page_get_instance_private (page);
diff --git a/gnome-initial-setup/gis-page.h b/gnome-initial-setup/gis-page.h
index b9a3e9a..3862caf 100644
--- a/gnome-initial-setup/gis-page.h
--
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
The proposal to merge ~3v1n0/ubuntu/+source/gdm3:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/master has been updated. Status: Needs review => Merged 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. -- 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
The proposal to merge ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/nautilus/+git/nautilus/+merge/356988 -- Your team Ubuntu Desktop is subscribed to branch ~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] ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master-ubuntu-firstrun into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master
Andrea Azzarone has proposed merging
~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master-ubuntu-firstrun into
~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master.
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
For more details, see:
https://code.launchpad.net/~azzar1/ubuntu/+source/gnome-initial-setup/+git/gnome-initial-setup/+merge/356910
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master-ubuntu-firstrun into
~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master.
diff --git a/debian/changelog b/debian/changelog
index c1bea68..9394f07 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+gnome-initial-setup (3.30.0-1ubuntu3) UNRELEASED; urgency=medium
+
+ * Populate featured snaps from ubuntu-firstrun category
+
+ -- Andrea Azzarone Wed, 17 Oct 2018 10:25:35 +0100
+
gnome-initial-setup (3.30.0-1ubuntu2) cosmic; urgency=medium
* Add Don-t-show-Facebook-in-Ubuntu.patch:
diff --git a/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch b/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch
index df7bbdb..3de104b 100644
--- a/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch
+++ b/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch
@@ -468,7 +468,7 @@ index 000..0d8dd94
\ No newline at end of file
diff --git a/gnome-initial-setup/pages/apps/gis-apps-page.c b/gnome-initial-setup/pages/apps/gis-apps-page.c
new file mode 100644
-index 000..bcd9462
+index 000..1230c61
--- /dev/null
+++ b/gnome-initial-setup/pages/apps/gis-apps-page.c
@@ -0,0 +1,528 @@
@@ -953,7 +953,7 @@ index 000..bcd9462
+ installed_snaps = snapd_client_list_sync (client, NULL, );
+ if (installed_snaps == NULL)
+g_warning ("Failed to get installed snaps: %s", error->message);
-+ featured_snaps = snapd_client_find_section_sync (client, SNAPD_FIND_FLAGS_NONE, "featured", NULL, NULL, NULL, );
++ featured_snaps = snapd_client_find_section_sync (client, SNAPD_FIND_FLAGS_NONE, "ubuntu-firstrun", NULL, NULL, NULL, );
+ if (featured_snaps != NULL) {
+guint i, n_tiles = 0, n_extra = 0;
+
diff --git a/debian/patches/0001-Make-summary-page-explicitly-request-navigation-butt.patch b/debian/patches/0001-Make-summary-page-explicitly-request-navigation-butt.patch
index 8bad3a5..623f566 100644
--- a/debian/patches/0001-Make-summary-page-explicitly-request-navigation-butt.patch
+++ b/debian/patches/0001-Make-summary-page-explicitly-request-navigation-butt.patch
@@ -166,11 +166,10 @@ index 8564935..64272ba 100644
obj_props[PROP_NEEDS_ACCEPT] =
g_param_spec_boolean ("needs-accept", "", "", FALSE,
G_PARAM_STATIC_STRINGS | G_PARAM_READWRITE);
-@@ -282,6 +293,21 @@ gis_page_set_skippable (GisPage *page, gboolean skippable)
- g_object_notify_by_pspec (G_OBJECT (page), obj_props[PROP_SKIPPABLE]);
+@@ -283,6 +294,21 @@ gis_page_set_skippable (GisPage *page, gboolean skippable)
}
-+gboolean
+ gboolean
+gis_page_get_hide_navigation (GisPage *page)
+{
+ GisPagePrivate *priv = gis_page_get_instance_private (page);
@@ -185,9 +184,10 @@ index 8564935..64272ba 100644
+ g_object_notify_by_pspec (G_OBJECT (page), obj_props[PROP_HIDE_NAVIGATION]);
+}
+
- gboolean
++gboolean
gis_page_get_needs_accept (GisPage *page)
{
+ GisPagePrivate *priv = gis_page_get_instance_private (page);
diff --git a/gnome-initial-setup/gis-page.h b/gnome-initial-setup/gis-page.h
index b9a3e9a..3862caf 100644
--- a/gnome-initial-setup/gis-page.h
--
ubuntu-desktop mailing list
ubuntu-desktop@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master-ubuntu-firstrun into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master
The proposal to merge ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master-ubuntu-firstrun into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master has been updated. Status: Needs review => Work in progress For more details, see: https://code.launchpad.net/~azzar1/ubuntu/+source/gnome-initial-setup/+git/gnome-initial-setup/+merge/356910 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master-ubuntu-firstrun into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master. -- 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_debug ("is seat master\n");
++r
Re: [Merge] ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic
Review: Approve thanks -- https://code.launchpad.net/~3v1n0/ubuntu/+source/nautilus/+git/nautilus/+merge/356726 Your team Ubuntu Desktop is subscribed to branch ~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: 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
The proposal to merge ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/nautilus/+git/nautilus/+merge/356726 -- Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~3v1n0/ubuntu/+source/nautilus:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master
Review: Approve thanks -- 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. -- 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/master into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master
The proposal to merge ~3v1n0/ubuntu/+source/nautilus:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master has been updated. Status: Needs review => Merged 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. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Bug 1795207] Re: upgrade to ubuntu-18.04: 'ubuntu-minimal' not found
Status changed to 'Confirmed' because the bug affects multiple users. ** Changed in: ubuntu-release-upgrader (Ubuntu) Status: New => Confirmed -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/1795207 Title: upgrade to ubuntu-18.04: 'ubuntu-minimal' not found To manage notifications about this bug go to: https://bugs.launchpad.net/ubuntu/+source/ubuntu-release-upgrader/+bug/1795207/+subscriptions -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Merge] ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/bionic
You have been 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.
For more details, see:
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.
diff --git a/debian/changelog b/debian/changelog
index 4ce35cf..035bb0a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+gnome-initial-setup (3.28.0-2ubuntu7) UNRELEASED; urgency=medium
+
+ * debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch:
+- Show an error message in case livepatch setup fails. This also will
+ make sure that gnome-intial-setup does not quit before livepatch
+ responds back (LP: #1764723).
+
+ -- Andrea Azzarone Mon, 03 Sep 2018 15:28:27 +
+
gnome-initial-setup (3.28.0-2ubuntu6.16.04.1) bionic; urgency=medium
* debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch:
diff --git a/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch b/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch
index 1ba127d..e092d80 100644
--- a/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch
+++ b/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch
@@ -8,21 +8,24 @@ This commit is a combined work of a number of authors.
data/Makefile.am | 6 +
data/com.ubuntu.welcome.policy.in | 21 +
gnome-initial-setup/Makefile.am| 4 +
+ gnome-initial-setup/gis-driver.c | 35 ++
+ gnome-initial-setup/gis-driver.h | 6 +
gnome-initial-setup/gnome-initial-setup.c | 40 +-
gnome-initial-setup/pages/Makefile.am | 6 +-
gnome-initial-setup/pages/apps/Makefile.am | 21 +
gnome-initial-setup/pages/apps/apps.gresource.xml | 8 +
.../pages/apps/default-snap-icon.svg | 1 +
- gnome-initial-setup/pages/apps/gis-apps-page.c | 531 +
+ gnome-initial-setup/pages/apps/gis-apps-page.c | 531
gnome-initial-setup/pages/apps/gis-apps-page.h | 52 ++
gnome-initial-setup/pages/apps/gis-apps-page.ui| 96
gnome-initial-setup/pages/livepatch/Makefile.am| 21 +
- .../pages/livepatch/gis-livepatch-page.c | 483 +++
+ .../pages/livepatch/gis-livepatch-page.c | 534 +
.../pages/livepatch/gis-livepatch-page.h | 52 ++
.../pages/livepatch/gis-livepatch-page.ui | 156 ++
.../pages/livepatch/livepatch.gresource.xml| 8 +
gnome-initial-setup/pages/livepatch/livepatch.svg | 1 +
.../pages/privacy/gis-privacy-page.c | 2 +-
+ .../pages/summary/gis-summary-page.c | 2 +-
.../pages/ubuntu-changes/Makefile.am | 21 +
.../pages/ubuntu-changes/gis-ubuntu-changes-page.c | 177 +++
.../pages/ubuntu-changes/gis-ubuntu-changes-page.h | 52 ++
@@ -36,7 +39,7 @@ This commit is a combined work of a number of authors.
.../ubuntu-report/ubuntu-report.gresource.xml | 8 +
.../pages/ubuntu-report/ubuntu-report.svg | 1 +
po/POTFILES.in | 9 +
- 32 files changed, 2404 insertions(+), 5 deletions(-)
+ 35 files changed, 2497 insertions(+), 6 deletions(-)
create mode 100644 data/com.ubuntu.welcome.policy.in
create mode 100644 gnome-initial-setup/pages/apps/Makefile.am
create mode 100644 gnome-initial-setup/pages/apps/apps.gresource.xml
@@ -164,8 +167,78 @@ index c04f1e4..6c36682 100644
$(INITIAL_SETUP_LIBS) \
-lm
+diff --git a/gnome-initial-setup/gis-driver.c b/gnome-initial-setup/gis-driver.c
+index eeaf1b7..6267b32 100644
+--- a/gnome-initial-setup/gis-driver.c
b/gnome-initial-setup/gis-driver.c
+@@ -78,6 +78,9 @@ struct _GisDriverPrivate {
+ GisDriverMode mode;
+ UmAccountMode account_mode;
+ gboolean small_screen;
++
++ guint inhibit_count;
++ gboolean quit_requested;
+ };
+ typedef struct _GisDriverPrivate GisDriverPrivate;
+
+@@ -535,6 +538,38 @@ gis_driver_save_data (GisDriver *driver)
+ gis_assistant_save_data (priv->assistant);
+ }
+
++void
++gis_driver_inhibit_quit (GisDriver *driver)
++{
++ GisDriverPrivate *priv = gis_driver_get_instance_private (driver);
++ priv->inhibit_count++;
++}
++
++void
++gis_driver_uninhibit_quit (GisDriver *driver)
++{
++ GisDriverPrivate *priv = gis_driver_get_instance_private (driver);
++
++ priv->inhibit_count--;
++ if (!priv->inhibit_count && priv->quit_requested)
++gis_driver_quit (driver);
++}
++
++void gis_driver_quit (GisDriver *driver)
++{
++ GisDriverPrivate *priv = gis_driver_get_instance_private (d
[Merge] ~azzar1/ubuntu/+source/gnome-control-center:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master
Andrea Azzarone has proposed merging ~azzar1/ubuntu/+source/gnome-control-center:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master. Requested reviews: Ubuntu Desktop (ubuntu-desktop) For more details, see: https://code.launchpad.net/~azzar1/ubuntu/+source/gnome-control-center/+git/gnome-control-center/+merge/356324 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~azzar1/ubuntu/+source/gnome-control-center:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~binli/ubuntu/+source/gdm3:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic
Review: Approve thank you! -- https://code.launchpad.net/~binli/ubuntu/+source/gdm3/+git/gdm3/+merge/356297 Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gdm3: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
The proposal to merge ~3v1n0/ubuntu/+source/nautilus:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master has been updated. Status: Needs review => Merged 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. -- 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. Status: Needs review => Merged 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
Re: [Merge] ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic-recent-search-memory-fixes into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic
Review: Approve looks fine, thanks -- https://code.launchpad.net/~3v1n0/ubuntu/+source/nautilus/+git/nautilus/+merge/356149 Your team Ubuntu Desktop is subscribed to branch ~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-recent-search-memory-fixes into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic
The proposal to merge ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic-recent-search-memory-fixes into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/bionic has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/nautilus/+git/nautilus/+merge/356149 -- Your team Ubuntu Desktop is subscribed to branch ~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-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 (>query);
+g_clear_object (>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 (>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)
++{
++Se
[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/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
Re: [Merge] ~3v1n0/ubuntu/+source/gnome-calculator:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-calculator:ubuntu/master
Review: Approve Thanks Marco -- https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-calculator/+git/gnome-calculator/+merge/355919 Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gnome-calculator:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~azzar1/ubuntu/+source/gnome-control-center:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-control-center:ubuntu/master
Review: Approve Thanks -- https://code.launchpad.net/~azzar1/ubuntu/+source/gnome-control-center/+git/gnome-control-center/+merge/356004 Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gnome-control-center: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
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] ~khurshid-alam/ubuntu/+source/ubuntu-settings:enable-background-plugin into ~ubuntu-desktop/ubuntu/+source/ubuntu-settings:master
The proposal to merge ~khurshid-alam/ubuntu/+source/ubuntu-settings:enable-background-plugin into ~ubuntu-desktop/ubuntu/+source/ubuntu-settings:master has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~khurshid-alam/ubuntu/+source/ubuntu-settings/+git/ubuntu-settings/+merge/355874 -- 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] ~3v1n0/ubuntu/+source/gnome-calculator:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-calculator:ubuntu/bionic
Generally we do not like unnecessary changes carried by SRUs and normally this could be a potential reason for rejection. But generally gnome packages are covered by the Gnome MRE so in overall there's much more flexibility what can be released as part of the SRU (new upstream microreleases themselves don't really qualify as 'minimal set of changes'). Not sure if I was reading the git diff properly and if I saw all the debian/ changes that have been introduced as part of the merge with Debian, but with my SRU hat on I'd say it should be ok for some unrelated, safe noise with a new microrelease. -- https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-calculator/+git/gnome-calculator/+merge/354330 Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/gnome-calculator:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-calculator:ubuntu/bionic. -- 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
+ {
+ r
[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
[Merge] ~3v1n0/ubuntu/+source/nautilus:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master
The proposal to merge ~3v1n0/ubuntu/+source/nautilus:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/nautilus/+git/nautilus/+merge/355857 -- Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/nautilus: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-fix-file-remote-type-search-crash into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master
The proposal to merge ~3v1n0/ubuntu/+source/nautilus:ubuntu/bionic-fix-file-remote-type-search-crash into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master has been updated. Status: Needs review => Superseded 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. -- 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
The proposal to merge ~3v1n0/ubuntu/+source/nautilus:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/nautilus/+git/nautilus/+merge/355192 -- 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. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~3v1n0/ubuntu/+source/nautilus:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/nautilus:ubuntu/master
Review: Approve Thanks! -- https://code.launchpad.net/~3v1n0/ubuntu/+source/nautilus/+git/nautilus/+merge/355857 Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/nautilus: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/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) 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/355857 -- 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 f9868fd..1a49d56 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +nautilus (1:3.26.4-0ubuntu5) UNRELEASED; 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) Fri, 28 Sep 2018 19:06:46 +0200 + nautilus (1:3.26.4-0ubuntu4) cosmic; urgency=medium [ Marco Trevisan (Treviño) ] 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/ubuntu/+source/nautilus/+bug/1795028 +Applied-Upstream: yes, 3.30.1, https://gitlab.gnome.org/GNOME/nauti
[Merge] ~khurshid-alam/ubuntu/+source/ubuntu-settings:enable-background-plugin into ~ubuntu-desktop/ubuntu/+source/ubuntu-settings:master
Khurshid Alam has proposed merging ~khurshid-alam/ubuntu/+source/ubuntu-settings:enable-background-plugin into ~ubuntu-desktop/ubuntu/+source/ubuntu-settings:master. Commit message: Re-enable background plugin by default. Gnome-settings-daemon doesn't use that key anymore (They are auto started by desktop files), But unity-settings-daemon now requires it to be enabled by default. Fixes LP: #1795145 Requested reviews: Iain Lane (laney) Related bugs: Bug #1795145 in ubuntu-settings (Ubuntu): "Turn on background plugin by default (Ubuntu 18.10)" https://bugs.launchpad.net/ubuntu/+source/ubuntu-settings/+bug/1795145 For more details, see: https://code.launchpad.net/~khurshid-alam/ubuntu/+source/ubuntu-settings/+git/ubuntu-settings/+merge/355874 -- Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/ubuntu-settings:master. diff --git a/debian/ubuntu-settings.gsettings-override b/debian/ubuntu-settings.gsettings-override index a2852e5..8291381 100644 --- a/debian/ubuntu-settings.gsettings-override +++ b/debian/ubuntu-settings.gsettings-override @@ -137,7 +137,7 @@ antialiasing = 'rgba' active = false [org.gnome.settings-daemon.plugins.background:ubuntu] -active = false +active = true [org.gnome.software:ubuntu] first-run = false -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Bug 1795207] [NEW] upgrade to ubuntu-18.04: 'ubuntu-minimal' not found
Public bug reported: I tried several times to upgrade to 18.04, but always get the same error: 'essential package ubuntu-minimal not found'. When I try to install ubuntu-minimal, then I get 'is already the newest version (1.361.1)' - translating from Dutch When I do a 'locate ubuntu-minimal' then I get this: /usr/share/doc/ubuntu-minimal /usr/share/doc/ubuntu-minimal/changelog.gz /usr/share/doc/ubuntu-minimal/copyright /var/lib/dpkg/info/ubuntu-minimal.list /var/lib/dpkg/info/ubuntu-minimal.md5sums So far, I never had a problem with an overloaded mirror-server, when doing upgrades or updates. ProblemType: Bug DistroRelease: Ubuntu 16.04 Package: ubuntu-release-upgrader-core 1:16.04.25 ProcVersionSignature: Ubuntu 4.4.0-135.161-powerpc64-smp 4.4.140 Uname: Linux 4.4.0-135-powerpc64-smp ppc64 ApportVersion: 2.20.1-0ubuntu2.18 Architecture: powerpc CrashDB: ubuntu Date: Sun Sep 30 08:54:31 2018 PackageArchitecture: all ProcEnviron: SHELL=/bin/bash PATH=(custom, no user) LANG=nl_BE.UTF-8 LANGUAGE=nl_BE:nl SourcePackage: ubuntu-release-upgrader UpgradeStatus: Upgraded to xenial on 2018-09-30 (0 days ago) ** Affects: ubuntu-release-upgrader (Ubuntu) Importance: Undecided Status: New ** Tags: apport-bug dist-upgrade powerpc xenial -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/1795207 Title: upgrade to ubuntu-18.04: 'ubuntu-minimal' not found To manage notifications about this bug go to: https://bugs.launchpad.net/ubuntu/+source/ubuntu-release-upgrader/+bug/1795207/+subscriptions -- ubuntu-bugs mailing list ubuntu-bugs@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-bugs
[Merge] ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master
Andrea Azzarone has proposed merging ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master. Requested reviews: Ubuntu Desktop (ubuntu-desktop) For more details, see: https://code.launchpad.net/~azzar1/ubuntu/+source/gnome-initial-setup/+git/gnome-initial-setup/+merge/355424 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~azzar1/ubuntu/+source/gnome-initial-setup:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-initial-setup:ubuntu/master. diff --git a/debian/changelog b/debian/changelog index 14b234b..5faa898 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +gnome-initial-setup (3.29.92-1ubuntu3) UNRELEASED; urgency=medium + + * debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch: +Drop ubuntu-changes page (LP: #1790146). + + -- Andrea Azzarone Thu, 20 Sep 2018 13:38:11 + + gnome-initial-setup (3.29.92-1ubuntu2) cosmic; urgency=medium * debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch: diff --git a/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch b/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch index 01953c3..f39b104 100644 --- a/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch +++ b/debian/patches/0001-Add-Ubuntu-mode-with-special-pages.patch @@ -3,18 +3,18 @@ Date: Tue, 20 Mar 2018 11:51:30 +1300 Subject: Add Ubuntu mode with special pages --- - configure.ac | 9 +- + configure.ac | 8 +- data/Makefile.am | 8 + data/com.ubuntu.welcome.policy.in | 21 + data/its/polkit.its| 8 + data/its/polkit.loc| 6 + data/meson.build | 23 + - gnome-initial-setup/Makefile.am| 4 + + gnome-initial-setup/Makefile.am| 3 + gnome-initial-setup/gis-driver.c | 35 ++ gnome-initial-setup/gis-driver.h | 6 + - gnome-initial-setup/gnome-initial-setup.c | 42 +- + gnome-initial-setup/gnome-initial-setup.c | 40 +- gnome-initial-setup/meson.build| 3 + - gnome-initial-setup/pages/Makefile.am | 8 +- + gnome-initial-setup/pages/Makefile.am | 5 +- gnome-initial-setup/pages/apps/Makefile.am | 23 + gnome-initial-setup/pages/apps/apps.gresource.xml | 8 + .../pages/apps/default-snap-icon.svg | 1 + @@ -32,16 +32,9 @@ Subject: Add Ubuntu mode with special pages .../pages/livepatch/livepatch.gresource.xml| 9 + gnome-initial-setup/pages/livepatch/livepatch.svg | 1 + gnome-initial-setup/pages/livepatch/meson.build| 12 + - gnome-initial-setup/pages/meson.build | 6 +- + gnome-initial-setup/pages/meson.build | 5 +- .../pages/privacy/gis-privacy-page.c | 2 +- .../pages/summary/gis-summary-page.c | 2 +- - .../pages/ubuntu-changes/Makefile.am | 23 + - .../pages/ubuntu-changes/gis-ubuntu-changes-page.c | 175 +++ - .../pages/ubuntu-changes/gis-ubuntu-changes-page.h | 52 ++ - .../ubuntu-changes/gis-ubuntu-changes-page.ui | 118 + - .../pages/ubuntu-changes/meson.build | 10 + - .../ubuntu-changes/ubuntu-changes.gresource.xml| 8 + - .../pages/ubuntu-changes/ubuntu-changes.png| Bin 0 -> 183653 bytes .../pages/ubuntu-report/Makefile.am| 23 + .../pages/ubuntu-report/gis-ubuntu-report-page.c | 241 ++ .../pages/ubuntu-report/gis-ubuntu-report-page.h | 52 ++ @@ -50,8 +43,8 @@ Subject: Add Ubuntu mode with special pages .../ubuntu-report/ubuntu-report.gresource.xml | 8 + .../pages/ubuntu-report/ubuntu-report.svg | 1 + meson.build| 3 + - po/POTFILES.in | 14 + - 48 files changed, 3398 insertions(+), 8 deletions(-) + po/POTFILES.in | 12 + + 41 files changed, 3003 insertions(+), 7 deletions(-) create mode 100644 data/com.ubuntu.welcome.policy.in create mode 100644 data/its/polkit.its create mode 100644 data/its/polkit.loc @@ -72,13 +65,6 @@ Subject: Add Ubuntu mode with special pages create mode 100644 gnome-initial-setup/pages/livepatch/livepatch.gresource.xml create mode 100644 gnome-initial-setup/pages/livepatch/livepatch.svg create mode 100644 gnome-initial-setup/pages/livepatch/meson.build - create mode 100644 gnome-initial-setup/pages/ubuntu-changes/Makefile.am - create mode 100644 gnome-initial-setup/pages/ubuntu-changes/gis-ubuntu-changes-page.c - create mode 100644 gnome-initial-setup/pages/ubuntu-changes/gis-ubuntu-changes-page.h - create mode 100644 gnome-initial-setup/pages/ubuntu-chan
[Ubuntu-be] Ubuntu Touch Get Together in Brussels (tomorrow)
Hi all, The UBports community that as taken over the development of Ubuntu Touch mobile device version of Ubuntu and of the Unity 8 desktop. Will be doing a Get Together tomorrow (20th of September) in Brussels. This will be a social event, an opportunity to meet up, get to know each other, and have interesting conversations. Maybe to find out how you can help the project. The venue will be at the Brussels Brewdog (in front of the Central Station), after 19:00h. Event page at: https://gettogether.community/events/194/ubports-gettogether-bxl/ I hope to also have the opportunity to meet there some of the members of this local community. Best regards Diogo -- ubuntu-be mailing list / mailto:ubuntu-be@lists.ubuntu.com Modify settings or unsubscribe at: https://lists.ubuntu.com/mailman/listinfo/ubuntu-be
[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/355192 -- 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/control b/debian/control index 0e523a2..0499a7c 100644 --- a/debian/control +++ b/debian/control @@ -1,5 +1,5 @@ # This file is autogenerated. DO NOT EDIT! -# +# # Modifications should be made to debian/control.in instead. # This file is regenerated automatically in the clean target. Source: nautilus @@ -7,7 +7,7 @@ Section: gnome Priority: optional Maintainer: Ubuntu Developers XSBC-Original-Maintainer: Debian GNOME Maintainers -Uploaders: Jeremy Bicha , Michael Biebl +Uploaders: Laurent Bigonville , Michael Biebl Build-Depends: debhelper (>= 10.3), dpkg-dev (>= 1.17.14), gnome-pkg-tools (>= 0.19.4ubuntu1), diff --git a/debian/gbp.conf b/debian/gbp.conf index e0a871e..84905e4 100644 --- a/debian/gbp.conf +++ b/debian/gbp.conf @@ -4,3 +4,15 @@ upstream-branch=upstream/3.26.x debian-tag=ubuntu/%(version)s upstream-vcs-tag=%(version)s pristine-tar=True + +[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/nautilus.install b/debian/nautilus.install index 76be1d6..ccb80de 100644 --- a/debian/nautilus.install +++ b/debian/nautilus.install @@ -1,6 +1,4 @@ -debian/nautilus-home.desktop usr/share/applications debian/mount-archive.desktop usr/share/applications -debian/nautilus-folder-handler.desktop usr/share/applications usr/bin usr/lib/*/nautilus/extensions-3.0/*.so usr/share/applications diff --git a/debian/patches/03_translations_list_update.patch b/debian/patches/03_translations_list_update.patch index 7fc36f0..1125c31 100644 --- a/debian/patches/03_translations_list_update.patch +++ b/debian/patches/03_translations_list_update.patch @@ -3,19 +3,18 @@ Date: Fri, 20 Jul 2018 03:25:37 +0200 Subject: _translations_list_update --- - po/POTFILES.in | 2 ++ - 1 file changed, 2 insertions(+) + po/POTFILES.in | 1 + + 1 file changed, 1 insertion(+) diff --git a/po/POTFILES.in b/po/POTFILES.in -index 277a7ff..2960c09 100644 +index 277a7ff..80d90ff 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in -@@ -4,6 +4,8 @@ data/nautilus-autorun-software.desktop.in +@@ -4,6 +4,7 @@ data/nautilus-autorun-software.desktop.in data/org.gnome.Nautilus.appdata.xml.in data/org.gnome.Nautilus.desktop.in data/org.gnome.nautilus.gschema.xml +debian/mount-archive.desktop.in -+debian/nautilus-home.desktop.in eel/eel-canvas.c eel/eel-glib-extensions.c eel/eel-gnome-extensions.c diff --git a/debian/patches/12_unity_launcher_support.patch b/debian/patches/12_unity_launcher_support.patch index 180934e..08acc60 100644 --- a/debian/patches/12_unity_launcher_support.patch +++ b/debian/patches/12_unity_launcher_support.patch @@ -1,5 +1,5 @@ From: Ubuntu Developers -Date: Thu, 12 Apr 2018 16:54:13 -0500 +Date: Thu, 12 Apr 2018 23:54:13 +0200 Subject: _unity_launcher_support --- @@ -9,11 +9,11 @@ Subject: _unity_launcher_support src/meson.build | 10 +++ src/nautilus-application.c| 8 +++ src/nautilus-toolbar.c| 21 ++ - src/unity-bookmarks-handler.c | 147 + + src/unity-bookmarks-handler.c | 147 ++ src/unity-bookmarks-handler.h | 31 - src/unity-quicklist-handler.c | 163 ++ + src/unity-quicklist-handler.c | 161 ++ src/unity-quicklist-handler.h | 72 +++ - 10 files changed, 465 insertions(+) + 10 files changed, 463 insertions(+) create mode 100644 src/unity-bookmarks-handler.c create mode 100644 src/unity-bookmarks-handler.h create mode 100644 src/unity-quicklist-handler.c @@ -378,10 +378,10 @@ index 000..a887648 +#endif /* __UNITY_BOOKMARKS_HANDLER_H__*/ diff --git a/src/unity-quicklist-handler.c b/src/unity-quicklist-handler.c new file mode 100644 -index 000..e11da55 +index 000..3133ecb --- /dev/null +++ b/src/unity-quicklist-handler.c -@@ -0,0 +1,163 @@ +@@ -0,0 +1,161 @@ +/*unity-quicklist-handler.c: handle Unity quicklists + * + * Copyright (C) 2012 Canonical @@ -514,8 +514,6 @@ index 000..e11da55 + UnityQuicklistHandlerPriv); + +unity_quicklist_handler_launcher_entry_add (self, "org.gnome.Nautilus.desktop"); -+unity_quicklist_handler_launcher_entry_add (self
[Merge] ~didrocks/ubuntu/+source/gnome-shell:yaru-as-default into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master
The proposal to merge ~didrocks/ubuntu/+source/gnome-shell:yaru-as-default into ~ubuntu-desktop/ubuntu/+source/gnome-shell:ubuntu/master has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~didrocks/ubuntu/+source/gnome-shell/+git/gnome-shell/+merge/350925 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~didrocks/ubuntu/+source/gnome-shell:yaru-as-default 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/glib2.0:ubuntu/bionic+gsubprocess-fix into ~ubuntu-desktop/ubuntu/+source/glib2.0:ubuntu/bionic
The proposal to merge ~3v1n0/ubuntu/+source/glib2.0:ubuntu/bionic+gsubprocess-fix into ~ubuntu-desktop/ubuntu/+source/glib2.0:ubuntu/bionic has been updated. Status: Needs review => Rejected For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/glib2.0/+git/glib2.0/+merge/354012 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/glib2.0:ubuntu/bionic+gsubprocess-fix into ~ubuntu-desktop/ubuntu/+source/glib2.0:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~azzar1/ubuntu/+source/gnome-screenshot:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-screenshot:ubuntu/master
The proposal to merge ~azzar1/ubuntu/+source/gnome-screenshot:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-screenshot:ubuntu/master has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~azzar1/ubuntu/+source/gnome-screenshot/+git/gnome-screenshot/+merge/354557 -- Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gnome-screenshot:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~binli/ubuntu/+source/gdm3:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic
Diff comments:
> diff --git a/debian/patches/data-61-gdm.rules.in.patch
> b/debian/patches/data-61-gdm.rules.in.patch
> new file mode 100644
> index 000..77146bf
> --- /dev/null
> +++ b/debian/patches/data-61-gdm.rules.in.patch
> @@ -0,0 +1,23 @@
> +From: Bin Li
> +Date: Wed, 29 Aug 2018 16:47:46 +0800
> +Subject: data: 61-gdm.rules.in
> +
> +Disable wayland for Huawei Hi1710 chipsets.
> +
> +The login screen is skewed/distorted on arm server, and I couldn't
> +find root cause, and no other developer ever has access to the hardware.
> +
> +https://gitlab.gnome.org/GNOME/mutter/issues/219
Sorry about it, I've added them in patches one by one, but I don't why it's
missed when I pushed the branch.
Did we have method to add these items automatically when use gbp or
cherry-pick? Thanks!
> +---
> + data/61-gdm.rules.in | 2 ++
> + 1 file changed, 2 insertions(+)
> +
> +diff --git a/data/61-gdm.rules.in b/data/61-gdm.rules.in
> +index de8e179..c9f6110 100644
> +--- a/data/61-gdm.rules.in
> b/data/61-gdm.rules.in
> +@@ -1,2 +1,4 @@
> + # disable Wayland on Cirrus chipsets
> + ATTR{vendor}=="0x1013", ATTR{device}=="0x00b8",
> ATTR{subsystem_vendor}=="0x1af4", ATTR{subsystem_device}=="0x1100",
> RUN+="@libexecdir@/gdm-disable-wayland"
> ++# disable Wayland on Hi1710 chipsets
> ++ATTR{vendor}=="0x19e5", ATTR{device}=="0x1711",
> RUN+="@libexecdir@/gdm-disable-wayland"
--
https://code.launchpad.net/~binli/ubuntu/+source/gdm3/+git/gdm3/+merge/354933
Your team Ubuntu Desktop is subscribed to branch
~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic.
--
ubuntu-desktop mailing list
ubuntu-desktop@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~binli/ubuntu/+source/gdm3:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic
@Iain, Done, I thought I forgot commit the DEP-3 changes, and I re-added them, please help check it again, thanks! -- https://code.launchpad.net/~binli/ubuntu/+source/gdm3/+git/gdm3/+merge/354933 Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~binli/ubuntu/+source/gdm3:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic
Great! Thanks a lot! -- https://code.launchpad.net/~binli/ubuntu/+source/gdm3/+git/gdm3/+merge/354933 Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~binli/ubuntu/+source/gdm3:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic
Bin Li has proposed merging ~binli/ubuntu/+source/gdm3:ubuntu/bionic into
~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic.
Commit message:
* Add patches to disable wayland for Huawei Hi1710 chipsets.(LP: #1780076)
- data-61-gdm.rules.in.patch
- data-Makefile.am.patch
- install-udev-rules-in-the-correct-folder.patch
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
Related bugs:
Bug #1780076 in gdm3 (Ubuntu): "18.04 login screen is skewed/distorted
(incorrect stride) when using hibmc_drm graphics"
https://bugs.launchpad.net/ubuntu/+source/gdm3/+bug/1780076
For more details, see:
https://code.launchpad.net/~binli/ubuntu/+source/gdm3/+git/gdm3/+merge/354933
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~binli/ubuntu/+source/gdm3:ubuntu/bionic into
~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic.
diff --git a/debian/changelog b/debian/changelog
index abf7f96..ccb8795 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+gdm3 (3.28.3-0ubuntu18.04.2) UNRELEASED; urgency=medium
+
+ * Add patches to disable wayland for Huawei Hi1710 chipsets.(LP: #1780076)
+- data-61-gdm.rules.in.patch
+- data-Makefile.am.patch
+- install-udev-rules-in-the-correct-folder.patch
+
+ -- Bin Li Fri, 14 Sep 2018 17:25:51 +0800
+
gdm3 (3.28.3-0ubuntu18.04.1) bionic; urgency=medium
[ Iain Lane ]
diff --git a/debian/patches/data-61-gdm.rules.in.patch b/debian/patches/data-61-gdm.rules.in.patch
new file mode 100644
index 000..77146bf
--- /dev/null
+++ b/debian/patches/data-61-gdm.rules.in.patch
@@ -0,0 +1,23 @@
+From: Bin Li
+Date: Wed, 29 Aug 2018 16:47:46 +0800
+Subject: data: 61-gdm.rules.in
+
+Disable wayland for Huawei Hi1710 chipsets.
+
+The login screen is skewed/distorted on arm server, and I couldn't
+find root cause, and no other developer ever has access to the hardware.
+
+https://gitlab.gnome.org/GNOME/mutter/issues/219
+---
+ data/61-gdm.rules.in | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/data/61-gdm.rules.in b/data/61-gdm.rules.in
+index de8e179..c9f6110 100644
+--- a/data/61-gdm.rules.in
b/data/61-gdm.rules.in
+@@ -1,2 +1,4 @@
+ # disable Wayland on Cirrus chipsets
+ ATTR{vendor}=="0x1013", ATTR{device}=="0x00b8", ATTR{subsystem_vendor}=="0x1af4", ATTR{subsystem_device}=="0x1100", RUN+="@libexecdir@/gdm-disable-wayland"
++# disable Wayland on Hi1710 chipsets
++ATTR{vendor}=="0x19e5", ATTR{device}=="0x1711", RUN+="@libexecdir@/gdm-disable-wayland"
diff --git a/debian/patches/data-Makefile.am.patch b/debian/patches/data-Makefile.am.patch
new file mode 100644
index 000..461f07b
--- /dev/null
+++ b/debian/patches/data-Makefile.am.patch
@@ -0,0 +1,23 @@
+From: Bin Li
+Date: Thu, 23 Aug 2018 15:15:24 +0800
+Subject: data: Makefile.am
+
+The $prefix was /usr in general, but rules in /usr/lib/udev/ can't
+be loaded by udev, so just remove it.
+---
+ data/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/data/Makefile.am b/data/Makefile.am
+index a56f32d..774f2cb 100644
+--- a/data/Makefile.am
b/data/Makefile.am
+@@ -160,7 +160,7 @@ if ENABLE_ARCH_PAM_CONFIG
+ pam_files = $(pam_arch_files)
+ endif
+
+-udevrulesdir = $(prefix)/lib/udev/rules.d
++udevrulesdir = /lib/udev/rules.d
+ udevrules_DATA = 61-gdm.rules
+
+ EXTRA_DIST += $(srcdir)/61-gdm.rules.in
diff --git a/debian/patches/install-udev-rules-in-the-correct-folder.patch b/debian/patches/install-udev-rules-in-the-correct-folder.patch
new file mode 100644
index 000..5834c0a
--- /dev/null
+++ b/debian/patches/install-udev-rules-in-the-correct-folder.patch
@@ -0,0 +1,24 @@
+From: Didier Roche
+Date: Wed, 5 Sep 2018 09:40:04 +0200
+Subject: install udev rules in the correct folder
+
+* debian/gdm3.install:
+ - install udev rules in the correct folder (following upstream build
+fixes)
+---
+ debian/gdm3.install | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/debian/gdm3.install b/debian/gdm3.install
+index c69747c..b7438b8 100644
+--- a/debian/gdm3.install
b/debian/gdm3.install
+@@ -3,7 +3,7 @@ lib/systemd/
+ lib/*/security/*.so
+ usr/bin/gdm-screenshot
+ usr/lib/gdm3/gdm-*
+-usr/lib/udev
++lib/udev
+ # gets renamed to gdm3 in binary-install
+ usr/sbin/gdm
+ usr/share/pixmaps/
diff --git a/debian/patches/series b/debian/patches/series
index 8a5cba3..188025d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,6 @@ revert_override_LANG_with_accountservices.patch
ubuntu_config_error_dialog.patch
ubuntu_dont_set_language_env.patch
ubuntu_prefer_ubuntu_session_fallback.patch
+data-Makefile.am.patch
+data-61-gdm.rules.in.patch
+install-udev-rules-in-the-correct-folder.patch
--
ubuntu-desktop mailing list
ubuntu-desktop@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~binli/ubuntu/+source/gdm3:bionic into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic
ok, let's head over there, thanks -- https://code.launchpad.net/~binli/ubuntu/+source/gdm3/+git/gdm3/+merge/354839 Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~binli/ubuntu/+source/gdm3:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic
The proposal to merge ~binli/ubuntu/+source/gdm3:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic has been updated. Status: Needs review => Merged For more details, see: https://code.launchpad.net/~binli/ubuntu/+source/gdm3/+git/gdm3/+merge/354933 -- Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~binli/ubuntu/+source/gdm3:bionic into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic
The proposal to merge ~binli/ubuntu/+source/gdm3:bionic into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic has been updated. Status: Needs review => Rejected For more details, see: https://code.launchpad.net/~binli/ubuntu/+source/gdm3/+git/gdm3/+merge/354839 -- Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~binli/ubuntu/+source/gdm3:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic
Review: Approve Thanks. I did a couple of fixes to the branch and I'll push & upload to the queue. - Add "[ Bin Li ]" to the changelog above your bits - Noted that you cherry picked the install location fix from cosmic - Reordered the patches so that the backports are above the distro ones - Squashed all the fixes together. It would probably have been better as two commits but I am too lazy to split them. :-) -- https://code.launchpad.net/~binli/ubuntu/+source/gdm3/+git/gdm3/+merge/354933 Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~binli/ubuntu/+source/gdm3:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic
> by the way, if you force push this branch when fixing it, there should be no > need to make a new merge proposal Got it.:) -- https://code.launchpad.net/~binli/ubuntu/+source/gdm3/+git/gdm3/+merge/354933 Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~binli/ubuntu/+source/gdm3:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic
Review: Needs Fixing
thanks, almost there, just a couple of changes to request please (see the diff
comments)
Diff comments:
> diff --git a/debian/patches/data-61-gdm.rules.in.patch
> b/debian/patches/data-61-gdm.rules.in.patch
> new file mode 100644
> index 000..77146bf
> --- /dev/null
> +++ b/debian/patches/data-61-gdm.rules.in.patch
> @@ -0,0 +1,23 @@
> +From: Bin Li
> +Date: Wed, 29 Aug 2018 16:47:46 +0800
> +Subject: data: 61-gdm.rules.in
> +
> +Disable wayland for Huawei Hi1710 chipsets.
> +
> +The login screen is skewed/distorted on arm server, and I couldn't
> +find root cause, and no other developer ever has access to the hardware.
> +
> +https://gitlab.gnome.org/GNOME/mutter/issues/219
Please could you add add DEP-3 metadata here so that people in the future can
easily find out where the patch comes from? At the end of the description, add:
Bug-Ubuntu:
Bug: ,
Origin:
> +---
> + data/61-gdm.rules.in | 2 ++
> + 1 file changed, 2 insertions(+)
> +
> +diff --git a/data/61-gdm.rules.in b/data/61-gdm.rules.in
> +index de8e179..c9f6110 100644
> +--- a/data/61-gdm.rules.in
> b/data/61-gdm.rules.in
> +@@ -1,2 +1,4 @@
> + # disable Wayland on Cirrus chipsets
> + ATTR{vendor}=="0x1013", ATTR{device}=="0x00b8",
> ATTR{subsystem_vendor}=="0x1af4", ATTR{subsystem_device}=="0x1100",
> RUN+="@libexecdir@/gdm-disable-wayland"
> ++# disable Wayland on Hi1710 chipsets
> ++ATTR{vendor}=="0x19e5", ATTR{device}=="0x1711",
> RUN+="@libexecdir@/gdm-disable-wayland"
> diff --git a/debian/patches/data-Makefile.am.patch
> b/debian/patches/data-Makefile.am.patch
> new file mode 100644
> index 000..461f07b
> --- /dev/null
> +++ b/debian/patches/data-Makefile.am.patch
> @@ -0,0 +1,23 @@
> +From: Bin Li
> +Date: Thu, 23 Aug 2018 15:15:24 +0800
> +Subject: data: Makefile.am
> +
> +The $prefix was /usr in general, but rules in /usr/lib/udev/ can't
> +be loaded by udev, so just remove it.
same here
> +---
> + data/Makefile.am | 2 +-
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/data/Makefile.am b/data/Makefile.am
> +index a56f32d..774f2cb 100644
> +--- a/data/Makefile.am
> b/data/Makefile.am
> +@@ -160,7 +160,7 @@ if ENABLE_ARCH_PAM_CONFIG
> + pam_files = $(pam_arch_files)
> + endif
> +
> +-udevrulesdir = $(prefix)/lib/udev/rules.d
> ++udevrulesdir = /lib/udev/rules.d
> + udevrules_DATA = 61-gdm.rules
> +
> + EXTRA_DIST += $(srcdir)/61-gdm.rules.in
> diff --git a/debian/patches/install-udev-rules-in-the-correct-folder.patch
> b/debian/patches/install-udev-rules-in-the-correct-folder.patch
> new file mode 100644
> index 000..5834c0a
> --- /dev/null
> +++ b/debian/patches/install-udev-rules-in-the-correct-folder.patch
> @@ -0,0 +1,24 @@
> +From: Didier Roche
> +Date: Wed, 5 Sep 2018 09:40:04 +0200
> +Subject: install udev rules in the correct folder
> +
> +* debian/gdm3.install:
> + - install udev rules in the correct folder (following upstream build
> +fixes)
> +---
> + debian/gdm3.install | 2 +-
This one should not be a Debian patch - a patch should never patch the debian/
directory itself. Please make this change directly.
> + 1 file changed, 1 insertion(+), 1 deletion(-)
> +
> +diff --git a/debian/gdm3.install b/debian/gdm3.install
> +index c69747c..b7438b8 100644
> +--- a/debian/gdm3.install
> b/debian/gdm3.install
> +@@ -3,7 +3,7 @@ lib/systemd/
> + lib/*/security/*.so
> + usr/bin/gdm-screenshot
> + usr/lib/gdm3/gdm-*
> +-usr/lib/udev
> ++lib/udev
> + # gets renamed to gdm3 in binary-install
> + usr/sbin/gdm
> + usr/share/pixmaps/
--
https://code.launchpad.net/~binli/ubuntu/+source/gdm3/+git/gdm3/+merge/354933
Your team Ubuntu Desktop is subscribed to branch
~ubuntu-desktop/ubuntu/+source/gdm3: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-screenshot:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-screenshot:ubuntu/master
Review: Approve Thanks -- https://code.launchpad.net/~azzar1/ubuntu/+source/gnome-screenshot/+git/gnome-screenshot/+merge/354557 Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gnome-screenshot:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~binli/ubuntu/+source/gdm3:bionic into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic
@Iain, Follow the tips, I pushed a new branch, could you help me check it? Thanks! https://code.launchpad.net/~binli/ubuntu/+source/gdm3/+git/gdm3/+merge/354933 -- https://code.launchpad.net/~binli/ubuntu/+source/gdm3/+git/gdm3/+merge/354839 Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~binli/ubuntu/+source/gdm3:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic
by the way, if you force push this branch when fixing it, there should be no
need to make a new merge proposal
Diff comments:
> diff --git a/debian/patches/data-61-gdm.rules.in.patch
> b/debian/patches/data-61-gdm.rules.in.patch
> new file mode 100644
> index 000..77146bf
> --- /dev/null
> +++ b/debian/patches/data-61-gdm.rules.in.patch
> @@ -0,0 +1,23 @@
> +From: Bin Li
> +Date: Wed, 29 Aug 2018 16:47:46 +0800
> +Subject: data: 61-gdm.rules.in
> +
> +Disable wayland for Huawei Hi1710 chipsets.
> +
> +The login screen is skewed/distorted on arm server, and I couldn't
> +find root cause, and no other developer ever has access to the hardware.
> +
> +https://gitlab.gnome.org/GNOME/mutter/issues/219
When you use `gbp-pq export` to make the patch series, the commit message
becomes the patch description. So if you have them in your commit messages in
`patch-queue/ubuntu/bionic`, they should show up correctly. Or it's also OK to
do it by hand if you prefer.
This isn't done automatically, no - it's something you need to do by hand.
> +---
> + data/61-gdm.rules.in | 2 ++
> + 1 file changed, 2 insertions(+)
> +
> +diff --git a/data/61-gdm.rules.in b/data/61-gdm.rules.in
> +index de8e179..c9f6110 100644
> +--- a/data/61-gdm.rules.in
> b/data/61-gdm.rules.in
> +@@ -1,2 +1,4 @@
> + # disable Wayland on Cirrus chipsets
> + ATTR{vendor}=="0x1013", ATTR{device}=="0x00b8",
> ATTR{subsystem_vendor}=="0x1af4", ATTR{subsystem_device}=="0x1100",
> RUN+="@libexecdir@/gdm-disable-wayland"
> ++# disable Wayland on Hi1710 chipsets
> ++ATTR{vendor}=="0x19e5", ATTR{device}=="0x1711",
> RUN+="@libexecdir@/gdm-disable-wayland"
--
https://code.launchpad.net/~binli/ubuntu/+source/gdm3/+git/gdm3/+merge/354933
Your team Ubuntu Desktop is subscribed to branch
~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic.
--
ubuntu-desktop mailing list
ubuntu-desktop@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~binli/ubuntu/+source/gdm3:disable-wayland-for-huawei-hi1710 into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/master
The proposal to merge ~binli/ubuntu/+source/gdm3:disable-wayland-for-huawei-hi1710 into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/master has been updated. Status: Needs review => Rejected For more details, see: https://code.launchpad.net/~binli/ubuntu/+source/gdm3/+git/gdm3/+merge/353981 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~binli/ubuntu/+source/gdm3:disable-wayland-for-huawei-hi1710 into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~binli/ubuntu/+source/gdm3:disable-wayland-for-huawei-hi1710 into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/master
not needed any more, right? thanks! -- https://code.launchpad.net/~binli/ubuntu/+source/gdm3/+git/gdm3/+merge/353981 Your team Ubuntu Desktop is requested to review the proposed merge of ~binli/ubuntu/+source/gdm3:disable-wayland-for-huawei-hi1710 into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~binli/ubuntu/+source/gdm3:disable-wayland-for-huawei-hi1710 into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/master
Yes, don't need it any more. -- https://code.launchpad.net/~binli/ubuntu/+source/gdm3/+git/gdm3/+merge/353981 Your team Ubuntu Desktop is requested to review the proposed merge of ~binli/ubuntu/+source/gdm3:disable-wayland-for-huawei-hi1710 into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~binli/ubuntu/+source/gdm3:bionic into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic
Bin Li has proposed merging ~binli/ubuntu/+source/gdm3:bionic into
~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic.
Commit message:
commit 287fe76d874f02c568a1c36660f00e7eb14f70e0 (HEAD -> bionic, binli/bionic)
Author: Bin Li
Date: Thu Sep 13 15:38:35 2018 +0800
debian/gdm3.install:
- install udev rules in the correct folder (following upstream build
fixes)
commit dd0547c1176bd3e782154483a2f42237b41d039f
Author: Bin Li
Date: Wed Aug 29 16:47:46 2018 +0800
data: 61-gdm.rules.in
Disable wayland for Huawei Hi1710 chipsets.
The login screen is skewed/distorted on arm server, and I couldn't
find root cause, and no other developer ever has access to the hardware.
https://gitlab.gnome.org/GNOME/mutter/issues/219
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
For more details, see:
https://code.launchpad.net/~binli/ubuntu/+source/gdm3/+git/gdm3/+merge/354839
--
Your team Ubuntu Desktop is requested to review the proposed merge of
~binli/ubuntu/+source/gdm3:bionic into
~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/bionic.
diff --git a/data/61-gdm.rules.in b/data/61-gdm.rules.in
index de8e179..c9f6110 100644
--- a/data/61-gdm.rules.in
+++ b/data/61-gdm.rules.in
@@ -1,2 +1,4 @@
# disable Wayland on Cirrus chipsets
ATTR{vendor}=="0x1013", ATTR{device}=="0x00b8", ATTR{subsystem_vendor}=="0x1af4", ATTR{subsystem_device}=="0x1100", RUN+="@libexecdir@/gdm-disable-wayland"
+# disable Wayland on Hi1710 chipsets
+ATTR{vendor}=="0x19e5", ATTR{device}=="0x1711", RUN+="@libexecdir@/gdm-disable-wayland"
diff --git a/debian/gdm3.install b/debian/gdm3.install
index c69747c..b7438b8 100644
--- a/debian/gdm3.install
+++ b/debian/gdm3.install
@@ -3,7 +3,7 @@ lib/systemd/
lib/*/security/*.so
usr/bin/gdm-screenshot
usr/lib/gdm3/gdm-*
-usr/lib/udev
+lib/udev
# gets renamed to gdm3 in binary-install
usr/sbin/gdm
usr/share/pixmaps/
--
ubuntu-desktop mailing list
ubuntu-desktop@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~binli/ubuntu/+source/gdm3:disable-wayland-for-huawei-hi1710 into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/master
Review: Abstain I found these patch was in ubuntu-desktop tree. commit 53a5db08ae0b6e8e65b2bc0a99d374a5783a3e9b Author: Didier Roche Date: Wed Sep 5 09:40:04 2018 +0200 install udev rules in the correct folder * debian/gdm3.install: - install udev rules in the correct folder (following upstream build fixes) commit e7c108779b23f10da71953fefa2ba5eacc76fac1 Author: Bin Li Date: Wed Aug 29 16:47:46 2018 +0800 data: 61-gdm.rules.in Disable wayland for Huawei Hi1710 chipsets. The login screen is skewed/distorted on arm server, and I couldn't find root cause, and no other developer ever has access to the hardware. https://gitlab.gnome.org/GNOME/mutter/issues/219 -- https://code.launchpad.net/~binli/ubuntu/+source/gdm3/+git/gdm3/+merge/353981 Your team Ubuntu Desktop is requested to review the proposed merge of ~binli/ubuntu/+source/gdm3:disable-wayland-for-huawei-hi1710 into ~ubuntu-desktop/ubuntu/+source/gdm3:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~azzar1/ubuntu/+source/gnome-screenshot:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-screenshot:ubuntu/master
> Why the save dialog was dropped? For a control center message ? Please see the > discussion in the bug: https://bugs.launchpad.net/ubuntu/+source/gnome- > screenshot/+bug/927952 The save dialog was not dropped in unity. I tried to re-introduce it in gnome-shell but there are several issues: - the strings in gnome-control-center - in a gnome-shell session, when pressing "Print" the one taking the screenshot is gnome-settings-daemon using DIRECTLY the gnome-shell API. gnome-screenshot is not used anymore. This is has to be fixed in gnome-shell and/or in gnome-settings-daemon. I'm afraid it's too late for this cycle. > > We need headerbar patch in Unity. Without it the save window simply loses > focus (another bug). We no loger support Unity. Feel free to propose it and I'll be happy to review it. -- https://code.launchpad.net/~azzar1/ubuntu/+source/gnome-screenshot/+git/gnome-screenshot/+merge/354557 Your team Ubuntu Desktop is requested to review the proposed merge of ~azzar1/ubuntu/+source/gnome-screenshot:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-screenshot:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~azzar1/ubuntu/+source/gnome-screenshot:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-screenshot:ubuntu/master
Why the save dialog was dropped? For a control center message ? Please see the discussion in the bug: https://bugs.launchpad.net/ubuntu/+source/gnome-screenshot/+bug/927952 We need headerbar patch in Unity. Without it the save window simply loses focus (another bug). -- https://code.launchpad.net/~azzar1/ubuntu/+source/gnome-screenshot/+git/gnome-screenshot/+merge/354557 Your team Ubuntu Desktop is requested to review the proposed merge of ~azzar1/ubuntu/+source/gnome-screenshot:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-screenshot: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-calculator:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-calculator:ubuntu/bionic
Please get a +1 by the SRU team members (!= from the release team) and then, I'll approve it :) -- https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-calculator/+git/gnome-calculator/+merge/354330 Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/gnome-calculator:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-calculator: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-calculator:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-calculator:ubuntu/bionic
I asked Seb at the time and since the diff on debian/* was just few lines, he said it was ok. Then I noticed the clutter of the generated files, but in general should be something that is fine to go once release team is informed. -- https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-calculator/+git/gnome-calculator/+merge/354330 Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/gnome-calculator:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-calculator:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~azzar1/ubuntu/+source/gnome-screenshot:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-screenshot:ubuntu/master
The proposal to merge ~azzar1/ubuntu/+source/gnome-screenshot:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-screenshot:ubuntu/master has been updated. Commit message changed to: Merge with debian. For more details, see: https://code.launchpad.net/~azzar1/ubuntu/+source/gnome-screenshot/+git/gnome-screenshot/+merge/354557 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~azzar1/ubuntu/+source/gnome-screenshot:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-screenshot: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-calculator:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-calculator:ubuntu/bionic
Do we really want to merge with Debian for a SRU? This sounds like against the "minimal set of changes" that a SRU should have and may be rejected by the SRU team. Otherwise, +1 on the changes themselves for me, but before acking, please check with the SRU team. -- https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-calculator/+git/gnome-calculator/+merge/354330 Your team Ubuntu Desktop is requested to review the proposed merge of ~3v1n0/ubuntu/+source/gnome-calculator:ubuntu/bionic into ~ubuntu-desktop/ubuntu/+source/gnome-calculator:ubuntu/bionic. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~azzar1/ubuntu/+source/gnome-screenshot:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-screenshot:ubuntu/master
The proposal to merge ~azzar1/ubuntu/+source/gnome-screenshot:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-screenshot:ubuntu/master has been updated. Status: Needs review => Work in progress For more details, see: https://code.launchpad.net/~azzar1/ubuntu/+source/gnome-screenshot/+git/gnome-screenshot/+merge/354557 -- Your team Ubuntu Desktop is requested to review the proposed merge of ~azzar1/ubuntu/+source/gnome-screenshot:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-screenshot:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/gnome-session:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master
Marco Trevisan (Treviño) has proposed merging
~3v1n0/ubuntu/+source/gnome-session:ubuntu/master into
~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master.
Requested reviews:
Ubuntu Desktop (ubuntu-desktop)
Related bugs:
Bug #1790532 in gnome-session (Ubuntu):
"ubuntu-settings-migrate-to-defaults.18.10.0.py crashed with KeyError in
__getitem__(): 'DESKTOP_SESSION'"
https://bugs.launchpad.net/ubuntu/+source/gnome-session/+bug/1790532
For more details, see:
https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-session/+git/gnome-session/+merge/354394
--
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 88be35d..e50bac0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+gnome-session (3.30.0-0ubuntu2) UNRELEASED; urgency=medium
+
+ * debian/ubuntu-settings-migrate-to-defaults.18.10.0.py:
+- Skip the settings migrations even if DESKTOP_SESSION is not
+ exported (LP: #1790532)
+ * debian
+
+ -- Marco Trevisan (Treviño) Thu, 06 Sep 2018 15:11:53 +0200
+
gnome-session (3.30.0-0ubuntu1) cosmic; urgency=medium
* New upstream release:
diff --git a/debian/ubuntu-settings-migrate-to-defaults.18.10.0.py b/debian/ubuntu-settings-migrate-to-defaults.18.10.0.py
index 3fdf000..4220c83 100755
--- a/debian/ubuntu-settings-migrate-to-defaults.18.10.0.py
+++ b/debian/ubuntu-settings-migrate-to-defaults.18.10.0.py
@@ -32,7 +32,7 @@ OLD_DEFAULTS = {
}
}
-if os.environ['DESKTOP_SESSION'] != 'ubuntu':
+if 'DESKTOP_SESSION' not in os.environ or os.environ['DESKTOP_SESSION'] != 'ubuntu':
sys.exit(0)
any_changed = False
--
ubuntu-desktop mailing list
ubuntu-desktop@lists.ubuntu.com
https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
[Merge] ~3v1n0/ubuntu/+source/gnome-session:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master
The proposal to merge ~3v1n0/ubuntu/+source/gnome-session:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master has been updated. Status: Needs review => Rejected For more details, see: https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-session/+git/gnome-session/+merge/354394 -- Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
Re: [Merge] ~3v1n0/ubuntu/+source/gnome-session:ubuntu/master into ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master
Review: Disapprove Let's just use getenv which is better for this IMHO. I'm adding also a missing import sys. -- https://code.launchpad.net/~3v1n0/ubuntu/+source/gnome-session/+git/gnome-session/+merge/354394 Your team Ubuntu Desktop is subscribed to branch ~ubuntu-desktop/ubuntu/+source/gnome-session:ubuntu/master. -- ubuntu-desktop mailing list ubuntu-desktop@lists.ubuntu.com https://lists.ubuntu.com/mailman/listinfo/ubuntu-desktop
