Merge pull request #7379 from IdrisKalp/master

gdk-pixbuf 2.40.0

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")

desktop/toolkit/gtk/gdk-pixbuf/pspec.xml

@@ -12,8 +12,9 @@
         <IsA>library</IsA>
         <Summary>GDK pixbuf library</Summary>
         <Description>gdk-pixbuf is a library that provides image loading and scaling support for gtk+ applications</Description>
-        <Archive sha1sum="2a32bf71fd7c47b22abd9843bc3116e771772fbe" type="tarxz">mirrors://gnome/gdk-pixbuf/2.36/gdk-pixbuf-2.36.12.tar.xz</Archive>
+        <Archive sha1sum="9396bd89c4647d8db2d02ef93c20c17dbce359d8" type="tarxz">mirrors://gnome/gdk-pixbuf/2.40/gdk-pixbuf-2.40.0.tar.xz</Archive>
         <BuildDependencies>
+            <Dependency>meson</Dependency>
             <Dependency>gtk-doc</Dependency>
             <Dependency>glib2-devel</Dependency>
             <Dependency>libX11-devel</Dependency>
@@ -110,6 +111,13 @@
     </Package>
 
     <History>
+		<Update release="10">
+            <Date>2020-01-08</Date>
+            <Version>2.40.0</Version>
+            <Comment>Version bump</Comment>
+            <Name>Pisi Linux Community</Name>
+            <Email>admin@pisilinux.org</Email>
+        </Update>
         <Update release="9">
             <Date>2019-04-17</Date>
             <Version>2.36.12</Version>