summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMaxin B. John <maxin.john@intel.com>2018-04-09 14:29:36 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2018-05-04 13:28:03 +0100
commit4e380d7f4bcc1db6d9f2b4a9edb7e37d91d22ac4 (patch)
tree4ed543fca2691715b512fb03b48b1e84f8c4aeab
parent452894f5579e942ba16522137332175395b548f3 (diff)
downloadpoky-4e380d7f4bcc1db6d9f2b4a9edb7e37d91d22ac4.tar.gz
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>
-rw-r--r--meta/recipes-support/atk/at-spi2-core/0001-build-Add-with-systemduserunitdir.patch52
-rw-r--r--meta/recipes-support/atk/at-spi2-core_2.26.2.bb29
-rw-r--r--meta/recipes-support/atk/at-spi2-core_2.28.0.bb39
3 files changed, 39 insertions, 81 deletions
diff --git a/meta/recipes-support/atk/at-spi2-core/0001-build-Add-with-systemduserunitdir.patch b/meta/recipes-support/atk/at-spi2-core/0001-build-Add-with-systemduserunitdir.patch
deleted file mode 100644
index 1f8c9f374f..0000000000
--- a/meta/recipes-support/atk/at-spi2-core/0001-build-Add-with-systemduserunitdir.patch
+++ /dev/null
@@ -1,52 +0,0 @@
1From fa376762b92404b9e3c430054b8c3341ca0fdd8b Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Tue, 21 Jun 2016 16:00:02 +0300
4Subject: [PATCH] build: Add --with-systemduserunitdir
5
6Default to "pkg-config --variable=systemduserunitdir systemd" but
7allow overriding the value.
8
9Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=767911]
10Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com>
11
12---
13 bus/Makefile.am | 2 +-
14 configure.ac | 9 +++++++++
15 2 files changed, 10 insertions(+), 1 deletion(-)
16
17diff --git a/bus/Makefile.am b/bus/Makefile.am
18index 688f82a..10cde62 100644
19--- a/bus/Makefile.am
20+++ b/bus/Makefile.am
21@@ -29,7 +29,7 @@ org.a11y.Bus.service: org.a11y.Bus.service.in
22 EXTRA_DIST += org.a11y.Bus.service.in
23 CLEANFILES += org.a11y.Bus.service
24
25-systemd_userdir = $(prefix)/lib/systemd/user
26+systemd_userdir = $(systemduserunitdir)
27 systemd_user_DATA = at-spi-dbus-bus.service
28 at-spi-dbus-bus.service: at-spi-dbus-bus.service.in Makefile
29 $(AM_V_GEN) $(SED) -e $(substitutions) $< > $@.tmp && mv $@.tmp $@
30diff --git a/configure.ac b/configure.ac
31index 8c4fca2..1415cca 100644
32--- a/configure.ac
33+++ b/configure.ac
34@@ -146,6 +146,15 @@ else
35 fi
36 AC_SUBST(DBUS_SERVICES_DIR)
37
38+AC_ARG_WITH([systemduserunitdir],
39+ AS_HELP_STRING([--with-systemduserunitdir=DIR],
40+ [Directory for systemd service files]),
41+ [],
42+ [with_systemduserunitdir=$($PKG_CONFIG --variable=systemduserunitdir systemd)])
43+AC_SUBST([systemduserunitdir], [$with_systemduserunitdir])
44+
45+AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
46+
47 GOBJECT_INTROSPECTION_CHECK([1.32.0])
48
49 AC_SUBST(LIBTOOL_EXPORT_OPTIONS)
50--
512.14.1
52
diff --git a/meta/recipes-support/atk/at-spi2-core_2.26.2.bb b/meta/recipes-support/atk/at-spi2-core_2.26.2.bb
deleted file mode 100644
index 521ee3b96e..0000000000
--- a/meta/recipes-support/atk/at-spi2-core_2.26.2.bb
+++ /dev/null
@@ -1,29 +0,0 @@
1SUMMARY = "Assistive Technology Service Provider Interface (dbus core)"
2HOMEPAGE = "https://wiki.linuxfoundation.org/accessibility/d-bus"
3LICENSE = "LGPLv2"
4LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886"
5
6MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
7
8SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
9 file://0001-build-Add-with-systemduserunitdir.patch \
10 "
11
12SRC_URI[md5sum] = "4a042e4c801fdb793788b749eab21485"
13SRC_URI[sha256sum] = "c80e0cdf5e3d713400315b63c7deffa561032a6c37289211d8afcfaa267c2615"
14
15DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst"
16
17inherit autotools gtk-doc gettext systemd pkgconfig distro_features_check upstream-version-is-even gobject-introspection
18# depends on virtual/libx11
19REQUIRED_DISTRO_FEATURES = "x11"
20
21EXTRA_OECONF = " \
22 --with-systemduserunitdir=${systemd_user_unitdir} \
23 --with-dbus-daemondir=${bindir}"
24
25FILES_${PN} += "${datadir}/dbus-1/services/*.service \
26 ${datadir}/dbus-1/accessibility-services/*.service \
27 ${datadir}/defaults/at-spi2 \
28 ${systemd_user_unitdir}/at-spi-dbus-bus.serviceĀ \
29 "
diff --git a/meta/recipes-support/atk/at-spi2-core_2.28.0.bb b/meta/recipes-support/atk/at-spi2-core_2.28.0.bb
new file mode 100644
index 0000000000..7975f58bad
--- /dev/null
+++ b/meta/recipes-support/atk/at-spi2-core_2.28.0.bb
@@ -0,0 +1,39 @@
1SUMMARY = "Assistive Technology Service Provider Interface (dbus core)"
2HOMEPAGE = "https://wiki.linuxfoundation.org/accessibility/d-bus"
3LICENSE = "LGPLv2"
4LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886"
5
6MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
7
8SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
9 "
10
11SRC_URI[md5sum] = "9c42f79636ed1c0e908b7483d789b32e"
12SRC_URI[sha256sum] = "42a2487ab11ce43c288e73b2668ef8b1ab40a0e2b4f94e80fca04ad27b6f1c87"
13
14DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst"
15
16inherit meson gtk-doc gettext systemd pkgconfig distro_features_check upstream-version-is-even gobject-introspection
17# depends on virtual/libx11
18REQUIRED_DISTRO_FEATURES = "x11"
19
20EXTRA_OEMESON = " -Dsystemd_user_dir=${systemd_user_unitdir} \
21 -Ddbus_daemon=${bindir}"
22
23GTKDOC_ENABLE_FLAG = "-Denable_docs=true"
24GTKDOC_DISABLE_FLAG = "-Denable_docs=false"
25
26GI_ENABLE_FLAG = "-Denable-introspection=yes"
27GI_DISABLE_FLAG = "-Denable-introspection=no"
28
29EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '${GI_ENABLE_FLAG}', \
30 '${GI_DISABLE_FLAG}', d)} "
31
32EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '${GTKDOC_ENABLE_FLAG}', \
33 '${GTKDOC_DISABLE_FLAG}', d)} "
34
35FILES_${PN} += "${datadir}/dbus-1/services/*.service \
36 ${datadir}/dbus-1/accessibility-services/*.service \
37 ${datadir}/defaults/at-spi2 \
38 ${systemd_user_unitdir}/at-spi-dbus-bus.serviceĀ \
39 "