- updated to 2.34.2

- added one more fix to win32 patch

diff --git a/crossmingw32-glib2.spec b/crossmingw32-glib2.spec
index b0e092e068c43b2f2d5141ececb7f7c7d9db19d8..4a26ea3b8ca27f2de3e0ca0763f3f2ecc70306b3 100644 (file)
--- a/crossmingw32-glib2.spec
+++ b/crossmingw32-glib2.spec
@@ -12,12 +12,12 @@ Summary(tr.UTF-8):  Yararlı ufak yordamlar kitaplığı
 Summary(zh_CN.UTF-8):  实用工具函数库
 %define                realname   glib
 Name:          crossmingw32-glib2
-Version:       2.34.1
+Version:       2.34.2
 Release:       1
 License:       LGPL v2+
 Group:         Development/Libraries
 Source0:       http://ftp.gnome.org/pub/GNOME/sources/glib/2.34/glib-%{version}.tar.xz
-# Source0-md5: ee779493b083be9348a841e0a51f1b27
+# Source0-md5: a8a6be30781952e5ab2651c79da69a90
 Patch0:                %{name}-stacktest.patch
 Patch1:                glib2-cross.patch
 Patch2:                glib2-win32.patch

diff --git a/glib2-win32.patch b/glib2-win32.patch
index a82281854169b50f857dbc8e83fe6aa5bd349dc0..45d4024e570a29e5e84e133be1ef7298d9982ec7 100644 (file)
--- a/glib2-win32.patch
+++ b/glib2-win32.patch
@@ -20,3 +20,14 @@
  };
  
  
+--- glib-2.34.2/gio/gsocket.c.orig     2012-11-10 04:27:29.000000000 +0100
++++ glib-2.34.2/gio/gsocket.c  2012-11-12 21:22:20.558859131 +0100
+@@ -2391,7 +2391,7 @@
+   g_return_val_if_fail (G_IS_SOCKET (socket), -1);
+ 
+ #if defined(G_OS_WIN32)
+-  if (WSAIoctl (socket->priv->fd, FIONREAD, NULL, 0, &avail, sizeof (avail), 0, 0) == SOCKET_ERROR)
++  if (WSAIoctl (socket->priv->fd, FIONREAD, NULL, 0, &avail, sizeof (avail), 0, NULL, NULL) == SOCKET_ERROR)
+     return -1;
+ #elif defined(SO_NREAD)
+   if (getsockopt (socket->priv->fd, SOL_SOCKET, SO_NREAD, &avail, &avail_len) < 0)