From 1644e3227c944e66012bf0c3fbc4fb4547720c6d Mon Sep 17 00:00:00 2001 From: Rmys Date: Tue, 28 Oct 2025 14:45:25 +0300 Subject: [PATCH] at-spi2-core rebuild --- desktop/misc/at-spi2-core/actions.py | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/desktop/misc/at-spi2-core/actions.py b/desktop/misc/at-spi2-core/actions.py index 8879c6df5e..e5ed9a69fc 100644 --- a/desktop/misc/at-spi2-core/actions.py +++ b/desktop/misc/at-spi2-core/actions.py @@ -13,8 +13,9 @@ from pisi.actionsapi import get def setup(): options = "--prefix=/usr \ + -Duse_systemd=false \ + -Ddefault_bus=dbus-daemon \ --sysconfdir=/etc \ - --libexec=/usr/libexec/at-spi2 \ -Dintrospection=enabled \ -Ddbus_daemon=/usr/bin/dbus-daemon \ -Dsystemd_user_dir=/tmp \ @@ -24,12 +25,15 @@ def setup(): if get.buildTYPE() == "emul32": options += " --datadir=/usr/emul32 \ - --libexec=/usr/emul32 \ + --libexec=/usr/lib32/at-spi2 \ --sysconfdir=/usr/emul32 \ --libdir=lib32 \ -Dintrospection=disabled \ -D docs=false" + else: + options += " --libexec=/usr/lib/at-spi2" + 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/lib/systemd/user" % get.installDIR(), "^(ExecStart=)\/usr/emul32", r"\1/usr/libexec/at-spi2") pisitools.removeDir("/usr/emul32") - pisitools.removeDir("/tmp") - pisitools.dosym("/usr/libexec/at-spi2/at-spi-bus-launcher", "/usr/lib/at-spi2-core/at-spi-bus-launcher") + # pisitools.removeDir("/tmp") + # pisitools.dosym("/usr/libexec/at-spi2/at-spi-bus-launcher", "/usr/lib/at-spi2-core/at-spi-bus-launcher") return pisitools.dodoc("NEWS", "README*")