From 1896d7f463561f43e99aa0dfa1e3032849e84738 Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@gnome.org>
Date: Fri, 4 Sep 2020 12:02:15 +0100
Subject: [PATCH 1/2] build: Make sysprof truly optional

We are falling back to the sysprof subproject even if sysprof support
has been explicitly disabled.

Fixes: #3118
---
 meson.build | 62 +++++++++++++++++++++++++++++------------------------
 1 file changed, 34 insertions(+), 28 deletions(-)

diff --git a/meson.build b/meson.build
index c520298a84..1ef6b16f2c 100644
--- a/meson.build
+++ b/meson.build
@@ -672,35 +672,41 @@ cloudproviders_dep = dependency('cloudproviders',
   ])
 cdata.set('HAVE_CLOUDPROVIDERS', cloudproviders_dep.found())
 
-profiler_enabled = get_option('sysprof').enabled()
 # libsysprof-capture support
-libsysprof_capture_dep = dependency('sysprof-capture-4',
-  required: get_option('sysprof'),
-  default_options: [
-    'enable_examples=false',
-    'enable_gtk=false',
-    'enable_tests=false',
-    'enable_tools=false',
-    'libsysprof=true',
-    'with_sysprofd=none',
-    'help=false',
-  ],
-  fallback: ['sysprof', 'libsysprof_capture_dep'],
-)
-cdata.set('HAVE_SYSPROF', libsysprof_capture_dep.found())
-libsysprof_dep = dependency('sysprof-4',
-  required: false,
-  default_options: [
-    'enable_examples=false',
-    'enable_gtk=false',
-    'enable_tests=false',
-    'enable_tools=false',
-    'libsysprof=true',
-    'with_sysprofd=none',
-    'help=false',
-  ],
-  fallback: ['sysprof', 'libsysprof_dep'],
-)
+if not get_option('sysprof').disabled()
+  libsysprof_capture_dep = dependency('sysprof-capture-4',
+    required: get_option('sysprof'),
+    default_options: [
+      'enable_examples=false',
+      'enable_gtk=false',
+      'enable_tests=false',
+      'enable_tools=false',
+      'libsysprof=true',
+      'with_sysprofd=none',
+      'help=false',
+    ],
+    fallback: ['sysprof', 'libsysprof_capture_dep'],
+  )
+  cdata.set('HAVE_SYSPROF', libsysprof_capture_dep.found())
+  libsysprof_dep = dependency('sysprof-4',
+    required: false,
+    default_options: [
+      'enable_examples=false',
+      'enable_gtk=false',
+      'enable_tests=false',
+      'enable_tools=false',
+      'libsysprof=true',
+      'with_sysprofd=none',
+      'help=false',
+    ],
+    fallback: ['sysprof', 'libsysprof_dep'],
+  )
+  profiler_enabled = true
+else
+  libsysprof_capture_dep = disabler()
+  libsysprof_dep = disabler()
+  profiler_enabled = false
+endif
 
 graphene_dep_type = graphene_dep.type_name()
 if graphene_dep_type == 'pkgconfig'

From f7f0bc036973bf37855df29283d47bbe115dacf4 Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@gnome.org>
Date: Fri, 4 Sep 2020 12:05:01 +0100
Subject: [PATCH 2/2] Use consistent argument name

Declarations, definitions, and gtk-doc stanzas should use the same name
for arguments. Otherwise both g-ir-scanner and gtk-doc will complain
that they can't find the argument.
---
 gtk/gtktogglebutton.c | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/gtk/gtktogglebutton.c b/gtk/gtktogglebutton.c
index 45019471b7..9c1b5af385 100644
--- a/gtk/gtktogglebutton.c
+++ b/gtk/gtktogglebutton.c
@@ -440,7 +440,7 @@ gtk_toggle_button_toggled (GtkToggleButton *toggle_button)
 
 /**
  * gtk_toggle_button_set_group:
- * @self: a #GtkToggleButton
+ * @toggle_button: a #GtkToggleButton
  * @group: (nullable) (transfer none): another #GtkToggleButton to
  *   form a group with
  *
@@ -454,13 +454,13 @@ gtk_toggle_button_toggled (GtkToggleButton *toggle_button)
 
  */
 void
-gtk_toggle_button_set_group (GtkToggleButton *self,
+gtk_toggle_button_set_group (GtkToggleButton *toggle_button,
                              GtkToggleButton *group)
 {
-  GtkToggleButtonPrivate *priv = gtk_toggle_button_get_instance_private (self);
+  GtkToggleButtonPrivate *priv = gtk_toggle_button_get_instance_private (toggle_button);
   GtkToggleButtonPrivate *group_priv = gtk_toggle_button_get_instance_private (group);
 
-  g_return_if_fail (GTK_IS_TOGGLE_BUTTON (self));
+  g_return_if_fail (GTK_IS_TOGGLE_BUTTON (toggle_button));
 
   if (!group)
     {
@@ -477,7 +477,7 @@ gtk_toggle_button_set_group (GtkToggleButton *self,
 
       priv->group_next = NULL;
       priv->group_prev = NULL;
-      g_object_notify_by_pspec (G_OBJECT (self), toggle_button_props[PROP_GROUP]);
+      g_object_notify_by_pspec (G_OBJECT (toggle_button), toggle_button_props[PROP_GROUP]);
       return;
     }
 
@@ -489,12 +489,12 @@ gtk_toggle_button_set_group (GtkToggleButton *self,
     {
       GtkToggleButtonPrivate *prev = gtk_toggle_button_get_instance_private (group_priv->group_prev);
 
-      prev->group_next = self;
+      prev->group_next = toggle_button;
       priv->group_prev = group_priv->group_prev;
     }
 
-  group_priv->group_prev = self;
+  group_priv->group_prev = toggle_button;
   priv->group_next = group;
 
-  g_object_notify_by_pspec (G_OBJECT (self), toggle_button_props[PROP_GROUP]);
+  g_object_notify_by_pspec (G_OBJECT (toggle_button), toggle_button_props[PROP_GROUP]);
 }