Merge pull request #8469 from suvari/master

gtk3 with autotools

desktop/toolkit/gtk/gtk3/actions.py

@@ -1,64 +1,58 @@
-#!/usr/bin/python
+#!/usr/bin/python
-# -*- coding: utf-8 -*-
+# -*- coding: utf-8 -*-
-#
+#
-# Licensed under the GNU General Public License, version 3.
+# Licensed under the GNU General Public License, version 3.
-# See the file http://www.gnu.org/licenses/gpl.txt
+# See the file http://www.gnu.org/licenses/gpl.txt
-
+
-from pisi.actionsapi import get
+from pisi.actionsapi import get
-from pisi.actionsapi import autotools
+from pisi.actionsapi import autotools
-from pisi.actionsapi import pisitools
+from pisi.actionsapi import pisitools
-from pisi.actionsapi import mesontools
+from pisi.actionsapi import shelltools
-from pisi.actionsapi import shelltools
+
-
+
-
+def setup():
-def setup():
+    options = "--prefix=/usr             \
-    options = "--prefix=/usr           \
+               --sysconfdir=/etc         \
-               --sysconfdir=/etc       \
+               --enable-x11-backend \
-               -Dcolord=no \
+               --enable-broadway-backend \
-               -Dgtk_doc=true \
+               --disable-wayland-backend \
-               -Dwayland_backend=false \
+              "
-               -Dbroadway_backend=true \
+
-              "
+    shelltools.export("CFLAGS", get.CFLAGS().replace("-fomit-frame-pointer",""))
-
+
-    shelltools.export("CFLAGS", get.CFLAGS().replace("-fomit-frame-pointer",""))
+    if get.buildTYPE() == "emul32":
-
+        options += " --libdir=/usr/lib32 \
-    if get.buildTYPE() == "emul32":
+                     --bindir=/usr/bin32 \
-        options += " --libdir=/usr/lib32 \
+                     --sbindir=/usr/sbin32 \
-                     --bindir=/usr/bin32 \
+                     --enable-colord=no \
-                     --sbindir=/usr/sbin32 \
+                   "
-                     -Dman=false \
+
-                     -Dgtk_doc=false \
+        shelltools.export("CC", "%s -m32" % get.CC())
-                     -Dcolord=no \
+        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("CC", "%s -m32" % get.CC())
+        shelltools.export("LDFLAGS", "%s -m32" % get.LDFLAGS())
-        shelltools.export("CXX", "%s -m32" % get.CC())
+        shelltools.export("PKG_CONFIG_PATH", "/usr/lib32/pkgconfig")
-        shelltools.export("CFLAGS", "%s -m32" % get.CFLAGS().replace("-fomit-frame-pointer",""))
+
-        shelltools.export("CXXFLAGS", "%s -m32" % get.CFLAGS())
+        pisitools.dosed("configure.ac", "cups-config", "cups-config-32bit")
-        shelltools.export("LDFLAGS", "%s -m32" % get.LDFLAGS())
+
-        shelltools.export("PKG_CONFIG_PATH", "/usr/lib32/pkgconfig")
+    autotools.autoreconf("-fiv")
-
+    autotools.configure(options)
-        pisitools.dosed("configure.ac", "cups-config", "cups-config-32bit")
+
-
+    pisitools.dosed("libtool", "( -shared )", r" -Wl,-O1,--as-needed\1")
-    #autotools.autoreconf("-fiv")
+
-    mesontools.configure(options)
+def build():
-
+    autotools.make()
-    #pisitools.dosed("libtool", "( -shared )", r" -Wl,-O1,--as-needed\1")
+
-
+def install():
-def build():
+    autotools.rawInstall("DESTDIR=%s" % get.installDIR())
-    mesontools.build()
+
-    #autotools.make()
+    # remove empty dir
-
+    pisitools.removeDir("/usr/share/man")
-def install():
+    pisitools.dodoc("AUTHORS", "README*", "HACKING", "ChangeLog*", "NEWS*")
-    mesontools.install()
+
-    #autotools.rawInstall("DESTDIR=%s" % get.installDIR())
+    if get.buildTYPE() == "emul32":
-
+        for binaries in ["gtk-query-immodules-3.0"]:
-    # remove empty dir
+            pisitools.domove("/usr/bin/%s" % binaries, "/usr/bin/", "%s-32bit" % binaries)
-    #pisitools.removeDir("/usr/share/man")
+        pisitools.removeDir("/usr/bin32")
-    pisitools.dodoc("AUTHORS", "README*", "HACKING", "ChangeLog*", "NEWS*")
+    pisitools.rename("/usr/bin/gtk-update-icon-cache", "gtk3-update-icon-cache")
-
-    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")

desktop/toolkit/gtk/gtk3/pspec.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" ?>
-<!DOCTYPE PISI SYSTEM "http://www.pisilinux.org/projeler/pisi/pisi-spec.dtd">
+<!DOCTYPE PISI SYSTEM "https://pisilinux.org/projeler/pisi/pisi-spec.dtd">
 <PISI>
     <Source>
         <Name>gtk3</Name>
@@ -11,9 +11,8 @@
         <License>LGPLv2.1</License>
         <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="f718433c09f77227fd3a10cbf31249f2ceea5a22" type="tarxz">mirrors://gnome/gtk+/3.24/gtk+-3.24.18.tar.xz</Archive>
+        <Archive sha1sum="56b853392d4198326dfc6b6104edccb757b8e94b" type="tarxz">mirrors://gnome/gtk+/3.24/gtk+-3.24.20.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>
@@ -40,8 +39,8 @@
             <!--Dependency>librest-devel</Dependency>-->
             <Dependency>fribidi-devel</Dependency>
             <Dependency>harfbuzz-devel</Dependency>
-            <Dependency>libxkbcommon-devel</Dependency>
+            <Dependency>iso-codes-devel</Dependency>
-            <Dependency>docbook-xsl</Dependency>
+            <Dependency>sassc</Dependency>
         </BuildDependencies>
         <Patches>
 <!--             <Patch level="1">071_fix-installation-of-HTML-images.patch</Patch> -->
@@ -82,7 +81,6 @@
             <Dependency>fribidi</Dependency>
             <Dependency>freetype</Dependency>
             <Dependency>harfbuzz</Dependency>
-	    <Dependency>libxkbcommon</Dependency>	
         </RuntimeDependencies>
         <Files>
             <Path fileType="config">/etc</Path>
@@ -220,14 +218,14 @@
     </Package>-->
 
     <History>
-        <Update release="133">
+        <Update release="13">
-            <Date>2020-04-12</Date>
+            <Date>2020-05-01</Date>
-            <Version>3.24.18</Version>
+            <Version>3.24.20</Version>
-            <Comment>Version bump.</Comment>
+            <Comment>Version bump</Comment>
-            <Name>Mustafa Cinasal</Name>
+            <Name>Kamil Atlı</Name>
-            <Email>muscnsl@gmail.com</Email>
+            <Email>suvari@pisilinux.org</Email>
         </Update>
-		<Update release="12">
+        <Update release="12">
             <Date>2020-01-10</Date>
             <Version>3.24.13</Version>
             <Comment>Version bump.</Comment>
@@ -312,4 +310,4 @@
             <Email>osman.erkan@pisilinux.org</Email>
         </Update>
     </History>
-</PISI>
+</PISI>