[mingw-webkitgtk: 11/36] Replaced TimerQueueTimer related reverts with a single upstreamable patch

[Kalev Lember]

commit 315099765cf1e06584934a8ea857ea21aee8451a
Author: Kalev Lember <kalev at smartlink.ee>
Date:   Thu Apr 28 18:50:50 2011 +0300

    Replaced TimerQueueTimer related reverts with a single upstreamable patch

 changeset_r75819.diff       |  201 -------------------------------------------
 changeset_r75825.diff       |   17 ----
 changeset_r75827.diff       |   18 ----
 changeset_r75830.diff       |   11 ---
 changeset_r75839.diff       |   11 ---
 javascriptcore-winver.patch |   54 ++++++++++++
 mingw32-webkitgtk.spec      |   22 ++---
 7 files changed, 62 insertions(+), 272 deletions(-)
---
diff --git a/javascriptcore-winver.patch b/javascriptcore-winver.patch
new file mode 100644
index 0000000..162997d
--- /dev/null
+++ b/javascriptcore-winver.patch
@@ -0,0 +1,54 @@
+2011-04-28  Kalev Lember  <kalev at smartlink.ee>
+
+        Reviewed by NOBODY (OOPS!).
+
+        Add missing _WIN32_WINNT and WINVER definitions
+        https://bugs.webkit.org/show_bug.cgi?id=59702
+
+        Moved _WIN32_WINNT and WINVER definitions to config.h so that they are
+        available for all source files.
+
+        In particular, wtf/FastMalloc.cpp uses CreateTimerQueueTimer and
+        DeleteTimerQueueTimer which are both guarded by
+        #if (_WIN32_WINNT >= 0x0500)
+        in MinGW headers.
+
+        * config.h:
+        * wtf/Assertions.cpp:
+
+diff --git a/Source/JavaScriptCore/config.h b/Source/JavaScriptCore/config.h
+index 394bba5..67aaea4 100644
+--- a/Source/JavaScriptCore/config.h
++++ b/Source/JavaScriptCore/config.h
+@@ -66,6 +66,14 @@
+ 
+ #if OS(WINDOWS)
+ 
++#ifndef _WIN32_WINNT
++#define _WIN32_WINNT 0x0500
++#endif
++
++#ifndef WINVER
++#define WINVER 0x0500
++#endif
++
+ // If we don't define these, they get defined in windef.h. 
+ // We want to use std::min and std::max
+ #define max max
+diff --git a/Source/JavaScriptCore/wtf/Assertions.cpp b/Source/JavaScriptCore/wtf/Assertions.cpp
+index 930368c..c927585 100644
+--- a/Source/JavaScriptCore/wtf/Assertions.cpp
++++ b/Source/JavaScriptCore/wtf/Assertions.cpp
+@@ -42,12 +42,6 @@
+ #endif
+ 
+ #if COMPILER(MSVC) && !OS(WINCE) && !PLATFORM(BREWMP)
+-#ifndef WINVER
+-#define WINVER 0x0500
+-#endif
+-#ifndef _WIN32_WINNT
+-#define _WIN32_WINNT 0x0500
+-#endif
+ #include <crtdbg.h>
+ #endif
+ 
diff --git a/mingw32-webkitgtk.spec b/mingw32-webkitgtk.spec
index f20296d..7b48ed0 100644
--- a/mingw32-webkitgtk.spec
+++ b/mingw32-webkitgtk.spec
@@ -48,7 +48,7 @@
 
 Name:		mingw32-webkitgtk
 Version:	1.4.0
-Release:	1%{?dist}
+Release:	2%{?dist}
 Summary:	MinGW Windows web content engine library
 
 Group:		Development/Libraries
@@ -84,14 +84,9 @@ Patch5:		webkit-libpng15-compile-fix.patch
 # Fix build break when font backend is Pango
 Patch6:		changeset_r82701.diff
 
-# Revert some commits as the CreateTimerQueueTimer function isn't
-# implemented in the mingw.org stack (but is in the mingw-w64 stack)
-# These can be dropped as soon as were using the mingw-w64 toolchain
-Patch7:		changeset_r75839.diff
-Patch8:		changeset_r75830.diff
-Patch9:		changeset_r75827.diff
-Patch10:	changeset_r75825.diff
-Patch11:	changeset_r75819.diff
+# Add missing _WIN32_WINNT and WINVER definitions
+# https://bugs.webkit.org/show_bug.cgi?id=59702
+Patch7:		javascriptcore-winver.patch
 
 BuildArch:	noarch
 
@@ -152,11 +147,7 @@ Static version of the MinGW Windows WebKitGTK+ library.
 %patch4 -p0 -b .libpng15
 #%patch5 -p0 -b .libpng15_2
 %patch6 -p0 -b .pango
-%patch7 -p0 -b .createtimerqueuetimer -R
-%patch8 -p0 -b .createtimerqueuetimer -R
-%patch9 -p0 -b .createtimerqueuetimer -R
-%patch10 -p0 -b .createtimerqueuetimer -R
-%patch11 -p0 -b .createtimerqueuetimer -R
+%patch7 -p1 -b .winver
 
 
 %build
@@ -220,6 +211,9 @@ install -m 755 Programs/.libs/GtkLauncher.exe %{buildroot}%{_mingw32_bindir}
 
 
 %changelog
+* Thu Apr 28 2011 Kalev Lember <kalev at smartlink.ee> - 1.4.0-2
+- Replaced TimerQueueTimer related reverts with a single upstreamable patch
+
 * Wed Apr 27 2011 Erik van Pienbroek <epienbro at fedoraproject.org> - 1.4.0-1
 - Update to 1.4.0
 - Drop upstreamed patches