mirrors/poky
1
0
Fork 0
mirror of https://git.yoctoproject.org/poky synced 2026-04-17 00:32:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

at-spi2-core: Upgrade 2.18.3 -> 2.20.2

Browse Source 
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>
This commit is contained in:
Jussi Kukkonen
2016-06-22 14:52:22 +03:00
committed by Richard Purdie
parent 478d446e85
commit 169fbdbeee
3 changed files with 78 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
meta/recipes-support/atk/at-spi2-core/0001-build-Add-with-systemduserunitdir.patch Normal file
View File

@@ -0,0 +1,49 @@
From 2f47c975ebe52b6916a45ade023ae3bac21bb0e0 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
Default to "pkg-config --variable=systemduserunitdir systemd" but
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(-)
diff --git a/bus/Makefile.am b/bus/Makefile.am
index b189e02..52fbb0b 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 $@
-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 $@
diff --git a/configure.ac b/configure.ac
index f9061c2..2b8eeed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -183,6 +183,13 @@ else
fi
AC_SUBST(DBUS_SERVICES_DIR)
+AC_ARG_WITH([systemduserunitdir],
+ AS_HELP_STRING([--with-systemduserunitdir=DIR],
+ [Directory for systemd service files]),
+ [],
+ [with_systemduserunitdir=$($PKG_CONFIG --variable=systemduserunitdir systemd)])
+AC_SUBST([systemduserunitdir], [$with_systemduserunitdir])
+
AC_PATH_PROG(GLIB_MKENUMS, glib-mkenums)
GOBJECT_INTROSPECTION_CHECK([0.9.6])
--
2.1.4

23
meta/recipes-support/atk/at-spi2-core_2.18.3.bb
View File

@@ -1,23 +0,0 @@
SUMMARY = "Assistive Technology Service Provider Interface (dbus core)"
LICENSE = "LGPLv2"
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 \
"
SRC_URI[md5sum] = "fc18801e56f6ce6914126f837d42f556"
SRC_URI[sha256sum] = "ada26add94155f97d0f601a20cb7a0e3fd3ba1588c3520b7288316494027d629"
DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst intltool-native gettext-native"
inherit autotools gtk-doc pkgconfig distro_features_check upstream-version-is-even gobject-introspection
# depends on virtual/libx11
REQUIRED_DISTRO_FEATURES = "x11"
EXTRA_OECONF = "--disable-xevie --with-dbus-daemondir=${bindir}"
FILES_${PN} += "${datadir}/dbus-1/services/*.service \
${datadir}/dbus-1/accessibility-services/*.service"

29
meta/recipes-support/atk/at-spi2-core_2.20.2.bb Normal file
View File

@@ -0,0 +1,29 @@
SUMMARY = "Assistive Technology Service Provider Interface (dbus core)"
LICENSE = "LGPLv2"
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] = "f6f6303da2e72317f881703f40bf0c62"
SRC_URI[sha256sum] = "88a4de9d43139f13cca531b47b901bc1b56e0ab06ba899126644abd4ac16a143"
DEPENDS = "dbus glib-2.0 virtual/libx11 libxi libxtst intltool-native"
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 \
--with-systemduserunitdir=${systemd_user_unitdir} \
--with-dbus-daemondir=${bindir}"
FILES_${PN} += "${datadir}/dbus-1/services/*.service \
${datadir}/dbus-1/accessibility-services/*.service \
${datadir}/defaults/at-spi2 \
${systemd_user_unitdir}/at-spi-dbus-bus.service \
"