[gnome-builder/wip/gtk4-port: 1046/1774] plugins/sysprof: enable sysprof plugin

[Christian Hergert <chergert src gnome org>]

commit 92b6359178b9b5ddb97aadab672686df68357843
Author: Christian Hergert <chergert redhat com>
Date:   Mon May 16 23:03:15 2022 -0700

    plugins/sysprof: enable sysprof plugin
    
    This only merges in the menus currently, but that is going to be a
    majority of the interface going forward until we get the IdePage view
    going as there will no longer be a "sysprof surface".

 src/plugins/meson.build                   |  2 +-
 src/plugins/sysprof/gtk/menus.ui          | 25 ++++++-------------------
 src/plugins/sysprof/meson.build           |  6 +-----
 src/plugins/sysprof/sysprof-plugin.c      |  7 ++++---
 src/plugins/sysprof/sysprof.gresource.xml |  2 --
 src/plugins/sysprof/themes/shared.css     | 13 -------------
 6 files changed, 12 insertions(+), 43 deletions(-)
---
diff --git a/src/plugins/meson.build b/src/plugins/meson.build
index 04412df94..b85ed9ce4 100644
--- a/src/plugins/meson.build
+++ b/src/plugins/meson.build
@@ -121,7 +121,7 @@ subdir('stylelint')
 #subdir('sublime')
 subdir('support')
 subdir('symbol-tree')
-#subdir('sysprof')
+subdir('sysprof')
 subdir('sysroot')
 subdir('terminal')
 subdir('testui')
diff --git a/src/plugins/sysprof/gtk/menus.ui b/src/plugins/sysprof/gtk/menus.ui
index 0050f4b9e..af1460eaa 100644
--- a/src/plugins/sysprof/gtk/menus.ui
+++ b/src/plugins/sysprof/gtk/menus.ui
@@ -6,30 +6,17 @@
         <attribute name="id">open-sysprof-capture</attribute>
         <attribute name="after">open-file</attribute>
         <attribute name="label" translatable="yes" context="menu label">Open _Sysprof Capture…</attribute>
-        <attribute name="action">profiler.open-profile</attribute>
-      </item>
-    </section>
-  </menu>
-  <menu id="ide-primary-workspace-surfaces-menu">
-    <section id="ide-primary-workspace-surfaces-menu-section">
-      <item>
-        <attribute name="accel">&lt;alt&gt;2</attribute>
-        <attribute name="before">surface-menu-config</attribute>
-        <attribute name="id">surface-menu-profiler</attribute>
-        <attribute name="label" translatable="yes">Profiler</attribute>
-        <attribute name="role">normal</attribute>
-        <attribute name="action">profiler.show</attribute>
-        <attribute name="verb-icon-name">builder-profiler-symbolic</attribute>
+        <attribute name="action">sysprof.open-capture</attribute>
       </item>
     </section>
   </menu>
   <menu id="run-menu">
-    <section id="run-menu-section">
+    <section id="run-menu-observation-section">
       <item>
-        <attribute name="id">profiler-run-handler</attribute>
+        <attribute name="id">sysprof-run-handler</attribute>
         <attribute name="after">default-run-handler</attribute>
-        <attribute name="action">profiler.run</attribute>
-        <attribute name="label" translatable="yes">Run with Profiler</attribute>
+        <attribute name="action">sysprof.run</attribute>
+        <attribute name="label" translatable="yes">Run with Sysprof</attribute>
         <attribute name="verb-icon-name">builder-profiler-symbolic</attribute>
         <attribute name="accel">&lt;Control&gt;F8</attribute>
       </item>
@@ -41,7 +28,7 @@
         <attribute name="id">project-tree-menu-profiler</attribute>
         <attribute name="label" translatable="yes">Run with _Profiler</attribute>
         <attribute name="action">buildui.run-with-handler</attribute>
-        <attribute name="target" type="s">'profiler'</attribute>
+        <attribute name="target" type="s">'sysprof'</attribute>
       </item>
     </section>
   </menu>
diff --git a/src/plugins/sysprof/meson.build b/src/plugins/sysprof/meson.build
index 15570ba7a..f37aa2d26 100644
--- a/src/plugins/sysprof/meson.build
+++ b/src/plugins/sysprof/meson.build
@@ -2,15 +2,11 @@ if get_option('plugin_sysprof')
 
 plugins_deps += [
   dependency('sysprof-4', version: '>= 3.37.1'),
-  dependency('sysprof-ui-4', version: '>= 3.37.1'),
+  dependency('sysprof-ui-5', version: '>= 3.45.0'),
 ]
 
 plugins_sources += files([
   'sysprof-plugin.c',
-  'gbp-sysprof-surface.c',
-  'gbp-sysprof-surface.h',
-  'gbp-sysprof-workspace-addin.c',
-  'gbp-sysprof-workspace-addin.h',
 ])
 
 plugin_sysprof_resources = gnome.compile_resources(
diff --git a/src/plugins/sysprof/sysprof-plugin.c b/src/plugins/sysprof/sysprof-plugin.c
index f403d1cde..75e4bcea1 100644
--- a/src/plugins/sysprof/sysprof-plugin.c
+++ b/src/plugins/sysprof/sysprof-plugin.c
@@ -1,6 +1,6 @@
 /* sysprof-plugin.c
  *
- * Copyright 2016-2019 Christian Hergert <chergert redhat com>
+ * Copyright 2016-2022 Christian Hergert <chergert redhat com>
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -23,17 +23,18 @@
 #include "config.h"
 
 #include <libpeas/peas.h>
-#include <libide-gui.h>
 #include <sysprof.h>
 
-#include "gbp-sysprof-workspace-addin.h"
+#include <libide-gui.h>
 
 _IDE_EXTERN void
 _gbp_sysprof_register_types (PeasObjectModule *module)
 {
   sysprof_clock_init ();
 
+#if 0
   peas_object_module_register_extension_type (module,
                                               IDE_TYPE_WORKSPACE_ADDIN,
                                               GBP_TYPE_SYSPROF_WORKSPACE_ADDIN);
+#endif
 }
diff --git a/src/plugins/sysprof/sysprof.gresource.xml b/src/plugins/sysprof/sysprof.gresource.xml
index 1d23d1167..909302258 100644
--- a/src/plugins/sysprof/sysprof.gresource.xml
+++ b/src/plugins/sysprof/sysprof.gresource.xml
@@ -3,7 +3,5 @@
   <gresource prefix="/plugins/sysprof">
     <file>sysprof.plugin</file>
     <file>gtk/menus.ui</file>
-    <file>themes/shared.css</file>
-    <file>gbp-sysprof-surface.ui</file>
   </gresource>
 </gresources>