summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJakub Bogusz2021-02-07 19:13:41 (GMT)
committerJakub Bogusz2021-02-07 19:13:41 (GMT)
commit61b158f2c145cc853fcf3c0c954531844f884681 (patch)
treeaa598bc36f9294f3bf7feb03ee8d73ee29b871e6
parent98b9ebaf637a30485ef945c7237c22a49082a731 (diff)
downloadcrossmingw32-glib2-61b158f2c145cc853fcf3c0c954531844f884681.zip
crossmingw32-glib2-61b158f2c145cc853fcf3c0c954531844f884681.tar.gz
- updated win32 patch
-rw-r--r--crossmingw32-glib2.spec4
-rw-r--r--glib2-win32.patch8
2 files changed, 7 insertions, 5 deletions
diff --git a/crossmingw32-glib2.spec b/crossmingw32-glib2.spec
index 337e290..08b2b82 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.66.4
+Version: 2.66.6
Release: 1
License: LGPL v2+
Group: Development/Libraries
Source0: https://download.gnome.org/sources/glib/2.66/glib-%{version}.tar.xz
-# Source0-md5: 2df4576b1e4acfd118867eebb41d9956
+# Source0-md5: fd805b652a0732579eaaafa7a17f90a6
Patch0: glib2-win32.patch
URL: https://www.gtk.org/
BuildRequires: crossmingw32-gcc-c++
diff --git a/glib2-win32.patch b/glib2-win32.patch
index de743e8..da40300 100644
--- a/glib2-win32.patch
+++ b/glib2-win32.patch
@@ -8,9 +8,9 @@
#include <string.h>
#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,15 @@
+--- glib-2.66.6/gio/gwin32registrykey.c.orig 2021-02-07 19:11:29.468421063 +0100
++++ glib-2.66.6/gio/gwin32registrykey.c 2021-02-07 19:51:00.202244362 +0100
+@@ -25,12 +25,17 @@
#pragma warning ( disable:4005 )
#endif
#include <windows.h>
@@ -22,6 +22,8 @@
#include <winternl.h>
+#endif
+ #include "gstrfuncsprivate.h"
+
-#ifndef _WDMDDK_
+#if !defined(_WDMDDK_) && !defined(_DDK_WINDDK_H)
typedef enum _KEY_INFORMATION_CLASS {