[packages/crossmingw32-glib2] - updated to 2.58.1 - updated win32 patch, adjusted for w32api 5.0.2+updates
qboosh
qboosh at pld-linux.org
Wed Sep 26 18:28:55 CEST 2018
commit 23e253c6b31bad98d1208fb1d89c66dc6b12281e
Author: Jakub Bogusz <qboosh at pld-linux.org>
Date: Wed Sep 26 18:32:11 2018 +0200
- updated to 2.58.1
- updated win32 patch, adjusted for w32api 5.0.2+updates
crossmingw32-glib2.spec | 10 ++--
glib2-win32.patch | 124 ++++++++++++++++++++++++++++--------------------
2 files changed, 79 insertions(+), 55 deletions(-)
---
diff --git a/crossmingw32-glib2.spec b/crossmingw32-glib2.spec
index bcff763..5634636 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.54.2
+Version: 2.58.1
Release: 1
License: LGPL v2+
Group: Development/Libraries
-Source0: http://ftp.gnome.org/pub/GNOME/sources/glib/2.54/glib-%{version}.tar.xz
-# Source0-md5: 50f83e08f080f99b1e2f0ad2b760fb81
+Source0: http://ftp.gnome.org/pub/GNOME/sources/glib/2.58/glib-%{version}.tar.xz
+# Source0-md5: 4fd2ead128a408c89b9153dfdb99f9a5
Patch0: glib2-win32.patch
URL: http://www.gtk.org/
BuildRequires: autoconf >= 2.62
@@ -29,6 +29,8 @@ BuildRequires: crossmingw32-libiconv
BuildRequires: crossmingw32-pcre >= 8.13
# rand_s()
BuildRequires: crossmingw32-runtime >= 1:4.0.3-2
+# SetThreadErrorMode and more
+BuildRequires: crossmingw32-w32api >= 1:5.0.2-2
BuildRequires: crossmingw32-zlib
# host glib-genmarshall and glib-compile-schemas are needed for cross-compiling
BuildRequires: glib2 >= 1:2.32.0
@@ -176,7 +178,7 @@ mv -f $RPM_BUILD_ROOT%{_prefix}/bin/*.dll $RPM_BUILD_ROOT%{_dlldir}
# use system glib2-devel instead
%{__rm} $RPM_BUILD_ROOT%{_bindir}/{gdbus-codegen,glib-genmarshal,glib-gettextize,glib-mkenums,*.exe}
-%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/{aclocal,bash-completion,gdb,gettext,glib-2.0,gtk-doc,man}
+%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/{aclocal,bash-completion,gdb,gettext,glib-2.0,man}
# runtime
%{__rm} $RPM_BUILD_ROOT%{_libdir}/charset.alias
%{__rm} -r $RPM_BUILD_ROOT%{_datadir}/locale
diff --git a/glib2-win32.patch b/glib2-win32.patch
index 5472d5b..6912d5f 100644
--- a/glib2-win32.patch
+++ b/glib2-win32.patch
@@ -1,13 +1,3 @@
---- glib-2.40.0/glib/grand.c.orig 2014-02-22 16:29:07.000000000 +0100
-+++ glib-2.40.0/glib/grand.c 2014-03-25 18:45:39.693348981 +0100
-@@ -55,6 +55,7 @@
- #endif
-
- #ifdef G_OS_WIN32
-+#include <windows.h>
- #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 @@
@@ -22,68 +12,100 @@
typedef NET_IFINDEX (WINAPI *PFN_IfNameToIndex) (PCSTR);
typedef struct _GWin32WinsockFuncs
---- glib-2.46.0/glib/gstrfuncs.c.orig 2015-09-12 18:05:31.000000000 +0200
-+++ glib-2.46.0/glib/gstrfuncs.c 2015-09-22 17:09:13.736714571 +0200
-@@ -1272,7 +1272,7 @@
- gchar buf[1024];
- GError *error = NULL;
+--- 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 @@
--#if defined(G_OS_WIN32)
-+#if defined(G_OS_WIN32) && !defined(__MINGW32__)
- strerror_s (buf, sizeof (buf), errnum);
- msg = buf;
- #elif defined(HAVE_STRERROR_R)
---- glib-2.46.0/gio/gwin32appinfo.c.orig 2015-09-21 14:37:29.000000000 +0200
-+++ glib-2.46.0/gio/gwin32appinfo.c 2015-09-22 17:34:28.039984356 +0200
-@@ -34,6 +34,11 @@
- #include <gio/gwin32registrykey.h>
+ #include "config.h"
- #include <windows.h>
-+#include <wchar.h>
-+
-+#ifndef LOAD_LIBRARY_AS_IMAGE_RESOURCE
-+#define LOAD_LIBRARY_AS_IMAGE_RESOURCE 0x20
-+#endif
++#include <wctype.h>
+ #include <string.h>
- /* We need to watch 8 places:
- * 0) HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\Shell\\Associations\\UrlAssociations
+ #include "gcontenttype.h"
--- glib-2.46.0/gio/gwin32registrykey.c.orig 2015-09-21 12:44:58.000000000 +0200
+++ glib-2.46.0/gio/gwin32registrykey.c 2015-09-22 18:50:25.926459740 +0200
-@@ -25,10 +25,21 @@
+@@ -25,10 +25,15 @@
#pragma warning ( disable:4005 )
#endif
#include <windows.h>
+#ifdef __MINGW32__
+#include <ddk/ntstatus.h>
+#include <ddk/ntddk.h>
-+#if !defined HKEY_PERFORMANCE_NLSTEXT
-+#define HKEY_PERFORMANCE_NLSTEXT (( HKEY ) (ULONG_PTR)((LONG)0x80000060) )
-+#endif
-+#if ! defined HKEY_PERFORMANCE_TEXT
-+#define HKEY_PERFORMANCE_TEXT (( HKEY ) (ULONG_PTR)((LONG)0x80000050) )
-+#endif
+#else
#include <ntstatus.h>
#include <winternl.h>
+#endif
-#ifndef _WDMDDK_
-+#if !defined(_WDMDDK_) && !defined(__WINDDK_H)
++#if !defined(_WDMDDK_) && !defined(_DDK_WINDDK_H)
typedef enum _KEY_INFORMATION_CLASS {
KeyBasicInformation,
KeyNodeInformation,
---- glib-2.46.2/glib/gwin32.c.orig 2015-11-05 21:49:18.000000000 +0100
-+++ glib-2.46.2/glib/gwin32.c 2015-11-08 14:51:02.152308457 +0100
-@@ -60,8 +60,12 @@
- #pragma comment (lib, "ntoskrnl.lib")
- #endif
- #else
+--- glib-2.58.0/glib/gstdio.c.orig 2018-08-30 19:12:08.000000000 +0200
++++ glib-2.58.0/glib/gstdio.c 2018-09-14 18:41:52.350477519 +0200
+@@ -36,6 +36,9 @@
+ #include <direct.h>
+ #include <io.h>
+ #include <sys/utime.h>
+#ifdef __MINGW32__
-+#include <ddk/ntddk.h>
-+#else
- #include <winternl.h>
- #endif
++#include <winioctl.h>
+#endif
+ #else
+ #include <utime.h>
+ #include <errno.h>
+@@ -54,6 +57,7 @@
+ #endif
+
+ #if defined (G_OS_WIN32)
++# if !defined(__MINGW32__)
+ /* We can't include Windows DDK and Windows SDK simultaneously,
+ * so let's copy this here from MinGW-w64 DDK.
+@@ -90,6 +94,7 @@
+ } GenericReparseBuffer;
+ };
+ } REPARSE_DATA_BUFFER, *PREPARSE_DATA_BUFFER;
++# endif
+
+ static int
+ w32_error_to_errno (DWORD error_code)
+--- glib-2.58.0/glib/giowin32.c.orig 2018-08-30 19:12:08.000000000 +0200
++++ glib-2.58.0/glib/giowin32.c 2018-09-15 10:12:54.423173008 +0200
+@@ -70,6 +70,7 @@
#include "glib.h"
- #include "gthreadprivate.h"
+
+ #include <stdlib.h>
++#include <winerror.h>
+ #include <winsock2.h>
+ #include <windows.h>
+ #include <conio.h>
+--- glib-2.58.0/gio/gioerror.c.orig 2018-08-30 19:12:08.000000000 +0200
++++ glib-2.58.0/gio/gioerror.c 2018-09-17 20:04:51.387461074 +0200
+@@ -23,6 +23,7 @@
+ #include "gioerror.h"
+
+ #ifdef G_OS_WIN32
++#include <winerror.h>
+ #include <winsock2.h>
+ #endif
+
+--- glib-2.58.0/gio/gnetworking.h.in.orig 2018-08-30 19:12:08.000000000 +0200
++++ glib-2.58.0/gio/gnetworking.h.in 2018-09-18 19:33:44.179829189 +0200
+@@ -29,6 +29,7 @@
+ #include <winsock2.h>
+ #include <ws2tcpip.h>
+ #include <windns.h>
++#include <winerror.h>
+ #include <mswsock.h>
+ @WSPIAPI_INCLUDE@
+ #include <iphlpapi.h>
+--- glib-2.58.0/gio/gwin32networkmonitor.c.orig 2018-08-30 19:12:08.000000000 +0200
++++ glib-2.58.0/gio/gwin32networkmonitor.c 2018-09-26 17:22:59.000209749 +0200
+@@ -28,6 +28,7 @@
+
+ #include <winsock2.h>
+ #include <ws2tcpip.h>
++#include <netioapi.h>
+ #include <iphlpapi.h>
+ #include <stdio.h>
+
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/crossmingw32-glib2.git/commitdiff/23e253c6b31bad98d1208fb1d89c66dc6b12281e
More information about the pld-cvs-commit
mailing list