[mingw-wine-gecko] Fix FTBFS when winpthreads is available (Mozilla bug #893444)

[Erik van Pienbroek]

commit 19e42fd1096a07f8bf5fc9edb93ffdb9e4a28e97
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Thu Sep 12 23:37:09 2013 +0200

    Fix FTBFS when winpthreads is available (Mozilla bug #893444)

 mingw-wine-gecko.spec      |    9 ++++++++-
 wine-gecko-bug893444.patch |   20 ++++++++++++++++++++
 2 files changed, 28 insertions(+), 1 deletions(-)
---
diff --git a/mingw-wine-gecko.spec b/mingw-wine-gecko.spec
index 7773fe2..7cd9082 100644
--- a/mingw-wine-gecko.spec
+++ b/mingw-wine-gecko.spec
@@ -2,7 +2,7 @@
 
 Name:           mingw-wine-gecko
 Version:        2.21
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        Gecko library required for Wine
 
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
@@ -12,6 +12,9 @@ Source0:        http://downloads.sourceforge.net/wine/wine-mozilla-%{version}-sr
 Patch0:         %{name}-mozconfig.patch
 # Build with -static-libgcc rhbz#977039
 Patch1:         %{name}-with-static-gcc.patch
+# Fix FTBFS which occurs when winpthreads is available
+# https://bugzilla.mozilla.org/show_bug.cgi?id=893444
+Patch2:         wine-gecko-bug893444.patch
 BuildArch:      noarch
 
 # 64
@@ -62,6 +65,7 @@ Windows Gecko library required for Wine.
 cd wine-mozilla-%{version}
 %patch0 -p1 -b.mozconfig
 %patch1 -p1 -b.staticgcc
+%patch2 -p1 -b.winpthreads
 
 # fix nsprpub cross compile detection
 sed -i 's,cross_compiling=.*$,cross_compiling=yes,' nsprpub/configure
@@ -105,6 +109,9 @@ install -p -m 0644 wine_gecko-%{version}-x86_64/dist/wine_gecko-%{version}-x86_6
 %{_datadir}/wine/gecko/wine_gecko-%{version}-x86_64.msi
 
 %changelog
+* Thu Sep 12 2013 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.21-4
+- Fix FTBFS when winpthreads is available (Mozilla bug #893444)
+
 * Sun Aug 18 2013 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
 - 2.21-3
 - add BR python
diff --git a/wine-gecko-bug893444.patch b/wine-gecko-bug893444.patch
new file mode 100644
index 0000000..b5f8ded
--- /dev/null
+++ b/wine-gecko-bug893444.patch
@@ -0,0 +1,20 @@
+diff --git a/xpcom/ds/Makefile.in b/xpcom/ds/Makefile.in
+index 995eb70..8f6b00b 100644
+--- a/xpcom/ds/Makefile.in
++++ b/xpcom/ds/Makefile.in
+@@ -41,12 +41,12 @@ CPPSRCS		= \
+ 		nsVariant.cpp \
+ 		$(NULL)
+ 
+-ifdef HAVE_CLOCK_MONOTONIC
++ifeq ($(OS_ARCH),WINNT)
++CPPSRCS += TimeStamp_windows.cpp
++else ifdef HAVE_CLOCK_MONOTONIC
+ CPPSRCS += TimeStamp_posix.cpp
+ else ifeq ($(OS_ARCH),Darwin)
+ CPPSRCS += TimeStamp_darwin.cpp
+-else ifeq ($(OS_ARCH),WINNT)
+-CPPSRCS += TimeStamp_windows.cpp
+ else
+ $(error No TimeStamp implementation on this platform.  Build will not succeed)
+ endif