rpms/xulrunner/OLPC-3 mozilla-mochitest.patch, NONE, 1.1 mozilla-ps-pdf-simplify-operators.patch, 1.2, 1.3 mozilla-sqlite.patch, NONE, 1.1 mozilla-ssl-exception.patch, NONE, 1.1

[Marco Pesenti Gritti (mpg)]

Author: mpg

Update of /cvs/pkgs/rpms/xulrunner/OLPC-3
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv28449

Added Files:
	mozilla-mochitest.patch 
	mozilla-ps-pdf-simplify-operators.patch mozilla-sqlite.patch 
	mozilla-ssl-exception.patch 
Log Message:
Forgot to add patches

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-ps-pdf-simplify-operators.patch:

Index: mozilla-ps-pdf-simplify-operators.patch
===================================================================
RCS file: mozilla-ps-pdf-simplify-operators.patch
diff -N mozilla-ps-pdf-simplify-operators.patch
--- /dev/null	1 Jan 1970 00:00:00 -0000
+++ mozilla-ps-pdf-simplify-operators.patch	20 Jun 2008 12:23:34 -0000	1.3
@@ -0,0 +1,42 @@
+https://bugzilla.mozilla.org/show_bug.cgi?id=435313
+
+Index: mozilla/gfx/thebes/public/gfxPDFSurface.h
+===================================================================
+RCS file: /cvsroot/mozilla/gfx/thebes/public/gfxPDFSurface.h,v
+retrieving revision 1.13
+diff -d -u -p -r1.13 gfxPDFSurface.h
+--- mozilla/gfx/thebes/public/gfxPDFSurface.h	19 Mar 2008 20:51:42 -0000	1.13
++++ mozilla/gfx/thebes/public/gfxPDFSurface.h	23 May 2008 00:50:31 -0000
+@@ -63,7 +63,11 @@ public:
+     // this is in points!
+     const gfxSize& GetSize() const { return mSize; }
+ 
+-    virtual PRInt32 GetDefaultContextFlags() const { return gfxContext::FLAG_DISABLE_SNAPPING; }
++    virtual PRInt32 GetDefaultContextFlags() const
++    {
++        return gfxContext::FLAG_SIMPLIFY_OPERATORS |
++               gfxContext::FLAG_DISABLE_SNAPPING;
++    }
+ 
+ private:
+     nsCOMPtr<nsIOutputStream> mStream;
+Index: mozilla/gfx/thebes/public/gfxPSSurface.h
+===================================================================
+RCS file: /cvsroot/mozilla/gfx/thebes/public/gfxPSSurface.h,v
+retrieving revision 1.13
+diff -d -u -p -r1.13 gfxPSSurface.h
+--- mozilla/gfx/thebes/public/gfxPSSurface.h	19 Mar 2008 20:51:42 -0000	1.13
++++ mozilla/gfx/thebes/public/gfxPSSurface.h	23 May 2008 00:50:31 -0000
+@@ -63,7 +63,11 @@ public:
+     // this is in points!
+     const gfxSize& GetSize() const { return mSize; }
+ 
+-    virtual PRInt32 GetDefaultContextFlags() const { return gfxContext::FLAG_DISABLE_SNAPPING; }
++    virtual PRInt32 GetDefaultContextFlags() const
++    {
++        return gfxContext::FLAG_SIMPLIFY_OPERATORS |
++               gfxContext::FLAG_DISABLE_SNAPPING;
++    }
+ 
+ private:
+     nsCOMPtr<nsIOutputStream> mStream;

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()