diff --git a/gettext-use-proper-cdecl.patch b/gettext-use-proper-cdecl.patch new file mode 100644 index 0000000..de9576d --- /dev/null +++ b/gettext-use-proper-cdecl.patch @@ -0,0 +1,33 @@ +--- gettext-runtime/gnulib-lib/msvc-inval.c.orig 2013-06-15 18:01:47.658316614 +0200 ++++ gettext-runtime/gnulib-lib/msvc-inval.c 2013-06-15 18:01:51.492348702 +0200 +@@ -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, +--- gettext-tools/gnulib-lib/msvc-inval.c.orig 2013-06-15 18:02:11.335514821 +0200 ++++ gettext-tools/gnulib-lib/msvc-inval.c 2013-06-15 18:02:20.387590641 +0200 +@@ -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, +--- gettext-tools/libgettextpo/msvc-inval.c.orig 2013-06-15 18:02:25.814636031 +0200 ++++ gettext-tools/libgettextpo/msvc-inval.c 2013-06-15 18:02:31.912687078 +0200 +@@ -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, diff --git a/mingw-gettext.spec b/mingw-gettext.spec index 06fba09..28abaf2 100644 --- a/mingw-gettext.spec +++ b/mingw-gettext.spec @@ -33,6 +33,9 @@ BuildRequires: mingw64-termcap #BuildRequires: mingw32-expat #BuildRequires: mingw32-glib2 +# Fix FTBFS due to invalid use of cdecl (__cdecl should be used instead) +Patch0: gettext-use-proper-cdecl.patch + %description MinGW Windows Gettext library @@ -74,6 +77,7 @@ Static version of the MinGW Windows Gettext library. %prep %setup -q -n gettext-%{version} +%patch0 -p0 %build @@ -184,7 +188,10 @@ find $RPM_BUILD_ROOT -name "*.la" -delete %changelog -* Sat Jun 15 2013 Erik van Pienbroek - 0.18.2.1-3 +- Fix FTBFS due to invalid use of cdecl + +* Sat Jun 15 2013 Erik van Pienbroek - 0.18.2.1-2 - Rebuild to resolve InterlockedCompareExchange regression in mingw32 libraries * Sat May 4 2013 Erik van Pienbroek - 0.18.2.1-1