[mingw-tk] Fix FTBFS against latest mingw-w64
Erik van Pienbroek
epienbro at fedoraproject.org
Tue Sep 17 22:33:19 UTC 2013
commit ad913300756475292a9c2c27a6fef7a2f2092432
Author: Erik van Pienbroek <epienbro at fedoraproject.org>
Date: Wed Sep 18 00:33:08 2013 +0200
Fix FTBFS against latest mingw-w64
mingw-tk.spec | 8 +++++++-
tk-mingw-w64-compatibility-fix.patch | 11 +++++++++++
2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/mingw-tk.spec b/mingw-tk.spec
index ed38a20..887281b 100644
--- a/mingw-tk.spec
+++ b/mingw-tk.spec
@@ -11,7 +11,7 @@
Summary: MinGW Windows graphical toolkit for the Tcl scripting language
Name: mingw-%{name1}
Version: %{vers}
-Release: 3%{?dist}
+Release: 4%{?dist}
License: TCL
Group: Development/Languages
URL: http://tcl.sourceforge.net/
@@ -20,6 +20,8 @@ Patch1: tk8.5-make.patch
Patch2: tk8.5-conf.patch
# this patch isn't needed since tk8.6b1
Patch3: tk-seg_input.patch
+# Fix compatibility with latest mingw-w64
+Patch4: tk-mingw-w64-compatibility-fix.patch
Buildrequires: autoconf
BuildRequires: file
BuildRequires: m4
@@ -55,6 +57,7 @@ mv changes.utf8 changes
%patch1 -p1 -b .make
%patch2 -p1 -b .conf
%patch3 -p1 -b .seg
+%patch4 -p1 -b .mingw-w64
%build
pushd win
@@ -125,6 +128,9 @@ rm -rf $RPM_BUILD_ROOT/%{mingw32_datadir}/%{name1}%{majorver}/ldAix
%doc license.terms
%changelog
+* Thu Sep 12 2013 Erik van Pienbroek <epienbro at fedoraproject.org> - 8.5.13-4
+- Fix FTBFS against latest mingw-w64
+
* Sat Aug 03 2013 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 8.5.13-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
diff --git a/tk-mingw-w64-compatibility-fix.patch b/tk-mingw-w64-compatibility-fix.patch
new file mode 100644
index 0000000..e482c1a
--- /dev/null
+++ b/tk-mingw-w64-compatibility-fix.patch
@@ -0,0 +1,11 @@
+--- tk8.5.13/win/tkWin32Dll.c.orig 2013-09-12 07:16:01.344315269 +0200
++++ tk8.5.13/win/tkWin32Dll.c 2013-09-12 07:20:35.909303786 +0200
+@@ -12,7 +12,7 @@
+ #include "tkWinInt.h"
+ #ifndef STATIC_BUILD
+
+-#ifdef HAVE_NO_SEH
++#if defined(HAVE_NO_SEH) && __MINGW64_VERSION_MAJOR < 3
+
+ /*
+ * Unlike Borland and Microsoft, we don't register exception handlers by
More information about the scm-commits
mailing list