Fixed the build error for gcc-14.

[platform/upstream/at-spi2-core.git] / meson.build

diff --git a/meson.build b/meson.build
index abebb40..97d7874 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1,5 +1,5 @@
 project('at-spi2-core', 'c',
-        version: '2.39.90.1',
+        version: '2.44.1',
         license: 'LGPLv2.1+',
         default_options: [
           'buildtype=debugoptimized',
@@ -8,7 +8,7 @@ project('at-spi2-core', 'c',
         ],
         meson_version: '>= 0.46.0')
 
-add_project_arguments([ '-D_POSIX_C_SOURCE=200809L', '-D_DEFAULT_SOURCE' ], language: 'c')
+add_project_arguments([ '-D_POSIX_C_SOURCE=200809L', '-D_DEFAULT_SOURCE', '-fno-omit-frame-pointer' ], language: 'c')
 
 atspi_gir_ns = 'Atspi'
 
@@ -48,6 +48,7 @@ libdbus_req_version = '>= 1.5'
 glib_req_version = '>= 2.62.0'
 gobject_req_version = '>= 2.0.0'
 gio_req_version = '>= 2.28.0'
+gir_req_version = '>= 0.6.7'
 app_svc_req_version = '>= 0.0.0'
 
 libdbus_dep = dependency('dbus-1', version: libdbus_req_version)
@@ -65,6 +66,8 @@ endif
 
 x11_deps = []
 x11_option = get_option('x11')
+# ensure x11_dep is defined for use elsewhere, such as bus/meson.build
+x11_dep = dependency('', required: false)
 if x11_option != 'no'
   x11_dep = dependency('x11', required: false)
 
@@ -107,7 +110,7 @@ have_gir = false
 
 introspection_option = get_option('introspection')
 if introspection_option != 'no'
-  gir_dep = dependency('gobject-introspection-1.0', version: '>= 0.6.7', required: false)
+  gir_dep = dependency('gobject-introspection-1.0', version: gir_req_version, required: false)
 
   if gir_dep.found()
     have_gir = true