[gnome-software: 2/3] build: Drop valgrind option and dependency

[Milan Crha <mcrha src gnome org>]

commit 788e37f0791a4c65ab00a64d9eac90845427c24d
Author: Philip Withnall <pwithnall endlessos org>
Date:   Fri Jun 17 16:29:16 2022 +0100

    build: Drop valgrind option and dependency
    
    It was used to avoid unloading plugins when running under valgrind, so
    that stack information could be handled by valgrind in leak reports
    correctly.
    
    The previous commit fixes this in a different way, by marking plugin
    modules as resident. This allows reference counting them as normal, but
    prevents them from actually being unloaded when their reference count
    reaches zero.
    
    Given that, we can drop this commit and simplify our dependency logic a
    teeny bit.
    
    This is a spiritual revert of commit
    0e2e452aa010139eea7ef31a785e563bf9476e56. It can’t be a verbatim revert
    as a lot of nearby lines have changed since that commit landed.
    
    Signed-off-by: Philip Withnall <pwithnall endlessos org>

 .gitlab-ci/fedora.Dockerfile   | 1 -
 contrib/gnome-software.spec.in | 1 -
 lib/gs-plugin.c                | 6 ------
 lib/meson.build                | 2 --
 meson.build                    | 8 --------
 meson_options.txt              | 1 -
 6 files changed, 19 deletions(-)
---
diff --git a/.gitlab-ci/fedora.Dockerfile b/.gitlab-ci/fedora.Dockerfile
index beea19a90..a3bc5f1cf 100644
--- a/.gitlab-ci/fedora.Dockerfile
+++ b/.gitlab-ci/fedora.Dockerfile
@@ -72,7 +72,6 @@ RUN dnf -y install \
     sysprof-capture-devel \
     unzip \
     valgrind \
-    valgrind-devel \
     wayland-protocols-devel \
     wget \
     xz \
diff --git a/contrib/gnome-software.spec.in b/contrib/gnome-software.spec.in
index 668cec999..08327ce14 100644
--- a/contrib/gnome-software.spec.in
+++ b/contrib/gnome-software.spec.in
@@ -43,7 +43,6 @@ BuildRequires: ostree-devel
 BuildRequires: rpm-devel
 BuildRequires: rpm-ostree-devel
 BuildRequires: libgudev1-devel
-BuildRequires: valgrind-devel
 
 Requires: appstream-data
 Requires: flatpak%{?_isa} >= %{flatpak_version}
diff --git a/lib/gs-plugin.c b/lib/gs-plugin.c
index e1af1c450..2fe17134a 100644
--- a/lib/gs-plugin.c
+++ b/lib/gs-plugin.c
@@ -36,10 +36,6 @@
 #include <gdk/gdk.h>
 #include <string.h>
 
-#ifdef USE_VALGRIND
-#include <valgrind.h>
-#endif
-
 #include "gs-app-list-private.h"
 #include "gs-download-utils.h"
 #include "gs-enums.h"
@@ -262,10 +258,8 @@ gs_plugin_finalize (GObject *object)
        g_mutex_clear (&priv->interactive_mutex);
        g_mutex_clear (&priv->timer_mutex);
        g_mutex_clear (&priv->vfuncs_mutex);
-#ifndef RUNNING_ON_VALGRIND
        if (priv->module != NULL)
                g_module_close (priv->module);
-#endif
 
        G_OBJECT_CLASS (gs_plugin_parent_class)->finalize (object);
 }
diff --git a/lib/meson.build b/lib/meson.build
index 69746c062..036bb3068 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -52,7 +52,6 @@ librarydeps = [
   libsoup,
   libsysprof_capture_dep,
   libxmlb,
-  valgrind,
 ]
 
 if get_option('mogwai')
@@ -163,7 +162,6 @@ executable(
     libgnomesoftware_dep,
     libm,
     libsoup,
-    valgrind,
   ],
   c_args : cargs,
   install : true,
diff --git a/meson.build b/meson.build
index d14b323e5..b362ba34b 100644
--- a/meson.build
+++ b/meson.build
@@ -182,14 +182,6 @@ if get_option('mogwai')
   conf.set('HAVE_MOGWAI', 1)
 endif
 
-if get_option('valgrind')
-  valgrind = dependency('valgrind')
-  conf.set('USE_VALGRIND', 1)
-else
-  message('Valgrind integration disabled')
-  valgrind = []
-endif
-
 gsettings_desktop_schemas = dependency('gsettings-desktop-schemas', version : '>= 3.18.0', required: 
get_option('gsettings_desktop_schemas'))
 if gsettings_desktop_schemas.found()
   conf.set('HAVE_GSETTINGS_DESKTOP_SCHEMAS', 1)
diff --git a/meson_options.txt b/meson_options.txt
index 8c36a5ed6..a2fde39cc 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -16,7 +16,6 @@ option('gudev', type : 'boolean', value : true, description : 'enable GUdev supp
 option('apt', type : 'boolean', value : false, description : 'enable apt: URL handler in the .desktop file')
 option('snap', type : 'boolean', value : false, description : 'enable Snap support')
 option('external_appstream', type : 'boolean', value : false, description : 'enable external AppStream 
support')
-option('valgrind', type : 'boolean', value : true, description : 'enable Valgrind debugging integration')
 option('gtk_doc', type : 'boolean', value : true, description : 'enable API reference')
 option('hardcoded_curated', type : 'boolean', value : true, description : 'enable installation of default 
curated apps list')
 option('default_featured_apps', type : 'boolean', value : true, description : 'enable installation of 
default featured apps list')