summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
authorAlexander Kanavin <alexander.kanavin@linux.intel.com>2017-10-10 15:18:04 +0300
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-11-09 12:33:17 +0000
commit94dfa6211a310b86ddaeea574a3799f7a93bc56c (patch)
tree7c3356ddd443eb54453d7227882c7abdb297104c /meta
parentc22776a50348df76a6af94042f8b178c4da7a28d (diff)
downloadpoky-94dfa6211a310b86ddaeea574a3799f7a93bc56c.tar.gz
at-spi2-core: update to 2.26.0
Drop 0001-nls.m4-Take-it-from-gettext-0.15.patch as it's now upstreamed. Remove --disable-xevie option: https://github.com/GNOME/at-spi2-core/commit/644096a28a47bdf5c6e0c34c9cd5b944df059925 (From OE-Core rev: f7c3b14238b7e2b84d5a972bc3dfda29de45ad3e) Signed-off-by: Alexander Kanavin <alexander.kanavin@linux.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.patch29
-rw-r--r--meta/recipes-support/atk/at-spi2-core/0001-nls.m4-Take-it-from-gettext-0.15.patch54
-rw-r--r--meta/recipes-support/atk/at-spi2-core_2.26.0.bb (renamed from meta/recipes-support/atk/at-spi2-core_2.24.1.bb)9
3 files changed, 20 insertions, 72 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 @@
1From 2f47c975ebe52b6916a45ade023ae3bac21bb0e0 Mon Sep 17 00:00:00 2001 1From fa376762b92404b9e3c430054b8c3341ca0fdd8b Mon Sep 17 00:00:00 2001
2From: Jussi Kukkonen <jussi.kukkonen@intel.com> 2From: Jussi Kukkonen <jussi.kukkonen@intel.com>
3Date: Tue, 21 Jun 2016 16:00:02 +0300 3Date: Tue, 21 Jun 2016 16:00:02 +0300
4Subject: [PATCH] build: Add --with-systemduserunitdir 4Subject: [PATCH] build: Add --with-systemduserunitdir
@@ -8,29 +8,30 @@ allow overriding the value.
8 8
9Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=767911] 9Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=767911]
10Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> 10Signed-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
16diff --git a/bus/Makefile.am b/bus/Makefile.am 17diff --git a/bus/Makefile.am b/bus/Makefile.am
17index b189e02..52fbb0b 100644 18index 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 $@
29diff --git a/configure.ac b/configure.ac 30diff --git a/configure.ac b/configure.ac
30index f9061c2..2b8eeed 100644 31index 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--
482.1.4 512.14.1
49 52
diff --git a/meta/recipes-support/atk/at-spi2-core/0001-nls.m4-Take-it-from-gettext-0.15.patch b/meta/recipes-support/atk/at-spi2-core/0001-nls.m4-Take-it-from-gettext-0.15.patch
deleted file mode 100644
index 69a51d5662..0000000000
--- a/meta/recipes-support/atk/at-spi2-core/0001-nls.m4-Take-it-from-gettext-0.15.patch
+++ /dev/null
@@ -1,54 +0,0 @@
1From c320799c941d42a9b7e351805359694ea3b36d2d Mon Sep 17 00:00:00 2001
2From: Khem Raj <raj.khem@gmail.com>
3Date: Sun, 5 Apr 2015 09:08:38 -0700
4Subject: [PATCH] nls.m4: Take it from gettext-0.15
5
6It otherwise expects gettext to provide it. Lets go independent
7
8Signed-off-by: Khem Raj <raj.khem@gmail.com>
9
10Upstream-Status: Pending
11---
12 m4/nls.m4 | 30 ++++++++++++++++++++++++++++++
13 1 file changed, 30 insertions(+)
14 create mode 100644 m4/nls.m4
15
16diff --git a/m4/nls.m4 b/m4/nls.m4
17new file mode 100644
18index 0000000..2c8fe69
19--- /dev/null
20+++ b/m4/nls.m4
21@@ -0,0 +1,30 @@
22+dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc.
23+dnl This file is free software; the Free Software Foundation
24+dnl gives unlimited permission to copy and/or distribute it,
25+dnl with or without modifications, as long as this notice is preserved.
26+dnl
27+dnl This file can can be used in projects which are not available under
28+dnl the GNU General Public License or the GNU Library General Public
29+dnl License but which still want to provide support for the GNU gettext
30+dnl functionality.
31+dnl Please note that the actual code of the GNU gettext library is covered
32+dnl by the GNU Library General Public License, and the rest of the GNU
33+dnl gettext package package is covered by the GNU General Public License.
34+dnl They are not in the public domain.
35+
36+dnl Authors:
37+dnl Ulrich Drepper drepper@cygnus.com, 1995-2000.
38+dnl Bruno Haible haible@clisp.cons.org, 2000-2003.
39+
40+AC_PREREQ(2.50)
41+
42+AC_DEFUN([AM_NLS],
43+[
44+AC_MSG_CHECKING([whether NLS is requested])
45+dnl Default is enabled NLS
46+AC_ARG_ENABLE(nls,
47+[ --disable-nls do not use Native Language Support],
48+USE_NLS=$enableval, USE_NLS=yes)
49+AC_MSG_RESULT($USE_NLS)
50+AC_SUBST(USE_NLS)
51+])
52--
532.1.4
54
diff --git a/meta/recipes-support/atk/at-spi2-core_2.24.1.bb b/meta/recipes-support/atk/at-spi2-core_2.26.0.bb
index 1687ae341c..c4cfa8b921 100644
--- a/meta/recipes-support/atk/at-spi2-core_2.24.1.bb
+++ b/meta/recipes-support/atk/at-spi2-core_2.26.0.bb
@@ -6,12 +6,11 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886"
6MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" 6MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}"
7 7
8SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ 8SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \
9 file://0001-nls.m4-Take-it-from-gettext-0.15.patch \
10 file://0001-build-Add-with-systemduserunitdir.patch \ 9 file://0001-build-Add-with-systemduserunitdir.patch \
11 " 10 "
12 11
13SRC_URI[md5sum] = "61d0a471e693292934a73f288ebff35c" 12SRC_URI[md5sum] = "ef3de25da46da8f650915205eb7e1a33"
14SRC_URI[sha256sum] = "1e90d064b937aacfe79a96232ac7e63d28d716e85bd9ff4333f865305a959b5b" 13SRC_URI[sha256sum] = "511568a65fda11fdd5ba5d4adfd48d5d76810d0e6ba4f7460f1b2ec0dbbbc337"
15 14
16DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst intltool-native" 15DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst intltool-native"
17 16
@@ -19,7 +18,7 @@ inherit autotools gtk-doc gettext systemd pkgconfig distro_features_check upstre
19# depends on virtual/libx11 18# depends on virtual/libx11
20REQUIRED_DISTRO_FEATURES = "x11" 19REQUIRED_DISTRO_FEATURES = "x11"
21 20
22EXTRA_OECONF = "--disable-xevie \ 21EXTRA_OECONF = " \
23 --with-systemduserunitdir=${systemd_user_unitdir} \ 22 --with-systemduserunitdir=${systemd_user_unitdir} \
24 --with-dbus-daemondir=${bindir}" 23 --with-dbus-daemondir=${bindir}"
25 24