AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Meson: Only g-ir-scanner warnings fatal when buit with -Dwerror=true

Browse Source 
Also fix deprecation warning that requires using fatal_warnings kwarg
from Meson 0.55.0.

Fixes: #4072.
This commit is contained in:
Xavier Claessens 2021-06-25 11:11:12 -04:00
parent b18e95d6b3
commit 0fd790eb8d
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/meson.build
View File

@ -1153,7 +1153,6 @@ if build_gir
gir_args = [ gir_args = [
'-DGTK_COMPILATION', '-DGTK_COMPILATION',
'--quiet', '--quiet',
'--warn-error',
] ]
gdk_gir_inc = [ 'cairo-1.0', 'Gio-2.0', 'GdkPixbuf-2.0', 'Pango-1.0', 'PangoCairo-1.0' ] gdk_gir_inc = [ 'cairo-1.0', 'Gio-2.0', 'GdkPixbuf-2.0', 'Pango-1.0', 'PangoCairo-1.0' ]
@ -1170,6 +1169,7 @@ if build_gir
install: true, install: true,
dependencies: libgdk_dep, dependencies: libgdk_dep,
extra_args: gir_args, extra_args: gir_args,
fatal_warnings: get_option('werror'),
) )
gtk_dep_sources += gdk_gir gtk_dep_sources += gdk_gir
@ -1186,6 +1186,7 @@ if build_gir
dependencies: libgdk_dep, dependencies: libgdk_dep,
header: 'gdk/x11/gdkx.h', header: 'gdk/x11/gdkx.h',
extra_args: gir_args, extra_args: gir_args,
fatal_warnings: get_option('werror'),
) )
gtk_dep_sources += gdk_x11_gir gtk_dep_sources += gdk_x11_gir
endif endif
@ -1203,6 +1204,7 @@ if build_gir
dependencies: libgdk_dep, dependencies: libgdk_dep,
header: 'gdk/wayland/gdkwayland.h', header: 'gdk/wayland/gdkwayland.h',
extra_args: gir_args, extra_args: gir_args,
fatal_warnings: get_option('werror'),
) )
gtk_dep_sources += gdk_wayland_gir gtk_dep_sources += gdk_wayland_gir
endif endif
@ -1221,6 +1223,7 @@ if build_gir
install: true, install: true,
dependencies: libgsk_dep, dependencies: libgsk_dep,
extra_args: gir_args, extra_args: gir_args,
fatal_warnings: get_option('werror'),
) )
gtk_dep_sources += gsk_gir gtk_dep_sources += gsk_gir
@ -1255,6 +1258,7 @@ if build_gir
install: true, install: true,
dependencies: [gtk_deps, libgsk_dep], dependencies: [gtk_deps, libgsk_dep],
extra_args: gir_args, extra_args: gir_args,
fatal_warnings: get_option('werror'),
) )
gtk_dep_sources += gtk_gir gtk_dep_sources += gtk_gir
endif endif

2
meson.build
View File

@ -7,7 +7,7 @@ project('gtk', 'c',
# https://github.com/mesonbuild/meson/issues/2289 # https://github.com/mesonbuild/meson/issues/2289
'c_std=gnu99', 'c_std=gnu99',
], ],
meson_version : '>= 0.54', meson_version : '>= 0.55',
license: 'LGPLv2.1+') license: 'LGPLv2.1+')
glib_req = '>= 2.66.0' glib_req = '>= 2.66.0'