rpms/sunbird/F-13 xulrunner-1.9.2.1-build.patch, NONE, 1.1 sunbird.spec, 1.54, 1.55

[Jan Horak]

Author: xhorak

Update of /cvs/pkgs/rpms/sunbird/F-13
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv7816

Modified Files:
	sunbird.spec 
Added Files:
	xulrunner-1.9.2.1-build.patch 
Log Message:
Added fix for protected gcc error


xulrunner-1.9.2.1-build.patch:
 nsFrame.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- NEW FILE xulrunner-1.9.2.1-build.patch ---
diff -up xulrunner-1.9.2.1/mozilla-1.9.2/layout/generic/nsFrame.h.old xulrunner-1.9.2.1/mozilla-1.9.2/layout/generic/nsFrame.h
--- xulrunner-1.9.2.1/mozilla/layout/generic/nsFrame.h.old	2009-11-11 15:34:51.000000000 +0100
+++ xulrunner-1.9.2.1/mozilla/layout/generic/nsFrame.h	2009-11-11 15:33:09.000000000 +0100
@@ -157,7 +157,7 @@ private:
   // Left undefined; nsFrame objects are never allocated from the heap.
   void* operator new(size_t sz) CPP_THROW_NEW;
 
-protected:
+public:
   // Overridden to prevent the global delete from being called, since
   // the memory came out of an arena instead of the heap.
   //


Index: sunbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/sunbird/F-13/sunbird.spec,v
retrieving revision 1.54
retrieving revision 1.55
diff -u -p -r1.54 -r1.55
--- sunbird.spec	22 Jun 2010 11:40:45 -0000	1.54
+++ sunbird.spec	22 Jun 2010 12:13:34 -0000	1.55
@@ -35,6 +35,8 @@ Source100:      find-external-requires
 
 # Pulled from Thunderbird
 Patch0:         mozilla-jemalloc.patch
+# Fixes gcc complain that nsFrame::delete is protected
+Patch1:         xulrunner-1.9.2.1-build.patch
 
 # Ours
 Patch10:        sunbird-1.0-libical.patch
@@ -108,6 +110,7 @@ calendaring tasks.
 %prep
 %setup -n comm-1.9.2 -q -a 2
 %patch0 -p0 -b .jemalloc
+%patch4 -p1 -b .protected
 %patch10 -p0 -b .libical
 %patch11 -p0 -b .uilocale