diff --git a/.gitignore b/.gitignore index e650a93..3f45fa5 100644 --- a/.gitignore +++ b/.gitignore @@ -166,3 +166,4 @@ nautilus-2.31.6.tar.bz2 /nautilus-43.beta.1.tar.xz /nautilus-43.rc.tar.xz /nautilus-43.0.tar.xz +/nautilus-43.1.tar.xz diff --git a/977.patch b/977.patch deleted file mode 100644 index 5e6b34c..0000000 --- a/977.patch +++ /dev/null @@ -1,56 +0,0 @@ -From 57b1d9b523c57a9ebf662f6da08cd26a3a22401a Mon Sep 17 00:00:00 2001 -From: Qiu Wenbo -Date: Tue, 13 Sep 2022 17:03:37 +0800 -Subject: [PATCH] Revert "thumbnails: Create larger thumbnails for higher - density displays" - -This reverts commit 278435e3c20244b48986c6cd8b72c5317668c72d. - -glib2 do not handle x-large and xx-large case so G_FILE_ATTRIBUTE_THUMBNAIL_PATH -simply return nothing. That makes nautilus think the thumbnail should be -generated again which is a dead loop. ---- - src/nautilus-thumbnails.c | 27 +-------------------------- - 1 file changed, 1 insertion(+), 26 deletions(-) - -diff --git a/src/nautilus-thumbnails.c b/src/nautilus-thumbnails.c -index 790b4e36f..1bad311e1 100644 ---- a/src/nautilus-thumbnails.c -+++ b/src/nautilus-thumbnails.c -@@ -137,32 +137,7 @@ get_thumbnail_factory (void) - - if (thumbnail_factory == NULL) - { -- GdkDisplay *display = gdk_display_get_default (); -- GListModel *monitors = gdk_display_get_monitors (display); -- gint max_scale = 1; -- GnomeDesktopThumbnailSize size; -- -- for (guint i = 0; i < g_list_model_get_n_items (monitors); i++) -- { -- g_autoptr (GdkMonitor) monitor = g_list_model_get_item (monitors, i); -- -- max_scale = MAX (max_scale, gdk_monitor_get_scale_factor (monitor)); -- } -- -- if (max_scale <= 1) -- { -- size = GNOME_DESKTOP_THUMBNAIL_SIZE_LARGE; -- } -- else if (max_scale <= 2) -- { -- size = GNOME_DESKTOP_THUMBNAIL_SIZE_XLARGE; -- } -- else -- { -- size = GNOME_DESKTOP_THUMBNAIL_SIZE_XXLARGE; -- } -- -- thumbnail_factory = gnome_desktop_thumbnail_factory_new (size); -+ thumbnail_factory = gnome_desktop_thumbnail_factory_new (GNOME_DESKTOP_THUMBNAIL_SIZE_LARGE); - } - - return thumbnail_factory; --- -GitLab - diff --git a/nautilus.spec b/nautilus.spec index d1227c7..890d929 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -1,4 +1,4 @@ -%global glib2_version 2.72.0 +%global glib2_version 2.72.1 %global gnome_autoar_version 0.4.0 %global gtk4_version 4.7.2 %global libadwaita_version 1.2~beta @@ -6,19 +6,13 @@ %global tarball_version %%(echo %{version} | tr '~' '.') Name: nautilus -Version: 43.0 -Release: 2%{?dist} +Version: 43.1 +Release: 1%{?dist} Summary: File manager for GNOME License: GPLv3+ URL: https://wiki.gnome.org/Apps/Nautilus Source0: https://download.gnome.org/sources/%{name}/43/%{name}-%{tarball_version}.tar.xz -# https://gitlab.gnome.org/GNOME/nautilus/-/merge_requests/977 -# https://bugzilla.redhat.com/show_bug.cgi?id=2127618 -# https://gitlab.gnome.org/GNOME/nautilus/-/issues/2487 -# Revert high-resolution thumbnail generation as it cannot work -# without fixes in glib -Patch0: 977.patch BuildRequires: desktop-file-utils BuildRequires: gcc @@ -144,6 +138,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop %doc %{_datadir}/doc/nautilus/ %changelog +* Tue Dec 06 2022 David King - 43.1-1 +- Update to 43.1 + * Fri Sep 30 2022 Adam Williamson - 43.0-2 - Backport MR #977 to revert broken high-res thumbnails (#2127618) diff --git a/sources b/sources index 81a822a..a001453 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (nautilus-43.0.tar.xz) = c880125c2339be02852470e45cd4d589470e0df7723acc44b80df35c18cb1375c5f85cb46c7e53efbab1b51eedb4fd51ffa455773d4913d44c59070dafa22b49 +SHA512 (nautilus-43.1.tar.xz) = f09362584f2d4a04870c7e6b64ec3d23c90f20c8d37aa7103277985f182db49f3306f6e130966c6cfc97463fd5322f454564f713e70b839fea177545214dced2