From 92654975c77e3098db9f2550d6a3d053815f23b1 Mon Sep 17 00:00:00 2001 From: Rmys Date: Thu, 22 Dec 2022 23:07:07 +0300 Subject: [PATCH] gtk3-3.24.36 --- desktop/toolkit/gtk/gtk3/actions.py | 33 +++++++++++++++-------------- desktop/toolkit/gtk/gtk3/pspec.xml | 10 ++++++++- 2 files changed, 26 insertions(+), 17 deletions(-) diff --git a/desktop/toolkit/gtk/gtk3/actions.py b/desktop/toolkit/gtk/gtk3/actions.py index 0d32a77bf3..feea45c4f6 100644 --- a/desktop/toolkit/gtk/gtk3/actions.py +++ b/desktop/toolkit/gtk/gtk3/actions.py @@ -8,16 +8,17 @@ 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(): - shelltools.unlink('testsuite/gtk/gtkresources.c') - options = "--prefix=/usr \ - --sysconfdir=/etc \ - --enable-x11-backend \ - --enable-broadway-backend \ - --enable-wayland-backend \ - " + # shelltools.unlink('testsuite/gtk/gtkresources.c') + options = "-Dbroadway_backend=true \ + -Dxinerama=yes \ + -Dgtk_doc=true \ + -Dcolord=yes \ + -Dcloudproviders=true \ + " shelltools.export("CFLAGS", get.CFLAGS().replace("-fomit-frame-pointer","")) @@ -25,7 +26,7 @@ def setup(): options += " --libdir=/usr/lib32 \ --bindir=/usr/bin32 \ --sbindir=/usr/sbin32 \ - --enable-colord=no \ + -Dcolord=no \ " shelltools.export("CC", "%s -m32" % get.CC()) @@ -35,22 +36,22 @@ def setup(): shelltools.export("LDFLAGS", "%s -m32" % get.LDFLAGS()) shelltools.export("PKG_CONFIG_PATH", "/usr/lib32/pkgconfig") - pisitools.dosed("configure.ac", "cups-config", "cups-config-32bit") + # 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() def install(): - autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + mesontools.install() # remove empty dir - pisitools.removeDir("/usr/share/man") - pisitools.dodoc("AUTHORS", "README*", "HACKING", "ChangeLog*", "NEWS*") + # pisitools.removeDir("/usr/share/man") + pisitools.dodoc("README*", "COPYING*", "NEWS*") if get.buildTYPE() == "emul32": for binaries in ["gtk-query-immodules-3.0"]: diff --git a/desktop/toolkit/gtk/gtk3/pspec.xml b/desktop/toolkit/gtk/gtk3/pspec.xml index 926ac684c9..88ac47dbce 100644 --- a/desktop/toolkit/gtk/gtk3/pspec.xml +++ b/desktop/toolkit/gtk/gtk3/pspec.xml @@ -12,8 +12,9 @@ gtk 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.35.tar.xz + mirrors://gnome/gtk+/3.24/gtk+-3.24.36.tar.xz + meson atk-devel cups-devel at-spi2-atk-devel @@ -237,6 +238,13 @@ --> + + 2022-12-22 + 3.24.36 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com + 2022-11-23 3.24.35