[arch-commits] Commit in xulrunner/trunk (10 files)

Jan de Groot jgc at archlinux.org
Sat Jun 21 22:47:20 UTC 2008


    Date: Saturday, June 21, 2008 @ 18:47:20
  Author: jgc
Revision: 3294

Update to 1.9, prepare for Firefox 3.0

Added:
  xulrunner/trunk/100-system-hunspell-corrections.patch
  xulrunner/trunk/bzXXX_pc_honour_system_nspr_nss.patch
  xulrunner/trunk/mozilla-ps-pdf-simplify-operators.patch
  xulrunner/trunk/mozilla-ssl-exception.patch
Modified:
  xulrunner/trunk/PKGBUILD
  xulrunner/trunk/mozconfig
Deleted:
  xulrunner/trunk/about-plugins.patch
  xulrunner/trunk/firefox-2.0-buildversion.patch
  xulrunner/trunk/gnome_helpers_with_params.patch
  xulrunner/trunk/moz310924.patch

-----------------------------------------+
 100-system-hunspell-corrections.patch   |  116 +++++++
 PKGBUILD                                |   64 +---
 about-plugins.patch                     |   19 -
 bzXXX_pc_honour_system_nspr_nss.patch   |  114 +++++++
 firefox-2.0-buildversion.patch          |   10 
 gnome_helpers_with_params.patch         |  457 ------------------------------
 moz310924.patch                         |   74 ----
 mozconfig                               |   46 +--
 mozilla-ps-pdf-simplify-operators.patch |   42 ++
 mozilla-ssl-exception.patch             |   14 
 10 files changed, 335 insertions(+), 621 deletions(-)

Added: 100-system-hunspell-corrections.patch
===================================================================
--- 100-system-hunspell-corrections.patch	                        (rev 0)
+++ 100-system-hunspell-corrections.patch	2008-06-21 22:47:20 UTC (rev 3294)
@@ -0,0 +1,116 @@
+--- ./extensions/spellcheck/hunspell/src/mozHunspell.cpp.orig	2008-02-15 19:21:21.000000000 +0000
++++ ./extensions/spellcheck/hunspell/src/mozHunspell.cpp	2008-02-15 19:23:20.000000000 +0000
+@@ -63,6 +63,9 @@
+ #include "nsISimpleEnumerator.h"
+ #include "nsIDirectoryEnumerator.h"
+ #include "nsIFile.h"
++#ifdef MOZ_NATIVE_HUNSPELL
++#include "nsILocalFile.h"
++#endif
+ #include "nsDirectoryServiceUtils.h"
+ #include "nsDirectoryServiceDefs.h"
+ #include "mozISpellI18NManager.h"
+@@ -307,7 +310,16 @@
+     return;
+ 
+   nsCOMPtr<nsIFile> dictDir;
+-  rv = dirSvc->Get(DICTIONARY_SEARCH_DIRECTORY,
++  #ifdef MOZ_NATIVE_HUNSPELL
++    nsCOMPtr<nsILocalFile>  localFile;
++    rv = NS_NewNativeLocalFile(nsDependentCString("/usr/share/myspell"),PR_TRUE, getter_AddRefs(localFile));
++    if (localFile && NS_SUCCEEDED(rv)) {
++      localFile->QueryInterface(NS_GET_IID(nsIFile), getter_AddRefs(dictDir));
++      LoadDictionariesFromDir(dictDir);
++    }
++    else {
++  #endif
++    rv = dirSvc->Get(DICTIONARY_SEARCH_DIRECTORY,
+                    NS_GET_IID(nsIFile), getter_AddRefs(dictDir));
+   if (NS_SUCCEEDED(rv)) {
+     LoadDictionariesFromDir(dictDir);
+@@ -332,6 +344,9 @@
+       LoadDictionariesFromDir(appDir);
+     }
+   }
++#ifdef MOZ_NATIVE_HUNSPELL
++  }
++#endif
+ 
+   nsCOMPtr<nsISimpleEnumerator> dictDirs;
+   rv = dirSvc->Get(DICTIONARY_SEARCH_DIRECTORY_LIST,
+--- ./extensions/spellcheck/src/Makefile.in.orig	2008-02-15 19:25:58.000000000 +0000
++++ ./extensions/spellcheck/src/Makefile.in	2008-02-15 19:28:36.000000000 +0000
+@@ -63,9 +63,16 @@
+ 		  txtsvc \
+ 		  uconv \
+ 		  unicharutil \
++		  xulapp \
+ 		  $(NULL)
+ 
+-CPPSRCS		= \
++ifdef MOZ_NATIVE_HUNSPELL
++CPPSRCS         += mozHunspell.cpp
++ifdef MOZ_XUL_APP
++CPPSRCS         += mozHunspellDirProvider.cpp
++endif
++endif
++CPPSRCS		+= \
+ 		mozSpellCheckerFactory.cpp	\
+ 		mozSpellChecker.cpp		\
+ 		mozPersonalDictionary.cpp	\
+@@ -80,8 +87,14 @@
+ SHARED_LIBRARY_LIBS += ../osxspell/src/$(LIB_PREFIX)osxspell_s.$(LIB_SUFFIX)
+ LOCAL_INCLUDES += -I$(srcdir)/../osxspell/src
+ else
++ifndef MOZ_NATIVE_HUNSPELL
+ SHARED_LIBRARY_LIBS += ../hunspell/src/$(LIB_PREFIX)hunspell_s.$(LIB_SUFFIX)
+ LOCAL_INCLUDES += -I$(srcdir)/../hunspell/src
++else
++LOCAL_INCLUDES += $(MOZ_HUNSPELL_CFLAGS) \
++		-DMOZ_NATIVE_HUNSPELL \
++		$(NULL)
++endif
+ endif
+ 
+ EXTRA_DSO_LDOPTS = \
+@@ -96,3 +112,18 @@
+ LOCAL_INCLUDES += \
+ 	-I$(topsrcdir)/xpcom/io \
+ 	$(NULL)
++
++ifdef MOZ_NATIVE_HUNSPELL
++export:: $(srcdir)/../hunspell/src/mozHunspell.cpp
++	$(INSTALL) $(srcdir)/../hunspell/src/mozHunspell.* .
++GARBAGE += mozHunspell.$(OBJ_SUFFIX) mozHunspell.cpp
++clean::
++	rm -f mozHunspell.*
++ifdef MOZ_XUL_APP
++export:: $(srcdir)/../hunspell/src/mozHunspellDirProvider.cpp
++	$(INSTALL) $(srcdir)/../hunspell/src/mozHunspellDirProvider.* .
++GARBAGE += mozHunspellDirProvider.$(OBJ_SUFFIX) mozHunspellDirProvider.cpp
++clean::
++	rm -f mozHunspellDirProvider.*
++endif
++endif
+--- ./extensions/spellcheck/Makefile.in.orig	2008-02-15 19:23:39.000000000 +0000
++++ ./extensions/spellcheck/Makefile.in	2008-02-15 19:24:34.000000000 +0000
+@@ -42,13 +42,19 @@
+ include $(DEPTH)/config/autoconf.mk
+ 
+ MODULE		= spellchecker
+-DIRS		= idl locales
++ifndef MOZ_NATIVE_HUNSPELL
++DIRS		= idl locales
++else
++DIRS		= idl
++endif
+ 
+ ifeq (camino,$(MOZ_BUILD_APP))
+ DIRS		+= osxspell
+ else
++ifndef MOZ_NATIVE_HUNSPELL
+ DIRS		+= hunspell
+ endif
++endif
+ 
+ DIRS += src

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2008-06-21 22:46:24 UTC (rev 3293)
+++ PKGBUILD	2008-06-21 22:47:20 UTC (rev 3294)
@@ -2,58 +2,48 @@
 # Maintainer: Alexander Baldeck <alexander at archlinux.org>
 # Contributor: Jan de Groot <jgc at archlinux.org>
 pkgname=xulrunner
-pkgver=1.8.1.14
-pkgrel=2
+pkgver=1.9
+pkgrel=1
 pkgdesc="Mozilla Runtime Environment"
 arch=(i686 x86_64)
 license=('MPL' 'GPL' 'LGPL')
-depends=('gtk2>=2.12.10' 'gcc-libs>=4.3.0' 'libidl2>=0.8.10' 'mozilla-common' 'nss>=3.11.9' 'libxt')
-makedepends=('zip' 'pkgconfig' 'diffutils' 'libgnome>=2.22.0')
-options=(!makeflags)
+depends=('gtk2>=2.12.10' 'gcc-libs>=4.3.1' 'libidl2>=0.8.10' 'mozilla-common' 'nss>=3.12rc4' 'libxt' 'lcms' 'hunspell>=1.2.2')
+makedepends=('zip' 'pkgconfig' 'diffutils' 'libgnomeui>=2.22.1')
 provides=(gecko-sdk)
 replaces=(gecko-sdk)
 url="http://wiki.mozilla.org/XUL:Xul_Runner"
 source=(ftp://ftp.archlinux.org/other/xulrunner/${pkgname}-${pkgver}.tar.bz2
-	about-plugins.patch
         mozconfig
-        moz310924.patch
-        firefox-2.0-buildversion.patch
-	gnome_helpers_with_params.patch)
-md5sums=('29139dcd6037e7c935edb29fb552d4d2'
-         'b2b5ce5ddf6e84858b8acb1e71b4682f'
-         'bd53b644c5a2855d3a2288a382b0d1e5'
-         '29194973e2a535b460c6b7f92c635eaf'
-         '11b221ff41078d97c131e17361072e47'
-         'fd50e0a1c20f5418eb10effb9eaacac2')
+	mozilla-ps-pdf-simplify-operators.patch
+	mozilla-ssl-exception.patch
+	100-system-hunspell-corrections.patch
+	bzXXX_pc_honour_system_nspr_nss.patch)
 
 build() {
-  cd ${startdir}/src/${pkgname}-${pkgver}
-  patch -Np0 -i ${startdir}/src/moz310924.patch || return 1
-  patch -Np1 -i ${startdir}/src/gnome_helpers_with_params.patch || return 1
-  patch -Np0 -i ${startdir}/src/firefox-2.0-buildversion.patch || return 1
-  patch -Np1 -i ${startdir}/src/about-plugins.patch || return 1
-
+  cd ${startdir}/src/mozilla
   cp ${startdir}/src/mozconfig .mozconfig
 
-  if [ "${CARCH}" = "x86_64" ]; then
-    echo "ac_cv_visibility_pragma=no" >> .mozconfig
-  fi
-  
+  #upstream fixes
+  patch -Np1 -i ${srcdir}/mozilla-ps-pdf-simplify-operators.patch || return 1
+  patch -Np1 -i ${srcdir}/mozilla-ssl-exception.patch || return 1
+
+  #fix build with system hunspell - gentoo
+  patch -Np0 -i ${srcdir}/100-system-hunspell-corrections.patch || return 1
+
+  #fix pkgconfig files when building with system nss/nspr - ubuntu
+  patch -Np1 -i ${srcdir}/bzXXX_pc_honour_system_nspr_nss.patch || return 1
+
+  #fix profiling
   unset CFLAGS
   unset CXXFLAGS
+  export LDFLAGS="-Wl,-rpath,/usr/lib/xulrunner-1.9"
 
-  make -f client.mk build || return 1
-  make DESTDIR=${startdir}/pkg DISTDIR=${startdir}/pkg install || return 1
+  make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS" || return 1
+  make -j1 DESTDIR=${startdir}/pkg install || return 1
 
-  cd ${startdir}/pkg/usr/lib && ln -sf xulrunner-${pkgver} xulrunner
-  cd ${startdir}/pkg/usr/include && ln -sf xulrunner-${pkgver} xulrunner
-  cd ${startdir}/pkg/usr/share/idl && ln -sf xulrunner-${pkgver} xulrunner
+  rm -f ${startdir}/pkg/usr/bin/xulrunner
+  ln -sf /usr/lib/xulrunner-1.9/xulrunner ${startdir}/pkg/usr/bin/xulrunner
 
-  rm -rf ${startdir}/pkg/usr/bin/defaults
-
-  #NSPR and NSS aren't built anyways, remove pkgconfig files for it
-  rm -f ${startdir}/pkg/usr/lib/pkgconfig/xulrunner-ns{s,pr}.pc
-  #Remove versioned directories from .pc files, fixes problems with updates
-  sed -i -e "s/xulrunner-${pkgver}/xulrunner/" \
-  	${startdir}/pkg/usr/lib/pkgconfig/*.pc
+  # The ubuntu patch adds these... get rid of it, NSS/NSPR has it.
+  rm -f ${startdir}/pkg/usr/lib/pkgconfig/mozilla-ns{s,pr}.pc || return 1
 }

Deleted: about-plugins.patch
===================================================================
--- about-plugins.patch	2008-06-21 22:46:24 UTC (rev 3293)
+++ about-plugins.patch	2008-06-21 22:47:20 UTC (rev 3294)
@@ -1,19 +0,0 @@
-=== toolkit/content/jar.mn
-==================================================================
---- xulrunner/toolkit/content/jar.mn	(revision 209)
-+++ xulrunner/toolkit/content/jar.mn	(local)
-@@ -78,4 +78,4 @@
- +  content/global/selectDialog.xul            (selectDialog.xul)
- *+ content/global/viewZoomOverlay.js          (viewZoomOverlay.js)
- #endif
--
-+   content/global/plugins.html                (../../xpfe/global/resources/content/plugins.html)
-=== toolkit/themes/winstripe/global/jar.mn
-==================================================================
---- xulrunner/toolkit/themes/winstripe/global/jar.mn	(revision 209)
-+++ xulrunner/toolkit/themes/winstripe/global/jar.mn	(local)
-@@ -153,3 +153,4 @@
-         skin/classic/global/console/console-error-caret.gif         (console/console-error-caret.gif)
-         skin/classic/global/console/console-error-dash.gif          (console/console-error-dash.gif)
- #endif
-+        skin/classic/global/plugins.css                             (../../../../themes/classic/global/plugins.css)

Added: bzXXX_pc_honour_system_nspr_nss.patch
===================================================================
--- bzXXX_pc_honour_system_nspr_nss.patch	                        (rev 0)
+++ bzXXX_pc_honour_system_nspr_nss.patch	2008-06-21 22:47:20 UTC (rev 3294)
@@ -0,0 +1,114 @@
+---
+ xulrunner/installer/Makefile.in                     |   17 ++++++++++++++---
+ xulrunner/installer/libxul-embedding-unstable.pc.in |    2 +-
+ xulrunner/installer/libxul-embedding.pc.in          |    2 +-
+ xulrunner/installer/mozilla-nss.pc.in               |    6 +++---
+ 4 files changed, 19 insertions(+), 8 deletions(-)
+
+Index: mozilla/xulrunner/installer/Makefile.in
+===================================================================
+--- mozilla.orig/xulrunner/installer/Makefile.in
++++ mozilla/xulrunner/installer/Makefile.in
+@@ -90,40 +90,51 @@
+ 	mozilla-plugin.pc \
+ 	mozilla-gtkmozembed.pc \
+ 	mozilla-gtkmozembed-embedding.pc \
+ 	$(NULL)
+ 
+ ifdef MOZ_NATIVE_NSPR
+ NSPR_NAME=nspr
+ NSPR_VERSION=$(shell $(NSPR_CONFIG) --version)
++FULL_NSPR_CFLAGS=$(shell $(NSPR_CONFIG) --cflags)
++FULL_NSPR_LIBS=$(shell $(NSPR_CONFIG) --libs)
+ else
+-pkg_config_files += mozilla-nspr.pc
+ NSPR_NAME=mozilla-nspr
+ FULL_NSPR_CFLAGS=-I\$${includedir}/stable
+ FULL_NSPR_LIBS=$(subst $(prefix),\$${sdkdir},$(shell $(DEPTH)/nsprpub/config/nspr-config --libs))
+ NSPR_VERSION=$(shell $(DEPTH)/nsprpub/config/nspr-config --version)
+ endif
++pkg_config_files += mozilla-nspr.pc
+ 
+ $(warning FULL_NSPR_CFLAGS=$(FULL_NSPR_CFLAGS))
+ 
+-ifndef MOZ_NATIVE_NSS
+-pkg_config_files += mozilla-nss.pc
++ifdef MOZ_NATIVE_NSS
++NSPR_VERSION=$(shell $(NSS_CONFIG) --version)
++FULL_NSS_CFLAGS=$(shell $(NSS_CONFIG) --cflags)
++FULL_NSS_LIBS=$(shell $(NSS_CONFIG) --libs)
++else
++NSS_VERSION=$(shell $(DEPTH)/nsprpub/config/nss-config --version)
++FULL_NSS_CFLAGS=-I\$${includedir}/stable
++FULL_NSS_LIBS=$(subst $(prefix),\$${sdkdir},$(shell $(DEPTH)/nsprpub/config/nss-config --libs))
+ endif
++pkg_config_files += mozilla-nss.pc
+ 
+ %.pc: $(srcdir)/%.pc.in Makefile.in Makefile $(DEPTH)/config/autoconf.mk
+ 	cat $< | sed \
+ 	-e "s|%prefix%|$(prefix)|" \
+ 	-e "s|%includedir%|$(includedir)|" \
+ 	-e "s|%idldir%|$(idldir)|" \
+ 	-e "s|%sdkdir%|$(sdkdir)|" \
+ 	-e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \
+ 	-e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \
+ 	-e "s|%FULL_NSPR_LIBS%|$(FULL_NSPR_LIBS)|" \
+ 	-e "s|%FULL_NSPR_CFLAGS%|$(FULL_NSPR_CFLAGS)|" \
++	-e "s|%FULL_NSS_LIBS%|$(FULL_NSS_LIBS)|" \
++	-e "s|%FULL_NSS_CFLAGS%|$(FULL_NSS_CFLAGS)|" \
+ 	-e "s|%NSPR_NAME%|$(NSPR_NAME)|" \
+ 	-e "s|%NSPR_VERSION%|$(NSPR_VERSION)|" > $@
+ 	chmod 644 $@
+ 
+ install:: $(pkg_config_files)
+ 	@echo pkg_config_file: $(pkg_config_files)
+ 	$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(libdir)/pkgconfig
+ 
+Index: mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in
+===================================================================
+--- mozilla.orig/xulrunner/installer/libxul-embedding-unstable.pc.in
++++ mozilla/xulrunner/installer/libxul-embedding-unstable.pc.in
+@@ -3,9 +3,9 @@
+ includedir=%includedir%
+ idldir=%idldir%
+ includetype=unstable
+ 
+ Name: libxul-embedding-unstable
+ Description: Static library for version-independent embedding of the Mozilla runtime (unstable API)
+ Version: %MOZILLA_VERSION%
+ Libs: -L${sdkdir}/lib -lxpcomglue
+-Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} -fshort-wchar
++Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} -fshort-wchar %FULL_NSPR_CFLAGS%
+Index: mozilla/xulrunner/installer/libxul-embedding.pc.in
+===================================================================
+--- mozilla.orig/xulrunner/installer/libxul-embedding.pc.in
++++ mozilla/xulrunner/installer/libxul-embedding.pc.in
+@@ -7,9 +7,9 @@
+ # Note: the default pkg-config cflags will only list include directories
+ # that contain stable (frozen or safe for linking) header files. To include
+ # nonfrozen headers, run pkg-config with --define-variable=includetype=unstable
+ 
+ Name: libxul-embedding
+ Description: Static library for version-independent embedding of the Mozilla runtime
+ Version: %MOZILLA_VERSION%
+ Libs: -L${sdkdir}/lib -lxpcomglue
+-Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} -fshort-wchar
++Cflags: -DXPCOM_GLUE -I${includedir}/${includetype} -fshort-wchar %FULL_NSPR_CFLAGS%
+Index: mozilla/xulrunner/installer/mozilla-nss.pc.in
+===================================================================
+--- mozilla.orig/xulrunner/installer/mozilla-nss.pc.in
++++ mozilla/xulrunner/installer/mozilla-nss.pc.in
+@@ -1,10 +1,10 @@
+ prefix=%prefix%
+ sdkdir=%sdkdir%
+ includedir=%includedir%
+ 
+ Name: NSS
+ Description: Mozilla Network Security Services
+-Version: %MOZILLA_VERSION%
++Version: %NSS_VERSION%
+ Requires: %NSPR_NAME% >= %NSPR_VERSION%
+-Libs: -L${sdkdir}/lib -lnss3 -lnssutil3 -lsmime3 -lssl3 -lsoftokn3
+-Cflags: -I${includedir}/stable
++Libs: %FULL_NSS_LIBS%
++Cflags: %FULL_NSS_CFLAGS%

Deleted: firefox-2.0-buildversion.patch
===================================================================
--- firefox-2.0-buildversion.patch	2008-06-21 22:46:24 UTC (rev 3293)
+++ firefox-2.0-buildversion.patch	2008-06-21 22:47:20 UTC (rev 3294)
@@ -1,10 +0,0 @@
---- config/bdate.pl.orig	2006-10-26 21:06:39.000000000 +0000
-+++ config/bdate.pl	2006-10-26 21:06:56.000000000 +0000
-@@ -39,6 +39,6 @@
- 
- # Both "generate" args are optional
- $file = $ARGV[0]  if ("$ARGV[0]" ne "");
--$official = 1 if ("$ARGV[1]" ne "");
-+$official = 1;
- &mozBDate::UpdateBuildNumber($file, $official);
- 

Deleted: gnome_helpers_with_params.patch
===================================================================
--- gnome_helpers_with_params.patch	2008-06-21 22:46:24 UTC (rev 3293)
+++ gnome_helpers_with_params.patch	2008-06-21 22:47:20 UTC (rev 3294)
@@ -1,457 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 125_gnome_helpers_with_params.dpatch by Mike Hommey <glandium at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Make helper applications with parameters work. Adapted patch from 
-## DP: bz#273524
-
- at DPATCH@
-
-=== uriloader/exthandler/Makefile.in
-==================================================================
---- xulrunner/uriloader/exthandler/Makefile.in	(revision 116)
-+++ xulrunner/uriloader/exthandler/Makefile.in	(local)
-@@ -102,7 +102,7 @@
- LOCAL_INCLUDES = -I$(srcdir)
- 
- ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
--OSHELPER	+= nsGNOMERegistry.cpp
-+OSHELPER	+= nsMIMEInfoUnix.cpp nsGNOMERegistry.cpp
- endif
- 
- ifeq ($(MOZ_WIDGET_TOOLKIT),beos)
-=== uriloader/exthandler/unix/nsGNOMERegistry.cpp
-==================================================================
---- xulrunner/uriloader/exthandler/unix/nsGNOMERegistry.cpp	(revision 116)
-+++ xulrunner/uriloader/exthandler/unix/nsGNOMERegistry.cpp	(local)
-@@ -42,7 +42,7 @@
- #include "nsString.h"
- #include "nsIComponentManager.h"
- #include "nsILocalFile.h"
--#include "nsMIMEInfoImpl.h"
-+#include "nsMIMEInfoUnix.h"
- #include "nsAutoPtr.h"
- 
- #include <glib.h>
-@@ -56,12 +56,12 @@
- typedef struct _GnomeProgram GnomeProgram;
- typedef struct _GnomeModuleInfo GnomeModuleInfo;
- 
--typedef struct {
-+struct GnomeVFSMimeApplication {
-   char *id;
-   char *name;
-   char *command;
-   /* there is more here, but we don't need it */
--} GnomeVFSMimeApplication;
-+};
- 
- typedef GConfClient * (*_gconf_client_get_default_fn)();
- typedef gchar * (*_gconf_client_get_string_fn)(GConfClient *,
-@@ -264,7 +264,7 @@
- }
- 
- 
--/* static */ already_AddRefed<nsMIMEInfoBase>
-+/* static */ already_AddRefed<nsMIMEInfoUnix>
- nsGNOMERegistry::GetFromExtension(const char *aFileExt)
- {
-   if (!gconfLib)
-@@ -286,7 +286,7 @@
-   return GetFromType(mimeType);
- }
- 
--/* static */ already_AddRefed<nsMIMEInfoBase>
-+/* static */ already_AddRefed<nsMIMEInfoUnix>
- nsGNOMERegistry::GetFromType(const char *aMIMEType)
- {
-   if (!gconfLib)
-@@ -296,7 +296,7 @@
-   if (!handlerApp)
-     return nsnull;
- 
--  nsRefPtr<nsMIMEInfoImpl> mimeInfo = new nsMIMEInfoImpl(aMIMEType);
-+  nsRefPtr<nsMIMEInfoUnix> mimeInfo = new nsMIMEInfoUnix(aMIMEType);
-   NS_ENSURE_TRUE(mimeInfo, nsnull);
- 
-   // Get the list of extensions and append then to the mimeInfo.
-@@ -320,11 +320,21 @@
-     return nsnull;
-   }
- 
--  gchar *commandPath = g_find_program_in_path(nativeCommand);
-+  gchar **argv;
-+  gboolean res = g_shell_parse_argv(nativeCommand, NULL, &argv, NULL);
-+  if (!res) {
-+    NS_ERROR("Could not convert helper app command to filesystem encoding");
-+    _gnome_vfs_mime_application_free(handlerApp);
-+    return nsnull;
-+  }
- 
-+  gchar *commandPath = g_find_program_in_path(argv[0]);
-+
-   g_free(nativeCommand);
-+  g_strfreev(argv);
- 
-   if (!commandPath) {
-+    NS_WARNING("could not find command in path");
-     _gnome_vfs_mime_application_free(handlerApp);
-     return nsnull;
-   }
-@@ -342,7 +352,7 @@
- 
-   _gnome_vfs_mime_application_free(handlerApp);
- 
--  nsMIMEInfoBase* retval;
-+  nsMIMEInfoUnix* retval;
-   NS_ADDREF((retval = mimeInfo));
-   return retval;
- }
-=== uriloader/exthandler/unix/nsGNOMERegistry.h
-==================================================================
---- xulrunner/uriloader/exthandler/unix/nsGNOMERegistry.h	(revision 116)
-+++ xulrunner/uriloader/exthandler/unix/nsGNOMERegistry.h	(local)
-@@ -35,10 +35,13 @@
-  *
-  * ***** END LICENSE BLOCK ***** */
- 
-+#ifndef nsGNOMERegistry_h__
-+#define nsGNOMERegistry_h__
-+
- #include "nsIURI.h"
- #include "nsCOMPtr.h"
- 
--class nsMIMEInfoBase;
-+class nsMIMEInfoUnix;
- 
- class nsGNOMERegistry
- {
-@@ -52,7 +55,9 @@
-   static void GetAppDescForScheme(const nsACString& aScheme,
-                                   nsAString& aDesc);
- 
--  static already_AddRefed<nsMIMEInfoBase> GetFromExtension(const char *aFileExt);
-+  static already_AddRefed<nsMIMEInfoUnix> GetFromExtension(const char *aFileExt);
- 
--  static already_AddRefed<nsMIMEInfoBase> GetFromType(const char *aMIMEType);
-+  static already_AddRefed<nsMIMEInfoUnix> GetFromType(const char *aMIMEType);
- };
-+
-+#endif // nsGNOMERegistry_h__
-=== uriloader/exthandler/unix/nsOSHelperAppService.cpp
-==================================================================
---- xulrunner/uriloader/exthandler/unix/nsOSHelperAppService.cpp	(revision 175)
-+++ xulrunner/uriloader/exthandler/unix/nsOSHelperAppService.cpp	(local)
-@@ -44,11 +44,13 @@
- #include "nsOSHelperAppService.h"
- #ifdef MOZ_WIDGET_GTK2
- #include "nsGNOMERegistry.h"
-+#include "nsMIMEInfoUnix.h"
- #endif
- #include "nsISupports.h"
- #include "nsString.h"
- #include "nsReadableUtils.h"
- #include "nsUnicharUtils.h"
-+#include "nsIStringEnumerator.h"
- #include "nsXPIDLString.h"
- #include "nsIURL.h"
- #include "nsIFileStreams.h"
-@@ -1486,6 +1488,22 @@
-   
-   LOG(("Here we do a mimetype lookup for '%s'\n", aMIMEType.get()));
- 
-+#ifdef MOZ_WIDGET_GTK2
-+  // Look in GNOME registry first since it is the preferred method in GNOME,
-+  // should trump the mailcap entry
-+  LOG(("Looking in GNOME registry\n"));
-+  nsMIMEInfoBase *gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType.get()).get();
-+  if (gnomeInfo) {
-+    LOG(("Got MIMEInfo from GNOME registry\n"));
-+    nsCOMPtr<nsIUTF8StringEnumerator> extensions;
-+    gnomeInfo->GetFileExtensions(getter_AddRefs(extensions));
-+    PRBool hasMore;
-+    extensions->HasMore(&hasMore);
-+    if (hasMore)
-+      return gnomeInfo;
-+  }
-+#endif
-+
-   // extract the major and minor types
-   NS_ConvertASCIItoUTF16 mimeType(aMIMEType);
-   nsAString::const_iterator start_iter, end_iter,
-@@ -1521,21 +1539,6 @@
-           NS_LossyConvertUTF16toASCII(handler).get(),
-           NS_LossyConvertUTF16toASCII(mailcap_description).get()));
- 
--#ifdef MOZ_WIDGET_GTK2
--  nsMIMEInfoBase *gnomeInfo = nsnull;
--  if (handler.IsEmpty()) {
--    // No useful data yet.  Check the GNOME registry.  Unfortunately, newer
--    // GNOME versions no longer have type-to-extension mappings, so we might
--    // get back a MIMEInfo without any extensions set.  In that case we'll have
--    // to look in our mime.types files for the extensions.    
--    LOG(("Looking in GNOME registry\n"));
--    gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType.get()).get();
--    if (gnomeInfo && gnomeInfo->HasExtensions()) {
--      LOG(("Got MIMEInfo from GNOME registry, and it has extensions set\n"));
--      return gnomeInfo;
--    }
--  }
--#endif
- 
-   // Now look up our extensions
-   nsAutoString extensions, mime_types_description;
-=== uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
-==================================================================
---- xulrunner/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp	(revision 116)
-+++ xulrunner/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp	(local)
-@@ -0,0 +1,196 @@
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Version: MPL 1.1
-+ *
-+ * The contents of this file are subject to the Mozilla Public License Version
-+ * 1.1 (the "License"); you may not use this file except in compliance with
-+ * the License. You may obtain a copy of the License at
-+ * http://www.mozilla.org/MPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+ * for the specific language governing rights and limitations under the
-+ * License.
-+ *
-+ * The Original Code is mozilla.org Code.
-+ *
-+ * The Initial Developer of the Original Code is
-+ * Red Hat, Inc.
-+ * Portions created by the Initial Developer are Copyright (C) 2005
-+ * the Initial Developer. All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ *   Christopher Aillon <caillon at redhat.com> (Original author)
-+ *
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+
-+#include "nsMIMEInfoUnix.h"
-+#include "prlink.h"
-+#include "prmem.h"
-+#include <glib.h>
-+#include <glib-object.h>
-+
-+static PRLibrary *gnomeLib;
-+static PRLibrary *vfsLib;
-+
-+typedef struct _GnomeProgram GnomeProgram;
-+typedef struct _GnomeModuleInfo GnomeModuleInfo;
-+
-+typedef enum {
-+  GNOME_VFS_OK // there's more but we don't care about them.
-+} GnomeVFSResult;
-+
-+typedef GnomeVFSResult (*_gnome_vfs_mime_application_launch_fn)
-+                              (GnomeVFSMimeApplication *app,
-+                               GList *uris);
-+typedef void (*_gnome_vfs_mime_application_free_fn)(GnomeVFSMimeApplication *);
-+typedef GnomeVFSMimeApplication * (*_gnome_vfs_mime_application_copy_fn)(GnomeVFSMimeApplication *);
-+typedef GnomeProgram * (*_gnome_program_init_fn)(const char *, const char *,
-+						 const GnomeModuleInfo *, int,
-+						 char **, const char *, ...);
-+typedef const char * (*_gnome_vfs_mime_application_get_name_fn)(GnomeVFSMimeApplication *);
-+typedef const GnomeModuleInfo * (*_libgnome_module_info_get_fn)();
-+typedef GnomeProgram * (*_gnome_program_get_fn)();
-+typedef char * (*_gnome_vfs_make_uri_from_input_fn)(const char *);
-+
-+#define DECL_FUNC_PTR(func) static _##func##_fn _##func
-+
-+DECL_FUNC_PTR(gnome_vfs_mime_application_launch);
-+DECL_FUNC_PTR(gnome_vfs_mime_application_free);
-+DECL_FUNC_PTR(gnome_vfs_mime_application_copy);
-+DECL_FUNC_PTR(gnome_vfs_mime_application_get_name);
-+DECL_FUNC_PTR(gnome_program_init);
-+DECL_FUNC_PTR(gnome_program_get);
-+DECL_FUNC_PTR(libgnome_module_info_get);
-+DECL_FUNC_PTR(gnome_vfs_make_uri_from_input);
-+
-+static PRLibrary *
-+LoadVersionedLibrary(const char* libName, const char* libVersion)
-+{
-+  char *platformLibName = PR_GetLibraryName(nsnull, libName);
-+  nsCAutoString versionLibName(platformLibName);
-+  versionLibName.Append(libVersion);
-+  PR_Free(platformLibName);
-+  return PR_LoadLibrary(versionLibName.get());
-+}
-+
-+static void
-+Cleanup()
-+{
-+  // Unload all libraries
-+  if (gnomeLib)
-+    PR_UnloadLibrary(gnomeLib);
-+  if (vfsLib)
-+    PR_UnloadLibrary(vfsLib);
-+
-+  gnomeLib = vfsLib = nsnull;
-+}
-+
-+static void
-+InitGnomeVFS()
-+{
-+  static PRBool initialized = PR_FALSE;
-+
-+  if (initialized)
-+    return;
-+
-+  #define ENSURE_LIB(lib) \
-+    PR_BEGIN_MACRO \
-+    if (!lib) { \
-+      Cleanup(); \
-+      return; \
-+    } \
-+    PR_END_MACRO
-+
-+  #define GET_LIB_FUNCTION(lib, func, failure) \
-+    PR_BEGIN_MACRO \
-+    _##func = (_##func##_fn) PR_FindFunctionSymbol(lib##Lib, #func); \
-+    if (!_##func) { \
-+      failure; \
-+    } \
-+    PR_END_MACRO
-+
-+  // Attempt to open libgnome
-+  gnomeLib = LoadVersionedLibrary("gnome-2", ".0");
-+  ENSURE_LIB(gnomeLib);
-+
-+  GET_LIB_FUNCTION(gnome, gnome_program_init, return Cleanup());
-+  GET_LIB_FUNCTION(gnome, libgnome_module_info_get, return Cleanup());
-+  GET_LIB_FUNCTION(gnome, gnome_program_get, return Cleanup());
-+
-+  // Attempt to open libgnomevfs
-+  vfsLib = LoadVersionedLibrary("gnomevfs-2", ".0");
-+  ENSURE_LIB(vfsLib);
-+
-+  GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_launch, /* do nothing */);
-+  GET_LIB_FUNCTION(vfs, gnome_vfs_make_uri_from_input, return Cleanup());
-+  GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_get_name, return Cleanup());
-+  GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_free, return Cleanup());
-+  GET_LIB_FUNCTION(vfs, gnome_vfs_mime_application_copy, return Cleanup());
-+
-+  // Initialize GNOME, if it's not already initialized.  It's not
-+  // necessary to tell GNOME about our actual command line arguments.
-+
-+  if (!_gnome_program_get()) {
-+    char *argv[1] = { "gecko" };
-+    _gnome_program_init("Gecko", "1.0", _libgnome_module_info_get(),
-+                        1, argv, NULL);
-+  }
-+
-+  // Note: after GNOME has been initialized, do not ever unload these
-+  // libraries.  They register atexit handlers, so if they are unloaded, we'll
-+  // crash on exit.  
-+}
-+
-+void
-+nsMIMEInfoUnix::SetDefaultGnomeVFSMimeApplication(GnomeVFSMimeApplication* app)
-+{
-+  if (_gnome_vfs_mime_application_copy && _gnome_vfs_mime_application_free) {
-+    mDefaultVFSApplication = _gnome_vfs_mime_application_copy(app);
-+
-+    mPreferredAction = nsIMIMEInfo::useSystemDefault;
-+
-+    const gchar * name = _gnome_vfs_mime_application_get_name(mDefaultVFSApplication);
-+    if (name) 
-+      mDefaultAppDescription = NS_ConvertUTF8toUCS2(name);
-+  }
-+}
-+
-+nsMIMEInfoUnix::~nsMIMEInfoUnix()
-+{
-+  if (mDefaultVFSApplication)
-+    _gnome_vfs_mime_application_free(mDefaultVFSApplication);
-+}
-+
-+nsresult
-+nsMIMEInfoUnix::LaunchDefaultWithFile(nsIFile* aFile)
-+{
-+  NS_ENSURE_ARG_POINTER(aFile);
-+
-+  InitGnomeVFS();
-+
-+  if (_gnome_vfs_mime_application_launch && mDefaultVFSApplication) {
-+    nsCAutoString nativePath;
-+    aFile->GetNativePath(nativePath);
-+
-+    gchar *uri = _gnome_vfs_make_uri_from_input(nativePath.get());
-+
-+    GList *uris = NULL;
-+    uris = g_list_append(uris, uri);
-+
-+    GnomeVFSResult result = _gnome_vfs_mime_application_launch(mDefaultVFSApplication, uris);
-+
-+    g_free(uri);
-+    g_list_free(uris);
-+
-+    if (result != GNOME_VFS_OK)
-+      return NS_ERROR_FAILURE;
-+
-+    return NS_OK;
-+  }
-+
-+  if (!mDefaultApplication)
-+    return NS_ERROR_FILE_NOT_FOUND;
-+
-+  return LaunchWithIProcess(mDefaultApplication, aFile);
-+}
-=== uriloader/exthandler/unix/nsMIMEInfoUnix.h
-==================================================================
---- xulrunner/uriloader/exthandler/unix/nsMIMEInfoUnix.h	(revision 116)
-+++ xulrunner/uriloader/exthandler/unix/nsMIMEInfoUnix.h	(local)
-@@ -0,0 +1,48 @@
-+/* ***** BEGIN LICENSE BLOCK *****
-+ * Version: MPL 1.1
-+ *
-+ * The contents of this file are subject to the Mozilla Public License Version
-+ * 1.1 (the "License"); you may not use this file except in compliance with
-+ * the License. You may obtain a copy of the License at
-+ * http://www.mozilla.org/MPL/
-+ *
-+ * Software distributed under the License is distributed on an "AS IS" basis,
-+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-+ * for the specific language governing rights and limitations under the
-+ * License.
-+ *
-+ * The Original Code is mozilla.org Code.
-+ *
-+ * The Initial Developer of the Original Code is
-+ * Red Hat, Inc.
-+ * Portions created by the Initial Developer are Copyright (C) 2005
-+ * the Initial Developer. All Rights Reserved.
-+ *
-+ * Contributor(s):
-+ *   Christopher Aillon <caillon at redhat.com> (Original author)
-+ *
-+ *
-+ * ***** END LICENSE BLOCK ***** */
-+
-+#ifndef nsMimeInfoUnix_h__
-+#define nsMimeInfoUnix_h__
-+
-+#include "nsMIMEInfoImpl.h"
-+
-+struct GnomeVFSMimeApplication;
-+
-+class nsMIMEInfoUnix : public nsMIMEInfoImpl
-+{
-+public:
-+  nsMIMEInfoUnix(const char* aType = "") : nsMIMEInfoImpl(aType), mDefaultVFSApplication(nsnull) {}
-+  virtual ~nsMIMEInfoUnix();
-+
-+  void SetDefaultGnomeVFSMimeApplication(GnomeVFSMimeApplication *app);
-+
-+protected:
-+  virtual NS_HIDDEN_(nsresult) LaunchDefaultWithFile(nsIFile* aFile);
-+
-+  GnomeVFSMimeApplication *mDefaultVFSApplication;
-+};
-+ 
-+#endif // nsMimeInfoUnix_h__

Deleted: moz310924.patch
===================================================================
--- moz310924.patch	2008-06-21 22:46:24 UTC (rev 3293)
+++ moz310924.patch	2008-06-21 22:47:20 UTC (rev 3294)
@@ -1,74 +0,0 @@
---- widget/src/gtk2/nsWindow.cpp	2006-01-09 05:48:56.000000000 +0000
-+++ widget/src/gtk2/nsWindow.cpp	2006-08-09 18:51:41.000000000 +0000
-@@ -3512,15 +3512,19 @@
-         gdkcursor = gdk_cursor_new(GDK_FLEUR);
-         break;
-     case eCursor_help:
-+        gdkcursor = gdk_cursor_new_from_name(gdk_display_get_default(), "help");
-         newType = MOZ_CURSOR_QUESTION_ARROW;
-         break;
-     case eCursor_copy: // CSS3
-+        gdkcursor = gdk_cursor_new_from_name(gdk_display_get_default(), "copy");
-         newType = MOZ_CURSOR_COPY;
-         break;
-     case eCursor_alias:
-+        gdkcursor = gdk_cursor_new_from_name(gdk_display_get_default(), "alias");
-         newType = MOZ_CURSOR_ALIAS;
-         break;
-     case eCursor_context_menu:
-+        gdkcursor = gdk_cursor_new_from_name(gdk_display_get_default(), "context-menu");
-         newType = MOZ_CURSOR_CONTEXT_MENU;
-         break;
-     case eCursor_cell:
-@@ -3533,6 +3537,7 @@
-         newType = MOZ_CURSOR_HAND_GRABBING;
-         break;
-     case eCursor_spinning:
-+        gdkcursor = gdk_cursor_new_from_name(gdk_display_get_default(), "wait"); // or maybe "progress" ?
-         newType = MOZ_CURSOR_SPINNING;
-         break;
-     case eCursor_zoom_in:
-@@ -3542,25 +3547,34 @@
-         newType = MOZ_CURSOR_ZOOM_OUT;
-         break;
-     case eCursor_not_allowed:
-+        gdkcursor = gdk_cursor_new_from_name(gdk_display_get_default(), "not-allowed");
-+        newType = MOZ_CURSOR_NOT_ALLOWED;
-+        break;
-     case eCursor_no_drop:
-+        gdkcursor = gdk_cursor_new_from_name(gdk_display_get_default(), "no-drop");
-         newType = MOZ_CURSOR_NOT_ALLOWED;
-         break;
-     case eCursor_col_resize:
-+        gdkcursor = gdk_cursor_new_from_name(gdk_display_get_default(), "col-resize");
-         newType = MOZ_CURSOR_COL_RESIZE;
-         break;
-     case eCursor_row_resize:
-+        gdkcursor = gdk_cursor_new_from_name(gdk_display_get_default(), "row-resize");
-         newType = MOZ_CURSOR_ROW_RESIZE;
-         break;
-     case eCursor_vertical_text:
-+        gdkcursor = gdk_cursor_new_from_name(gdk_display_get_default(), "vertical-text");
-         newType = MOZ_CURSOR_VERTICAL_TEXT;
-         break;
-     case eCursor_all_scroll:
-         gdkcursor = gdk_cursor_new(GDK_FLEUR);
-         break;
-     case eCursor_nesw_resize:
-+        gdkcursor = gdk_cursor_new_from_name(gdk_display_get_default(), "nesw-resize");
-         newType = MOZ_CURSOR_NESW_RESIZE;
-         break;
-     case eCursor_nwse_resize:
-+        gdkcursor = gdk_cursor_new_from_name(gdk_display_get_default(), "nwse-resize");
-         newType = MOZ_CURSOR_NWSE_RESIZE;
-         break;
-     case eCursor_ns_resize:
-@@ -3577,7 +3591,7 @@
- 
-     // if by now we dont have a xcursor, this means we have to make a
-     // custom one
--    if (newType != 0xff) {
-+    if (!gdkcursor && newType != 0xff) {
-         gdk_color_parse("#000000", &fg);
-         gdk_color_parse("#ffffff", &bg);
- 

Modified: mozconfig
===================================================================
--- mozconfig	2008-06-21 22:46:24 UTC (rev 3293)
+++ mozconfig	2008-06-21 22:47:20 UTC (rev 3294)
@@ -1,34 +1,32 @@
-mk_add_options MOZILLA_OFFICIAL=0
-mk_add_options BUILD_OFFICIAL=0
-mk_add_options MOZ_MAKE_FLAGS=-j1
-
-# load defaults from src tarball
 . $topsrcdir/xulrunner/config/mozconfig
-# add our own options
-
+ac_add_options --prefix=/usr
+ac_add_options --libdir=/usr/lib
 ac_add_options --with-system-nspr
 ac_add_options --with-system-nss
 ac_add_options --with-system-jpeg
 ac_add_options --with-system-zlib
+ac_add_options --with-system-bz2
 ac_add_options --with-system-png
-ac_add_options --with-system-mng
-ac_add_options --disable-tests
-ac_add_options --disable-installer
-ac_add_options --enable-canvas
-ac_add_options --enable-svg
-ac_add_options --enable-xft
-ac_add_options --enable-pango
-ac_add_options --enable-ldap
-ac_add_options --disable-freetype2
-ac_add_options --prefix=/usr
-ac_add_options --enable-optimize
-ac_add_options --enable-default-toolkit=gtk2
+ac_add_options --enable-system-lcms
+ac_add_options --enable-system-hunspell
+ac_add_options --enable-system-sqlite
 ac_add_options --enable-system-cairo
-ac_add_options --disable-xprint
-ac_add_options --enable-gnomevfs
-ac_add_options --with-default-mozilla-five-home=/usr/lib/xulrunner
+ac_add_options --with-pthreads
 ac_add_options --enable-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
+ac_add_options --enable-default-toolkit=cairo-gtk2
+ac_add_options --enable-pango
+ac_add_options --enable-svg
+ac_add_options --enable-canvas
 ac_add_options --disable-javaxpcom
-ac_add_options --enable-extensions=default,cookie,permissions,spellcheck
-ac_add_options --disable-gnomeui
+ac_add_options --disable-crashreporter
+ac_add_options --enable-safe-browsing
+
+export BUILD_OFFICIAL=1
+export MOZILLA_OFFICIAL=1
+mk_add_options BUILD_OFFICIAL=1
+mk_add_options MOZILLA_OFFICIAL=1

Added: mozilla-ps-pdf-simplify-operators.patch
===================================================================
--- mozilla-ps-pdf-simplify-operators.patch	                        (rev 0)
+++ mozilla-ps-pdf-simplify-operators.patch	2008-06-21 22:47:20 UTC (rev 3294)
@@ -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;

Added: mozilla-ssl-exception.patch
===================================================================
--- mozilla-ssl-exception.patch	                        (rev 0)
+++ mozilla-ssl-exception.patch	2008-06-21 22:47:20 UTC (rev 3294)
@@ -0,0 +1,14 @@
+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()
+





More information about the arch-commits mailing list