mirror of
https://git.yoctoproject.org/poky
synced 2026-05-08 17:19:20 +00:00
at-spi2-core: upgrade to version 2.28.0
1. Convert to meson build
2. Remove the following patch made obsolete by moving to meson:
0001-build-Add-with-systemduserunitdir.patch
3. Provide meson flags for introspection and documentation
(From OE-Core rev: 0e1f4b0f0339fa5afd674c8f67dfe35f58cdf77e)
Signed-off-by: Maxin B. John <maxin.john@intel.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
452894f557
commit
4e380d7f4b
@@ -1,52 +0,0 @@
|
||||
From fa376762b92404b9e3c430054b8c3341ca0fdd8b Mon Sep 17 00:00:00 2001
|
||||
From: Jussi Kukkonen <jussi.kukkonen@intel.com>
|
||||
Date: Tue, 21 Jun 2016 16:00:02 +0300
|
||||
Subject: [PATCH] build: Add --with-systemduserunitdir
|
||||
|
||||
Default to "pkg-config --variable=systemduserunitdir systemd" but
|
||||
allow overriding the value.
|
||||
|
||||
Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=767911]
|
||||
Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
|
||||
|
||||
---
|
||||
bus/Makefile.am | 2 +-
|
||||
configure.ac | 9 +++++++++
|
||||
2 files changed, 10 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/bus/Makefile.am b/bus/Makefile.am
|
||||
index 688f82a..10cde62 100644
|
||||
--- a/bus/Makefile.am
|
||||
+++ b/bus/Makefile.am
|
||||
@@ -29,7 +29,7 @@ org.a11y.Bus.service: org.a11y.Bus.service.in
|
||||
EXTRA_DIST += org.a11y.Bus.service.in
|
||||
CLEANFILES += org.a11y.Bus.service
|
||||
|
||||
-systemd_userdir = $(prefix)/lib/systemd/user
|
||||
+systemd_userdir = $(systemduserunitdir)
|
||||
systemd_user_DATA = at-spi-dbus-bus.service
|
||||
at-spi-dbus-bus.service: at-spi-dbus-bus.service.in Makefile
|
||||
$(AM_V_GEN) $(SED) -e $(substitutions) $< > $@.tmp && mv $@.tmp $@
|
||||
diff --git a/configure.ac b/configure.ac
|
||||
index 8c4fca2..1415cca 100644
|
||||
--- a/configure.ac
|
||||
+++ b/configure.ac
|
||||
@@ -146,6 +146,15 @@ else
|
||||
fi
|
||||
AC_SUBST(DBUS_SERVICES_DIR)
|
||||
|
||||
+AC_ARG_WITH([systemduserunitdir],
|
||||
+ AS_HELP_STRING([--with-systemduserunitdir=DIR],
|
||||
+ [Directory for systemd service files]),
|
||||
+ [],
|
||||
+ [with_systemduserunitdir=$($PKG_CONFIG --variable=systemduserunitdir systemd)])
|
||||
+AC_SUBST([systemduserunitdir], [$with_systemduserunitdir])
|
||||
+
|
||||
+AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
|
||||
+
|
||||
GOBJECT_INTROSPECTION_CHECK([1.32.0])
|
||||
|
||||
AC_SUBST(LIBTOOL_EXPORT_OPTIONS)
|
||||
--
|
||||
2.14.1
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
SUMMARY = "Assistive Technology Service Provider Interface (dbus core)"
|
||||
HOMEPAGE = "https://wiki.linuxfoundation.org/accessibility/d-bus"
|
||||
LICENSE = "LGPLv2"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886"
|
||||
|
||||
MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
|
||||
|
||||
SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
|
||||
file://0001-build-Add-with-systemduserunitdir.patch \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "4a042e4c801fdb793788b749eab21485"
|
||||
SRC_URI[sha256sum] = "c80e0cdf5e3d713400315b63c7deffa561032a6c37289211d8afcfaa267c2615"
|
||||
|
||||
DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst"
|
||||
|
||||
inherit autotools gtk-doc gettext systemd pkgconfig distro_features_check upstream-version-is-even gobject-introspection
|
||||
# depends on virtual/libx11
|
||||
REQUIRED_DISTRO_FEATURES = "x11"
|
||||
|
||||
EXTRA_OECONF = " \
|
||||
--with-systemduserunitdir=${systemd_user_unitdir} \
|
||||
--with-dbus-daemondir=${bindir}"
|
||||
|
||||
FILES_${PN} += "${datadir}/dbus-1/services/*.service \
|
||||
${datadir}/dbus-1/accessibility-services/*.service \
|
||||
${datadir}/defaults/at-spi2 \
|
||||
${systemd_user_unitdir}/at-spi-dbus-bus.service \
|
||||
"
|
||||
@@ -0,0 +1,39 @@
|
||||
SUMMARY = "Assistive Technology Service Provider Interface (dbus core)"
|
||||
HOMEPAGE = "https://wiki.linuxfoundation.org/accessibility/d-bus"
|
||||
LICENSE = "LGPLv2"
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886"
|
||||
|
||||
MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
|
||||
|
||||
SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
|
||||
"
|
||||
|
||||
SRC_URI[md5sum] = "9c42f79636ed1c0e908b7483d789b32e"
|
||||
SRC_URI[sha256sum] = "42a2487ab11ce43c288e73b2668ef8b1ab40a0e2b4f94e80fca04ad27b6f1c87"
|
||||
|
||||
DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst"
|
||||
|
||||
inherit meson gtk-doc gettext systemd pkgconfig distro_features_check upstream-version-is-even gobject-introspection
|
||||
# depends on virtual/libx11
|
||||
REQUIRED_DISTRO_FEATURES = "x11"
|
||||
|
||||
EXTRA_OEMESON = " -Dsystemd_user_dir=${systemd_user_unitdir} \
|
||||
-Ddbus_daemon=${bindir}"
|
||||
|
||||
GTKDOC_ENABLE_FLAG = "-Denable_docs=true"
|
||||
GTKDOC_DISABLE_FLAG = "-Denable_docs=false"
|
||||
|
||||
GI_ENABLE_FLAG = "-Denable-introspection=yes"
|
||||
GI_DISABLE_FLAG = "-Denable-introspection=no"
|
||||
|
||||
EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '${GI_ENABLE_FLAG}', \
|
||||
'${GI_DISABLE_FLAG}', d)} "
|
||||
|
||||
EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '${GTKDOC_ENABLE_FLAG}', \
|
||||
'${GTKDOC_DISABLE_FLAG}', d)} "
|
||||
|
||||
FILES_${PN} += "${datadir}/dbus-1/services/*.service \
|
||||
${datadir}/dbus-1/accessibility-services/*.service \
|
||||
${datadir}/defaults/at-spi2 \
|
||||
${systemd_user_unitdir}/at-spi-dbus-bus.service \
|
||||
"
|
||||
Reference in New Issue
Block a user