[console/wip/jtojnar/nautilus-deprecated] nautilus: Fix build with Nautilus 43




commit e0131faeabdce95bfe1ea260b1ed439120abf1db
Author: Jan Tojnar <jtojnar gmail com>
Date:   Thu Jul 28 23:45:36 2022 +0200

    nautilus: Fix build with Nautilus 43
    
    The *Iface symbols were deprecated since Nautilus 3.28 and 43 removes them.
    Further, we need to remove the GDK min/max variables since the extension uses GTK 4.

 nautilus/kgx-nautilus.c | 10 +++++-----
 nautilus/meson.build    |  6 ++++++
 2 files changed, 11 insertions(+), 5 deletions(-)
---
diff --git a/nautilus/kgx-nautilus.c b/nautilus/kgx-nautilus.c
index bb22bc9..ca884d7 100644
--- a/nautilus/kgx-nautilus.c
+++ b/nautilus/kgx-nautilus.c
@@ -25,11 +25,11 @@
 #include "kgx-nautilus-menu-item.h"
 
 
-static void kgx_nautilus_menu_provider_iface_init (NautilusMenuProviderIface *iface);
+static void kgx_nautilus_menu_provider_interface_init (NautilusMenuProviderInterface *interface);
 
 G_DEFINE_DYNAMIC_TYPE_EXTENDED (KgxNautilus, kgx_nautilus, G_TYPE_OBJECT, 0,
                                 G_IMPLEMENT_INTERFACE_DYNAMIC (NAUTILUS_TYPE_MENU_PROVIDER,
-                                                               kgx_nautilus_menu_provider_iface_init))
+                                                               kgx_nautilus_menu_provider_interface_init))
 
 
 static void
@@ -94,10 +94,10 @@ kgx_nautilus_get_file_items (NautilusMenuProvider *provider,
 
 
 static void
-kgx_nautilus_menu_provider_iface_init (NautilusMenuProviderIface *iface)
+kgx_nautilus_menu_provider_interface_init (NautilusMenuProviderInterface *interface)
 {
-  iface->get_background_items = kgx_nautilus_get_background_items;
-  iface->get_file_items = kgx_nautilus_get_file_items;
+  interface->get_background_items = kgx_nautilus_get_background_items;
+  interface->get_file_items = kgx_nautilus_get_file_items;
 }
 
 
diff --git a/nautilus/meson.build b/nautilus/meson.build
index 70dd42e..51fd241 100644
--- a/nautilus/meson.build
+++ b/nautilus/meson.build
@@ -6,8 +6,14 @@ nautilus_sources = [
     config_h
 ]
 
+nautilus_c_args = [
+    '-UGDK_VERSION_MIN_REQUIRED',
+    '-UGDK_VERSION_MAX_ALLOWED',
+]
+
 nautilus_extension = shared_library(bin_name + '-nautilus', nautilus_sources,
                                      dependencies: [nautilus_dep, gio_unix],
                               include_directories: kgx_inc,
+                                          c_args: nautilus_c_args,
                                           install: true,
                                       install_dir: libdir / 'nautilus' / 'extensions-3.0')


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