rpms/thunderbird/devel xulrunner-1.9.2.1-build.patch, NONE, 1.1 thunderbird.spec, 1.168, 1.169

[Jan Horak]

Author: xhorak

Update of /cvs/pkgs/rpms/thunderbird/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv27078

Modified Files:
	thunderbird.spec 
Added Files:
	xulrunner-1.9.2.1-build.patch 
Log Message:
Update to 3.1 RC1

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: thunderbird.spec
===================================================================
RCS file: /cvs/pkgs/rpms/thunderbird/devel/thunderbird.spec,v
retrieving revision 1.168
retrieving revision 1.169
diff -u -p -r1.168 -r1.169
--- thunderbird.spec	27 May 2010 23:19:00 -0000	1.168
+++ thunderbird.spec	28 May 2010 11:50:49 -0000	1.169
@@ -63,7 +63,8 @@ Patch0:         thunderbird-version.patc
 Patch1:         mozilla-jemalloc.patch
 # Fix for installation fail when building with dynamic linked libraries
 Patch2:         thunderbird-shared-error.patch
-
+# Fixes gcc complain that nsFrame::delete is protected
+Patch4:         xulrunner-1.9.2.1-build.patch
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -122,6 +123,8 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{ver
 
 %patch1 -p0 -b .jemalloc
 %patch2 -p1 -b .shared-error
+%patch4 -p1 -b .protected
+
 
 %if %{official_branding}
 # Required by Mozilla Corporation
@@ -337,6 +340,7 @@ fi
 %dir %{mozappdir}/components
 %ghost %{mozappdir}/components/compreg.dat
 %ghost %{mozappdir}/components/xpti.dat
+%{mozappdir}/components/components.list
 %{mozappdir}/components/*.so
 %{mozappdir}/components/*.xpt
 %attr(644,root,root) %{mozappdir}/components/*.js
@@ -367,7 +371,6 @@ fi
 %{mozappdir}/platform.ini
 %{mozappdir}/updater.ini
 %{mozappdir}/application.ini
-%exclude %{mozappdir}/dependentlibs.list
 %exclude %{mozappdir}/removed-files
 %{mozappdir}/update.locale
 %{_datadir}/icons/hicolor/16x16/apps/thunderbird.png