From 265bc905243d069e953f67abd6366869fc2d8baa Mon Sep 17 00:00:00 2001
From: Emmanuele Bassi <ebassi@gnome.org>
Date: Tue, 9 May 2023 13:13:00 +0100
Subject: [PATCH] build: Use Meson's gnu_symbol_visibility

Instead of injecting `-fvisibility=hidden` depending on a compiler check
ourselves, let Meson do it for us.

This also avoids us having to filter `-fvisibility=hidden` when reusing
the common compiler flags.
---
 demos/gtk-demo/meson.build     | 3 +--
 gtk/meson.build                | 1 +
 meson.build                    | 5 -----
 testsuite/a11y/meson.build     | 3 +--
 testsuite/gtk/meson.build      | 3 +--
 testsuite/reftests/meson.build | 3 +--
 6 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/demos/gtk-demo/meson.build b/demos/gtk-demo/meson.build
index c03beb3940..53f56c1ce3 100644
--- a/demos/gtk-demo/meson.build
+++ b/demos/gtk-demo/meson.build
@@ -233,8 +233,7 @@ endif
 demo_cflags = []
 foreach flag: common_cflags
   if flag not in ['-Werror=missing-prototypes', '-Wmissing-prototypes',
-                  '-Werror=missing-declarations', '-Wmissing-declarations',
-                  '-fvisibility=hidden']
+                  '-Werror=missing-declarations', '-Wmissing-declarations']
     demo_cflags += flag
   endif
 endforeach
diff --git a/gtk/meson.build b/gtk/meson.build
index b3975fb3fc..13e931f63a 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -1173,6 +1173,7 @@ libgtk = shared_library('gtk-4',
   soversion: gtk_soversion,
   version: gtk_library_version,
   darwin_versions: darwin_versions,
+  gnu_symbol_visibility: 'hidden',
   install: true,
 )
 
diff --git a/meson.build b/meson.build
index 0c38fcb1ca..5023a70121 100644
--- a/meson.build
+++ b/meson.build
@@ -344,11 +344,6 @@ common_cflags = cc.get_supported_arguments(test_cflags)
 if get_option('default_library') != 'static'
   if os_win32
     cdata.set('DLL_EXPORT', true)
-    if cc.get_id() != 'msvc'
-      common_cflags += ['-fvisibility=hidden']
-    endif
-  else
-    common_cflags += ['-fvisibility=hidden']
   endif
 endif
 
diff --git a/testsuite/a11y/meson.build b/testsuite/a11y/meson.build
index c43465efb2..733f623217 100644
--- a/testsuite/a11y/meson.build
+++ b/testsuite/a11y/meson.build
@@ -38,8 +38,7 @@ test_cargs = []
 
 foreach flag: common_cflags
   if flag not in ['-Werror=missing-prototypes', '-Wmissing-prototypes',
-                  '-Werror=missing-declarations', '-Wmissing-declarations',
-                  '-fvisibility=hidden']
+                  '-Werror=missing-declarations', '-Wmissing-declarations']
     test_cargs += flag
   endif
 endforeach
diff --git a/testsuite/gtk/meson.build b/testsuite/gtk/meson.build
index 11560a95f4..7a27180854 100644
--- a/testsuite/gtk/meson.build
+++ b/testsuite/gtk/meson.build
@@ -148,8 +148,7 @@ endif
 
 foreach flag: common_cflags
   if flag not in ['-Werror=missing-prototypes', '-Wmissing-prototypes',
-                  '-Werror=missing-declarations', '-Wmissing-declarations',
-                  '-fvisibility=hidden']
+                  '-Werror=missing-declarations', '-Wmissing-declarations']
     test_cargs += flag
   endif
 endforeach
diff --git a/testsuite/reftests/meson.build b/testsuite/reftests/meson.build
index 1cc8a4302c..793ba19eb7 100644
--- a/testsuite/reftests/meson.build
+++ b/testsuite/reftests/meson.build
@@ -3,8 +3,7 @@
 reftest_cflags = []
 foreach flag: common_cflags
   if flag not in ['-Werror=missing-prototypes', '-Wmissing-prototypes',
-                  '-Werror=missing-declarations', '-Wmissing-declarations',
-                  '-fvisibility=hidden']
+                  '-Werror=missing-declarations', '-Wmissing-declarations']
     reftest_cflags += flag
   endif
 endforeach
-- 
2.30.2