[mingw-wine-gecko] 2.21-3

[Andreas Bierfert]

commit 8ea4c6dd811e79bfcfc02172bb2054cbddfcdb97
Author: Andreas Bierfert <andreas.bierfert at lowlatency.de>
Date:   Sun Aug 18 21:32:13 2013 +0200

    2.21-3
    
    - add BR python
    - build with -static-gcc (rhbz#977039)

 mingw-wine-gecko-with-static-gcc.patch |   24 ++++++++++++++++++++++++
 mingw-wine-gecko.spec                  |   15 +++++++++++----
 2 files changed, 35 insertions(+), 4 deletions(-)
---
diff --git a/mingw-wine-gecko-with-static-gcc.patch b/mingw-wine-gecko-with-static-gcc.patch
new file mode 100644
index 0000000..0ed2068
--- /dev/null
+++ b/mingw-wine-gecko-with-static-gcc.patch
@@ -0,0 +1,24 @@
+diff -up wine-mozilla-2.21/configure.in.orig wine-mozilla-2.21/configure.in
+--- wine-mozilla-2.21/configure.in.orig	2013-08-18 14:14:23.080772391 +0200
++++ wine-mozilla-2.21/configure.in	2013-08-18 14:15:57.872735849 +0200
+@@ -2087,6 +2087,7 @@ ia64*-hpux*)
+         RC='$(WINDRES)'
+         # Use static libgcc and libstdc++
+         LDFLAGS="$LDFLAGS -static-libgcc -static-libstdc++"
++        NSPR_LDFLAGS="$NSPR_LDFLAGS -static-libgcc"
+         # Use temp file for windres (bug 213281)
+         RCFLAGS='-O coff --use-temp-file'
+         # mingw doesn't require kernel32, user32, and advapi32 explicitly
+diff -up wine-mozilla-2.21/security/build/Makefile.in.orig wine-mozilla-2.21/security/build/Makefile.in
+--- wine-mozilla-2.21/security/build/Makefile.in.orig	2013-08-18 14:16:21.202005063 +0200
++++ wine-mozilla-2.21/security/build/Makefile.in	2013-08-18 14:17:19.177705457 +0200
+@@ -135,6 +135,9 @@ DEFAULT_GMAKE_FLAGS += MOZILLA_CLIENT=1
+ DEFAULT_GMAKE_FLAGS += NO_MDUPDATE=1
+ DEFAULT_GMAKE_FLAGS += NSS_ENABLE_ECC=1
+ DEFAULT_GMAKE_FLAGS += NSINSTALL="$(NSINSTALL)"
++ifeq ($(OS_ARCH)_$(GNU_CC),WINNT_1)
++DEFAULT_GMAKE_FLAGS += OS_DLLFLAGS="-static-libgcc"
++endif
+ ifndef MOZ_NATIVE_SQLITE
+ DEFAULT_GMAKE_FLAGS += SQLITE_LIB_NAME=mozsqlite3
+ DEFAULT_GMAKE_FLAGS += SQLITE_INCLUDE_DIR=$(ABS_DIST)/include
diff --git a/mingw-wine-gecko.spec b/mingw-wine-gecko.spec
index 48ce436..7773fe2 100644
--- a/mingw-wine-gecko.spec
+++ b/mingw-wine-gecko.spec
@@ -2,15 +2,16 @@
 
 Name:           mingw-wine-gecko
 Version:        2.21
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Gecko library required for Wine
 
 License:        MPLv1.1 or GPLv2+ or LGPLv2+
 Group:          Development/Libraries
 URL:            http://wiki.winehq.org/Gecko
 Source0:        http://downloads.sourceforge.net/wine/wine-mozilla-%{version}-src.tar.bz2
-Patch0:         mingw-wine-gecko-mozconfig.patch
-
+Patch0:         %{name}-mozconfig.patch
+# Build with -static-libgcc rhbz#977039
+Patch1:         %{name}-with-static-gcc.patch
 BuildArch:      noarch
 
 # 64
@@ -32,6 +33,7 @@ BuildRequires:  mingw32-crt
 
 BuildRequires:  autoconf213
 BuildRequires:  pkgconfig
+BuildRequires:  python
 BuildRequires:  yasm
 BuildRequires:  zip
 BuildRequires:  wine-core wine-wow
@@ -54,12 +56,12 @@ Requires:      wine-common
 %description -n mingw64-wine-gecko
 Windows Gecko library required for Wine.
 
-
 %prep
 %setup -q -c
 
 cd wine-mozilla-%{version}
 %patch0 -p1 -b.mozconfig
+%patch1 -p1 -b.staticgcc
 
 # fix nsprpub cross compile detection
 sed -i 's,cross_compiling=.*$,cross_compiling=yes,' nsprpub/configure
@@ -103,6 +105,11 @@ 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
+* Sun Aug 18 2013 Andreas Bierfert <andreas.bierfert[AT]lowlatency.de>
+- 2.21-3
+- add BR python
+- build with -static-gcc (rhbz#977039)
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 2.21-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild