Update to 42.alpha

.gitignore

@@ -155,3 +155,4 @@ nautilus-2.31.6.tar.bz2
 /nautilus-41.rc.tar.xz
 /nautilus-41.0.tar.xz
 /nautilus-41.1.tar.xz
+/nautilus-42.alpha.tar.xz

compress-dialog-controller-Fit-popover-fit-on-X11.patch

@@ -1,52 +0,0 @@
-From 203d24f1e57991340b2870b0b956922144f0152a Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ant=C3=B3nio=20Fernandes?= <antoniojpfernandes@gmail.com>
-Date: Mon, 8 Nov 2021 18:48:47 +0000
-Subject: [PATCH] compress-dialog-controller: Fit popover fit on X11
-
-Under X11, GTK3 cannot draw a GtkPopover outside of the main window area.
-
-This means the popover for compress formats is clipped under X11.
-
-As a workaround, make the window twice as tal when the popover is shown.
-
-Fixes https://gitlab.gnome.org/GNOME/nautilus/-/issues/2018
----
- src/nautilus-compress-dialog-controller.c | 15 +++++++++++++++
- 1 file changed, 15 insertions(+)
-
-diff --git a/src/nautilus-compress-dialog-controller.c b/src/nautilus-compress-dialog-controller.c
-index 3f7711ccb..de83b3717 100644
---- a/src/nautilus-compress-dialog-controller.c
-+++ b/src/nautilus-compress-dialog-controller.c
-@@ -21,6 +21,10 @@
- #include <gnome-autoar/gnome-autoar.h>
- #include <libhandy-1/handy.h>
- 
-+#ifdef GDK_WINDOWING_X11
-+#include <gdk/gdkx.h>
-+#endif
-+
- #include <eel/eel-vfs-extensions.h>
- 
- #include "nautilus-compress-dialog-controller.h"
-@@ -394,6 +398,17 @@ popover_on_show (GtkWidget *widget,
-         }
-         break;
-     }
-+
-+#ifdef GDK_WINDOWING_X11
-+    if (GDK_IS_X11_DISPLAY (gdk_display_get_default ()))
-+    {
-+        int w, h;
-+
-+        /* Workaround for https://gitlab.gnome.org/GNOME/nautilus/-/issues/2018 */
-+        gtk_window_get_default_size (GTK_WINDOW (self->compress_dialog), &w, &h);
-+        gtk_window_resize (GTK_WINDOW (self->compress_dialog), w, h * 2);
-+    }
-+#endif
- }
- 
- NautilusCompressDialogController *
--- 
-2.33.1
-

nautilus.spec

@@ -1,20 +1,17 @@
 %global glib2_version 2.67.1
 %global gnome_autoar_version 0.3.0
-%global gtk3_version 3.22.27
+%global gtk4_version 4.6
 
 %global tarball_version %%(echo %{version} | tr '~' '.')
 
 Name:           nautilus
-Version:        41.1
+Version:        42~alpha
-Release:        2%{?dist}
+Release:        1%{?dist}
 Summary:        File manager for GNOME
 
 License:        GPLv3+
 URL:            https://wiki.gnome.org/Apps/Nautilus
-Source0:        https://download.gnome.org/sources/%{name}/41/%{name}-%{tarball_version}.tar.xz
+Source0:        https://download.gnome.org/sources/%{name}/42/%{name}-%{tarball_version}.tar.xz
-
-# https://gitlab.gnome.org/GNOME/nautilus/-/issues/2018
-Patch0:         compress-dialog-controller-Fit-popover-fit-on-X11.patch
 
 BuildRequires:  desktop-file-utils
 BuildRequires:  gcc
@@ -24,15 +21,16 @@ BuildRequires:  meson
 BuildRequires:  pkgconfig(gexiv2)
 BuildRequires:  pkgconfig(glib-2.0) >= %{glib2_version}
 BuildRequires:  pkgconfig(gnome-autoar-0) >= %{gnome_autoar_version}
-BuildRequires:  pkgconfig(gnome-desktop-3.0)
+BuildRequires:  pkgconfig(gnome-desktop-4)
 BuildRequires:  pkgconfig(gobject-introspection-1.0)
 BuildRequires:  pkgconfig(gsettings-desktop-schemas)
 BuildRequires:  pkgconfig(gstreamer-pbutils-1.0)
 BuildRequires:  pkgconfig(gstreamer-tag-1.0)
-BuildRequires:  pkgconfig(gtk+-3.0) >= %{gtk3_version}
+BuildRequires:  pkgconfig(gtk4) >= %{gtk4_version}
-BuildRequires:  pkgconfig(libhandy-1)
+BuildRequires:  pkgconfig(libadwaita-1)
 %if 0%{?flatpak}
 BuildRequires:  pkgconfig(libportal)
+BuildRequires:  pkgconfig(libportal-gtk4)
 %endif
 BuildRequires:  pkgconfig(libseccomp)
 BuildRequires:  pkgconfig(libselinux)
@@ -44,7 +42,7 @@ BuildRequires:  /usr/bin/appstream-util
 Requires:       glib2%{_isa} >= %{glib2_version}
 Requires:       gnome-autoar%{_isa} >= %{gnome_autoar_version}
 Requires:       gsettings-desktop-schemas%{_isa}
-Requires:       gtk3%{_isa} >= %{gtk3_version}
+Requires:       gtk4%{_isa} >= %{gtk4_version}
 Requires:       gvfs%{_isa}
 # the main binary links against libnautilus-extension.so
 # don't depend on soname, rather on exact version
@@ -127,7 +125,6 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
 %{_datadir}/tracker3/domain-ontologies/org.gnome.Nautilus.domain.rule
 %{_libdir}/nautilus/extensions-3.0/libnautilus-image-properties.so
 %{_libdir}/nautilus/extensions-3.0/libnautilus-sendto.so
-%{_libdir}/nautilus/extensions-3.0/libtotem-properties-page.so
 
 %files extensions
 %license libnautilus-extension/LICENSE
@@ -146,6 +143,9 @@ desktop-file-validate $RPM_BUILD_ROOT%{_datadir}/applications/*.desktop
 %doc %{_datadir}/gtk-doc/html/libnautilus-extension/
 
 %changelog
+* Sun Jan 09 2022 David King <amigadave@amigadave.com> - 42~alpha-1
+- Update to 42.alpha
+
 * Tue Dec 07 2021 Ondrej Holy <oholy@redhat.com> - 41.1-2
 - Fix cropped popover for compress formats on X11
 

sources

@@ -1 +1 @@
-SHA512 (nautilus-41.1.tar.xz) = 1eb2f2a0187f8b6581fe64285f347e8522b971eeb4d1f575387f3767e177f0195e758da9187090155216807b8f49ebed0fbcc29dd3cce6f3e408d7a955ae5286
+SHA512 (nautilus-42.alpha.tar.xz) = bf3a000876503287767786bbab342e74e2d65c4e703f4fb5695b21541a1f467abdd6f817afd2edcea895c81bc09f34ed651907b995a62090b3258fc677fdc0de