[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#1107571: unblock (pre-approval): nautilus/48.2-3



Control: tags -1 moreinfo confirmed

On 2025-06-09 23:49:46 +0100, Simon McVittie wrote:
> Package: release.debian.org
> Severity: normal
> X-Debbugs-Cc: nautilus@packages.debian.org
> Control: affects -1 + src:nautilus
> User: release.debian.org@packages.debian.org
> Usertags: unblock
> 
> [ Reason ]
> New upstream bugfix release

Please go ahead. Please remove the moreinfo tag once the upload is
available in unstable.

Cheers

> 
> [ Impact ]
> The largest impact is that some crashes were fixed.
> 
> The proposed version also improves performance (especially for slower
> protocols like SMB), and avoids duplicate information in audio files'
> Properties windows.
> 
> [ Tests ]
> A functionally equivalent package is available in experimental.
> I used https://wiki.ubuntu.com/DesktopTeam/TestPlans/Nautilus for manual
> testing, which was successful (I skipped the email test, my email client
> is not compatible).
> 
> There are unit tests for some functionality, which are run at build-time
> and pass. I reverted an upstream change that disabled a test that was
> failing on their CI: it seems to be reliable on official Debian buildds,
> so more coverae seems better.
> 
> [ Risks ]
> It's a key package, part of our default GNOME desktop, but the changes
> are narrowly-targeted and would be easy to revert if necessary.
> 
> [ Checklist ]
>   [x] all changes are documented in the d/changelog
>   [x] I reviewed all changes and I approve them
>   [x] attach debdiff against the package in testing
>       - testing vs. experimental, the upload I'm proposing for unstable
>         would differ only in the changelog

> debdiff nautilus_48.1-2.dsc nautilus_48.2-2.dsc | filterdiff -p1 -x'po/*.po'
> 
> diff -Nru nautilus-48.1/data/org.gnome.Nautilus.metainfo.xml.in.in nautilus-48.2/data/org.gnome.Nautilus.metainfo.xml.in.in
> --- nautilus-48.1/data/org.gnome.Nautilus.metainfo.xml.in.in	2025-04-13 07:56:22.000000000 +0100
> +++ nautilus-48.2/data/org.gnome.Nautilus.metainfo.xml.in.in	2025-05-25 10:10:18.000000000 +0100
> @@ -40,7 +40,7 @@
>      <release version="@release-version@" date="@build-date@"/>
>    -->
>    <releases>
> -    <release version="@release-version@" type="stable" date="2025-04-13"/>
> +    <release version="@release-version@" type="stable" date="2025-05-24"/>
>    </releases>
>    <project_group>GNOME</project_group>
>    <project_license>GPL-3.0-or-later</project_license>
> diff -Nru nautilus-48.1/debian/changelog nautilus-48.2/debian/changelog
> --- nautilus-48.1/debian/changelog	2025-05-03 16:32:12.000000000 +0100
> +++ nautilus-48.2/debian/changelog	2025-06-09 23:19:50.000000000 +0100
> @@ -1,3 +1,35 @@
> +nautilus (48.2-2) experimental; urgency=medium
> +
> +  * Team upload
> +  * Summarize upstream changes in previous changelog entry
> +  * d/p/debian/Revert-test-Disable-localsearch-tracker-tests.patch:
> +    Re-enable localsearch/tracker test-case, disabled by upstream in 48.2.
> +    This restores the test coverage that we had in 48.1.
> +
> + -- Simon McVittie <smcv@debian.org>  Mon, 09 Jun 2025 23:19:50 +0100
> +
> +nautilus (48.2-1) experimental; urgency=medium
> +
> +  * New upstream release
> +    - Fix a crash when an async query changes the visibility of the "Empty
> +      Trash…" banner
> +      (nautilus#3844 upstream)
> +    - Fix a crash which can occur when moving between non-local locations,
> +      or when double-clicking on a folder when using single-click navigation
> +      (nautilus#3817 upstream)
> +    - Speed up loading of SMB shares by not waiting for attributes to be ready
> +      before loading directories
> +      (nautilus#3834 upstream)
> +    - Don't list FLAC in audio files' Properties as both a container and
> +      a codec
> +      (nautilus#3839 upstream)
> +    - Disable localsearch (Tracker)-related build-time tests, which did not
> +      work in the upstream CI
> +      (see nautilus#3878 upstream)
> +    - Translation updates
> +
> + -- Jeremy Bícha <jbicha@ubuntu.com>  Fri, 06 Jun 2025 14:44:20 -0400
> +
>  nautilus (48.1-2) unstable; urgency=medium
>  
>    * Team upload
> diff -Nru nautilus-48.1/debian/patches/debian/Revert-test-Disable-localsearch-tracker-tests.patch nautilus-48.2/debian/patches/debian/Revert-test-Disable-localsearch-tracker-tests.patch
> --- nautilus-48.1/debian/patches/debian/Revert-test-Disable-localsearch-tracker-tests.patch	1970-01-01 01:00:00.000000000 +0100
> +++ nautilus-48.2/debian/patches/debian/Revert-test-Disable-localsearch-tracker-tests.patch	2025-06-09 23:19:50.000000000 +0100
> @@ -0,0 +1,30 @@
> +From: Simon McVittie <smcv@debian.org>
> +Date: Mon, 9 Jun 2025 18:28:05 +0100
> +Subject: Revert "test: Disable localsearch/tracker tests"
> +
> +These tests didn't work reliably in upstream's CI, but they appear to be
> +reliable on Debian buildds, so let's keep the extra coverage.
> +
> +This reverts commit 1ea0be865bea3b3fbaba33b16de008a9b58756cd.
> +
> +Bug: https://gitlab.gnome.org/GNOME/nautilus/-/issues/3878
> +Forwarded: not-needed
> +---
> + test/automated/displayless/meson.build | 4 ----
> + 1 file changed, 4 deletions(-)
> +
> +diff --git a/test/automated/displayless/meson.build b/test/automated/displayless/meson.build
> +index cc8c271..4aaf36a 100644
> +--- a/test/automated/displayless/meson.build
> ++++ b/test/automated/displayless/meson.build
> +@@ -51,10 +51,6 @@ tracker_tests = [
> +   ]],
> + ]
> + 
> +-# disable tracker tests for now, until issues with accessing it from
> +-# within the sandbox are resolved
> +-tracker_tests = []
> +-
> + foreach t: tests
> +   test(
> +     t[0],
> diff -Nru nautilus-48.1/debian/patches/series nautilus-48.2/debian/patches/series
> --- nautilus-48.1/debian/patches/series	2025-05-03 16:01:45.000000000 +0100
> +++ nautilus-48.2/debian/patches/series	2025-06-09 23:19:50.000000000 +0100
> @@ -0,0 +1 @@
> +debian/Revert-test-Disable-localsearch-tracker-tests.patch
> diff -Nru nautilus-48.1/extensions/audio-video-properties/totem-properties-view.c nautilus-48.2/extensions/audio-video-properties/totem-properties-view.c
> --- nautilus-48.1/extensions/audio-video-properties/totem-properties-view.c	2025-04-13 07:56:22.000000000 +0100
> +++ nautilus-48.2/extensions/audio-video-properties/totem-properties-view.c	2025-05-25 10:10:18.000000000 +0100
> @@ -328,7 +328,7 @@
>      const char *label;
>      GstClockTime duration;
>      g_autofree char *duration_string = NULL;
> -    GstDiscovererStreamInfo *sinfo;
> +    g_autoptr (GstDiscovererStreamInfo) sinfo = NULL;
>  
>      if (error)
>      {
> @@ -365,10 +365,10 @@
>      append_item (props, _("Duration"), duration_string);
>  
>      sinfo = gst_discoverer_info_get_stream_info (info);
> -    if (sinfo)
> +    if (sinfo != NULL &&
> +        g_str_equal (gst_discoverer_stream_info_get_stream_type_nick (sinfo), "container"))
>      {
>          set_codec (props, sinfo, _("Container"));
> -        gst_discoverer_stream_info_unref (sinfo);
>      }
>  
>      taglist = gst_discoverer_info_get_tags (info);
> diff -Nru nautilus-48.1/meson.build nautilus-48.2/meson.build
> --- nautilus-48.1/meson.build	2025-04-13 07:56:22.000000000 +0100
> +++ nautilus-48.2/meson.build	2025-05-25 10:10:18.000000000 +0100
> @@ -3,7 +3,7 @@
>  
>    # Do not forget when releasing:
>    #  * Set release date in data/org.gnome.Nautilus.metainfo.xml.in.in
> -  version: '48.1',
> +  version: '48.2',
>  
>    meson_version: '>= 0.59.0',
>    license: 'GPL-3.0-or-later'
> diff -Nru nautilus-48.1/NEWS nautilus-48.2/NEWS
> --- nautilus-48.1/NEWS	2025-04-13 07:56:22.000000000 +0100
> +++ nautilus-48.2/NEWS	2025-05-25 10:10:18.000000000 +0100
> @@ -1,3 +1,13 @@
> +Major Changes in 48.2
> +=====================
> +* Bugfixes:
> +- Load directory before thumbnail attributes are ready (Khalid Abu Shawarib)
> +- Fix trash banner visibiltiy (Alessandro Astone)
> +- Fix sporadic crash when loading new view (Khalid Abu Shawarib)
> +- Improve container-related media property handling (Khalid Abu Shawarib)
> +
> +* Translation updates (GNOME Translation Project contributors)
> +
>  Major Changes in 48.1
>  =====================
>  * Bugfixes:
> diff -Nru nautilus-48.1/src/nautilus-files-view.c nautilus-48.2/src/nautilus-files-view.c
> --- nautilus-48.1/src/nautilus-files-view.c	2025-04-13 07:56:22.000000000 +0100
> +++ nautilus-48.2/src/nautilus-files-view.c	2025-05-25 10:10:18.000000000 +0100
> @@ -8953,7 +8953,7 @@
>      nautilus_directory_call_when_ready
>          (priv->directory,
>          attributes,
> -        !NAUTILUS_IS_SEARCH_DIRECTORY (priv->directory),
> +        FALSE,
>          metadata_for_files_in_directory_ready_callback, view);
>  
>      /* If capabilities change, then we need to update the menus
> diff -Nru nautilus-48.1/src/nautilus-location-banner.c nautilus-48.2/src/nautilus-location-banner.c
> --- nautilus-48.1/src/nautilus-location-banner.c	2025-04-13 07:56:22.000000000 +0100
> +++ nautilus-48.2/src/nautilus-location-banner.c	2025-05-25 10:10:18.000000000 +0100
> @@ -239,10 +239,10 @@
>              button_label = _("_Empty Trash…");
>              callback = G_CALLBACK (on_trash_clear_clicked);
>  
> -            g_signal_connect_swapped (nautilus_trash_monitor_get (),
> -                                      "trash-state-changed",
> -                                      G_CALLBACK (update_trash_banner_visibility),
> -                                      banner);
> +            g_signal_connect_object (nautilus_trash_monitor_get (),
> +                                     "trash-state-changed",
> +                                     G_CALLBACK (update_trash_banner_visibility),
> +                                     banner, G_CONNECT_SWAPPED);
>              g_signal_connect_object (gnome_privacy_preferences,
>                                       "changed::remove-old-trash-files",
>                                       G_CALLBACK (on_remove_old_trash_files_changed),
> diff -Nru nautilus-48.1/src/nautilus-window-slot.c nautilus-48.2/src/nautilus-window-slot.c
> --- nautilus-48.1/src/nautilus-window-slot.c	2025-04-13 07:56:22.000000000 +0100
> +++ nautilus-48.2/src/nautilus-window-slot.c	2025-05-25 10:10:18.000000000 +0100
> @@ -2096,8 +2096,16 @@
>          }
>  
>          g_assert (self->pending_location != NULL);
> +
> +        /* Setting the view location might trigger a signal that calls
> +         * into the slot. We don't want that when setting the location
> +         * outselves from the slot */
> +        g_object_freeze_notify (G_OBJECT (self->content_view));
> +
>          apply_pending_location_and_selection_on_view (self);
>          nautilus_window_slot_update_for_new_location (self);
> +
> +        g_object_thaw_notify (G_OBJECT (self->content_view));
>      }
>      else
>      {


-- 
Sebastian Ramacher


Reply to: