diff --git a/desktop/toolkit/gtk/gtk3/actions.py b/desktop/toolkit/gtk/gtk3/actions.py index 3109a47617..bff8e0d4e7 100644 --- a/desktop/toolkit/gtk/gtk3/actions.py +++ b/desktop/toolkit/gtk/gtk3/actions.py @@ -1,64 +1,58 @@ -#!/usr/bin/python -# -*- coding: utf-8 -*- -# -# 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 mesontools -from pisi.actionsapi import shelltools - - -def setup(): - options = "--prefix=/usr \ - --sysconfdir=/etc \ - -Dcolord=no \ - -Dgtk_doc=true \ - -Dwayland_backend=false \ - -Dbroadway_backend=true \ - " - - shelltools.export("CFLAGS", get.CFLAGS().replace("-fomit-frame-pointer","")) - - if get.buildTYPE() == "emul32": - options += " --libdir=/usr/lib32 \ - --bindir=/usr/bin32 \ - --sbindir=/usr/sbin32 \ - -Dman=false \ - -Dgtk_doc=false \ - -Dcolord=no \ - " - - shelltools.export("CC", "%s -m32" % get.CC()) - shelltools.export("CXX", "%s -m32" % get.CC()) - shelltools.export("CFLAGS", "%s -m32" % get.CFLAGS().replace("-fomit-frame-pointer","")) - shelltools.export("CXXFLAGS", "%s -m32" % get.CFLAGS()) - shelltools.export("LDFLAGS", "%s -m32" % get.LDFLAGS()) - shelltools.export("PKG_CONFIG_PATH", "/usr/lib32/pkgconfig") - - pisitools.dosed("configure.ac", "cups-config", "cups-config-32bit") - - #autotools.autoreconf("-fiv") - mesontools.configure(options) - - #pisitools.dosed("libtool", "( -shared )", r" -Wl,-O1,--as-needed\1") - -def build(): - mesontools.build() - #autotools.make() - -def install(): - mesontools.install() - #autotools.rawInstall("DESTDIR=%s" % get.installDIR()) - - # remove empty dir - #pisitools.removeDir("/usr/share/man") - pisitools.dodoc("AUTHORS", "README*", "HACKING", "ChangeLog*", "NEWS*") - - if get.buildTYPE() == "emul32": - for binaries in ["gtk-query-immodules-3.0"]: - pisitools.domove("/usr/bin/%s" % binaries, "/usr/bin/", "%s-32bit" % binaries) - pisitools.removeDir("/usr/bin32") - pisitools.rename("/usr/bin/gtk-update-icon-cache", "gtk3-update-icon-cache") +#!/usr/bin/python +# -*- coding: utf-8 -*- +# +# 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 + + +def setup(): + options = "--prefix=/usr \ + --sysconfdir=/etc \ + --enable-x11-backend \ + --enable-broadway-backend \ + --disable-wayland-backend \ + " + + shelltools.export("CFLAGS", get.CFLAGS().replace("-fomit-frame-pointer","")) + + if get.buildTYPE() == "emul32": + options += " --libdir=/usr/lib32 \ + --bindir=/usr/bin32 \ + --sbindir=/usr/sbin32 \ + --enable-colord=no \ + " + + shelltools.export("CC", "%s -m32" % get.CC()) + shelltools.export("CXX", "%s -m32" % get.CC()) + shelltools.export("CFLAGS", "%s -m32" % get.CFLAGS().replace("-fomit-frame-pointer","")) + shelltools.export("CXXFLAGS", "%s -m32" % get.CFLAGS()) + shelltools.export("LDFLAGS", "%s -m32" % get.LDFLAGS()) + shelltools.export("PKG_CONFIG_PATH", "/usr/lib32/pkgconfig") + + pisitools.dosed("configure.ac", "cups-config", "cups-config-32bit") + + autotools.autoreconf("-fiv") + autotools.configure(options) + + pisitools.dosed("libtool", "( -shared )", r" -Wl,-O1,--as-needed\1") + +def build(): + autotools.make() + +def install(): + autotools.rawInstall("DESTDIR=%s" % get.installDIR()) + + # remove empty dir + pisitools.removeDir("/usr/share/man") + pisitools.dodoc("AUTHORS", "README*", "HACKING", "ChangeLog*", "NEWS*") + + if get.buildTYPE() == "emul32": + for binaries in ["gtk-query-immodules-3.0"]: + pisitools.domove("/usr/bin/%s" % binaries, "/usr/bin/", "%s-32bit" % binaries) + pisitools.removeDir("/usr/bin32") + pisitools.rename("/usr/bin/gtk-update-icon-cache", "gtk3-update-icon-cache") diff --git a/desktop/toolkit/gtk/gtk3/pspec.xml b/desktop/toolkit/gtk/gtk3/pspec.xml index 8fb5b238ca..18a7ca2534 100644 --- a/desktop/toolkit/gtk/gtk3/pspec.xml +++ b/desktop/toolkit/gtk/gtk3/pspec.xml @@ -1,5 +1,5 @@ - + gtk3 @@ -11,9 +11,8 @@ 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.18.tar.xz + mirrors://gnome/gtk+/3.24/gtk+-3.24.20.tar.xz - meson atk-devel cups-devel at-spi2-atk-devel @@ -40,8 +39,8 @@ fribidi-devel harfbuzz-devel - libxkbcommon-devel - docbook-xsl + iso-codes-devel + sassc @@ -82,7 +81,6 @@ fribidi freetype harfbuzz - libxkbcommon /etc @@ -220,14 +218,14 @@ --> - - 2020-04-12 - 3.24.18 - Version bump. - Mustafa Cinasal - muscnsl@gmail.com + + 2020-05-01 + 3.24.20 + Version bump + Kamil Atlı + suvari@pisilinux.org - + 2020-01-10 3.24.13 Version bump. @@ -312,4 +310,4 @@ osman.erkan@pisilinux.org - + \ No newline at end of file