rpms/mingw-gettext
6
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix FTBFS due to invalid use of cdecl

Browse Source
This commit is contained in:
Erik van Pienbroek 2013-06-15 18:11:01 +02:00
parent 520fda94d6
commit 0b8425c752
2 changed files with 41 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
gettext-use-proper-cdecl.patch Normal file
View File

@ -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,

9
mingw-gettext.spec
View File

@ -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 <epienbro@fedoraproject.org - 0.18.2.1-2
* Sat Jun 15 2013 Erik van Pienbroek <epienbro@fedoraproject.org> - 0.18.2.1-3
- Fix FTBFS due to invalid use of cdecl
* Sat Jun 15 2013 Erik van Pienbroek <epienbro@fedoraproject.org> - 0.18.2.1-2
- Rebuild to resolve InterlockedCompareExchange regression in mingw32 libraries
* Sat May 4 2013 Erik van Pienbroek <epienbro@fedoraproject.org> - 0.18.2.1-1