Fix meson 0.60.3 errors

Change-Id: I74be6c48e1dd6a5120a506109a7b6849793d20ae

diff --git a/bus/meson.build b/bus/meson.build
index 9981e3a..eae2e1d 100644 (file)
--- a/bus/meson.build
+++ b/bus/meson.build
@@ -34,13 +34,6 @@ configure_file(input: 'at-spi-dbus-bus.service.in',
                configuration: libexec_conf,
                install_dir: systemd_user_dir)
 
-if x11_dep.found()
-  # Note: It is safe to always install it. However, we only need this on
-  #       systemd enabled machines where Xwayland may be started on-demand.
-  install_data('00-at-spi',
-               install_dir: xwayland_session_dir)
-endif
-
 launcher_args = [
              '-DSYSCONFDIR="@0@"'.format(atspi_sysconfdir),
              '-DDATADIR="@0@"'.format(atspi_datadir),

diff --git a/packaging/at-spi2-core.spec b/packaging/at-spi2-core.spec
index 09c3abb..3742942 100644 (file)
--- a/packaging/at-spi2-core.spec
+++ b/packaging/at-spi2-core.spec
@@ -73,21 +73,21 @@ to develop applications that require these.
 cp %{SOURCE1001} .
 
 %build
-meson --prefix /usr --libdir %{_libdir} build -Dwith-dbus-daemondir=%{_bindir} -Ddbus_daemon=/usr/bin/dbus-daemon \
-%if !%{with x}
-        -Denable-x11=no \
-%else
-        -Denable-x11=yes \
-%endif
-        -Denable-static=no
+meson setup \
+        --prefix=/usr \
+        --libdir=%{_libdir} \
+        --default-library=shared \
+        -Ddbus_daemon=/usr/bin/dbus-daemon \
+        -Dx11=no \
+        build
 
-ninja -C build all
+meson compile -C build
 
 %install
 find %{buildroot} -name '*.la' -or -name '*.a' | xargs rm -f
 
 export DESTDIR=%{buildroot}
-ninja -C build install
+meson install -C build
 
 %find_lang %{name}