From ba7709b3859db0f5b2963b356fa4e0e8b55a64b9 Mon Sep 17 00:00:00 2001
From: Jakub Bogusz <qboosh@pld-linux.org>
Date: Sun, 8 Nov 2015 15:04:26 +0100
Subject: [PATCH] - updated to 2.46.2 - updated win32 patch

---
 crossmingw32-glib2.spec |  4 ++--
 glib2-win32.patch       | 15 +++++++++------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/crossmingw32-glib2.spec b/crossmingw32-glib2.spec
index dc0d6ce..b3961b7 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.46.1
+Version:	2.46.2
 Release:	1
 License:	LGPL v2+
 Group:		Development/Libraries
 Source0:	http://ftp.gnome.org/pub/GNOME/sources/glib/2.46/glib-%{version}.tar.xz
-# Source0-md5:	c90e93ceb45100ffc1d40ec5d2ca3248
+# Source0-md5:	7f815d6e46df68e070cb421ed7f1139e
 Patch0:		glib2-win32.patch
 URL:		http://www.gtk.org/
 BuildRequires:	autoconf >= 2.62
diff --git a/glib2-win32.patch b/glib2-win32.patch
index 826c342..5472d5b 100644
--- a/glib2-win32.patch
+++ b/glib2-win32.patch
@@ -72,15 +72,18 @@
  typedef enum _KEY_INFORMATION_CLASS {
    KeyBasicInformation,
    KeyNodeInformation,
---- glib-2.46.1/glib/gwin32.c.orig	2015-10-14 15:04:10.000000000 +0200
-+++ glib-2.46.1/glib/gwin32.c	2015-10-16 18:30:22.408973356 +0200
-@@ -59,6 +59,9 @@
- #ifdef _MSC_VER
+--- 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
+ #else
++#ifdef __MINGW32__
 +#include <ddk/ntddk.h>
++#else
+ #include <winternl.h>
  #endif
++#endif
  
  #include "glib.h"
+ #include "gthreadprivate.h"
-- 
2.44.0