xulrunner 1.9.1.6, FFVERSION=3.5.6, SECURITY_PATCH=11

(cherry picked from commit c2614f98d85931229a4f186dc6f43ad9a3d75efe)

4 files changed, 7 insertions, 71 deletions

diff --git a/http/xulrunner/DETAILS b/http/xulrunner/DETAILS
index 2a20671f14..32102ae3d3 100755
--- a/http/xulrunner/DETAILS
+++ b/http/xulrunner/DETAILS
@@ -1,6 +1,6 @@
            SPELL=xulrunner
-         VERSION=1.9.1.5
-       FFVERSION=3.5.5
+         VERSION=1.9.1.6
+       FFVERSION=3.5.6
           SOURCE=firefox-$FFVERSION.source.tar.bz2
          SOURCE2=$SOURCE.asc
   SOURCE2_IGNORE=signature
@@ -9,7 +9,7 @@ SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
    SOURCE_URL[0]=ftp://ftp.mozilla.org/pub/firefox/releases/$FFVERSION/source/$SOURCE
   SOURCE2_URL[0]=$SOURCE_URL.asc     
         WEB_SITE=http://www.mozilla.org/
-  SECURITY_PATCH=10
+  SECURITY_PATCH=11
          ENTERED=20060829
       LICENSE[0]=MPL
             DOCS="LICENSE README.txt"
diff --git a/http/xulrunner/HISTORY b/http/xulrunner/HISTORY
index 3567488d74..553fd0e33b 100644
--- a/http/xulrunner/HISTORY
+++ b/http/xulrunner/HISTORY
@@ -1,3 +1,7 @@
+2009-12-16 Ladislav Hagara <hgr@vabo.cz>
+	* DETAILS: 1.9.1.6, FFVERSION=3.5.6, SECURITY_PATCH=11
+	* gfxdirectfbsurface-header.patch: removed patch, applied upstream
+
 2009-11-28 Vlad Glagolev <stealth@sourcemage.org>
 	* DEPENDS: corrected dependencies -- killed xorg-libs, see #14699
 
diff --git a/http/xulrunner/PRE_BUILD b/http/xulrunner/PRE_BUILD
index 99b4935b1e..4e74769c52 100755
--- a/http/xulrunner/PRE_BUILD
+++ b/http/xulrunner/PRE_BUILD
@@ -8,8 +8,6 @@ patch -p0 < $SCRIPT_DIRECTORY/xulrunner-install-paths.patch &&
 
 patch -p0 < $SCRIPT_DIRECTORY/xulrunner-nss.patch &&
 
-patch -p1 < $SCRIPT_DIRECTORY/gfxdirectfbsurface-header.patch &&
-
 # Needed to make things using XUL find NSPR.
 echo "Requires: nspr" >> xulrunner/installer/libxul-embedding.pc.in &&
 
diff --git a/http/xulrunner/gfxdirectfbsurface-header.patch b/http/xulrunner/gfxdirectfbsurface-header.patch
deleted file mode 100644
index 819446faa9..0000000000
--- a/http/xulrunner/gfxdirectfbsurface-header.patch
+++ /dev/null
@@ -1,66 +0,0 @@
-diff -r 2d9d7822862a gfx/thebes/src/gfxASurface.cpp
---- a/gfx/thebes/src/gfxASurface.cpp	Tue Apr 14 15:12:38 2009 -0700
-+++ b/gfx/thebes/src/gfxASurface.cpp	Wed Apr 15 10:07:50 2009 +0900
-@@ -41,26 +41,26 @@
- #include "gfxImageSurface.h"
- 
- #include "cairo.h"
- 
- #ifdef CAIRO_HAS_WIN32_SURFACE
- #include "gfxWindowsSurface.h"
- #endif
- 
--#ifdef CAIRO_HAS_XLIB_SURFACE
-+#ifdef MOZ_X11
- #include "gfxXlibSurface.h"
- #endif
- 
- #ifdef CAIRO_HAS_QUARTZ_SURFACE
- #include "gfxQuartzSurface.h"
- #include "gfxQuartzImageSurface.h"
- #endif
- 
--#ifdef CAIRO_HAS_DIRECTFB_SURFACE
-+#ifdef MOZ_DFB
- #include "gfxDirectFBSurface.h"
- #endif
- 
- #ifdef CAIRO_HAS_QPAINTER_SURFACE
- #include "gfxQPainterSurface.h"
- #endif
- 
- #include <stdio.h>
-@@ -153,30 +153,30 @@ gfxASurface::Wrap (cairo_surface_t *csur
-         result = new gfxImageSurface(csurf);
-     }
- #ifdef CAIRO_HAS_WIN32_SURFACE
-     else if (stype == CAIRO_SURFACE_TYPE_WIN32 ||
-              stype == CAIRO_SURFACE_TYPE_WIN32_PRINTING) {
-         result = new gfxWindowsSurface(csurf);
-     }
- #endif
--#ifdef CAIRO_HAS_XLIB_SURFACE
-+#ifdef MOZ_X11
-     else if (stype == CAIRO_SURFACE_TYPE_XLIB) {
-         result = new gfxXlibSurface(csurf);
-     }
- #endif
- #ifdef CAIRO_HAS_QUARTZ_SURFACE
-     else if (stype == CAIRO_SURFACE_TYPE_QUARTZ) {
-         result = new gfxQuartzSurface(csurf);
-     }
-     else if (stype == CAIRO_SURFACE_TYPE_QUARTZ_IMAGE) {
-         result = new gfxQuartzImageSurface(csurf);
-     }
- #endif
--#ifdef CAIRO_HAS_DIRECTFB_SURFACE
-+#ifdef MOZ_DFB
-     else if (stype == CAIRO_SURFACE_TYPE_DIRECTFB) {
-         result = new gfxDirectFBSurface(csurf);
-     }
- #endif
- #ifdef CAIRO_HAS_QPAINTER_SURFACE
-     else if (stype == CAIRO_SURFACE_TYPE_QPAINTER) {
-         result = new gfxQPainterSurface(csurf);
-     }
-