[file-roller/wip/jtojnar/nautilus-4] nautilus: Port to Nautilus 43




commit 5cfaa00f04130084e42548abb2226c1c2e378e48
Author: Jan Tojnar <jtojnar gmail com>
Date:   Fri Aug 12 19:11:02 2022 +0200

    nautilus: Port to Nautilus 43
    
    Fixes: https://gitlab.gnome.org/GNOME/file-roller/-/issues/175

 default.nix                    | 3 ++-
 meson.build                    | 5 ++---
 nautilus/meson.build           | 1 -
 nautilus/nautilus-fileroller.c | 1 -
 4 files changed, 4 insertions(+), 6 deletions(-)
---
diff --git a/default.nix b/default.nix
index 655416a7..79cb8cac 100644
--- a/default.nix
+++ b/default.nix
@@ -109,7 +109,6 @@ makeDerivation rec {
     file
     glib
     gnome.adwaita-icon-theme
-    gnome.nautilus
     gtk3
     json-glib
     libarchive
@@ -120,6 +119,8 @@ makeDerivation rec {
   mesonFlags = [
     "-Dintrospection=enabled"
     "-Dapi_docs=enabled"
+    # TODO: Re-enable once we have Nautilus 43.
+    "-Dnautilus-actions=disabled"
   ];
 
   inherit doCheck;
diff --git a/meson.build b/meson.build
index 5279bcd1..5861ea4f 100644
--- a/meson.build
+++ b/meson.build
@@ -7,7 +7,7 @@ project('file-roller', 'c',
 glib_version = '>=2.38'
 gtk_version = '>=3.22.0'
 hdy_version = '>=1.5.0'
-nautilus_version = '>=3.28.0'
+nautilus_version = '>=43.beta'
 json_glib_version = '>=0.14.0'
 libarchive_version = '>=3.1.900a'
 
@@ -37,8 +37,7 @@ libportal_gtk3_dep = dependency('libportal-gtk3', version: '>= 0.5', required: u
 # Optional dependencies
 gobject_introspection_dep = dependency('gobject-introspection-1.0', required: get_option('introspection'))
 
-libnautilus_extension_dep = dependency('libnautilus-extension', version : nautilus_version, required : 
get_option('nautilus-actions'))
-gtk4_dep = dependency('gtk4', required: libnautilus_extension_dep.found() and 
libnautilus_extension_dep.version().version_compare('>=43'))
+libnautilus_extension_dep = dependency('libnautilus-extension-4', version : nautilus_version, required : 
get_option('nautilus-actions'))
 build_nautilus_actions = libnautilus_extension_dep.found()
 
 libjson_glib_dep = dependency('json-glib-1.0', version : json_glib_version, required : false)
diff --git a/nautilus/meson.build b/nautilus/meson.build
index df57fcb6..b31cd16e 100644
--- a/nautilus/meson.build
+++ b/nautilus/meson.build
@@ -8,7 +8,6 @@ shared_module('nautilus-fileroller',
     thread_dep,
     glib_dep, 
     gthread_dep, 
-    libnautilus_extension_dep.version().version_compare('>=43') ? gtk_dep : gtk4_dep,
     libnautilus_extension_dep,
     use_json_glib ? libjson_glib_dep : [],
   ],  
diff --git a/nautilus/nautilus-fileroller.c b/nautilus/nautilus-fileroller.c
index 3d41d686..4aa5276d 100644
--- a/nautilus/nautilus-fileroller.c
+++ b/nautilus/nautilus-fileroller.c
@@ -207,7 +207,6 @@ unsupported_scheme (NautilusFileInfo *file)
 
 static GList *
 nautilus_fr_get_file_items (NautilusMenuProvider *provider,
-                           GtkWidget            *window,
                            GList                *files)
 {
        GList    *items = NULL;


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