rpms/xulrunner/F-9 mozilla-mochitest.patch, NONE, 1.1 mozilla-sqlite.patch, NONE, 1.1 mozilla-ssl-exception.patch, NONE, 1.1 .cvsignore, 1.48, 1.49 sources, 1.50, 1.51 xulrunner-mozconfig, 1.20, 1.21 xulrunner-redhat-default-prefs.js, 1.2, 1.3 xulrunner.spec, 1.126, 1.127 mozilla-dpi.patch, 1.1, NONE mozilla-fsync.patch, 1.1, NONE mozilla-keys.patch, 1.1, NONE mozilla-resolution.patch, 1.1, NONE mozilla-wtfbuttons.patch, 1.1, NONE xulrunner-hang.patch, 1.2, NONE
Christopher Aillon (caillon)
fedora-extras-commits at redhat.com
Tue Jun 17 16:16:01 UTC 2008
Author: caillon
Update of /cvs/extras/rpms/xulrunner/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv9094
Modified Files:
.cvsignore sources xulrunner-mozconfig
xulrunner-redhat-default-prefs.js xulrunner.spec
Added Files:
mozilla-mochitest.patch mozilla-sqlite.patch
mozilla-ssl-exception.patch
Removed Files:
mozilla-dpi.patch mozilla-fsync.patch mozilla-keys.patch
mozilla-resolution.patch mozilla-wtfbuttons.patch
xulrunner-hang.patch
Log Message:
* Tue Jun 17 2008 Christopher Aillon <caillon at redhat.com> 1.9-1
- Update to 1.9 final
mozilla-mochitest.patch:
--- NEW FILE mozilla-mochitest.patch ---
https://bugzilla.mozilla.org/show_bug.cgi?id=429178
Index: mozilla/testing/mochitest/ssltunnel/Makefile.in
===================================================================
RCS file: /cvsroot/mozilla/testing/mochitest/ssltunnel/Makefile.in,v
retrieving revision 1.2
diff -u -u -r1.2 Makefile.in
--- mozilla/testing/mochitest/ssltunnel/Makefile.in 11 Apr 2008 05:58:04 -0000 1.2
+++ mozilla/testing/mochitest/ssltunnel/Makefile.in 3 Jun 2008 19:25:55 -0000
@@ -55,6 +55,10 @@
nss \
$(NULL)
+# Use local includes because they are inserted before INCLUDES
+# so that Mozilla's nss.h is used, not glibc's
+LOCAL_INCLUDES += $(NSPR_CFLAGS) $(NSS_CFLAGS)
+
LIBS = \
$(NSPR_LIBS) \
$(NSS_LIBS) \
mozilla-sqlite.patch:
--- NEW FILE mozilla-sqlite.patch ---
https://bugzilla.mozilla.org/show_bug.cgi?id=424063
Index: mozilla/configure.in
===================================================================
RCS file: /cvsroot/mozilla/configure.in,v
retrieving revision 1.1992
diff -d -u -p -r1.1992 configure.in
--- mozilla/configure.in 5 May 2008 21:08:14 -0000 1.1992
+++ mozilla/configure.in 17 May 2008 02:26:32 -0000
@@ -5958,7 +5958,21 @@ then
SQLITE_CFLAGS=
SQLITE_LIBS='$(call EXPAND_LIBNAME_PATH,sqlite3,$(DIST)/lib)'
else
- PKG_CHECK_MODULES(SQLITE, sqlite3 >= $SQLITE_VERSION)
+ SQLITE_VERSION_NUMBER=3005004
+ AC_MSG_CHECKING(sqlite version >= $SQLITE_VERSION)
+ AC_TRY_COMPILE([#include <sqlite3.h>], [
+# if SQLITE_VERSION_NUMBER < $SQLITE_VERSION_NUMBER
+# error "sqlite version < $SQLITE_VERSION_NUMBER
+# endif
+ ] , [res=yes], [res=no])
+ AC_MSG_RESULT([$res])
+ if test "$res" != "yes"; then
+ AC_MSG_ERROR([sqlite version $SQLITE_VERSION or higher required])
+ fi
+ SQLITE_CFLAGS=`$PKG_CONFIG --cflags sqlite3`
+ SQLITE_LIBS=`$PKG_CONFIG --libs sqlite3`
+ AC_SUBST(SQLITE_CFLAGS)
+ AC_SUBST(SQLITE_LIBS)
fi
AC_SUBST(MOZ_NATIVE_SQLITE)
mozilla-ssl-exception.patch:
--- NEW FILE mozilla-ssl-exception.patch ---
https://bugzilla.mozilla.org/show_bug.cgi?id=436870
diff --git a/security/manager/ssl/src/nsCertOverrideService.h b/security/manager/ssl/src/nsCertOverrideService.h
--- a/security/manager/ssl/src/nsCertOverrideService.h
+++ b/security/manager/ssl/src/nsCertOverrideService.h
@@ -109,6 +109,7 @@
nsCertOverrideEntry(const nsCertOverrideEntry& toCopy)
{
mSettings = toCopy.mSettings;
+ mHostWithPort = toCopy.mHostWithPort;
}
~nsCertOverrideEntry()
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/F-9/.cvsignore,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- .cvsignore 31 Mar 2008 23:28:12 -0000 1.48
+++ .cvsignore 17 Jun 2008 16:15:18 -0000 1.49
@@ -1 +1 @@
-xulrunner-1.9b5-source.tar.bz2
+xulrunner-1.9-source.tar.bz2
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/F-9/sources,v
retrieving revision 1.50
retrieving revision 1.51
diff -u -r1.50 -r1.51
--- sources 31 Mar 2008 23:28:12 -0000 1.50
+++ sources 17 Jun 2008 16:15:18 -0000 1.51
@@ -1 +1 @@
-cbb83017ed3c0e740a9128089a4f1b2d xulrunner-1.9b5-source.tar.bz2
+b514375509fd439e44def1e4a7873af4 xulrunner-1.9-source.tar.bz2
Index: xulrunner-mozconfig
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/F-9/xulrunner-mozconfig,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- xulrunner-mozconfig 8 May 2008 20:34:53 -0000 1.20
+++ xulrunner-mozconfig 17 Jun 2008 16:15:18 -0000 1.21
@@ -15,6 +15,7 @@
ac_add_options --with-pthreads
ac_add_options --disable-strip
ac_add_options --disable-tests
+#ac_add_options --disable-mochitest
ac_add_options --disable-installer
ac_add_options --disable-debug
ac_add_options --enable-optimize
Index: xulrunner-redhat-default-prefs.js
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/F-9/xulrunner-redhat-default-prefs.js,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- xulrunner-redhat-default-prefs.js 13 Jan 2008 23:57:38 -0000 1.2
+++ xulrunner-redhat-default-prefs.js 17 Jun 2008 16:15:18 -0000 1.3
@@ -6,3 +6,4 @@
pref("general.useragent.vendor", "Fedora");
pref("general.useragent.vendorSub", "RPM_VERREL");
pref("intl.locale.matchOS", true);
+pref("toolkit.storage.synchronous", 0);
Index: xulrunner.spec
===================================================================
RCS file: /cvs/extras/rpms/xulrunner/F-9/xulrunner.spec,v
retrieving revision 1.126
retrieving revision 1.127
diff -u -r1.126 -r1.127
--- xulrunner.spec 29 May 2008 14:43:54 -0000 1.126
+++ xulrunner.spec 17 Jun 2008 16:15:18 -0000 1.127
@@ -2,19 +2,17 @@
%define nss_version 3.11.99.5
%define cairo_version 0.5
-%define version_internal 1.9pre
+%define version_internal 1.9
%define mozappdir %{_libdir}/%{name}-%{version_internal}
-%define version_pre .beta5
-
Summary: XUL Runtime for Gecko Applications
Name: xulrunner
Version: 1.9
-Release: 0.63%{?version_pre}%{?dist}
+Release: 1%{?dist}
URL: http://www.mozilla.org/projects/xulrunner/
License: MPLv1.1 or GPLv2+ or LGPLv2+
Group: Applications/Internet
-Source0: xulrunner-1.9b5-source.tar.bz2
+Source0: xulrunner-1.9-source.tar.bz2
Source10: %{name}-mozconfig
Source12: %{name}-redhat-default-prefs.js
Source21: %{name}.sh.in
@@ -23,19 +21,15 @@
# build patches
Patch1: mozilla-build.patch
Patch2: xulrunner-path.patch
-Patch3: xulrunner-version.patch
+Patch4: mozilla-sqlite.patch
+Patch5: mozilla-mochitest.patch
# Fedora specific patches
Patch10: mozilla-pkgconfig.patch
# Upstream patches
-Patch20: mozilla-dpi.patch
-Patch21: mozilla-wtfbuttons.patch
-Patch22: mozilla-keys.patch
-Patch23: xulrunner-hang.patch
-Patch24: mozilla-resolution.patch
-Patch25: mozilla-fsync.patch
Patch26: mozilla-ps-pdf-simplify-operators.patch
+Patch27: mozilla-ssl-exception.patch
# ---------------------------------------------------
@@ -62,6 +56,8 @@
BuildRequires: hunspell-devel
BuildRequires: sqlite-devel >= 3.5
BuildRequires: startup-notification-devel
+# For -sqlite.patch
+BuildRequires: autoconf213
Requires: mozilla-filesystem
Requires: nspr >= %{nspr_version}
@@ -99,19 +95,16 @@
%prep
%setup -q -c
cd mozilla
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1 -b .ver
+%patch1 -p1 -b .build
+%patch2 -p1 -b .path
+%patch4 -p1 -b .sqlite
+autoconf-2.13
+%patch5 -p1 -b .mochitest
%patch10 -p1 -b .pk
-%patch20 -p1 -b .dpi
-%patch21 -p1 -b .wtfbuttons
-%patch22 -p1 -b .keys
-%patch23 -p1 -b .hang
-%patch24 -p1 -b .resolution
-%patch25 -p1 -b .fsync
%patch26 -p1 -b .ps-pdf-simplify-operators
+%patch27 -p1 -b .ssl-exception
%{__rm} -f .mozconfig
%{__cp} %{SOURCE10} .mozconfig
@@ -384,17 +377,20 @@
#---------------------------------------------------------------------
%changelog
-* Thu May 29 2008 Christopher Aillon <caillon at redhat.com> 1.0-0.63
+* Tue Jun 17 2008 Christopher Aillon <caillon at redhat.com> 1.9-1
+- Update to 1.9 final
+
+* Thu May 29 2008 Christopher Aillon <caillon at redhat.com> 1.9-0.63
- Simplify PS/PDF operators
-* Thu May 22 2008 Christopher Aillon <caillon at redhat.com> 1.0-0.62
+* Thu May 22 2008 Christopher Aillon <caillon at redhat.com> 1.9-0.62
- Upstream patch to fsync() less
-* Thu May 08 2008 Colin Walters <walters at redhat.com> 1.0-0.61
+* Thu May 08 2008 Colin Walters <walters at redhat.com> 1.9-0.61
- Ensure we enable startup notification; add BR and modify config
(bug #445543)
-* Wed Apr 30 2008 Christopher Aillon <caillon at redhat.com> 1.0-0.60
+* Wed Apr 30 2008 Christopher Aillon <caillon at redhat.com> 1.9-0.60
- Some files moved to mozilla-filesystem; kill them and add the Req
* Mon Apr 28 2008 Christopher Aillon <caillon at redhat.com> 1.9-0.59
--- mozilla-dpi.patch DELETED ---
--- mozilla-fsync.patch DELETED ---
--- mozilla-keys.patch DELETED ---
--- mozilla-resolution.patch DELETED ---
--- mozilla-wtfbuttons.patch DELETED ---
--- xulrunner-hang.patch DELETED ---
More information about the fedora-extras-commits
mailing list