From 3f037b8bfaeea6619d30b636006112e2dbf2da80 Mon Sep 17 00:00:00 2001
From: idriskalp <idriskalp@gmail.com>
Date: Sun, 19 Jan 2020 19:37:05 +0300
Subject: [PATCH] libsoup 2.68.3

---
 programming/misc/libsoup/actions.py | 61 +++++++++++++++--------------
 programming/misc/libsoup/pspec.xml  | 22 +++++++++--
 2 files changed, 49 insertions(+), 34 deletions(-)

diff --git a/programming/misc/libsoup/actions.py b/programming/misc/libsoup/actions.py
index 951322fa37..161fe4c7c7 100644
--- a/programming/misc/libsoup/actions.py
+++ b/programming/misc/libsoup/actions.py
@@ -8,37 +8,38 @@ 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():
-    options = "\
-                --disable-static \
-                --without-apache-httpd \
-                --without-apache-module-dir \
-                --disable-tls-check \
-              "
-
-    if get.buildTYPE() == "_emul32":
-        options += " --libdir=/usr/lib32 \
-                     --without-krb5-config \
-                     --bindir=/_emul32/bin \
-                     --sbindir=/_emul32/sbin"
-
-
-        shelltools.export("CC", "%s -m32" % get.CC())
-        shelltools.export("CXX", "%s -m32" % get.CXX())
-        shelltools.export("PKG_CONFIG_PATH", "/usr/lib32/pkgconfig")
-
-    autotools.configure(options)
-
-    pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
-
-def build():
-    autotools.make()
-
-def install():
-    autotools.rawInstall("DESTDIR=%s" % get.installDIR())
-
+    options = " -Dbrotli=disabled \
+                -Dintrospection=enabled"
 
     #if get.buildTYPE() == "_emul32":
-        #pisitools.removeDir("/_emul32")
-    pisitools.dodoc("README", "NEWS", "AUTHORS")
+        #options += " --libdir=/usr/lib32 \
+                     #--bindir=/usr/bin32 \
+                     #--sbindir=/usr/sbin32 \
+                     #-Dintrospection=disabled \
+                     #-Dtls_check=false"
+
+
+        #shelltools.export("CC", "%s -m32" % get.CC())
+        #shelltools.export("CXX", "%s -m32" % get.CXX())
+        #shelltools.export("PKG_CONFIG_PATH", "/usr/lib32/pkgconfig")
+
+    mesontools.configure(options)
+    
+    
+
+    #pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
+
+def build():
+    mesontools.build
+
+def install():
+    mesontools.install()
+
+
+    if get.buildTYPE() == "_emul32":
+        pisitools.removeDir("/usr/bin32")
+        pisitools.removeDir("/usr/sbin32")
+    pisitools.dodoc("README", "NEWS", "AUTHORS")
\ No newline at end of file
diff --git a/programming/misc/libsoup/pspec.xml b/programming/misc/libsoup/pspec.xml
index ff877fc283..cb2a1382a4 100644
--- a/programming/misc/libsoup/pspec.xml
+++ b/programming/misc/libsoup/pspec.xml
@@ -12,11 +12,10 @@
         <IsA>library</IsA>
         <Summary>An HTTP library implementation in C</Summary>
         <Description>libsoup is an HTTP client/server library for GNOME.</Description>
-        <Archive sha1sum="8b9c743348b1f9fc044c6abf3431899154e93ad1" type="tarxz">mirrors://gnome/libsoup/2.62/libsoup-2.62.3.tar.xz</Archive>
+        <Archive sha1sum="98cd93e69bf5b1613374aa14f6a6b531d5d8a07a" type="tarxz">mirrors://gnome/libsoup/2.68/libsoup-2.68.3.tar.xz</Archive>
         <BuildDependencies>
             <Dependency>libgcrypt-devel</Dependency>
             <Dependency>gtk-doc</Dependency>
-            <Dependency>mit-kerberos</Dependency>
             <Dependency>python3-devel</Dependency>
             <Dependency>glib2-devel</Dependency>
             <Dependency>libxml2-devel</Dependency>
@@ -24,6 +23,9 @@
             <Dependency>intltool</Dependency>
             <Dependency>gettext-devel</Dependency>
             <Dependency>vala-devel</Dependency>
+            <Dependency>libpsl-devel</Dependency>
+            <Dependency>zlib-devel</Dependency>
+            <Dependency>mit-kerberos</Dependency>
             <Dependency>python-six</Dependency>
             <Dependency>gobject-introspection-devel</Dependency>
          </BuildDependencies>
@@ -35,6 +37,9 @@
              <Dependency>glib2</Dependency>
              <Dependency>libxml2</Dependency>
              <Dependency>sqlite</Dependency>
+             <Dependency>libpsl</Dependency>
+             <Dependency>zlib</Dependency>
+             <Dependency>mit-kerberos</Dependency>
              <Dependency>glib-networking</Dependency>
         </RuntimeDependencies>
         <Files>
@@ -87,7 +92,7 @@
         </Files>
     </Package>
 
-    <Package>
+<!--    <Package>
         <Name>libsoup-32bit</Name>
         <PartOf>emul32</PartOf>
         <Summary>32-bit shared libraries for libsoup</Summary>
@@ -96,19 +101,28 @@
             <Dependency>glib2-32bit</Dependency>
             <Dependency>sqlite-32bit</Dependency>
             <Dependency>libxml2-32bit</Dependency>
+            <Dependency>libpsl-32bit</Dependency>
         </BuildDependencies>
         <RuntimeDependencies>
             <Dependency>glib2-32bit</Dependency>
             <Dependency>sqlite-32bit</Dependency>
             <Dependency>libxml2-32bit</Dependency>
+            <Dependency>libpsl-32bit</Dependency>
             <Dependency release="current">libsoup</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="library">/usr/lib32</Path>
         </Files>
-    </Package>
+    </Package>-->
 
     <History>
+        <Update release="8">
+            <Date>2020-01-19</Date>
+            <Version>2.68.3</Version>
+            <Comment>Version bump</Comment>
+            <Name>İdris Kalp</Name>
+            <Email>idriskalp@gmail.com</Email>
+        </Update>
         <Update release="7">
             <Date>2020-01-19</Date>
             <Version>2.62.3</Version>