diff --git a/desktop/toolkit/gtk/pango/actions.py b/desktop/toolkit/gtk/pango/actions.py index 53c73805b4..d987441d4f 100644 --- a/desktop/toolkit/gtk/pango/actions.py +++ b/desktop/toolkit/gtk/pango/actions.py @@ -8,33 +8,49 @@ from pisi.actionsapi import get from pisi.actionsapi import autotools from pisi.actionsapi import pisitools from pisi.actionsapi import shelltools +from pisi.actionsapi import mesontools def setup(): - if get.buildTYPE()=="emul32": - pisitools.dosed("pango/modules.c", "(pango\.modules)", r"\1-32") + if get.buildTYPE()=="emul32": + pisitools.dosed("pango/modules.c", "(pango\.modules)", r"\1-32") # autotools.autoreconf("-fiv") - autotools.configure("--disable-static \ - --sysconfdir=/etc \ - --disable-gtk-doc \ - --%sable-introspection" % ("dis" if get.buildTYPE()=="emul32" else "en")) + #autotools.configure("--disable-static \ + #--sysconfdir=/etc \ + #--disable-gtk-doc \ + #--%sable-introspection" % ("dis" if get.buildTYPE()=="emul32" else "en")) + + options = "-Dgtk_doc=false \ + " + + if get.buildTYPE()=="emul32" : + options += "-Dintrospection=false \ + --bindir=/usr/bin32" + else: + options += "-Dintrospection=true" - pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ") + #pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ") + + mesontools.configure(options) def build(): - autotools.make() + mesontools.build() def install(): - autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + #autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + mesontools.install() - if get.buildTYPE()=="emul32": - #shelltools.move("pango/.libs/pango-querymodules", "pango/.libs/pango-querymodules-32") - #pisitools.dobin("pango/.libs/pango-querymodules-32") - return + #if get.buildTYPE()=="emul32": + ##shelltools.move("pango/.libs/pango-querymodules", "pango/.libs/pango-querymodules-32") + ##pisitools.dobin("pango/.libs/pango-querymodules-32") + #return pisitools.dodir("/etc/pango") shelltools.touch(get.installDIR() +"/etc/pango/pango.modules") + + if get.buildTYPE()=="emul32" : + pisitools.removeDir("/usr/bin32") - pisitools.dodoc("AUTHORS", "ChangeLog*", "COPYING", "README", "NEWS") + pisitools.dodoc("README.md", "NEWS") diff --git a/desktop/toolkit/gtk/pango/pspec.xml b/desktop/toolkit/gtk/pango/pspec.xml index 7b3fabd350..a789b52fe9 100644 --- a/desktop/toolkit/gtk/pango/pspec.xml +++ b/desktop/toolkit/gtk/pango/pspec.xml @@ -13,7 +13,7 @@ library Text rendering and layout library Pango is a library for laying out and rendering of text, with an emphasis on internationalization. Pango can be used anywhere that text layout is needed, though most of the work on Pango so far has been done in the context of the GTK+ widget toolkit. Pango forms the core of text and font handling for GTK+-2.x. - mirrors://gnome/pango/1.42/pango-1.42.4.tar.xz + mirrors://gnome/pango/1.44/pango-1.44.7.tar.xz libX11-devel freetype-devel @@ -128,6 +128,13 @@ + + 2020-01-08 + 1.44.7 + Version bump + Pisi Linux Community + admin@pisilinux.org + 2019-01-15 1.42.4