Jeremy Bicha · Jeremy Bicha · Jeremy Bicha · Jeremy Bicha · Jeremy Bicha · Jeremy Bicha
--- a/debian/changelog
+++ b/debian/changelog
+nautilus (1:44.0-1ubuntu2) lunar; urgency=medium
+
+  * Depend on xdg-desktop-portal-gnome | xdg-desktop-portal-backend.
+    Required for "Set as Background" feature
+  * Cherry-pick fix for inconsistent on/off switch
+  * Cherry-pick a translation fix
+  * Cherry-pick a fix for annoying behavior with autofs mounts
+  * Cherry-pick a fix for extra 1px thumbnail border
+
+ -- Jeremy Bicha <jbicha@ubuntu.com>  Thu, 06 Apr 2023 09:43:27 -0400
+
 nautilus (1:44.0-1ubuntu1) lunar; urgency=medium

  * Resynchronize with Debian, remaining Ubuntu changes:

--- a/debian/control
+++ b/debian/control
@@ -63,6 +63,7 @@ Depends: bubblewrap [linux-any],
         tracker (>= 3),
         tracker-miner-fs (>= 3),
         tracker-extract (>= 3),
+         xdg-desktop-portal-gnome | xdg-desktop-portal-backend,
         ${misc:Depends},
         ${shlibs:Depends}
 Recommends: gvfs-backends,

--- a/debian/control.in
+++ b/debian/control.in
@@ -59,6 +59,7 @@ Depends: bubblewrap [linux-any],
         tracker (>= 3),
         tracker-miner-fs (>= 3),
         tracker-extract (>= 3),
+         xdg-desktop-portal-gnome | xdg-desktop-portal-backend,
         ${misc:Depends},
         ${shlibs:Depends}
 Recommends: gvfs-backends,

--- a/debian/patches/grid-cell-name-cell-Have-thumbnail-cover-allocation.patch
+++ b/debian/patches/grid-cell-name-cell-Have-thumbnail-cover-allocation.patch
+From: =?utf-8?q?Ant=C3=B3nio_Fernandes?= <antoniof@gnome.org>
+Date: Wed, 5 Apr 2023 12:26:47 +0100
+Subject: grid-cell, name-cell: Have thumbnail cover allocation
+
+Otherwise, due to some modular arithmetic artifacts, there is an
+unsightly 1px transparent line between the picture and its css border.
+
+Fixes https://gitlab.gnome.org/GNOME/nautilus/-/issues/2779
+
+(cherry picked from commit baab8d3ad5168800b90e06b98070d250714d1b0e)
+---
+ src/resources/ui/nautilus-grid-cell.ui | 1 +
+ src/resources/ui/nautilus-name-cell.ui | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/src/resources/ui/nautilus-grid-cell.ui b/src/resources/ui/nautilus-grid-cell.ui
+index 1a92040..881e6b0 100644
+--- a/src/resources/ui/nautilus-grid-cell.ui
+++ b/src/resources/ui/nautilus-grid-cell.ui
+@@ -28,6 +28,7 @@
+                         <property name="valign">center</property>
+                         <property name="vexpand">True</property>
+                         <property name="can-shrink">False</property>
+                        <property name="content-fit">cover</property>
+                       </object>
+                     </property>
+                   </object>
+diff --git a/src/resources/ui/nautilus-name-cell.ui b/src/resources/ui/nautilus-name-cell.ui
+index 96094b7..ddfe398 100644
+--- a/src/resources/ui/nautilus-name-cell.ui
+++ b/src/resources/ui/nautilus-name-cell.ui
+@@ -37,6 +37,7 @@
+                     <property name="halign">center</property>
+                     <property name="valign">center</property>
+                     <property name="can-shrink">False</property>
+                    <property name="content-fit">cover</property>
+                   </object>
+                 </child>
+               </object>
--- a/debian/patches/places-view-remove-GTK-translation-domains.patch
+++ b/debian/patches/places-view-remove-GTK-translation-domains.patch
+From: Peter Eisenmann <p3732@getgoogleoff.me>
+Date: Sun, 26 Mar 2023 14:37:22 +0200
+Subject: places-view: remove GTK translation domains
+
+When copying these classes from GTK the translation domain was kept.
+This causes issues with translations in libadwaita widgets, so remove
+them.
+
+Fixes #2890
+
+(cherry picked from commit b2d1680f23b8947b57380a0a089ad350f843162b)
+---
+ src/gtk/nautilusgtkplacesview.ui    | 2 +-
+ src/gtk/nautilusgtkplacesviewrow.ui | 2 +-
+ src/gtk/nautilusgtksidebarrow.ui    | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/src/gtk/nautilusgtkplacesview.ui b/src/gtk/nautilusgtkplacesview.ui
+index fbedf70..ddb06f5 100644
+--- a/src/gtk/nautilusgtkplacesview.ui
+++ b/src/gtk/nautilusgtkplacesview.ui
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+-<interface domain="gtk40">
+<interface>
+   <object class="GtkListStore" id="completion_store">
+     <columns>
+       <column type="gchararray"/>
+diff --git a/src/gtk/nautilusgtkplacesviewrow.ui b/src/gtk/nautilusgtkplacesviewrow.ui
+index 06c8041..194079f 100644
+--- a/src/gtk/nautilusgtkplacesviewrow.ui
+++ b/src/gtk/nautilusgtkplacesviewrow.ui
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+-<interface domain="gtk40">
+<interface>
+   <template class="NautilusGtkPlacesViewRow" parent="GtkListBoxRow">
+     <property name="width-request">100</property>
+     <property name="child">
+diff --git a/src/gtk/nautilusgtksidebarrow.ui b/src/gtk/nautilusgtksidebarrow.ui
+index 95d91f9..43c853b 100644
+--- a/src/gtk/nautilusgtksidebarrow.ui
+++ b/src/gtk/nautilusgtksidebarrow.ui
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" encoding="UTF-8"?>
+-<interface domain="gtk40">
+<interface>
+   <template class="NautilusGtkSidebarRow" parent="GtkListBoxRow">
+     <property name="focus-on-click">0</property>
+     <style>
--- a/debian/patches/properties-window-fix-execution-switch-behavior.patch
+++ b/debian/patches/properties-window-fix-execution-switch-behavior.patch
+From: Peter Eisenmann <p3732@getgoogleoff.me>
+Date: Wed, 22 Mar 2023 13:32:51 +0100
+Subject: properties-window: fix execution switch behavior
+
+Changes in GTK (https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/5442)
+require to use `gtk_switch_set_active` to flip a switch, otherwise it
+ends up in an inconsistent state.
+
+Fixes #2883
+
+(cherry picked from commit d7af60161d30c885ebab69c58b346896f1565387)
+---
+ src/nautilus-properties-window.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/nautilus-properties-window.c b/src/nautilus-properties-window.c
+index e9e2426..c85d7b3 100644
+--- a/src/nautilus-properties-window.c
+++ b/src/nautilus-properties-window.c
+@@ -3001,8 +3001,8 @@ update_execution_row (GtkWidget         *row,
+                                          G_CALLBACK (execution_bit_changed),
+                                          self);
+ 
+-        gtk_switch_set_state (self->execution_switch,
+-                              target_perm->file_exec_permissions == PERMISSION_EXEC);
+        gtk_switch_set_active (self->execution_switch,
+                               target_perm->file_exec_permissions == PERMISSION_EXEC);
+ 
+         g_signal_handlers_unblock_by_func (self->execution_switch,
+                                            G_CALLBACK (execution_bit_changed),
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,3 +6,7 @@ ubuntu/unity_icon_color.patch
 ubuntu/ubuntu_backspace_behaviour.patch
 ubuntu/shell-search-provider-implement-XUbuntuCancel-to-request-.patch
 ubuntu/Revert-sidebar-Build-with-cloudproviders-support.patch
+properties-window-fix-execution-switch-behavior.patch
+places-view-remove-GTK-translation-domains.patch
+window-slot-Try-current-location-even-if-it-is-marked-as-.patch
+grid-cell-name-cell-Have-thumbnail-cover-allocation.patch
--- a/debian/patches/window-slot-Try-current-location-even-if-it-is-marked-as-.patch
+++ b/debian/patches/window-slot-Try-current-location-even-if-it-is-marked-as-.patch
+From: Ondrej Holy <oholy@redhat.com>
+Date: Tue, 24 Jan 2023 12:13:15 +0100
+Subject: window-slot: Try current location even if it is marked as gone
+
+When the current location is marked as gone, Nautilus jumps to the
+first existing parent currently (except for non-native locations and
+mount roots). This is fine in most cases, but not for autofs locations
+as Nautilus jumps to parent everytime autofs mount timeouted. It would
+be better to stay in the same folder in this case. Let's try the current
+location first even if it is marked as gone to ensure that. It would be
+perhaps even better to prevent autofs locations somehow from timeouting
+at all, or avoid immediate remounting at least, but those solutions
+don't look easy to implement.
+
+Fixes: https://gitlab.gnome.org/GNOME/nautilus/-/issues/1514
+(cherry picked from commit b0e28bc19c065b4bc1d6fdea922ae2c09115b0e6)
+---
+ src/nautilus-window-slot.c | 14 +++++++-------
+ 1 file changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/nautilus-window-slot.c b/src/nautilus-window-slot.c
+index c06dc34..a1af618 100644
+--- a/src/nautilus-window-slot.c
+++ b/src/nautilus-window-slot.c
+@@ -1442,11 +1442,10 @@ viewed_file_changed_callback (NautilusFile       *file,
+         if (self->viewed_file_seen)
+         {
+             GFile *go_to_file;
+-            GFile *parent;
+             GFile *location;
+             GMount *mount;
+            gboolean find_existing = FALSE;
+ 
+-            parent = NULL;
+             location = nautilus_file_get_location (file);
+ 
+             if (g_file_is_native (location))
+@@ -1455,16 +1454,18 @@ viewed_file_changed_callback (NautilusFile       *file,
+ 
+                 if (mount == NULL)
+                 {
+-                    parent = g_file_get_parent (location);
+                    find_existing = TRUE;
+                 }
+ 
+                 g_clear_object (&mount);
+             }
+ 
+-            if (parent != NULL)
+            if (find_existing)
+             {
+-                /* auto-show existing parent */
+-                go_to_file = nautilus_find_existing_uri_in_hierarchy (parent);
+                /* Verify also the current location to prevent jumps to parent
+                 * in case of autofs.
+                 */
+                go_to_file = nautilus_find_existing_uri_in_hierarchy (location);
+             }
+             else
+             {
+@@ -1473,7 +1474,6 @@ viewed_file_changed_callback (NautilusFile       *file,
+ 
+             nautilus_window_slot_open_location_full (self, go_to_file, 0, NULL);
+ 
+-            g_clear_object (&parent);
+             g_object_unref (go_to_file);
+             g_object_unref (location);
+         }