From 300a88922e7c4031599e0bf1d0486295dc358cdd Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Mon, 15 Nov 2021 15:34:05 +0100
Subject: [PATCH] build: Disable gcc warnings as warnings, too

We use -Werror in the build, so even if some warnings are just warnings,
they'd be errors.
---
 demos/gtk-demo/meson.build     | 4 +++-
 testsuite/a11y/meson.build     | 4 +++-
 testsuite/gtk/meson.build      | 4 +++-
 testsuite/reftests/meson.build | 4 +++-
 4 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/demos/gtk-demo/meson.build b/demos/gtk-demo/meson.build
index 94f2f45415..3576399f04 100644
--- a/demos/gtk-demo/meson.build
+++ b/demos/gtk-demo/meson.build
@@ -228,7 +228,9 @@ endif
 # Use a subset of compiler flags
 demo_cflags = []
 foreach flag: common_cflags
-  if flag not in ['-Werror=missing-prototypes', '-Werror=missing-declarations', '-fvisibility=hidden']
+  if flag not in ['-Werror=missing-prototypes', '-Wmissing-prototypes',
+                  '-Werror=missing-declarations', '-Wmissing-declarations',
+                  '-fvisibility=hidden']
     demo_cflags += flag
   endif
 endforeach
diff --git a/testsuite/a11y/meson.build b/testsuite/a11y/meson.build
index 54c27fe2e5..4f50d3a606 100644
--- a/testsuite/a11y/meson.build
+++ b/testsuite/a11y/meson.build
@@ -44,7 +44,9 @@ is_debug = get_option('buildtype').startswith('debug')
 test_cargs = []
 
 foreach flag: common_cflags
-  if flag not in ['-Werror=missing-prototypes', '-Werror=missing-declarations', '-fvisibility=hidden']
+  if flag not in ['-Werror=missing-prototypes', '-Wmissing-prototypes',
+                  '-Werror=missing-declarations', '-Wmissing-declarations',
+                  '-fvisibility=hidden']
     test_cargs += flag
   endif
 endforeach
diff --git a/testsuite/gtk/meson.build b/testsuite/gtk/meson.build
index b628b07dc2..3324664cac 100644
--- a/testsuite/gtk/meson.build
+++ b/testsuite/gtk/meson.build
@@ -152,7 +152,9 @@ if os_unix
 endif
 
 foreach flag: common_cflags
-  if flag not in ['-Werror=missing-prototypes', '-Werror=missing-declarations', '-fvisibility=hidden']
+  if flag not in ['-Werror=missing-prototypes', '-Wmissing-prototypes',
+                  '-Werror=missing-declarations', '-Wmissing-declarations',
+                  '-fvisibility=hidden']
     test_cargs += flag
   endif
 endforeach
diff --git a/testsuite/reftests/meson.build b/testsuite/reftests/meson.build
index f66ace543c..eb277d8bf7 100644
--- a/testsuite/reftests/meson.build
+++ b/testsuite/reftests/meson.build
@@ -2,7 +2,9 @@
 
 reftest_cflags = []
 foreach flag: common_cflags
-  if flag not in ['-Werror=missing-prototypes', '-Werror=missing-declarations', '-fvisibility=hidden']
+  if flag not in ['-Werror=missing-prototypes', '-Wmissing-prototypes',
+                  '-Werror=missing-declarations', '-Wmissing-declarations',
+                  '-fvisibility=hidden']
     reftest_cflags += flag
   endif
 endforeach