diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-support/atk')
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-support/atk/at-spi2-atk_2.26.1.bb (renamed from import-layers/yocto-poky/meta/recipes-support/atk/at-spi2-atk_2.24.1.bb) | 4 | ||||
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-support/atk/at-spi2-core/0001-build-Add-with-systemduserunitdir.patch | 29 | ||||
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-support/atk/at-spi2-core/0001-nls.m4-Take-it-from-gettext-0.15.patch | 54 | ||||
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-support/atk/at-spi2-core_2.26.2.bb (renamed from import-layers/yocto-poky/meta/recipes-support/atk/at-spi2-core_2.24.1.bb) | 11 | ||||
-rw-r--r-- | import-layers/yocto-poky/meta/recipes-support/atk/atk_2.26.1.bb (renamed from import-layers/yocto-poky/meta/recipes-support/atk/atk_2.24.0.bb) | 6 |
5 files changed, 25 insertions, 79 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-support/atk/at-spi2-atk_2.24.1.bb b/import-layers/yocto-poky/meta/recipes-support/atk/at-spi2-atk_2.26.1.bb index 4a0e41149..8617bb871 100644 --- a/import-layers/yocto-poky/meta/recipes-support/atk/at-spi2-atk_2.24.1.bb +++ b/import-layers/yocto-poky/meta/recipes-support/atk/at-spi2-atk_2.26.1.bb @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886" MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "79388fbc4dc7f27394556dd389aeb594" -SRC_URI[sha256sum] = "60dc90ac4f74b8ffe96a9363c25208a443b381bacecfefea6de549f20ed6957d" +SRC_URI[md5sum] = "eeec6cead3350dca48a235271c105b3e" +SRC_URI[sha256sum] = "b4f0c27b61dbffba7a5b5ba2ff88c8cee10ff8dac774fa5b79ce906853623b75" DEPENDS = "dbus glib-2.0 glib-2.0-native atk at-spi2-core" diff --git a/import-layers/yocto-poky/meta/recipes-support/atk/at-spi2-core/0001-build-Add-with-systemduserunitdir.patch b/import-layers/yocto-poky/meta/recipes-support/atk/at-spi2-core/0001-build-Add-with-systemduserunitdir.patch index 4103eaa2e..1f8c9f374 100644 --- a/import-layers/yocto-poky/meta/recipes-support/atk/at-spi2-core/0001-build-Add-with-systemduserunitdir.patch +++ b/import-layers/yocto-poky/meta/recipes-support/atk/at-spi2-core/0001-build-Add-with-systemduserunitdir.patch @@ -1,4 +1,4 @@ -From 2f47c975ebe52b6916a45ade023ae3bac21bb0e0 Mon Sep 17 00:00:00 2001 +From fa376762b92404b9e3c430054b8c3341ca0fdd8b Mon Sep 17 00:00:00 2001 From: Jussi Kukkonen <jussi.kukkonen@intel.com> Date: Tue, 21 Jun 2016 16:00:02 +0300 Subject: [PATCH] build: Add --with-systemduserunitdir @@ -8,29 +8,30 @@ allow overriding the value. Upstream-Status: Submitted [https://bugzilla.gnome.org/show_bug.cgi?id=767911] Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> + --- bus/Makefile.am | 2 +- - configure.ac | 7 +++++++ - 2 files changed, 8 insertions(+), 1 deletion(-) + configure.ac | 9 +++++++++ + 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/bus/Makefile.am b/bus/Makefile.am -index b189e02..52fbb0b 100644 +index 688f82a..10cde62 100644 --- a/bus/Makefile.am +++ b/bus/Makefile.am -@@ -26,7 +26,7 @@ dbusservice_DATA = org.a11y.Bus.service - org.a11y.Bus.service: org.a11y.Bus.service.in - sed -e $(substitutions) $< > $@.tmp && mv $@.tmp $@ +@@ -29,7 +29,7 @@ org.a11y.Bus.service: org.a11y.Bus.service.in + EXTRA_DIST += org.a11y.Bus.service.in + CLEANFILES += org.a11y.Bus.service -systemd_userdir = $(prefix)/lib/systemd/user +systemd_userdir = $(systemduserunitdir) systemd_user_DATA = at-spi-dbus-bus.service at-spi-dbus-bus.service: at-spi-dbus-bus.service.in Makefile - sed -e $(substitutions) $< > $@.tmp && mv $@.tmp $@ + $(AM_V_GEN) $(SED) -e $(substitutions) $< > $@.tmp && mv $@.tmp $@ diff --git a/configure.ac b/configure.ac -index f9061c2..2b8eeed 100644 +index 8c4fca2..1415cca 100644 --- a/configure.ac +++ b/configure.ac -@@ -183,6 +183,13 @@ else +@@ -146,6 +146,15 @@ else fi AC_SUBST(DBUS_SERVICES_DIR) @@ -41,9 +42,11 @@ index f9061c2..2b8eeed 100644 + [with_systemduserunitdir=$($PKG_CONFIG --variable=systemduserunitdir systemd)]) +AC_SUBST([systemduserunitdir], [$with_systemduserunitdir]) + - AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums) ++AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums) ++ + GOBJECT_INTROSPECTION_CHECK([1.32.0]) - GOBJECT_INTROSPECTION_CHECK([0.9.6]) + AC_SUBST(LIBTOOL_EXPORT_OPTIONS) -- -2.1.4 +2.14.1 diff --git a/import-layers/yocto-poky/meta/recipes-support/atk/at-spi2-core/0001-nls.m4-Take-it-from-gettext-0.15.patch b/import-layers/yocto-poky/meta/recipes-support/atk/at-spi2-core/0001-nls.m4-Take-it-from-gettext-0.15.patch deleted file mode 100644 index 69a51d566..000000000 --- a/import-layers/yocto-poky/meta/recipes-support/atk/at-spi2-core/0001-nls.m4-Take-it-from-gettext-0.15.patch +++ /dev/null @@ -1,54 +0,0 @@ -From c320799c941d42a9b7e351805359694ea3b36d2d Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sun, 5 Apr 2015 09:08:38 -0700 -Subject: [PATCH] nls.m4: Take it from gettext-0.15 - -It otherwise expects gettext to provide it. Lets go independent - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Upstream-Status: Pending ---- - m4/nls.m4 | 30 ++++++++++++++++++++++++++++++ - 1 file changed, 30 insertions(+) - create mode 100644 m4/nls.m4 - -diff --git a/m4/nls.m4 b/m4/nls.m4 -new file mode 100644 -index 0000000..2c8fe69 ---- /dev/null -+++ b/m4/nls.m4 -@@ -0,0 +1,30 @@ -+dnl Copyright (C) 1995-2003, 2005-2006 Free Software Foundation, Inc. -+dnl This file is free software; the Free Software Foundation -+dnl gives unlimited permission to copy and/or distribute it, -+dnl with or without modifications, as long as this notice is preserved. -+dnl -+dnl This file can can be used in projects which are not available under -+dnl the GNU General Public License or the GNU Library General Public -+dnl License but which still want to provide support for the GNU gettext -+dnl functionality. -+dnl Please note that the actual code of the GNU gettext library is covered -+dnl by the GNU Library General Public License, and the rest of the GNU -+dnl gettext package package is covered by the GNU General Public License. -+dnl They are not in the public domain. -+ -+dnl Authors: -+dnl Ulrich Drepper drepper@cygnus.com, 1995-2000. -+dnl Bruno Haible haible@clisp.cons.org, 2000-2003. -+ -+AC_PREREQ(2.50) -+ -+AC_DEFUN([AM_NLS], -+[ -+AC_MSG_CHECKING([whether NLS is requested]) -+dnl Default is enabled NLS -+AC_ARG_ENABLE(nls, -+[ --disable-nls do not use Native Language Support], -+USE_NLS=$enableval, USE_NLS=yes) -+AC_MSG_RESULT($USE_NLS) -+AC_SUBST(USE_NLS) -+]) --- -2.1.4 - diff --git a/import-layers/yocto-poky/meta/recipes-support/atk/at-spi2-core_2.24.1.bb b/import-layers/yocto-poky/meta/recipes-support/atk/at-spi2-core_2.26.2.bb index 1687ae341..521ee3b96 100644 --- a/import-layers/yocto-poky/meta/recipes-support/atk/at-spi2-core_2.24.1.bb +++ b/import-layers/yocto-poky/meta/recipes-support/atk/at-spi2-core_2.26.2.bb @@ -6,20 +6,19 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e9f288ba982d60518f375b5898283886" MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" SRC_URI = "${GNOME_MIRROR}/${BPN}/${MAJ_VER}/${BPN}-${PV}.tar.xz \ - file://0001-nls.m4-Take-it-from-gettext-0.15.patch \ file://0001-build-Add-with-systemduserunitdir.patch \ - " + " -SRC_URI[md5sum] = "61d0a471e693292934a73f288ebff35c" -SRC_URI[sha256sum] = "1e90d064b937aacfe79a96232ac7e63d28d716e85bd9ff4333f865305a959b5b" +SRC_URI[md5sum] = "4a042e4c801fdb793788b749eab21485" +SRC_URI[sha256sum] = "c80e0cdf5e3d713400315b63c7deffa561032a6c37289211d8afcfaa267c2615" -DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst intltool-native" +DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst" inherit autotools gtk-doc gettext systemd pkgconfig distro_features_check upstream-version-is-even gobject-introspection # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" -EXTRA_OECONF = "--disable-xevie \ +EXTRA_OECONF = " \ --with-systemduserunitdir=${systemd_user_unitdir} \ --with-dbus-daemondir=${bindir}" diff --git a/import-layers/yocto-poky/meta/recipes-support/atk/atk_2.24.0.bb b/import-layers/yocto-poky/meta/recipes-support/atk/atk_2.26.1.bb index d62319c1f..685b5991d 100644 --- a/import-layers/yocto-poky/meta/recipes-support/atk/atk_2.24.0.bb +++ b/import-layers/yocto-poky/meta/recipes-support/atk/atk_2.26.1.bb @@ -12,10 +12,8 @@ DEPENDS = "glib-2.0" inherit gnomebase gtk-doc gettext upstream-version-is-even gobject-introspection -SRC_URI[archive.md5sum] = "3747a80089dfa3c0bbcf21adfff9968b" -SRC_URI[archive.sha256sum] = "bb2daa9a808c73a7a79d2983f333e0ba74be42fc51e3ba1faf2551a636487a49" +SRC_URI[archive.md5sum] = "7cddcc313b9a3efd19b2ddf079ba68f5" +SRC_URI[archive.sha256sum] = "ef00ff6b83851dddc8db38b4d9faeffb99572ba150b0664ee02e46f015ea97cb" BBCLASSEXTEND = "native" -EXTRA_OECONF = "--disable-glibtest \ - " |