diff --git a/desktop/misc/at-spi2-core/actions.py b/desktop/misc/at-spi2-core/actions.py index b5003556ba..19c4a2d024 100644 --- a/desktop/misc/at-spi2-core/actions.py +++ b/desktop/misc/at-spi2-core/actions.py @@ -13,10 +13,12 @@ from pisi.actionsapi import get def setup(): shelltools.makedirs("build") shelltools.cd("build") - options = "meson --prefix=/usr --libexec=/usr/libexec/at-spi2 -D enable_docs=true" + 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" if get.buildTYPE() == "emul32": - options += "meson --prefix=/usr --libexec=tmp --sysconfdir=tmp --libdir=lib32 -D enable_docs=false .." + 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 .." shelltools.system(options) @@ -30,9 +32,9 @@ def install(): shelltools.system("DESTDIR=%s ninja install" % get.installDIR()) if get.buildTYPE() == "emul32": - 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/usr/lib/systemd/user" % get.installDIR(), "^(ExecStart=)\/usr/tmp", r"\1/usr/libexec/at-spi2") + #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") return diff --git a/desktop/misc/at-spi2-core/pspec.xml b/desktop/misc/at-spi2-core/pspec.xml index f2100e2ca2..dbb6b52199 100644 --- a/desktop/misc/at-spi2-core/pspec.xml +++ b/desktop/misc/at-spi2-core/pspec.xml @@ -98,6 +98,13 @@ + + 2018-05-07 + 2.28.0 + Rebuild. + Pisi Linux Community + admin@pisilinux.org + 2018-04-19 2.28.0