diff --git a/desktop/toolkit/gtk/gtk3/actions.py b/desktop/toolkit/gtk/gtk3/actions.py index c43821adb1..66c3d35909 100644 --- a/desktop/toolkit/gtk/gtk3/actions.py +++ b/desktop/toolkit/gtk/gtk3/actions.py @@ -7,15 +7,16 @@ from pisi.actionsapi import get from pisi.actionsapi import autotools from pisi.actionsapi import pisitools +from pisi.actionsapi import mesontools from pisi.actionsapi import shelltools def setup(): - options = "--prefix=/usr \ - --sysconfdir=/etc \ - --enable-x11-backend \ - --enable-broadway-backend \ - --disable-wayland-backend \ + options = "--prefix=/usr \ + --sysconfdir=/etc \ + -Dcolord=no \ + -Dgtk_doc=true \ + -Dbroadway_backend=true \ " shelltools.export("CFLAGS", get.CFLAGS().replace("-fomit-frame-pointer","")) @@ -24,7 +25,9 @@ def setup(): options += " --libdir=/usr/lib32 \ --bindir=/usr/bin32 \ --sbindir=/usr/sbin32 \ - --enable-colord=no \ + -Dman=false \ + -Dgtk_doc=false \ + -Dcolord=no \ " shelltools.export("CC", "%s -m32" % get.CC()) @@ -36,19 +39,21 @@ def setup(): pisitools.dosed("configure.ac", "cups-config", "cups-config-32bit") - autotools.autoreconf("-fiv") - autotools.configure(options) + #autotools.autoreconf("-fiv") + mesontools.configure(options) - pisitools.dosed("libtool", "( -shared )", r" -Wl,-O1,--as-needed\1") + #pisitools.dosed("libtool", "( -shared )", r" -Wl,-O1,--as-needed\1") def build(): - autotools.make() + mesontools.build() + #autotools.make() def install(): - autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + mesontools.install() + #autotools.rawInstall("DESTDIR=%s" % get.installDIR()) # remove empty dir - pisitools.removeDir("/usr/share/man") + #pisitools.removeDir("/usr/share/man") pisitools.dodoc("AUTHORS", "README*", "HACKING", "ChangeLog*", "NEWS*") if get.buildTYPE() == "emul32": diff --git a/desktop/toolkit/gtk/gtk3/pspec.xml b/desktop/toolkit/gtk/gtk3/pspec.xml index 6b00bb1333..5aeaacec2c 100644 --- a/desktop/toolkit/gtk/gtk3/pspec.xml +++ b/desktop/toolkit/gtk/gtk3/pspec.xml @@ -11,8 +11,9 @@ LGPLv2.1 The GIMP Toolkit version 3 GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete set of widgets, GTK+ is suitable for projects ranging from small one-off projects to complete application suites. - mirrors://gnome/gtk+/3.24/gtk+-3.24.13.tar.xz + mirrors://gnome/gtk+/3.24/gtk+-3.24.18.tar.xz + meson atk-devel cups-devel at-spi2-atk-devel @@ -39,6 +40,8 @@ fribidi-devel harfbuzz-devel + + docbook-xsl @@ -216,6 +219,13 @@ --> + + 2020-04-12 + 3.24.18 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2020-01-10 3.24.13