Update to beta8

This commit is contained in:
Martin Stransky 2010-12-21 13:15:45 +01:00
commit cebfca18ff
5 changed files with 7 additions and 28 deletions

1
.gitignore vendored
View file

@ -4,3 +4,4 @@ xulrunner-1.9.3.0b3.source.tar.bz2
/xulrunner-2.0b6.source.tar.bz2
/xulrunner-4.0b7.source.tar.bz2
/xulrunner-2.0b7.source.tar.bz2
/xulrunner-2.0b8.source.tar.bz2

View file

@ -1,10 +0,0 @@
diff -up mozilla-1.9.2/xulrunner/installer/mozilla-plugin.pc.in.old mozilla-1.9.2/xulrunner/installer/mozilla-plugin.pc.in
--- mozilla-1.9.2/xulrunner/installer/mozilla-plugin.pc.in.old 2009-11-25 05:13:11.000000000 +0100
+++ mozilla-1.9.2/xulrunner/installer/mozilla-plugin.pc.in 2009-12-03 10:14:41.000000000 +0100
@@ -5,5 +5,5 @@ includedir=%includedir%
Name: Mozilla Plug-In API
Description: Mozilla Plug-In API
Version: %MOZILLA_VERSION%
-Cflags: -I${includedir}/stable -DXP_UNIX %ojidef%
+Cflags: -I${includedir} -DXP_UNIX %ojidef%

View file

@ -1 +1,2 @@
d2ab9b7eefcbbaedf45189b8662b3e3c xulrunner-2.0b7.source.tar.bz2
665ffbf8571e713d5da8f98e3d971e9d xulrunner-2.0b8.source.tar.bz2

View file

@ -1,12 +0,0 @@
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-1.9.2/layout/generic/nsFrame.h.old 2009-11-11 15:34:51.000000000 +0100
+++ xulrunner-1.9.2.1/mozilla-1.9.2/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.
//

View file

@ -25,12 +25,12 @@
%define version_internal 2
%define mozappdir %{_libdir}/%{name}-%{version_internal}
%define pretag b7
%define pretag b8
Summary: XUL Runtime for Gecko Applications
Name: xulrunner
Version: 2.0
Release: 0.9%{?pretag}%{?dist}
Release: 0.10%{?pretag}%{?dist}
URL: http://developer.mozilla.org/En/XULRunner
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
@ -46,8 +46,6 @@ Source23: %{name}.1
Patch0: xulrunner-version.patch
Patch1: mozilla-build.patch
Patch3: firefox4-jemalloc.patch
Patch7: xulrunner-1.9.2.1-build.patch
Patch8: mozilla-plugin.patch
Patch9: mozilla-build-sbrk.patch
Patch11: mozilla-malloc.patch
Patch12: xulrunner-2.0-64bit-big-endian.patch
@ -153,8 +151,6 @@ sed -e 's/__RPM_VERSION_INTERNAL__/%{version_internal}/' %{P:%%PATCH0} \
%patch1 -p2 -b .build
%patch3 -p1 -b .jemalloc
%patch7 -p2 -b .del
#%patch8 -p1 -b .plugin
%patch9 -p2 -b .sbrk
%patch11 -p2 -b .malloc
%patch12 -p2 -b .64bit-big-endian
@ -453,6 +449,9 @@ fi
#---------------------------------------------------------------------
%changelog
* Tue Dec 21 2010 Martin Stransky <stransky@redhat.com> 2.0-0.10.b8
- Update to 2.0b8
* Mon Dec 20 2010 Martin Stransky <stransky@redhat.com> 2.0-0.9.b8
- removed unused library path (rhbz#658471)