From 29ceaa04507152cdc3e87182a1471810006b81ec Mon Sep 17 00:00:00 2001 From: Rmys Date: Tue, 26 Dec 2017 16:53:43 +0300 Subject: [PATCH] json-glib:ver.bump --- programming/misc/json-glib/actions.py | 20 ++++++++++---------- programming/misc/json-glib/pspec.xml | 12 +++++++++++- 2 files changed, 21 insertions(+), 11 deletions(-) diff --git a/programming/misc/json-glib/actions.py b/programming/misc/json-glib/actions.py index 9b439e2e70..3f29c962f3 100644 --- a/programming/misc/json-glib/actions.py +++ b/programming/misc/json-glib/actions.py @@ -11,15 +11,13 @@ from pisi.actionsapi import shelltools def setup(): - options = "--disable-gtk-doc-html \ - --disable-gtk-doc \ - --enable-introspection \ + options = "-Ddocs=false \ + -Dintrospection=true \ " if get.buildTYPE() == "_emul32": - options += " --libdir=/usr/lib32 \ - --bindir=/_emul32/bin \ - --sbindir=/_emul32/sbin \ + options += " --prefix='/usr' \ + --libdir=/usr/lib32 \ " shelltools.export("CC", "%s -m32" % get.CC()) shelltools.export("CXX", "%s -m32" % get.CXX()) @@ -33,9 +31,11 @@ def build(): def install(): autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + if get.buildTYPE() == "_emul32": - pisitools.removeDir("/_emul32") + #pisitools.removeDir("/_emul32") + + #pisitools.removeDir("/usr/share/gtk-doc") - pisitools.removeDir("/usr/share/gtk-doc") - - pisitools.dodoc("ChangeLog", "NEWS") \ No newline at end of file + pisitools.dodoc("README.md", "NEWS") diff --git a/programming/misc/json-glib/pspec.xml b/programming/misc/json-glib/pspec.xml index 43362b6438..9bcf8cd1e6 100644 --- a/programming/misc/json-glib/pspec.xml +++ b/programming/misc/json-glib/pspec.xml @@ -12,10 +12,11 @@ library Library for JavaScript Object Notation format json-glib is a library providing serialization and deserialization support for the JavaScript Object Notation (JSON) format. - mirrors://gnome/json-glib/1.2/json-glib-1.2.2.tar.xz + mirrors://gnome/json-glib/1.4/json-glib-1.4.2.tar.xz gobject-introspection-devel glib2-devel + meson @@ -30,6 +31,8 @@ /usr/lib /usr/share/doc /usr/share/man + /usr/libexec/installed-tests/json-glib-1.0 + /usr/share/installed-tests/json-glib-1.0 /usr/share/locale @@ -67,6 +70,13 @@ + + 2017-12-26 + 1.4.2 + Version Bump + Mustafa Cinasal + muscnsl@gmail.com + 2017-02-06 1.2.2