[gnome-builder/wip/gtk4-port: 634/736] plugins/sysroot: enable sysroot plugin

[Christian Hergert <chergert src gnome org>]

commit 8f88af32ba1064b4a86e93fd75ef124310ea3069
Author: Christian Hergert <chergert redhat com>
Date:   Tue Apr 19 10:39:00 2022 -0700

    plugins/sysroot: enable sysroot plugin
    
    However, preferences are still disabled as this will need some rework for
    the new preferences system.

 src/plugins/meson.build                   | 2 +-
 src/plugins/sysroot/gbp-sysroot-runtime.c | 2 +-
 src/plugins/sysroot/meson.build           | 4 ++--
 src/plugins/sysroot/sysroot-plugin.c      | 8 +++++++-
 4 files changed, 11 insertions(+), 5 deletions(-)
---
diff --git a/src/plugins/meson.build b/src/plugins/meson.build
index a2e4abcbf..2fbaeacf6 100644
--- a/src/plugins/meson.build
+++ b/src/plugins/meson.build
@@ -126,7 +126,7 @@ subdir('stylelint')
 #subdir('support')
 #subdir('symbol-tree')
 #subdir('sysprof')
-#subdir('sysroot')
+subdir('sysroot')
 subdir('terminal')
 subdir('testui')
 subdir('todo')
diff --git a/src/plugins/sysroot/gbp-sysroot-runtime.c b/src/plugins/sysroot/gbp-sysroot-runtime.c
index cc5307bd4..a9c77ffd9 100644
--- a/src/plugins/sysroot/gbp-sysroot-runtime.c
+++ b/src/plugins/sysroot/gbp-sysroot-runtime.c
@@ -112,7 +112,7 @@ gbp_sysroot_runtime_create_launcher (IdeRuntime  *runtime,
 
       pkgconfig_dirs = gbp_sysroot_manager_get_target_pkg_config_path (sysroot_manager, sysroot_id);
 
-      if (!dzl_str_empty0 (pkgconfig_dirs))
+      if (!ide_str_empty0 (pkgconfig_dirs))
         {
           g_autofree gchar *libdir_tmp = NULL;
 
diff --git a/src/plugins/sysroot/meson.build b/src/plugins/sysroot/meson.build
index cb640d5cf..f06cc27dc 100644
--- a/src/plugins/sysroot/meson.build
+++ b/src/plugins/sysroot/meson.build
@@ -3,8 +3,8 @@ if get_option('plugin_sysroot')
 plugins_sources += files([
   'sysroot-plugin.c',
   'gbp-sysroot-manager.c',
-  'gbp-sysroot-preferences-addin.c',
-  'gbp-sysroot-preferences-row.c',
+  # 'gbp-sysroot-preferences-addin.c',
+  # 'gbp-sysroot-preferences-row.c',
   'gbp-sysroot-runtime.c',
   'gbp-sysroot-runtime-provider.c',
   'gbp-sysroot-subprocess-launcher.c',
diff --git a/src/plugins/sysroot/sysroot-plugin.c b/src/plugins/sysroot/sysroot-plugin.c
index 4da9b9cc3..f0e8de3cb 100644
--- a/src/plugins/sysroot/sysroot-plugin.c
+++ b/src/plugins/sysroot/sysroot-plugin.c
@@ -22,22 +22,28 @@
 #include "config.h"
 
 #include <libpeas/peas.h>
+
 #include <libide-foundry.h>
 #include <libide-gui.h>
 
 #include "gbp-sysroot-runtime-provider.h"
-#include "gbp-sysroot-preferences-addin.h"
 #include "gbp-sysroot-toolchain-provider.h"
 
+#if 0
+#include "gbp-sysroot-preferences-addin.h"
+#endif
+
 _IDE_EXTERN void
 _gbp_sysroot_register_types (PeasObjectModule *module)
 {
   peas_object_module_register_extension_type (module,
                                               IDE_TYPE_RUNTIME_PROVIDER,
                                               GBP_TYPE_SYSROOT_RUNTIME_PROVIDER);
+#if 0
   peas_object_module_register_extension_type (module,
                                               IDE_TYPE_PREFERENCES_ADDIN,
                                               GBP_TYPE_SYSROOT_PREFERENCES_ADDIN);
+#endif
   peas_object_module_register_extension_type (module,
                                               IDE_TYPE_TOOLCHAIN_PROVIDER,
                                               GBP_TYPE_SYSROOT_TOOLCHAIN_PROVIDER);