rpms/gdl/devel gdl-0.9rc2-20090224-friend.patch, NONE, 1.1 gdl.spec, 1.42, 1.43

[Orion Poplawski]

Author: orion

Update of /cvs/pkgs/rpms/gdl/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv3691

Modified Files:
	gdl.spec 
Added Files:
	gdl-0.9rc2-20090224-friend.patch 
Log Message:
Get the friend patch right


gdl-0.9rc2-20090224-friend.patch:

--- NEW FILE gdl-0.9rc2-20090224-friend.patch ---
--- 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) ********************************


Index: gdl.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gdl/devel/gdl.spec,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -r1.42 -r1.43
--- gdl.spec	24 Feb 2009 17:12:06 -0000	1.42
+++ gdl.spec	25 Feb 2009 18:40:52 -0000	1.43
@@ -15,6 +15,9 @@
 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 @@
 %patch1 -p1 -b .ppc64
 %patch2 -p1 -b .gcc43
 %patch3 -p1 -b .antlr
+%patch4 -p1 -b .friend
 rm -rf src/antlr
 
 
@@ -81,6 +85,7 @@
 - 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 at cora.nwra.com> - 0.9-0.rc2.1