From 785aef33f654c064392fdc9131d1a1c3d2c9303f Mon Sep 17 00:00:00 2001 From: Rmys Date: Mon, 26 Nov 2018 13:48:59 +0300 Subject: [PATCH] at-spi2-core:rebuild --- desktop/misc/at-spi2-core/actions.py | 10 +++++----- desktop/misc/at-spi2-core/pspec.xml | 7 +++++++ 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/desktop/misc/at-spi2-core/actions.py b/desktop/misc/at-spi2-core/actions.py index 19c4a2d024..5d5965c821 100644 --- a/desktop/misc/at-spi2-core/actions.py +++ b/desktop/misc/at-spi2-core/actions.py @@ -13,12 +13,12 @@ from pisi.actionsapi import get def setup(): shelltools.makedirs("build") shelltools.cd("build") - options = "meson --prefix=/usr --libexec=/usr/libexec/at-spi2 --sysconfdir=/etc -D dbus_daemon=/usr/bin \ - -D systemd_user_dir=/usr/share/dbus-1/services -D enable_docs=true" + options = "meson --prefix=/usr --sysconfdir=/etc --libexec=/usr/libexec/at-spi2 \ + -D enable_docs=true \ + " if get.buildTYPE() == "emul32": - options += "meson --prefix=/usr --libexec=tmp --datadir=tmp --sysconfdir=tmp -D dbus_dir=tmp \ - -D systemd_user_dir=tmp --libdir=lib32 -D enable_docs=false .." + options += "--prefix=/usr --libdir=lib32 -D enable_docs=false .." shelltools.system(options) @@ -35,7 +35,7 @@ def install(): #pisitools.dosed("%s/usr/share/dbus-1/services" % get.installDIR(), "^(Exec=)\/usr/tmp", r"\1/usr/libexec/at-spi2") #pisitools.dosed("%s/usr/share/dbus-1/accessibility-services" % get.installDIR(), "^(Exec=)\/usr/tmp", r"\1/usr/libexec/at-spi2") #pisitools.dosed("%s/etc/dbus-1/system.d" % get.installDIR(), "^(ExecStart=)\/usr/tmp", r"\1/usr/libexec/at-spi2") - pisitools.removeDir("/usr/tmp") + #pisitools.removeDir("/usr/tmp") return shelltools.cd("..") diff --git a/desktop/misc/at-spi2-core/pspec.xml b/desktop/misc/at-spi2-core/pspec.xml index d81134b439..087e2962da 100644 --- a/desktop/misc/at-spi2-core/pspec.xml +++ b/desktop/misc/at-spi2-core/pspec.xml @@ -98,6 +98,13 @@ + + 2018-11-26 + 2.28.0 + Rebuild. + Pisi Linux Community + admin@pisilinux.org + 2018-07-27 2.28.0