diff --git a/desktop/toolkit/gtk/gdk-pixbuf/actions.py b/desktop/toolkit/gtk/gdk-pixbuf/actions.py
index 314a04ad6a..01d4b2bf63 100644
--- a/desktop/toolkit/gtk/gdk-pixbuf/actions.py
+++ b/desktop/toolkit/gtk/gdk-pixbuf/actions.py
@@ -7,35 +7,50 @@
from pisi.actionsapi import get
from pisi.actionsapi import autotools
from pisi.actionsapi import pisitools
+from pisi.actionsapi import mesontools
def setup():
- options = "\
- --disable-static \
- --disable-silent-rules \
- --with-libjasper \
- --with-x11 \
- --with-included-loaders=png \
- "
+ #options = "\
+ #--disable-static \
+ #--disable-silent-rules \
+ #--with-libjasper \
+ #--with-x11 \
+ #--with-included-loaders=png \
+ #"
- options += "\
- --bindir=/_emul32/bin \
- --disable-introspection \
- " if get.buildTYPE() == "emul32" else \
- "\
- --enable-introspection \
- "
- autotools.configure(options)
+ #options += "\
+ #--bindir=/_emul32/bin \
+ #--disable-introspection \
+ #" if get.buildTYPE() == "emul32" else \
+ #"\
+ #--enable-introspection \
+ #"
+ #autotools.configure(options)
- pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
+ #pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
+
+ options = "-Dgtk_doc=true \
+ -Dx11=true \
+ -Dbuiltin_loaders=png \
+ -Djasper=true \
+ "
+
+ if get.buildTYPE()=="emul32" :
+ options += "-Dintrospection=false \
+ --bindir=/usr/bin32"
+ else:
+ options += "-Dintrospection=true"
+
+ mesontools.configure(options)
def build():
- autotools.make()
+ mesontools.build()
def install():
- autotools.rawInstall("DESTDIR=%s" % get.installDIR())
+ mesontools.install()
if get.buildTYPE() == "emul32":
- pisitools.domove("/_emul32/bin/gdk-pixbuf-query-loaders", "/usr/bin", "gdk-pixbuf-query-loaders-32")
- pisitools.removeDir("/_emul32")
+ pisitools.domove("/usr/bin32/gdk-pixbuf-query-loaders", "/usr/bin", "gdk-pixbuf-query-loaders-32")
+ pisitools.removeDir("/usr/bin32")
return
pisitools.dosym("/usr/bin/gdk-pixbuf-query-loaders", "/usr/bin/gdk-pixbuf-query-loaders-64")
- pisitools.dodoc("AUTHORS", "COPYING", "NEWS", "README")
+ pisitools.dodoc("COPYING", "README.md")
diff --git a/desktop/toolkit/gtk/gdk-pixbuf/pspec.xml b/desktop/toolkit/gtk/gdk-pixbuf/pspec.xml
index 9e92b81a39..94bb009b5c 100644
--- a/desktop/toolkit/gtk/gdk-pixbuf/pspec.xml
+++ b/desktop/toolkit/gtk/gdk-pixbuf/pspec.xml
@@ -12,8 +12,9 @@
library
GDK pixbuf library
gdk-pixbuf is a library that provides image loading and scaling support for gtk+ applications
- mirrors://gnome/gdk-pixbuf/2.36/gdk-pixbuf-2.36.12.tar.xz
+ mirrors://gnome/gdk-pixbuf/2.40/gdk-pixbuf-2.40.0.tar.xz
+ meson
gtk-doc
glib2-devel
libX11-devel
@@ -110,6 +111,13 @@
+
+ 2020-01-08
+ 2.40.0
+ Version bump
+ Pisi Linux Community
+ admin@pisilinux.org
+
2019-04-17
2.36.12