Merge pull request #6064 from ertugerata/master
at-spi2-core // for fix launch
This commit is contained in:
@@ -0,0 +1,49 @@
|
||||
From 443e46d2d9d29cb9d20192e4978eb633bbbcc9b4 Mon Sep 17 00:00:00 2001
|
||||
From: David Herrmann <dh.herrmann@gmail.com>
|
||||
Date: Fri, 10 Aug 2018 16:35:31 +0200
|
||||
Subject: [PATCH 2/2] bus-launch: use __linux__ over __linux
|
||||
|
||||
The canonical way to check for linux support is '__linux__', not
|
||||
'__linux'. Particularly, on ppc64le '__linux' is not defined and the
|
||||
build will fail.
|
||||
|
||||
For reference, see:
|
||||
|
||||
https://sourceforge.net/p/predef/wiki/OperatingSystems/
|
||||
---
|
||||
bus/at-spi-bus-launcher.c | 4 ++--
|
||||
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/bus/at-spi-bus-launcher.c b/bus/at-spi-bus-launcher.c
|
||||
index 354c04eec7ba1a1ee034a245ee25c0139c48a1e5..b65301def88c2ff8aa5d10ada67507d0201b0984 100644
|
||||
--- a/bus/at-spi-bus-launcher.c
|
||||
+++ b/bus/at-spi-bus-launcher.c
|
||||
@@ -23,11 +23,11 @@
|
||||
#include "config.h"
|
||||
|
||||
#include <unistd.h>
|
||||
#include <string.h>
|
||||
#include <signal.h>
|
||||
-#ifdef __linux
|
||||
+#ifdef __linux__
|
||||
#include <sys/prctl.h>
|
||||
#include <sys/socket.h>
|
||||
#include <sys/un.h>
|
||||
#endif
|
||||
#include <sys/wait.h>
|
||||
@@ -275,11 +275,11 @@ setup_bus_child_daemon (gpointer data)
|
||||
close (app->pipefd[0]);
|
||||
dup2 (app->pipefd[1], 3);
|
||||
close (app->pipefd[1]);
|
||||
|
||||
/* On Linux, tell the bus process to exit if this process goes away */
|
||||
-#ifdef __linux
|
||||
+#ifdef __linux__
|
||||
prctl (PR_SET_PDEATHSIG, 15);
|
||||
#endif
|
||||
}
|
||||
|
||||
static gboolean
|
||||
--
|
||||
2.19.0.rc0
|
||||
|
||||
@@ -12,7 +12,7 @@
|
||||
<IsA>service</IsA>
|
||||
<Summary>Protocol definitions and daemons for D-Bus at-spi</Summary>
|
||||
<Description>at-spi allows assistive technologies to access GTK-based applications. Essentially it exposes the internals of applications over D-Bus for automation.</Description>
|
||||
<Archive sha1sum="45e15ab3c1cfe0a8b4ea333c448f3fc1cd634c4e" type="tarxz">mirrors://gnome/at-spi2-core/2.28/at-spi2-core-2.28.0.tar.xz</Archive>
|
||||
<Archive sha1sum="c8f91718ff7b9b88f32be744c88384d027d29bef" type="tarxz">mirrors://gnome/at-spi2-core/2.30/at-spi2-core-2.30.0.tar.xz</Archive>
|
||||
<BuildDependencies>
|
||||
<Dependency>libXtst-devel</Dependency>
|
||||
<Dependency>libxslt-devel</Dependency>
|
||||
@@ -27,6 +27,9 @@
|
||||
<Dependency>python-six</Dependency>
|
||||
<Dependency>gobject-introspection-devel</Dependency>
|
||||
</BuildDependencies>
|
||||
<Patches>
|
||||
<Patch>0002-bus-launch-use-__linux__-over-__linux.patch</Patch>
|
||||
</Patches>
|
||||
</Source>
|
||||
|
||||
<Package>
|
||||
@@ -98,6 +101,13 @@
|
||||
</Package>
|
||||
|
||||
<History>
|
||||
<Update release="10">
|
||||
<Date>2018-11-30</Date>
|
||||
<Version>2.30.0</Version>
|
||||
<Comment>Version bump.</Comment>
|
||||
<Name>Ertuğrul Erata</Name>
|
||||
<Email>ertugrulerata@gmail.com</Email>
|
||||
</Update>
|
||||
<Update release="9">
|
||||
<Date>2018-11-26</Date>
|
||||
<Version>2.28.0</Version>
|
||||
|
||||
Reference in New Issue
Block a user