diff options
author | Jussi Kukkonen <jussi.kukkonen@intel.com> | 2016-06-22 14:52:22 +0300 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-07-01 16:22:41 +0100 |
commit | 169fbdbeee9d021953d5c656ae75f9de09b501aa (patch) | |
tree | baa7853dbe81cd66552706b943415ce6dbd5a3eb /meta/recipes-support/atk/at-spi2-core | |
parent | 478d446e857d88f14f5e77c4d42a3d5dfa718d0a (diff) | |
download | poky-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/recipes-support/atk/at-spi2-core')
-rw-r--r-- | meta/recipes-support/atk/at-spi2-core/0001-build-Add-with-systemduserunitdir.patch | 49 |
1 files changed, 49 insertions, 0 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 @@ | |||
1 | From 2f47c975ebe52b6916a45ade023ae3bac21bb0e0 Mon Sep 17 00:00:00 2001 | ||
2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | ||
3 | Date: Tue, 21 Jun 2016 16:00:02 +0300 | ||
4 | Subject: [PATCH] build: Add --with-systemduserunitdir | ||
5 | |||
6 | Default to "pkg-config --variable=systemduserunitdir systemd" but | ||
7 | allow overriding the value. | ||
8 | |||
9 | Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=767911] | ||
10 | Signed-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 | |||
16 | diff --git a/bus/Makefile.am b/bus/Makefile.am | ||
17 | index 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 $@ | ||
29 | diff --git a/configure.ac b/configure.ac | ||
30 | index 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 | -- | ||
48 | 2.1.4 | ||
49 | |||