summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorJussi Kukkonen <jussi.kukkonen@intel.com>2016-06-22 14:52:22 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2016-07-01 16:22:41 +0100
commit169fbdbeee9d021953d5c656ae75f9de09b501aa (patch)
treebaa7853dbe81cd66552706b943415ce6dbd5a3eb /meta
parent478d446e857d88f14f5e77c4d42a3d5dfa718d0a (diff)
downloadpoky-169fbdbeee9d021953d5c656ae75f9de09b501aa.tar.gz
at-spi2-core: Upgrade 2.18.3 -> 2.20.2
Add systemd unit, patch in a configure flag to set the correct dir. (From OE-Core rev: 02cbcd7a94ff90d72443241915496d1f00345b69) Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-support/atk/at-spi2-core/0001-build-Add-with-systemduserunitdir.patch49
-rw-r--r--meta/recipes-support/atk/at-spi2-core_2.18.3.bb23
-rw-r--r--meta/recipes-support/atk/at-spi2-core_2.20.2.bb29
3 files changed, 78 insertions, 23 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
new file mode 100644
index 0000000000..4103eaa2e5
--- /dev/null
+++ b/meta/recipes-support/atk/at-spi2-core/0001-build-Add-with-systemduserunitdir.patch
@@ -0,0 +1,49 @@
1From 2f47c975ebe52b6916a45ade023ae3bac21bb0e0 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 bus/Makefile.am | 2 +-
13 configure.ac | 7 +++++++
14 2 files changed, 8 insertions(+), 1 deletion(-)
15
16diff --git a/bus/Makefile.am b/bus/Makefile.am
17index b189e02..52fbb0b 100644
18--- a/bus/Makefile.am
19+++ b/bus/Makefile.am
20@@ -26,7 +26,7 @@ dbusservice_DATA = org.a11y.Bus.service
21 org.a11y.Bus.service: org.a11y.Bus.service.in
22 sed -e $(substitutions) $< > $@.tmp && mv $@.tmp $@
23
24-systemd_userdir = $(prefix)/lib/systemd/user
25+systemd_userdir = $(systemduserunitdir)
26 systemd_user_DATA = at-spi-dbus-bus.service
27 at-spi-dbus-bus.service: at-spi-dbus-bus.service.in Makefile
28 sed -e $(substitutions) $< > $@.tmp && mv $@.tmp $@
29diff --git a/configure.ac b/configure.ac
30index f9061c2..2b8eeed 100644
31--- a/configure.ac
32+++ b/configure.ac
33@@ -183,6 +183,13 @@ else
34 fi
35 AC_SUBST(DBUS_SERVICES_DIR)
36
37+AC_ARG_WITH([systemduserunitdir],
38+ AS_HELP_STRING([--with-systemduserunitdir=DIR],
39+ [Directory for systemd service files]),
40+ [],
41+ [with_systemduserunitdir=$($PKG_CONFIG --variable=systemduserunitdir systemd)])
42+AC_SUBST([systemduserunitdir], [$with_systemduserunitdir])
43+
44 AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
45
46 GOBJECT_INTROSPECTION_CHECK([0.9.6])
47--
482.1.4
49
diff --git a/meta/recipes-support/atk/at-spi2-core_2.18.3.bb b/meta/recipes-support/atk/at-spi2-core_2.18.3.bb
deleted file mode 100644
index eced59750a..0000000000
--- a/meta/recipes-support/atk/at-spi2-core_2.18.3.bb
+++ /dev/null
@@ -1,23 +0,0 @@
1SUMMARY = "Assistive Technology Service Provider Interface (dbus core)"
2LICENSE = "LGPLv2"
3LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886"
4
5MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
6
7SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
8 file://0001-nls.m4-Take-it-from-gettext-0.15.patch \
9 "
10
11SRC_URI[md5sum] = "fc18801e56f6ce6914126f837d42f556"
12SRC_URI[sha256sum] = "ada26add94155f97d0f601a20cb7a0e3fd3ba1588c3520b7288316494027d629"
13
14DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst intltool-native gettext-native"
15
16inherit autotools gtk-doc pkgconfig distro_features_check upstream-version-is-even gobject-introspection
17# depends on virtual/libx11
18REQUIRED_DISTRO_FEATURES = "x11"
19
20EXTRA_OECONF = "--disable-xevie --with-dbus-daemondir=${bindir}"
21
22FILES_${PN} += "${datadir}/dbus-1/services/*.service \
23 ${datadir}/dbus-1/accessibility-services/*.service"
diff --git a/meta/recipes-support/atk/at-spi2-core_2.20.2.bb b/meta/recipes-support/atk/at-spi2-core_2.20.2.bb
new file mode 100644
index 0000000000..199243adf1
--- /dev/null
+++ b/meta/recipes-support/atk/at-spi2-core_2.20.2.bb
@@ -0,0 +1,29 @@
1SUMMARY = "Assistive Technology Service Provider Interface (dbus core)"
2LICENSE = "LGPLv2"
3LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886"
4
5MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
6
7SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
8 file://0001-nls.m4-Take-it-from-gettext-0.15.patch \
9 file://0001-build-Add-with-systemduserunitdir.patch \
10 "
11
12SRC_URI[md5sum] = "f6f6303da2e72317f881703f40bf0c62"
13SRC_URI[sha256sum] = "88a4de9d43139f13cca531b47b901bc1b56e0ab06ba899126644abd4ac16a143"
14
15DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst intltool-native"
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 = "--disable-xevie \
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 "