@@ -13,8 +13,9 @@ from pisi.actionsapi import get
|
|||||||
|
|
||||||
def setup():
|
def setup():
|
||||||
options = "--prefix=/usr \
|
options = "--prefix=/usr \
|
||||||
|
-Duse_systemd=false \
|
||||||
|
-Ddefault_bus=dbus-daemon \
|
||||||
--sysconfdir=/etc \
|
--sysconfdir=/etc \
|
||||||
--libexec=/usr/libexec/at-spi2 \
|
|
||||||
-Dintrospection=enabled \
|
-Dintrospection=enabled \
|
||||||
-Ddbus_daemon=/usr/bin/dbus-daemon \
|
-Ddbus_daemon=/usr/bin/dbus-daemon \
|
||||||
-Dsystemd_user_dir=/tmp \
|
-Dsystemd_user_dir=/tmp \
|
||||||
@@ -24,12 +25,15 @@ def setup():
|
|||||||
|
|
||||||
if get.buildTYPE() == "emul32":
|
if get.buildTYPE() == "emul32":
|
||||||
options += " --datadir=/usr/emul32 \
|
options += " --datadir=/usr/emul32 \
|
||||||
--libexec=/usr/emul32 \
|
--libexec=/usr/lib32/at-spi2 \
|
||||||
--sysconfdir=/usr/emul32 \
|
--sysconfdir=/usr/emul32 \
|
||||||
--libdir=lib32 \
|
--libdir=lib32 \
|
||||||
-Dintrospection=disabled \
|
-Dintrospection=disabled \
|
||||||
-D docs=false"
|
-D docs=false"
|
||||||
|
|
||||||
|
else:
|
||||||
|
options += " --libexec=/usr/lib/at-spi2"
|
||||||
|
|
||||||
|
|
||||||
mesontools.configure(options)
|
mesontools.configure(options)
|
||||||
|
|
||||||
@@ -43,8 +47,8 @@ def install():
|
|||||||
#pisitools.dosed("%s/usr/share/dbus-1/accessibility-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/emul32", r"\1/usr/libexec/at-spi2")
|
# pisitools.dosed("%s/usr/lib/systemd/user" % get.installDIR(), "^(ExecStart=)\/usr/emul32", r"\1/usr/libexec/at-spi2")
|
||||||
pisitools.removeDir("/usr/emul32")
|
pisitools.removeDir("/usr/emul32")
|
||||||
pisitools.removeDir("/tmp")
|
# pisitools.removeDir("/tmp")
|
||||||
pisitools.dosym("/usr/libexec/at-spi2/at-spi-bus-launcher", "/usr/lib/at-spi2-core/at-spi-bus-launcher")
|
# pisitools.dosym("/usr/libexec/at-spi2/at-spi-bus-launcher", "/usr/lib/at-spi2-core/at-spi-bus-launcher")
|
||||||
return
|
return
|
||||||
|
|
||||||
pisitools.dodoc("NEWS", "README*")
|
pisitools.dodoc("NEWS", "README*")
|
||||||
|
|||||||
Reference in New Issue
Block a user