Merge pull request #11213 from Rmys/master

gtk3-3.24.36

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')
+    # shelltools.unlink('testsuite/gtk/gtkresources.c')
-    options = "--prefix=/usr             \
+    options = "-Dbroadway_backend=true \
-               --sysconfdir=/etc         \
+                     -Dxinerama=yes \
-               --enable-x11-backend \
+                     -Dgtk_doc=true \
-               --enable-broadway-backend \
+                     -Dcolord=yes \
-               --enable-wayland-backend \
+                     -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.autoreconf("-fiv")
-    autotools.configure(options)
+    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.removeDir("/usr/share/man")
-    pisitools.dodoc("AUTHORS", "README*", "HACKING", "ChangeLog*", "NEWS*")
+    pisitools.dodoc("README*", "COPYING*", "NEWS*")
 
     if get.buildTYPE() == "emul32":
         for binaries in ["gtk-query-immodules-3.0"]:

desktop/toolkit/gtk/gtk3/pspec.xml

@@ -12,8 +12,9 @@
         <Icon>gtk</Icon>
         <Summary>The GIMP Toolkit version 3</Summary>
         <Description>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.</Description>
-        <Archive sha1sum="3114e45e248f9902bc836c4f23f46c63f6da5146" type="tarxz">mirrors://gnome/gtk+/3.24/gtk+-3.24.35.tar.xz</Archive>
+        <Archive sha1sum="05b0241ebc51183b6e2491f711e2f7c7f671bc4f" type="tarxz">mirrors://gnome/gtk+/3.24/gtk+-3.24.36.tar.xz</Archive>
         <BuildDependencies>
+            <Dependency>meson</Dependency>
             <Dependency>atk-devel</Dependency>
             <Dependency>cups-devel</Dependency> <!--It was disabled to avoid circle-->
             <Dependency>at-spi2-atk-devel</Dependency>
@@ -237,6 +238,13 @@
     </Package>-->
 
     <History>
+        <Update release="23">
+            <Date>2022-12-22</Date>
+            <Version>3.24.36</Version>
+            <Comment>Version bump.</Comment>
+            <Name>Mustafa Cinasal</Name>
+            <Email>muscnsl@gmail.com</Email>
+        </Update>
         <Update release="22">
             <Date>2022-11-23</Date>
             <Version>3.24.35</Version>