From 706295c1d6d148aef6aa9128931293c777488600 Mon Sep 17 00:00:00 2001
From: Orion Poplawski <orion@fedoraproject.org>
Date: Wed, 25 Feb 2009 18:40:52 +0000
Subject: [PATCH] Get the friend patch right

---
 gdl-0.9rc2-20090224-friend.patch | 11 +++++++++++
 gdl.spec                         |  5 +++++
 2 files changed, 16 insertions(+)
 create mode 100644 gdl-0.9rc2-20090224-friend.patch

diff --git a/gdl-0.9rc2-20090224-friend.patch b/gdl-0.9rc2-20090224-friend.patch
new file mode 100644
index 0000000..53c7952
--- /dev/null
+++ b/gdl-0.9rc2-20090224-friend.patch
@@ -0,0 +1,11 @@
+--- gdl-0.9rc2-20090224/src/envt.hpp.friend	2008-06-10 14:43:43.000000000 -0600
++++ gdl-0.9rc2-20090224/src/envt.hpp	2009-02-25 11:38:48.000000000 -0700
+@@ -162,6 +162,8 @@
+     if( ix >= env.size()) return false;
+     return ( env.Env( ix) != NULL);
+   }
++
++  friend class DInterpreter;
+ };
+ 
+ // for UD subroutines (written in GDL) ********************************
diff --git a/gdl.spec b/gdl.spec
index 454b1a5..ab8e37b 100644
--- a/gdl.spec
+++ b/gdl.spec
@@ -15,6 +15,9 @@ Source2:        gdl.sh
 Patch1:         gdl-0.9pre5-ppc64.patch
 Patch2:         gdl-0.9rc1-gcc43.patch
 Patch3:         gdl-0.9rc2-20090224-antlr.patch
+# gcc 4.4.0 catches more class issues - add needed friend
+# https://sourceforge.net/tracker/index.php?func=detail&aid=2634356&group_id=97659&atid=618683
+Patch4:         gdl-0.9rc2-20090224-friend.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  antlr
@@ -38,6 +41,7 @@ Systems Inc.
 %patch1 -p1 -b .ppc64
 %patch2 -p1 -b .gcc43
 %patch3 -p1 -b .antlr
+%patch4 -p1 -b .friend
 rm -rf src/antlr
 
 
@@ -81,6 +85,7 @@ rm -rf $RPM_BUILD_ROOT
 - Update to 0.9rc2 cvs 20090224
 - Fix release tag
 - Drop ImageMagick patch fixed upstream
+- Add patch to compile with gcc 4.4.0 - needs new friend statement
 - Don't build included copy of antlr, use system version
 
 * Fri Jan 23 2009 - Orion Poplawski <orion@cora.nwra.com> - 0.9-0.rc2.1