summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Bogusz2015-03-24 15:57:21 (GMT)
committerJakub Bogusz2015-03-24 15:57:21 (GMT)
commitc1cc1c67ca8ec579583fe0490786aaab41a3d387 (patch)
treedd381d3e4a3d8984cabfad07e4575f254814d5e1
parent0763f670e4369c07e574356f8442c728769e0914 (diff)
downloadcrossmingw32-glib2-c1cc1c67ca8ec579583fe0490786aaab41a3d387.zip
crossmingw32-glib2-c1cc1c67ca8ec579583fe0490786aaab41a3d387.tar.gz
- updated to 2.44.0
- enhanced win32 patch for two types missing in mingw32 API
-rw-r--r--crossmingw32-glib2.spec6
-rw-r--r--glib2-win32.patch14
2 files changed, 17 insertions, 3 deletions
diff --git a/crossmingw32-glib2.spec b/crossmingw32-glib2.spec
index 747b39c..83d2c59 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.42.2
+Version: 2.44.0
Release: 1
License: LGPL v2+
Group: Development/Libraries
-Source0: http://ftp.gnome.org/pub/GNOME/sources/glib/2.42/glib-%{version}.tar.xz
-# Source0-md5: ae9ee104932657ed08ef4679556be07f
+Source0: http://ftp.gnome.org/pub/GNOME/sources/glib/2.44/glib-%{version}.tar.xz
+# Source0-md5: 74cf7b4ea200b76e42a4c22c8daf0f93
Patch0: glib2-win32.patch
URL: http://www.gtk.org/
BuildRequires: autoconf >= 2.62
diff --git a/glib2-win32.patch b/glib2-win32.patch
index 5b82cc4..0415746 100644
--- a/glib2-win32.patch
+++ b/glib2-win32.patch
@@ -19,3 +19,17 @@
#include <stdlib.h>
#endif
+--- glib-2.44.0/gio/gwin32networking.h.orig 2015-03-20 18:33:38.000000000 +0100
++++ glib-2.44.0/gio/gwin32networking.h 2015-03-23 21:03:15.924279829 +0100
+@@ -24,8 +24,9 @@
+ /* Check if more ANSI-compliant Winsock2 functions are provided */
+ /* For run-time compatibility with Windows XP, remove when XP support dropped */
+
+-typedef INT (WSAAPI *PFN_InetPton) (INT, PCTSTR, PVOID);
+-typedef PCTSTR (WSAAPI *PFN_InetNtop) (INT, PVOID, PTSTR, size_t);
++typedef ULONG NET_IFINDEX;
++typedef INT (WSAAPI *PFN_InetPton) (INT, LPCTSTR, PVOID);
++typedef LPCTSTR (WSAAPI *PFN_InetNtop) (INT, PVOID, PTSTR, size_t);
+ typedef NET_IFINDEX (WINAPI *PFN_IfNameToIndex) (PCSTR);
+
+ typedef struct _GWin32WinsockFuncs