diff options
| author | Jakub Bogusz | 2020-09-10 16:47:00 (GMT) |
|---|---|---|
| committer | Jakub Bogusz | 2020-09-10 16:47:00 (GMT) |
| commit | 9cf3c7856efe5dabcfba893258a75758c22471f4 (patch) | |
| tree | 656323d37c5686ea6d2f64bdc547f8c353ad77b5 | |
| parent | 4f992c9d09a7783e38983fe5b383ea092ffe0030 (diff) | |
| download | crossmingw32-glib2-9cf3c7856efe5dabcfba893258a75758c22471f4.zip crossmingw32-glib2-9cf3c7856efe5dabcfba893258a75758c22471f4.tar.gz | |
- updated to 2.66.0auto/th/crossmingw32-glib2-2.66.0-1
- updated win32 patch
| -rw-r--r-- | crossmingw32-glib2.spec | 8 | ||||
| -rw-r--r-- | glib2-win32.patch | 22 |
2 files changed, 8 insertions, 22 deletions
diff --git a/crossmingw32-glib2.spec b/crossmingw32-glib2.spec index 5e07c75..03ed2f5 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.64.5 +Version: 2.66.0 Release: 1 License: LGPL v2+ Group: Development/Libraries -Source0: http://ftp.gnome.org/pub/GNOME/sources/glib/2.64/glib-%{version}.tar.xz -# Source0-md5: 9bc5c8da9b31d19c10d91ea4b902c04b +Source0: http://ftp.gnome.org/pub/GNOME/sources/glib/2.66/glib-%{version}.tar.xz +# Source0-md5: 5fbccd13eba61294a3e6ba01bb2f9b83 Patch0: glib2-win32.patch URL: https://www.gtk.org/ BuildRequires: crossmingw32-gcc-c++ @@ -28,7 +28,7 @@ BuildRequires: crossmingw32-pcre >= 8.31 # rand_s() BuildRequires: crossmingw32-runtime >= 1:4.0.3-2 # SetThreadErrorMode and more -BuildRequires: crossmingw32-w32api >= 1:5.0.2-7 +BuildRequires: crossmingw32-w32api >= 1:5.0.2-9 BuildRequires: crossmingw32-zlib # host glib-genmarshall and glib-compile-schemas are needed for cross-compiling BuildRequires: glib2 >= 1:2.62.0 diff --git a/glib2-win32.patch b/glib2-win32.patch index 5031143..de743e8 100644 --- a/glib2-win32.patch +++ b/glib2-win32.patch @@ -1,17 +1,3 @@ ---- 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 --- glib-2.58.0/gio/gwin32appinfo.c.orig 2018-08-30 19:12:08.000000000 +0200 +++ glib-2.58.0/gio/gwin32appinfo.c 2018-09-18 20:29:20.206457756 +0200 @@ -22,6 +22,7 @@ @@ -114,16 +100,16 @@ #include <winsock2.h> #endif ---- glib-2.60.0/gio/gnetworking.h.in.orig 2018-08-30 19:12:08.000000000 +0200 -+++ glib-2.60.0/gio/gnetworking.h.in 2018-09-18 19:33:44.179829189 +0200 -@@ -29,8 +29,11 @@ +--- glib-2.66.0/gio/gnetworking.h.in.orig 2020-09-10 17:57:49.379170952 +0200 ++++ glib-2.66.0/gio/gnetworking.h.in 2020-09-10 18:00:37.804925178 +0200 +@@ -25,8 +25,11 @@ #include <winsock2.h> #include <ws2tcpip.h> #include <windns.h> +#include <winerror.h> #include <mswsock.h> +#ifndef __MINGW32__ - @WSPIAPI_INCLUDE@ + #include <wspiapi.h> +#endif #include <iphlpapi.h> #undef interface |