[mingw-crt/f19] Prevent dependency on libgcc_s_sjlj-1.dll when it isn't needed (upstream commit r6044)

[Erik van Pienbroek]

commit 4505895622720d7eef1838cefb3a4bc65ce08ce2
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Sat Aug 10 17:05:24 2013 +0200

    Prevent dependency on libgcc_s_sjlj-1.dll when it isn't needed (upstream commit r6044)

 mingw-crt.spec                                     |   11 +++++-
 ...-w64-r6044-prevent-dep-on-libgcc-sljl-dll.patch |   36 ++++++++++++++++++++
 2 files changed, 46 insertions(+), 1 deletions(-)
---
diff --git a/mingw-crt.spec b/mingw-crt.spec
index 5dfc998..611b207 100644
--- a/mingw-crt.spec
+++ b/mingw-crt.spec
@@ -6,7 +6,7 @@
 
 Name:           mingw-crt
 Version:        2.0.999
-Release:        0.30.%{branch}.r%{snapshot_rev}.%{snapshot_date}%{?dist}
+Release:        0.31.%{branch}.r%{snapshot_rev}.%{snapshot_date}%{?dist}
 Summary:        MinGW Windows cross-compiler runtime
 
 License:        Public Domain and ZPLv2.1
@@ -23,6 +23,10 @@ Source0:        mingw-w64-code-%{snapshot_rev}-%{branch}.zip
 Source0:        http://downloads.sourceforge.net/mingw-w64/mingw-w64-v%{version}.tar.gz
 %endif
 
+# Make sure that libraries compiled for the i686 target don't always depend on libgcc_s_sjlj-1.dll
+# Upstream commit r6044
+Patch0:         mingw-w64-r6044-prevent-dep-on-libgcc-sljl-dll.patch
+
 BuildArch:      noarch
 
 BuildRequires:  mingw32-filesystem >= 95
@@ -70,6 +74,8 @@ unzip %{S:0}
 %setup -q -n mingw-w64-v%{version}
 %endif
 
+%patch0 -p1 -b .libgcc
+
 
 %build
 pushd mingw-w64-crt
@@ -99,6 +105,9 @@ rm -rf $RPM_BUILD_ROOT%{mingw64_includedir}/*.c
 
 
 %changelog
+* Sat Aug 10 2013 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.0.999-0.31.trunk.r5969.20130721
+- Prevent dependency on libgcc_s_sjlj-1.dll when it isn't needed (upstream commit r6044)
+
 * Sun Jul 21 2013 Erik van Pienbroek <epienbro at fedoraproject.org> - 2.0.999-0.30.trunk.r5969.20130721
 - Update to r5969 (20130721 snapshot)
 - Fixes strnlen issue on Windows XP
diff --git a/mingw-w64-r6044-prevent-dep-on-libgcc-sljl-dll.patch b/mingw-w64-r6044-prevent-dep-on-libgcc-sljl-dll.patch
new file mode 100644
index 0000000..ce54f2d
--- /dev/null
+++ b/mingw-w64-r6044-prevent-dep-on-libgcc-sljl-dll.patch
@@ -0,0 +1,36 @@
+commit 443b61e7fdf293f5054d31fdc326e9e9bcb47129
+Author: l_r_nightmare <l_r_nightmare at 4407c894-4637-0410-b4f5-ada5f102cad1>
+Date:   Thu Aug 8 08:07:26 2013 +0000
+
+    Don't use libmingwex printfs in libmingw32
+    
+    git-svn-id: svn://svn.code.sf.net/p/mingw-w64/code/trunk@6044 4407c894-4637-0410-b4f5-ada5f102cad1
+
+diff --git a/mingw-w64-crt/crt/merr.c b/mingw-w64-crt/crt/merr.c
+index 0d111ac..f3dff58 100644
+--- a/mingw-w64-crt/crt/merr.c
++++ b/mingw-w64-crt/crt/merr.c
+@@ -69,7 +69,7 @@ _matherr (struct _exception *pexcept)
+ 	break;
+     }
+ 
+-  __mingw_fprintf (stderr, "_matherr(): %s in %s(%g, %g)  (retval=%g)\n", 
++  fprintf (stderr, "_matherr(): %s in %s(%g, %g)  (retval=%g)\n", 
+ 	  type, pexcept->name, pexcept->arg1, pexcept->arg2, pexcept->retval);
+   return 0;
+ }
+diff --git a/mingw-w64-crt/crt/pseudo-reloc.c b/mingw-w64-crt/crt/pseudo-reloc.c
+index baf2003..542f951 100644
+--- a/mingw-w64-crt/crt/pseudo-reloc.c
++++ b/mingw-w64-crt/crt/pseudo-reloc.c
+@@ -146,8 +146,8 @@ __report_error (const char *msg, ...)
+   va_list argp;
+   va_start (argp, msg);
+ # ifdef __MINGW64_VERSION_MAJOR
+-  __mingw_fprintf (stderr, "Mingw-w64 runtime failure:\n");
+-  __mingw_vfprintf (stderr, msg, argp);
++  fprintf (stderr, "Mingw-w64 runtime failure:\n");
++  vfprintf (stderr, msg, argp);
+ # else
+   fprintf (stderr, "Mingw runtime failure:\n");
+   vfprintf (stderr, msg, argp);