rpms/sunbird/devel xulrunner-1.9.2.1-build.patch, NONE, 1.1 sunbird.spec, 1.49, 1.50

[Jan Horak]

Author: xhorak

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

Modified Files:
	sunbird.spec 
Added Files:
	xulrunner-1.9.2.1-build.patch 
Log Message:
Sync with TB 3.1RC2

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/devel/sunbird.spec,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -p -r1.49 -r1.50
--- sunbird.spec	30 Mar 2010 11:59:39 -0000	1.49
+++ sunbird.spec	22 Jun 2010 13:13:21 -0000	1.50
@@ -7,7 +7,8 @@
 
 %define version_internal 1.0b2
 %define progdir %{_libdir}/%{name}-%{version_internal}pre
-%define thunderbird_version 3.0.4
+%define thunderbird_version 3.1rc2
+%define libnotify_version 0.4
 
 # This is to filter unwanted provides, that should be provided only by gecko-devel
 %define _use_internal_dependency_generator 0
@@ -15,7 +16,7 @@
 
 Name:           sunbird
 Version:        1.0
-Release:        0.21.20090916hg%{?dist}
+Release:        0.23.b2pre%{?dist}
 Summary:        Calendar application built upon Mozilla toolkit
 
 Group:          Applications/Productivity
@@ -34,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
@@ -55,6 +58,8 @@ BuildRequires:  libical-devel
 BuildRequires:  zip
 BuildRequires:  autoconf213
 BuildRequires:  alsa-lib-devel
+BuildRequires:  libnotify-devel >= %{libnotify_version}
+BuildRequires:  wireless-tools-devel
 
 Requires(post):  desktop-file-utils
 Requires(postun): desktop-file-utils
@@ -103,8 +108,9 @@ calendaring tasks.
 
 
 %prep
-%setup -n comm-1.9.1 -q -a 2
+%setup -n comm-1.9.2 -q -a 2
 %patch0 -p0 -b .jemalloc
+%patch1 -p1 -b .protected
 %patch10 -p0 -b .libical
 %patch11 -p0 -b .uilocale
 
@@ -293,6 +299,9 @@ fi
 
 
 %changelog
+* Tue Jun 22 2010 Jan Horak <jhorak at redhat.com> - 1.0-0.23.b2pre
+- Rebuild against Thunderbird 3.1 RC2
+
 * Tue Mar 30 2010 Jan Horak <jhorak at redhat.com> - 1.0-0.21.20090916hg
 - Rebuild against new Thunderbird