Refresh patches

This commit is contained in:
Simon McVittie 2020-04-03 18:56:02 +01:00
parent 0593861148
commit 65a733ff8b
3 changed files with 4 additions and 497 deletions

View File

@ -12,7 +12,7 @@ Bug: https://gitlab.gnome.org/GNOME/gtk/issues/357
1 file changed, 7 insertions(+), 8 deletions(-) 1 file changed, 7 insertions(+), 8 deletions(-)
diff --git a/gtk/Makefile.am b/gtk/Makefile.am diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 463b3a4..468d330 100644 index bd26953..25307d5 100644
--- a/gtk/Makefile.am --- a/gtk/Makefile.am
+++ b/gtk/Makefile.am +++ b/gtk/Makefile.am
@@ -554,7 +554,6 @@ gtk_private_h_sources = \ @@ -554,7 +554,6 @@ gtk_private_h_sources = \
@ -47,7 +47,7 @@ index 463b3a4..468d330 100644
pkgdatadir = $(datadir)/gtk-$(GTK_API_VERSION) pkgdatadir = $(datadir)/gtk-$(GTK_API_VERSION)
@@ -1458,7 +1455,8 @@ $(srcdir)/gtktestutils.c: gtktypefuncs.inc @@ -1456,7 +1453,8 @@ $(srcdir)/gtktestutils.c: gtktypefuncs.inc
lib_LTLIBRARIES = libgtk-3.la lib_LTLIBRARIES = libgtk-3.la
gtkincludedir = $(includedir)/gtk-3.0/gtk gtkincludedir = $(includedir)/gtk-3.0/gtk
@ -57,7 +57,7 @@ index 463b3a4..468d330 100644
a11yincludedir = $(includedir)/gtk-3.0/gtk/a11y a11yincludedir = $(includedir)/gtk-3.0/gtk/a11y
a11yinclude_HEADERS= $(a11y_h_sources) a11yinclude_HEADERS= $(a11y_h_sources)
@@ -1517,6 +1515,7 @@ gtk_3_HEADERS_DIR = $(gtkincludedir) @@ -1515,6 +1513,7 @@ gtk_3_HEADERS_DIR = $(gtkincludedir)
gtk_3_HEADERS_INST = \ gtk_3_HEADERS_INST = \
$(gtkinclude_HEADERS) \ $(gtkinclude_HEADERS) \
@ -65,7 +65,7 @@ index 463b3a4..468d330 100644
$(a11y_h_sources) \ $(a11y_h_sources) \
$(deprecated_h_sources) $(deprecated_h_sources)
@@ -1598,7 +1597,7 @@ distclean-local: @@ -1596,7 +1595,7 @@ distclean-local:
fi fi
if HAVE_INTROSPECTION if HAVE_INTROSPECTION

View File

@ -1,4 +1,3 @@
supp-Use-a-single-suppressions-file-for-lib-lib64-and-mul.patch
gdk-Don-t-distribute-generated-files-in-tarballs.patch gdk-Don-t-distribute-generated-files-in-tarballs.patch
gtk-Really-don-t-distribute-built-files.patch gtk-Really-don-t-distribute-built-files.patch
demos-examples-tests-Don-t-distribute-built-files.patch demos-examples-tests-Don-t-distribute-built-files.patch

View File

@ -1,492 +0,0 @@
From: Simon McVittie <smcv@debian.org>
Date: Thu, 2 Apr 2020 09:18:55 +0100
Subject: 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>
Forwarded: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/1604
---
Makefile.am | 5 +-
gtk.supp | 54 +++++++-----
gtk64.supp | 277 ------------------------------------------------------------
meson.build | 2 +-
4 files changed, 35 insertions(+), 303 deletions(-)
delete mode 100644 gtk64.supp
diff --git a/Makefile.am b/Makefile.am
index 94a397f..a044e09 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 f2f0d0d..22fc9c9 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/gtk64.supp b/gtk64.supp
deleted file mode 100644
index 39f4f52..0000000
--- a/gtk64.supp
+++ /dev/null
@@ -1,277 +0,0 @@
-# Actual GTK things
-{
- GtkWidgetClass action GPtrArray
- Memcheck:Leak
- fun:malloc
- fun:g_malloc
- fun:g_slice_alloc
- fun:g_ptr_array_sized_new
- fun:g_ptr_array_new
- fun:gtk_widget_class_add_action
-}
-
-{
- GTK media extension gio modules
- Memcheck:Leak
- match-leak-kinds: definite
- fun:malloc
- fun:g_malloc
- fun:g_slice_alloc
- fun:g_slice_alloc0
- fun:g_type_create_instance
- fun:g_object_new_internal
- fun:g_object_new_with_properties
- fun:g_object_new
- fun:g_io_module_new
- fun:g_io_modules_scan_all_in_directory_with_scope
- fun:gtk_media_file_extension_init
-}
-
-{
- gtk-style-context
- Memcheck:Leak
- match-leak-kinds: possible
- fun:malloc
- fun:g_malloc
- ...
- fun:gtk_css_node_declaration_make_writable
- ...
- fun:gtk_style_constructed
-}
-
-{
- gtk-style-context2
- Memcheck:Leak
- match-leak-kinds: possible
- fun:malloc
- fun:g_malloc
- ...
- fun:gtk_css_node_declaration_make_writable_resize
- ...
- fun:gtk_style_constructed
-}
-
-# AMD driver
-{
- radeonsi_dri general
- Memcheck:Leak
- fun:calloc
- ...
- obj:/usr/lib64/dri/radeonsi_dri.so
-}
-
-# mesa driver stuff
-{
- i965 addr4
- Memcheck:Addr4
- obj:/usr/lib64/dri/i965_dri.so*
-}
-
-{
- i965 addr8
- Memcheck:Addr8
- obj:/usr/lib64/dri/i965_dri.so*
-}
-
-{
- i965 memcpy
- Memcheck:Addr8
- fun:memcpy*
- obj:/usr/lib64/dri/i965_dri.so*
-}
-
-{
- i965 memcpy
- Memcheck:Addr2
- fun:memcpy*
- obj:/usr/lib64/dri/i965_dri.so*
-}
-
-{
- mesa memcmp 8
- Memcheck:Addr8
- fun:*memcmp*
- obj:/usr/lib64/dri/i965_dri.so*
-}
-
-{
- mesa memcmp 1
- Memcheck:Addr1
- fun:*memcmp*
- obj:/usr/lib64/dri/i965_dri.so*
-}
-
-{
- mesa memset 8
- Memcheck:Addr8
- fun:*memset*
- obj:/usr/lib64/dri/i965_dri.so
-}
-
-{
- mesa realpath
- Memcheck:Leak
- match-leak-kinds: definite
- fun:malloc
- fun:realpath@@GLIBC_2.3
- obj:*
- obj:*
- obj:*
- obj:*
- obj:*
- obj:*
- obj:*
- obj:*
- fun:epoxy_eglInitialize_global_rewrite_ptr
-}
-
-{
- mesa calloc
- Memcheck:Leak
- match-leak-kinds: definite
- fun:calloc
- obj:*
- obj:*
- obj:*
- obj:*
- obj:*
- obj:*
- obj:*
- obj:*
- obj:*
- fun:epoxy_eglInitialize_global_rewrite_ptr
-}
-
-{
- mesa malloc
- Memcheck:Leak
- match-leak-kinds: definite
- fun:malloc
- obj:/usr/lib64/dri/i965_dri.so*
-}
-
-{
- mesa glReadPixels
- Memcheck:Addr16
- obj:*
- obj:*
- obj:*
- obj:*
- obj:*
- fun:epoxy_glReadPixels_global_rewrite_ptr
-}
-
-{
- epoxy glxQueryServerString 1
- Memcheck:Leak
- fun:malloc
- fun:XextAddDisplay
- obj:*
- obj:*
- obj:*
- obj:*
- obj:*
- fun:epoxy_glXQueryServerString_global_rewrite_ptr
-
-}
-
-{
- epoxy glxQueryServerString 2
- Memcheck:Leak
- match-leak-kinds: definite
- fun:malloc
- fun:realpath*
- obj:*
- obj:*
- obj:*
- obj:*
- obj:*
- obj:*
- obj:*
- fun:epoxy_glXQueryServerString_global_rewrite_ptr
-}
-
-{
- epoxy glGetTexImage
- Memcheck:Addr16
- obj:*
- obj:*
- obj:*
- obj:*
- obj:*
- fun:epoxy_glGetTexImage_global_rewrite_ptr
-}
-
-
-
-
-# Fontconfig
-{
- FcFontSetList
- Memcheck:Leak
- match-leak-kinds: definite
- fun:malloc
- obj:/usr/lib64/libfontconfig.so*
- obj:/usr/lib64/libfontconfig.so*
- fun:FcFontSetList
-}
-
-{
- FcFontRenderPrepare
- Memcheck:Leak
- match-leak-kinds: definite
- fun:realloc
- obj:/usr/lib64/libfontconfig.so*
- obj:/usr/lib64/libfontconfig.so*
- fun:FcFontRenderPrepare
-}
-
-{
- FcDefaultSubstitute
- Memcheck:Leak
- match-leak-kinds: definite
- fun:realloc
- obj:/usr/lib64/libfontconfig.so*
- obj:/usr/lib64/libfontconfig.so*
- fun:FcDefaultSubstitute
-}
-
-# Pixman
-{
- pixman_image_composite32
- Memcheck:Cond
- obj:/usr/lib64/libpixman-1.so*
- obj:/usr/lib64/libpixman-1.so*
- fun:pixman_image_composite32
-}
-
-# Pango
-{
- pango 1
- Memcheck:Leak
- match-leak-kinds: definite
- fun:realloc
- obj:/usr/lib64/libfontconfig.so*
- obj:/usr/lib64/libfontconfig.so*
- obj:/usr/lib64/libcairo.so*
- fun:pango_cairo_fc_font_map_fontset_key_substitute
-}
-
-{
- pango 2
- Memcheck:Leak
- fun:realloc
- obj:/usr/lib64/libfontconfig.so*
- obj:/usr/lib64/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 bd61f66..0c31ca0 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