[mingw-libtasn1] Fix FTBFS against latest mingw-w64 (already resolved in upstream gnulib)

[Erik van Pienbroek]

commit 71aeb5383c4b10a0806706e2650990d8b51b1b47
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date:   Sat Jul 13 21:20:53 2013 +0200

    Fix FTBFS against latest mingw-w64 (already resolved in upstream gnulib)

 gnulib-commit-867253.patch |   42 ++++++++++++++++++++++++++++++++++++++++++
 mingw-libtasn1.spec        |   13 ++++++++++++-
 2 files changed, 54 insertions(+), 1 deletions(-)
---
diff --git a/gnulib-commit-867253.patch b/gnulib-commit-867253.patch
new file mode 100644
index 0000000..1f8a40f
--- /dev/null
+++ b/gnulib-commit-867253.patch
@@ -0,0 +1,42 @@
+From 86725346a1b116f3c2da26c124288f5f4495bf69 Mon Sep 17 00:00:00 2001
+From: Paul Eggert <eggert at cs.ucla.edu>
+Date: Sun, 16 Jun 2013 00:24:24 +0000
+Subject: msvc-inval: port to mingw-w64
+
+* lib/msvc-inval.c (gl_msvc_invalid_parameter_handler):
+Use __cdecl, not cdecl, for mingw-w64.  Reported by LRN in
+<http://lists.gnu.org/archive/html/bug-gnulib/2013-06/msg00039.html>.
+---
+diff --git a/lib/msvc-inval.c b/lib/msvc-inval.c
+index ef2b860..1873e23 100644
+--- a/lib/msvc-inval.c
++++ b/lib/msvc-inval.c
+@@ -28,7 +28,7 @@
+ 
+ # if MSVC_INVALID_PARAMETER_HANDLING == DEFAULT_HANDLING
+ 
+-static void cdecl
++static void __cdecl
+ gl_msvc_invalid_parameter_handler (const wchar_t *expression,
+                                    const wchar_t *function,
+                                    const wchar_t *file,
+@@ -45,7 +45,7 @@ gl_msvc_invalid_parameter_handler (const wchar_t *expression,
+ 
+ #  if defined _MSC_VER
+ 
+-static void cdecl
++static void __cdecl
+ gl_msvc_invalid_parameter_handler (const wchar_t *expression,
+                                    const wchar_t *function,
+                                    const wchar_t *file,
+@@ -94,7 +94,7 @@ gl_msvc_inval_current (void)
+     }
+ }
+ 
+-static void cdecl
++static void __cdecl
+ gl_msvc_invalid_parameter_handler (const wchar_t *expression,
+                                    const wchar_t *function,
+                                    const wchar_t *file,
+--
+cgit v0.9.0.2
diff --git a/mingw-libtasn1.spec b/mingw-libtasn1.spec
index ff5ff03..daf2b82 100644
--- a/mingw-libtasn1.spec
+++ b/mingw-libtasn1.spec
@@ -2,7 +2,7 @@
 
 Name:           mingw-libtasn1
 Version:        3.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        MinGW Windows libtasn1 library
 
 # The libtasn1 library is LGPLv2+, utilities are GPLv3+;
@@ -12,6 +12,10 @@ Group:          Development/Libraries
 URL:            http://www.gnu.org/software/libtasn1/
 Source0:        http://ftp.gnu.org/gnu/libtasn1/libtasn1-%{version}.tar.gz
 
+# Fix FTBFS against latest mingw-w64
+# Already resolved in upstream gnulib
+Patch0:         gnulib-commit-867253.patch
+
 BuildArch:      noarch
 
 BuildRequires:  mingw32-binutils
@@ -58,6 +62,10 @@ This package contains the MinGW Windows cross compiled libtasn1 library.
 %prep
 %setup -q -n libtasn1-%{version}
 
+cd gl
+%patch0 -p2
+cd ..
+
 
 %build
 %mingw_configure --disable-static
@@ -96,6 +104,9 @@ rm -f $RPM_BUILD_ROOT%{mingw64_bindir}/*.exe
 
 
 %changelog
+* Sat Jul 13 2013 Erik van Pienbroek <epienbro at fedoraproject.org> - 3.3-3
+- Fix FTBFS against latest mingw-w64 (already resolved in upstream gnulib)
+
 * Thu May 30 2013 Michael Cronenworth <mike at cchtml.com> - 3.3-2
 - Rebuild for mingw-filesystem changes