From: Simon McVittie <smcv@debian.org>
Date: Tue, 4 Jan 2022 17:42:00 +0000 (+0000)
Subject: Add proposed patch to avoid unwanted symbol exports
X-Git-Tag: archive/raspbian/4.6.5+ds-1+rpi1~1^2~77
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=df696cfef6bd9eb7a817b58bb99153d89ab4c821;p=gtk4.git

Add proposed patch to avoid unwanted symbol exports
---

diff --git a/debian/patches/build-Tell-glib-compile-resources-to-make-symbols-interna.patch b/debian/patches/build-Tell-glib-compile-resources-to-make-symbols-interna.patch
new file mode 100644
index 0000000000..38a68920be
--- /dev/null
+++ b/debian/patches/build-Tell-glib-compile-resources-to-make-symbols-interna.patch
@@ -0,0 +1,41 @@
+From: Simon McVittie <smcv@debian.org>
+Date: Tue, 4 Jan 2022 17:41:34 +0000
+Subject: build: Tell glib-compile-resources to make symbols internal where
+ possible
+
+Partial solution to https://gitlab.gnome.org/GNOME/gtk/-/issues/4598
+
+Signed-off-by: Simon McVittie <smcv@debian.org>
+Forwarded: https://gitlab.gnome.org/GNOME/gtk/-/merge_requests/4334
+---
+ gtk/meson.build | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/gtk/meson.build b/gtk/meson.build
+index 6ce2c18..201af63 100644
+--- a/gtk/meson.build
++++ b/gtk/meson.build
+@@ -883,6 +883,7 @@ if not meson.is_cross_build() and build_machine.system() == 'linux' and objcopy.
+       depfile : 'gtk.gresource.d',
+       command : [glib_compile_resources,
+                  '--generate',
++                 '--internal',
+                  '--target=@OUTPUT@',
+                  '--dependency-file=@DEPFILE@',
+                  '--sourcedir=' + meson.current_source_dir(),
+@@ -897,6 +898,7 @@ if not meson.is_cross_build() and build_machine.system() == 'linux' and objcopy.
+       depfile : 'gtkresources.c.d',
+       command : [glib_compile_resources,
+                  '--generate-source',
++                 '--internal',
+                  '--target=@OUTPUT@',
+                  '--dependency-file=@DEPFILE@',
+                  '--sourcedir=' + meson.current_source_dir(),
+@@ -913,6 +915,7 @@ if not meson.is_cross_build() and build_machine.system() == 'linux' and objcopy.
+       depfile : 'gtkresources.h.d',
+       command : [glib_compile_resources,
+                  '--generate-header',
++                 '--internal',
+                  '--target=@OUTPUT@',
+                  '--dependency-file=@DEPFILE@',
+                  '--sourcedir=' + meson.current_source_dir(),
diff --git a/debian/patches/series b/debian/patches/series
index ef4bf013a3..9e99e85419 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 Make-our-stack-noexec.patch
+build-Tell-glib-compile-resources-to-make-symbols-interna.patch
 reftest_compare_surfaces-Report-how-much-the-images-diffe.patch
 reftests-Allow-minor-differences-to-be-tolerated.patch
 debian/Disable-web-fonts-for-now.patch