diff --git a/desktop/misc/at-spi2-core/actions.py b/desktop/misc/at-spi2-core/actions.py
index 2b12315d27..79f163adb7 100644
--- a/desktop/misc/at-spi2-core/actions.py
+++ b/desktop/misc/at-spi2-core/actions.py
@@ -4,41 +4,36 @@
# Licensed under the GNU General Public License, version 3.
# See the file http://www.gnu.org/licenses/gpl.txt
-from pisi.actionsapi import get
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
+from pisi.actionsapi import shelltools
+from pisi.actionsapi import get
-if get.buildTYPE() == "emul32":
- libexec = "/tmp"
- sysconf = "--sysconfdir=/tmp"
-else:
- libexec = "/usr/libexec/at-spi2"
- sysconf = ""
def setup():
- autotools.autoreconf("-vif")
- autotools.configure("--disable-static \
- --disable-silent-rules \
- --disable-xevie \
- --libexecdir=%s\
- --with-dbus-daemondir=/usr/bin \
- %s \
- " % (libexec, sysconf))
-
- #pisitools.dosed("libtool", "^(hardcode_libdir_flag_spec=).*", '\\1""')
- pisitools.dosed("libtool", "^(runpath_var=)LD_RUN_PATH", "\\1DIE_RPATH_DIE")
- pisitools.dosed("libtool", "( -shared )", " -Wl,--as-needed\\1")
-
-
-def build():
- autotools.make()
-
-def install():
- autotools.rawInstall("DESTDIR=%s" % get.installDIR())
- #pisitools.removeDir("/etc")
+ shelltools.makedirs("build")
+ shelltools.cd("build")
+ options = "meson .. --prefix=/usr -D enable_docs=true"
+
if get.buildTYPE() == "emul32":
- pisitools.dosed("%s/usr/share/dbus-1/services" % get.installDIR(), "^(Exec=)\/tmp", r"\1/usr/libexec/at-spi2")
- pisitools.removeDir("/tmp")
+ options += "meson --prefix=/usr --libexec=tmp --sysconfdir=tmp --libdir=lib32 -D enable_docs=false"
+
+
+ shelltools.system(options)
+
+def build():
+ shelltools.cd("build")
+ shelltools.system("ninja")
+
+def install():
+ shelltools.cd("build")
+ shelltools.system("DESTDIR=%s ninja install" % get.installDIR())
+
+ if get.buildTYPE() == "emul32":
+ #pisitools.dosed("%s/usr/share/dbus-1/services" % get.installDIR(), "^(Exec=)\/tmp", r"\1/usr/libexec/at-spi2")
+ pisitools.removeDir("/usr/tmp")
return
+
+ shelltools.cd("..")
+ pisitools.dodoc("COPYING", "NEWS", "README")
- pisitools.dodoc("AUTHORS", "COPYING", "README", "NEWS")
\ No newline at end of file
diff --git a/desktop/misc/at-spi2-core/pspec.xml b/desktop/misc/at-spi2-core/pspec.xml
index 44ced5f64a..f2100e2ca2 100644
--- a/desktop/misc/at-spi2-core/pspec.xml
+++ b/desktop/misc/at-spi2-core/pspec.xml
@@ -12,15 +12,18 @@
service
Protocol definitions and daemons for D-Bus at-spi
at-spi allows assistive technologies to access GTK-based applications. Essentially it exposes the internals of applications over D-Bus for automation.
- mirrors://gnome/at-spi2-core/2.26/at-spi2-core-2.26.2.tar.xz
+ mirrors://gnome/at-spi2-core/2.28/at-spi2-core-2.28.0.tar.xz
libXtst-devel
+ libxslt-devel
libXi-devel
gettext-devel
dbus-devel
glib2-devel
+ docbook-xsl
intltool
gtk-doc
+ meson
python-six
gobject-introspection-devel
@@ -49,9 +52,9 @@
at-spi2-core-32bit
- emul32
- 32-bit shared libraries for at-spi2-core
- emul32
+ emul32 -->
+ 32-bit shared libraries for at-spi2-core --> -->
+ emul32 --> -->
dbus-32bit
glib2-32bit
@@ -95,6 +98,13 @@
+
+ 2018-04-19
+ 2.28.0
+ Version Bump
+ Pisi Linux Community
+ admin@pisilinux.org
+
2018-01-17
2.26.2