From 179c3f843cb460c8bb34d1b641499e0e491b1ffed65680d6a7a856e65e1c42dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Mon, 26 Sep 2022 13:14:12 +0000 Subject: [PATCH] Accepting request 1005813 from home:badshah400:boo1203697 - Add nautilus-revert-extra-large-thumbnails.patch: Revert "thumbnails: Create larger thumbnails for higher density displays"; patch taken from upstream merge request (glgo#GNOME/nautilus#2487, boo#1203697). OBS-URL: https://build.opensuse.org/request/show/1005813 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/nautilus?expand=0&rev=364 --- nautilus-revert-extra-large-thumbnails.patch | 56 ++++++++++++++++++++ nautilus.changes | 8 +++ nautilus.spec | 2 + 3 files changed, 66 insertions(+) create mode 100644 nautilus-revert-extra-large-thumbnails.patch diff --git a/nautilus-revert-extra-large-thumbnails.patch b/nautilus-revert-extra-large-thumbnails.patch new file mode 100644 index 0000000..614a446 --- /dev/null +++ b/nautilus-revert-extra-large-thumbnails.patch @@ -0,0 +1,56 @@ +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.changes b/nautilus.changes index 16c110f..e474b35 100644 --- a/nautilus.changes +++ b/nautilus.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Sat Sep 24 08:58:51 UTC 2022 - Atri Bhattacharya + +- Add nautilus-revert-extra-large-thumbnails.patch: Revert + "thumbnails: Create larger thumbnails for higher density + displays"; patch taken from upstream merge request + (glgo#GNOME/nautilus#2487, boo#1203697). + ------------------------------------------------------------------- Sun Sep 18 07:42:05 UTC 2022 - Bjørn Lie diff --git a/nautilus.spec b/nautilus.spec index 3e0dd30..e699242 100644 --- a/nautilus.spec +++ b/nautilus.spec @@ -28,6 +28,8 @@ Source0: https://download.gnome.org/sources/nautilus/43/%{name}-%{version Source1: mount-archive.desktop Source2: set_trusted.desktop Source3: set_trusted.sh +# PATCH-FIX-UPSTREAM nautilus-revert-extra-large-thumbnails.patch glgo#GNOME/nautilus#2487 boo#1203697 badshah400@gmail.com -- Revert "thumbnails: Create larger thumbnails for higher density displays"; patch taken from upstream merge request +Patch0: https://gitlab.gnome.org/GNOME/nautilus/-/merge_requests/977.patch#/nautilus-revert-extra-large-thumbnails.patch # needed for directory ownership BuildRequires: dbus-1 BuildRequires: fdupes