[aplus-fsf] Add aplus-fsf-4.22-gcc46.patch (Set MS_OFFSETOF_IN_STDDEF). (Fix FTBFS BZ#716044).

[corsepiu]

commit 4ee665550b793bbb5df5fdb43ab6d51af56902f4
Author: Ralf Corsépius <corsepiu at fedoraproject.org>
Date:   Mon Jul 4 18:58:10 2011 +0200

    Add aplus-fsf-4.22-gcc46.patch (Set MS_OFFSETOF_IN_STDDEF).
    (Fix FTBFS BZ#716044).

 aplus-fsf-4.22-gcc46.patch |   11 +++++++++++
 aplus-fsf.spec             |    8 +++++++-
 2 files changed, 18 insertions(+), 1 deletions(-)
---
diff --git a/aplus-fsf-4.22-gcc46.patch b/aplus-fsf-4.22-gcc46.patch
new file mode 100644
index 0000000..8acc4a3
--- /dev/null
+++ b/aplus-fsf-4.22-gcc46.patch
@@ -0,0 +1,11 @@
+diff -Naur aplus-fsf-4.22/src/MSTypes/MSDefines.H aplus-fsf-4.22.hacked/src/MSTypes/MSDefines.H
+--- aplus-fsf-4.22.orig/src/MSTypes/MSDefines.H	2008-03-27 20:10:38.000000000 +0100
++++ aplus-fsf-4.22/src/MSTypes/MSDefines.H	2011-07-04 16:18:54.401015311 +0200
+@@ -747,6 +747,7 @@
+ # define MS_STD_TEMPLATE_INSTANTIATION        1
+ # define MS_PREDECLARE_TEMPLATE_FRIENDS       1
+ # define MS_GCC_FUNCTION_CAST_BUG             1
++# define MS_OFFSETOF_IN_STDDEF                1
+ 
+ //egcs 1.1.1
+ # define MS_TEMPLATE_FUNCTION_SPECILIZATON_BUG 1
diff --git a/aplus-fsf.spec b/aplus-fsf.spec
index 61202ab..b391dd9 100644
--- a/aplus-fsf.spec
+++ b/aplus-fsf.spec
@@ -23,7 +23,7 @@
 
 Name: %name
 Version: 4.22.4
-Release: 20%{?dist}
+Release: 21%{?dist}
 License: GPLv2
 
 Summary: Advanced APL interpreter with s interface
@@ -43,6 +43,7 @@ Patch1: aplus-fsf-4.22.4-makefile.patch
 Patch3: aplus-fsf-4.20-el.patch
 Patch4: aplus-fsf-4.22.3-atree.patch
 Patch5:	aplus-fsf-4.22-gcc44.patch
+Patch6: aplus-fsf-4.22-gcc46.patch
 
 BuildRequires: libtool
 BuildRequires: xorg-x11-proto-devel
@@ -123,6 +124,7 @@ This package contains the header file from the A+ libraries.
 %patch3 -p1
 %patch4 -p1 
 %patch5 -p1 -b .gcc44
+%patch6 -p1
 
 %build
 # export CXXFLAGS=-O3 CFLAGS=-O3
@@ -233,6 +235,10 @@ fi
 %{xemacs_lispdir}/aplus-fsf/*.el
 
 %changelog
+* Mon Jul 04 2011 Ralf Corsépius <corsepiu at fedoraproject.org> - 4.22.4-21
+- Add aplus-fsf-4.22-gcc46.patch (Set MS_OFFSETOF_IN_STDDEF).
+  (Fix FTBFS BZ#716044).
+
 * Mon Feb 07 2011 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 4.22.4-20
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild