diff options
Diffstat (limited to 'meta/recipes-support/atk/at-spi2-core/0001-build-Add-with-systemduserunitdir.patch')
-rw-r--r-- | meta/recipes-support/atk/at-spi2-core/0001-build-Add-with-systemduserunitdir.patch | 29 |
1 files changed, 16 insertions, 13 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 index 4103eaa2e5..1f8c9f374f 100644 --- 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 | |||
@@ -1,4 +1,4 @@ | |||
1 | From 2f47c975ebe52b6916a45ade023ae3bac21bb0e0 Mon Sep 17 00:00:00 2001 | 1 | From fa376762b92404b9e3c430054b8c3341ca0fdd8b Mon Sep 17 00:00:00 2001 |
2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> | 2 | From: Jussi Kukkonen <jussi.kukkonen@intel.com> |
3 | Date: Tue, 21 Jun 2016 16:00:02 +0300 | 3 | Date: Tue, 21 Jun 2016 16:00:02 +0300 |
4 | Subject: [PATCH] build: Add --with-systemduserunitdir | 4 | Subject: [PATCH] build: Add --with-systemduserunitdir |
@@ -8,29 +8,30 @@ allow overriding the value. | |||
8 | 8 | ||
9 | Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=767911] | 9 | Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=767911] |
10 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> | 10 | Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> |
11 | |||
11 | --- | 12 | --- |
12 | bus/Makefile.am | 2 +- | 13 | bus/Makefile.am | 2 +- |
13 | configure.ac | 7 +++++++ | 14 | configure.ac | 9 +++++++++ |
14 | 2 files changed, 8 insertions(+), 1 deletion(-) | 15 | 2 files changed, 10 insertions(+), 1 deletion(-) |
15 | 16 | ||
16 | diff --git a/bus/Makefile.am b/bus/Makefile.am | 17 | diff --git a/bus/Makefile.am b/bus/Makefile.am |
17 | index b189e02..52fbb0b 100644 | 18 | index 688f82a..10cde62 100644 |
18 | --- a/bus/Makefile.am | 19 | --- a/bus/Makefile.am |
19 | +++ b/bus/Makefile.am | 20 | +++ b/bus/Makefile.am |
20 | @@ -26,7 +26,7 @@ dbusservice_DATA = org.a11y.Bus.service | 21 | @@ -29,7 +29,7 @@ org.a11y.Bus.service: org.a11y.Bus.service.in |
21 | org.a11y.Bus.service: org.a11y.Bus.service.in | 22 | EXTRA_DIST += org.a11y.Bus.service.in |
22 | sed -e $(substitutions) $< > $@.tmp && mv $@.tmp $@ | 23 | CLEANFILES += org.a11y.Bus.service |
23 | 24 | ||
24 | -systemd_userdir = $(prefix)/lib/systemd/user | 25 | -systemd_userdir = $(prefix)/lib/systemd/user |
25 | +systemd_userdir = $(systemduserunitdir) | 26 | +systemd_userdir = $(systemduserunitdir) |
26 | systemd_user_DATA = at-spi-dbus-bus.service | 27 | systemd_user_DATA = at-spi-dbus-bus.service |
27 | at-spi-dbus-bus.service: at-spi-dbus-bus.service.in Makefile | 28 | at-spi-dbus-bus.service: at-spi-dbus-bus.service.in Makefile |
28 | sed -e $(substitutions) $< > $@.tmp && mv $@.tmp $@ | 29 | $(AM_V_GEN) $(SED) -e $(substitutions) $< > $@.tmp && mv $@.tmp $@ |
29 | diff --git a/configure.ac b/configure.ac | 30 | diff --git a/configure.ac b/configure.ac |
30 | index f9061c2..2b8eeed 100644 | 31 | index 8c4fca2..1415cca 100644 |
31 | --- a/configure.ac | 32 | --- a/configure.ac |
32 | +++ b/configure.ac | 33 | +++ b/configure.ac |
33 | @@ -183,6 +183,13 @@ else | 34 | @@ -146,6 +146,15 @@ else |
34 | fi | 35 | fi |
35 | AC_SUBST(DBUS_SERVICES_DIR) | 36 | AC_SUBST(DBUS_SERVICES_DIR) |
36 | 37 | ||
@@ -41,9 +42,11 @@ index f9061c2..2b8eeed 100644 | |||
41 | + [with_systemduserunitdir=$($PKG_CONFIG --variable=systemduserunitdir systemd)]) | 42 | + [with_systemduserunitdir=$($PKG_CONFIG --variable=systemduserunitdir systemd)]) |
42 | +AC_SUBST([systemduserunitdir], [$with_systemduserunitdir]) | 43 | +AC_SUBST([systemduserunitdir], [$with_systemduserunitdir]) |
43 | + | 44 | + |
44 | AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums) | 45 | +AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums) |
46 | + | ||
47 | GOBJECT_INTROSPECTION_CHECK([1.32.0]) | ||
45 | 48 | ||
46 | GOBJECT_INTROSPECTION_CHECK([0.9.6]) | 49 | AC_SUBST(LIBTOOL_EXPORT_OPTIONS) |
47 | -- | 50 | -- |
48 | 2.1.4 | 51 | 2.14.1 |
49 | 52 | ||