[packages/crossmingw32-glib2] - updated to 2.34.3 - updated win32 patch

qboosh qboosh at pld-linux.org
Tue Nov 27 17:55:35 CET 2012


commit d812f6fcaafd6a978f483f005f2593d5faa70b71
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date:   Tue Nov 27 17:55:55 2012 +0100

    - updated to 2.34.3
    - updated win32 patch

 crossmingw32-glib2.spec |  4 ++--
 glib2-win32.patch       | 11 -----------
 2 files changed, 2 insertions(+), 13 deletions(-)
---
diff --git a/crossmingw32-glib2.spec b/crossmingw32-glib2.spec
index 4a26ea3..d9e4a69 100644
--- 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.2
+Version:	2.34.3
 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:	a8a6be30781952e5ab2651c79da69a90
+# Source0-md5:	a4ca31e258273c3761e3de2edd607661
 Patch0:		%{name}-stacktest.patch
 Patch1:		glib2-cross.patch
 Patch2:		glib2-win32.patch
diff --git a/glib2-win32.patch b/glib2-win32.patch
index 45d4024..a822818 100644
--- a/glib2-win32.patch
+++ b/glib2-win32.patch
@@ -20,14 +20,3 @@
  };
  
  
---- 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)
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/crossmingw32-glib2.git/commitdiff/d812f6fcaafd6a978f483f005f2593d5faa70b71



More information about the pld-cvs-commit mailing list