[gtk/wip/smcv/libdir-independent-valgrind-suppressions-gtk3] supp: Use a single suppressions file for lib, lib64 and multiarch

[Simon McVittie <smcv src gnome org>]

commit 8afd623989a421a52e762ba49d11f2905ce7090a
Author: Simon McVittie <smcv debian org>
Date:   Thu Apr 2 09:18:55 2020 +0100

    supp: Use a single suppressions file for lib, lib64 and multiarch
    
    In addition to the traditional library directory lib and the 64-bit
    multilib directory lib64, this will cover Debian-style multiarch
    (lib/x86_64-linux-gnu etc.), Arch Linux 32-bit (lib32), x32 and
    various others.
    
    Signed-off-by: Simon McVittie <smcv debian org>

 Makefile.am |   5 +-
 gtk.supp    |  54 +++++++-----
 gtk64.supp  | 277 ------------------------------------------------------------
 meson.build |   2 +-
 4 files changed, 35 insertions(+), 303 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 94a397fec0..a044e090dc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -29,8 +29,7 @@ EXTRA_DIST +=                 \
        po-properties/meson.build       \
        build-aux/meson/post-install.py \
        config.h.meson          \
-       gtk.supp                \
-       gtk64.supp
+       gtk.supp
 
 MAINTAINERCLEANFILES = \
        $(GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL) \
@@ -44,7 +43,7 @@ MAINTAINERCLEANFILES = \
 
 if OS_UNIX
 valgrinddir = $(datadir)/gtk-3.0/valgrind
-valgrind_DATA = gtk.supp gtk64.supp
+valgrind_DATA = gtk.supp
 endif
 
 ## Copy .pc files to target-specific names
diff --git a/gtk.supp b/gtk.supp
index f2f0d0d406..22fc9c988e 100644
--- a/gtk.supp
+++ b/gtk.supp
@@ -57,55 +57,55 @@
   Memcheck:Leak
   fun:calloc
   ...
-  obj:/usr/lib/dri/radeonsi_dri.so
+  obj:/usr/lib*/dri/radeonsi_dri.so
 }
 
 # mesa driver stuff
 {
    i965 addr4
    Memcheck:Addr4
-   obj:/usr/lib/dri/i965_dri.so*
+   obj:/usr/lib*/dri/i965_dri.so*
 }
 
 {
    i965 addr8
    Memcheck:Addr8
-   obj:/usr/lib/dri/i965_dri.so*
+   obj:/usr/lib*/dri/i965_dri.so*
 }
 
 {
    i965 memcpy
    Memcheck:Addr8
    fun:memcpy*
-   obj:/usr/lib/dri/i965_dri.so*
+   obj:/usr/lib*/dri/i965_dri.so*
 }
 
 {
    i965 memcpy
    Memcheck:Addr2
    fun:memcpy*
-   obj:/usr/lib/dri/i965_dri.so*
+   obj:/usr/lib*/dri/i965_dri.so*
 }
 
 {
    mesa memcmp 8
    Memcheck:Addr8
    fun:*memcmp*
-   obj:/usr/lib/dri/i965_dri.so*
+   obj:/usr/lib*/dri/i965_dri.so*
 }
 
 {
    mesa memcmp 1
    Memcheck:Addr1
    fun:*memcmp*
-   obj:/usr/lib/dri/i965_dri.so*
+   obj:/usr/lib*/dri/i965_dri.so*
 }
 
 {
    mesa memset 8
    Memcheck:Addr8
    fun:*memset*
-   obj:/usr/lib/dri/i965_dri.so
+   obj:/usr/lib*/dri/i965_dri.so
 }
 
 {
@@ -147,7 +147,7 @@
    Memcheck:Leak
    match-leak-kinds: definite
    fun:malloc
-   obj:/usr/lib/dri/i965_dri.so*
+   obj:/usr/lib*/dri/i965_dri.so*
 }
 
 {
@@ -211,8 +211,8 @@
    Memcheck:Leak
    match-leak-kinds: definite
    fun:malloc
-   obj:/usr/lib/libfontconfig.so*
-   obj:/usr/lib/libfontconfig.so*
+   obj:/usr/lib*/libfontconfig.so*
+   obj:/usr/lib*/libfontconfig.so*
    fun:FcFontSetList
 }
 
@@ -221,8 +221,8 @@
    Memcheck:Leak
    match-leak-kinds: definite
    fun:realloc
-   obj:/usr/lib/libfontconfig.so*
-   obj:/usr/lib/libfontconfig.so*
+   obj:/usr/lib*/libfontconfig.so*
+   obj:/usr/lib*/libfontconfig.so*
    fun:FcFontRenderPrepare
 }
 
@@ -231,8 +231,8 @@
    Memcheck:Leak
    match-leak-kinds: definite
    fun:realloc
-   obj:/usr/lib/libfontconfig.so*
-   obj:/usr/lib/libfontconfig.so*
+   obj:/usr/lib*/libfontconfig.so*
+   obj:/usr/lib*/libfontconfig.so*
    fun:FcDefaultSubstitute
 }
 
@@ -240,8 +240,8 @@
 {
    pixman_image_composite32
    Memcheck:Cond
-   obj:/usr/lib/libpixman-1.so*
-   obj:/usr/lib/libpixman-1.so*
+   obj:/usr/lib*/libpixman-1.so*
+   obj:/usr/lib*/libpixman-1.so*
    fun:pixman_image_composite32
 }
 
@@ -251,9 +251,9 @@
    Memcheck:Leak
    match-leak-kinds: definite
    fun:realloc
-   obj:/usr/lib/libfontconfig.so*
-   obj:/usr/lib/libfontconfig.so*
-   obj:/usr/lib/libcairo.so*
+   obj:/usr/lib*/libfontconfig.so*
+   obj:/usr/lib*/libfontconfig.so*
+   obj:/usr/lib*/libcairo.so*
    fun:pango_cairo_fc_font_map_fontset_key_substitute
 }
 
@@ -261,7 +261,17 @@
   pango 2
   Memcheck:Leak
   fun:realloc
-  obj:/usr/lib/libfontconfig.so*
-  obj:/usr/lib/libfontconfig.so*
+  obj:/usr/lib*/libfontconfig.so*
+  obj:/usr/lib*/libfontconfig.so*
   fun:_cairo_ft_font_options_substitute
 }
+
+# GLib
+{
+  glib 1
+  Memcheck:Leak
+  match-leak-kinds: definite
+  fun:malloc
+  fun:g_malloc
+  fun:g_quark_init
+}
diff --git a/meson.build b/meson.build
index bd61f6664c..0c31ca0f30 100644
--- a/meson.build
+++ b/meson.build
@@ -983,7 +983,7 @@ meson.add_install_script('build-aux/meson/post-install.py',
 if host_machine.system() != 'windows'
   # Install Valgrind suppression files (except on Windows,
   # as Valgrind is currently not supported on Windows)
-  install_data('gtk.supp', 'gtk64.supp',
+  install_data('gtk.supp',
     install_dir : join_paths(gtk_datadir, 'gtk-3.0', 'valgrind'))
 endif