From 452f7ce5da0cee434965bdf98672cfb716788ae0 Mon Sep 17 00:00:00 2001
From: idriskalp <idriskalp@gmail.com>
Date: Sun, 22 Dec 2019 19:40:08 +0300
Subject: [PATCH] glib2 2.62.4

---
 system/base/glib2/actions.py          | 20 ++++++++++++--------
 system/base/glib2/files/multilib.diff | 12 ++++++++++++
 system/base/glib2/pspec.xml           | 20 ++++++++++++++++++--
 3 files changed, 42 insertions(+), 10 deletions(-)
 create mode 100644 system/base/glib2/files/multilib.diff

diff --git a/system/base/glib2/actions.py b/system/base/glib2/actions.py
index 1f966dc4..68b719c2 100644
--- a/system/base/glib2/actions.py
+++ b/system/base/glib2/actions.py
@@ -9,6 +9,7 @@ from pisi.actionsapi import pisitools
 from pisi.actionsapi import get
 from pisi.actionsapi import shelltools
 
+builddir = "build32" if get.buildTYPE() == 'emul32' else "build"
 
 def setup():
     options = "-Dselinux=disabled \
@@ -17,13 +18,15 @@ def setup():
 
 
     if get.buildTYPE() == "_emul32":
-        options += " --libdir=/usr/lib32 \
+        options += " --libdir=/_emul32/lib32 \
                      --bindir=/_emul32/bin \
                      --sbindir=/_emul32/sbin \
-                     --prefix=/usr"
+                     --prefix=/_emul32 \
+                     -Dlibmount=false"
         shelltools.export("CC", "%s -m32" % get.CC())
         shelltools.export("CXX", "%s -m32" % get.CXX())
         shelltools.export("PKG_CONFIG_PATH", "/usr/lib32/pkgconfig")
+        shelltools.system("patch -p1 < multilib.diff")
     else :
         options += " --libdir=/usr/lib \
                      --bindir=/usr/bin \
@@ -32,28 +35,29 @@ def setup():
                      --prefix=/usr"
 
     #autotools.autoreconf("-vif")
-    shelltools.makedirs("build")
-    shelltools.cd("build")
+    shelltools.makedirs("%s" %builddir)
+    shelltools.cd("%s" %builddir)
     shelltools.system("meson .. %s" % options)
 
     #pisitools.dosed("libtool", " -shared ", " -Wl,-O1,--as-needed -shared ")
 
 def build():
     #autotools.make("-j1")
-    shelltools.cd("build")
+    shelltools.cd("%s" %builddir)
     shelltools.system("ninja")
 
 def install():
-    shelltools.cd("build")
+    shelltools.cd("%s" %builddir)
     #autotools.rawInstall("DESTDIR=%s" % get.installDIR())
-    shelltools.system("ninja install")
+    shelltools.system("DESTDIR=%s ninja install" % get.installDIR())
 
     if get.buildTYPE() == "_emul32":
         pisitools.domove("/_emul32/bin/gio-querymodules", "/usr/bin/32/")
+        pisitools.domove("/_emul32/lib32", "/usr")
         pisitools.removeDir("/_emul32")
 
-    #pisitools.removeDir("/usr/share/gdb")
     
     if get.buildTYPE() != "_emul32":
+        pisitools.removeDir("/usr/share/gdb")
         shelltools.cd("..")
         pisitools.dodoc("AUTHORS", "COPYING", "README*")
diff --git a/system/base/glib2/files/multilib.diff b/system/base/glib2/files/multilib.diff
new file mode 100644
index 00000000..c3b4ed30
--- /dev/null
+++ b/system/base/glib2/files/multilib.diff
@@ -0,0 +1,12 @@
+diff --git i/gio/tests/meson.build w/gio/tests/meson.build
+index 65f43e267..3bd66bf60 100644
+--- i/gio/tests/meson.build
++++ w/gio/tests/meson.build
+@@ -598,6 +598,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
+                  '-r',
+                  '-b','binary',
+                  '@INPUT@',
++                 '--oformat', 'elf32-i386',
+                  '-o','@OUTPUT@'])
+ 
+     # Rename symbol to match the one in the C file
diff --git a/system/base/glib2/pspec.xml b/system/base/glib2/pspec.xml
index 464ac823..3533cb5b 100644
--- a/system/base/glib2/pspec.xml
+++ b/system/base/glib2/pspec.xml
@@ -17,6 +17,7 @@
             <Dependency versionFrom="8.43">libpcre-devel</Dependency>
             <Dependency>zlib-devel</Dependency>
             <Dependency>libffi-devel</Dependency>
+			<Dependency>libutil-linux-devel</Dependency>
 			<Dependency>docbook-xsl</Dependency>
 			<Dependency>meson</Dependency>
 			<Dependency>ninja</Dependency>
@@ -24,6 +25,9 @@
         <Patches>
             <Patch level="1">noisy-glib-compile-schemas.diff</Patch>
         </Patches>
+		<AdditionalFiles>
+            <AdditionalFile target="multilib.diff" permission="0644">multilib.diff</AdditionalFile>
+        </AdditionalFiles>
     </Source>
 
     <Package>
@@ -32,7 +36,9 @@
             <Dependency>libpcre</Dependency>
             <Dependency>zlib</Dependency>
             <!--<Dependency>elfutils</Dependency>-->
-            <Dependency>libffi</Dependency>
+            <Dependency>libffi</Dependency>			
+            <Dependency>elfutils</Dependency>
+            <Dependency>libutil-linux</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="executable">/etc/profile.d</Path>
@@ -62,7 +68,10 @@
         <Summary>Development files for glib2</Summary>
         <RuntimeDependencies>
             <Dependency release="current">glib2</Dependency>
-            <Dependency>libpcre-devel</Dependency>
+            <Dependency>libpcre-devel</Dependency>			
+            <Dependency>zlib-devel</Dependency>
+            <Dependency>libffi-devel</Dependency>
+			<Dependency>libutil-linux-devel</Dependency>
         </RuntimeDependencies>
         <Files>
             <Path fileType="executable">/usr/bin/gtester</Path>
@@ -128,6 +137,13 @@
     </Package>
 
     <History>
+		<Update release="8">
+            <Date>2019-12-22</Date>
+            <Version>2.62.4</Version>
+            <Comment>Version bump</Comment>
+            <Name>Idris Kalp</Name>
+            <Email>idriskalp@gmail.com</Email>
+        </Update>
         <Update release="7">
             <Date>2019-04-05</Date>
             <Version>2.54.3</Version>