2 files changed, 47 insertions, 12 deletions
diff --git a/dev-libs/appstream/files/appstream-0.14.3-disable-Werror-flags.patch b/dev-libs/appstream/files/appstream-0.14.3-disable-Werror-flags.patch
deleted file mode 100644
index 4e5a117061b..00000000000
--- a/dev-libs/appstream/files/appstream-0.14.3-disable-Werror-flags.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -52,9 +52,6 @@
-     add_project_arguments(maintainer_c_args, language: 'cpp')
- endif
- 
--# a few compiler warning flags we always want enabled
--add_project_arguments('-Werror=implicit-function-declaration', '-Wno-unused-parameter', language: 'c')
--add_project_arguments('-Wno-unused-parameter', language: 'cpp')
- add_project_arguments('-DAS_COMPILATION', language: 'c')
- 
- # Vendor extensions in system headers
diff --git a/dev-libs/appstream/files/appstream-1.0.0-disable-Werror-flags.patch b/dev-libs/appstream/files/appstream-1.0.0-disable-Werror-flags.patch
new file mode 100644
index 00000000000..309d365c28e
--- /dev/null
+++ b/dev-libs/appstream/files/appstream-1.0.0-disable-Werror-flags.patch
@@ -0,0 +1,47 @@
+--- a/meson.build
++++ b/meson.build
+@@ -90,44 +90,6 @@
+   endif
+ endif
+ 
+-# a few compiler warning flags we always want enabled
+-add_project_arguments(
+-  cc.get_supported_arguments([
+-    '-Werror=shadow',
+-    '-Werror=empty-body',
+-    '-Werror=strict-prototypes',
+-    '-Werror=missing-prototypes',
+-    '-Werror=implicit-function-declaration',
+-    '-Werror=pointer-arith',
+-    '-Werror=missing-declarations',
+-    '-Werror=return-type',
+-    '-Werror=int-conversion',
+-    '-Werror=incompatible-pointer-types',
+-    '-Werror=misleading-indentation',
+-    '-Werror=missing-include-dirs',
+-    '-Werror=declaration-after-statement',
+-    '-Werror=format-security',
+-
+-    '-Wno-missing-field-initializers',
+-    '-Wno-error=missing-field-initializers',
+-    '-Wno-unused-parameter',
+-    '-Wno-error=unused-parameter',
+-  ]),
+-  language: 'c'
+-)
+-add_project_arguments(
+-  '-Wno-unused-parameter',
+-  '-Werror=empty-body',
+-  '-Werror=pointer-arith',
+-  '-Werror=init-self',
+-  '-Werror=missing-declarations',
+-  '-Werror=return-type',
+-  '-Werror=misleading-indentation',
+-  '-Werror=format-security',
+-
+-  language: 'cpp'
+-)
+-
+ # Vendor extensions in system headers
+ if host_machine.system() != 'netbsd'
+     # on NetBSD, defining POSIX_C_SOURCE *removes* non-POSIX symbols from namespace,