Pisilinux/main
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #4830 from Rmys/master

Browse Source 
at-spi2-core:rebuild
This commit is contained in:
Rmys
2018-05-07 13:27:19 +03:00
committed by GitHub
parent 933b1fdf1e a68381500b
commit 3cfd8f17f4
2 changed files with 14 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
desktop/misc/at-spi2-core/actions.py
+7 -5
View File
@@ -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
desktop/misc/at-spi2-core/pspec.xml
+7
View File
@@ -98,6 +98,13 @@
</Package>
<History>
<Update release="7">
<Date>2018-05-07</Date>
<Version>2.28.0</Version>
<Comment>Rebuild.</Comment>
<Name>Pisi Linux Community</Name>
<Email>admin@pisilinux.org</Email>
</Update>
<Update release="6">
<Date>2018-04-19</Date>
<Version>2.28.0</Version>