# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1278552292 -7200
# Node ID 7177cac2391542a30cb499916d750f101f22cec7
# Parent  16a885bc70160316a619e20ec60e40f2a555d9a5
Update to snapshot 20100707
- use new registration code for mozilla-libproxy.patch

diff -r 16a885bc7016 -r 7177cac23915 MozillaFirefox/MozillaFirefox.desktop
--- a/MozillaFirefox/MozillaFirefox.desktop	Thu Jul 01 08:30:35 2010 +0200
+++ b/MozillaFirefox/MozillaFirefox.desktop	Thu Jul 08 03:24:52 2010 +0200
@@ -1,11 +1,11 @@
 [Desktop Entry]
 Encoding=UTF-8
-Name=Firefox
+Name=Firefox 4
 GenericName=Web Browser
 Comment=Web Browser
-TryExec=firefox
-Exec=firefox %u
-Icon=firefox
+TryExec=firefox4
+Exec=firefox4 %u
+Icon=firefox4
 Terminal=false
 StartupNotify=true
 MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;application/x-xpinstall;
diff -r 16a885bc7016 -r 7177cac23915 MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.spec	Thu Jul 01 08:30:35 2010 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Thu Jul 08 03:24:52 2010 +0200
@@ -33,7 +33,7 @@
 Provides:       firefox
 Version:        4.0b
 Release:        1
-%define         releasedate 2010063000
+%define         releasedate 2010070700
 Summary:        Mozilla Firefox Web Browser
 Url:            http://www.mozilla.org/
 Group:          Productivity/Networking/Web/Browsers
diff -r 16a885bc7016 -r 7177cac23915 firefox-appname.patch
--- a/firefox-appname.patch	Thu Jul 01 08:30:35 2010 +0200
+++ b/firefox-appname.patch	Thu Jul 08 03:24:52 2010 +0200
@@ -15,7 +15,7 @@
  
 -  return appPath->GetNativePath(mAppPath);
 +  /* This path to firefox is hardcoded for the default path setting */
-+  mAppPath.Assign ("/usr/bin/firefox");
++  mAppPath.Assign ("/usr/bin/firefox4");
 +  
 +  //return appPath->GetNativePath(mAppPath);
 +  return NS_OK;
diff -r 16a885bc7016 -r 7177cac23915 mozilla-libproxy.patch
--- a/mozilla-libproxy.patch	Thu Jul 01 08:30:35 2010 +0200
+++ b/mozilla-libproxy.patch	Thu Jul 08 03:24:52 2010 +0200
@@ -6,7 +6,7 @@
 diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in
 --- a/config/autoconf.mk.in
 +++ b/config/autoconf.mk.in
-@@ -538,16 +538,20 @@ FT2_CFLAGS             = @FT2_CFLAGS@
+@@ -541,16 +541,20 @@ FT2_CFLAGS             = @FT2_CFLAGS@
  FT2_LIBS               = @FT2_LIBS@
  
  MOZ_PANGO_CFLAGS        = @MOZ_PANGO_CFLAGS@
@@ -46,7 +46,7 @@
 diff --git a/configure.in b/configure.in
 --- a/configure.in
 +++ b/configure.in
-@@ -5564,16 +5564,39 @@ then
+@@ -5536,16 +5536,39 @@ then
      fi
  
      AC_SUBST(MOZ_ENABLE_GCONF)
@@ -167,7 +167,7 @@
 new file mode 100644
 --- /dev/null
 +++ b/toolkit/system/unixproxy/nsLibProxySettings.cpp
-@@ -0,0 +1,162 @@
+@@ -0,0 +1,173 @@
 +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 +/* ***** BEGIN LICENSE BLOCK *****
 + * Version: MPL 1.1/GPL 2.0/LGPL 2.1
@@ -206,7 +206,7 @@
 + * ***** END LICENSE BLOCK ***** */
 +
 +#include "nsISystemProxySettings.h"
-+#include "nsIGenericFactory.h"
++#include "mozilla/ModuleUtils.h"
 +#include "nsIServiceManager.h"
 +#include "nsIIOService.h"
 +#include "nsIURI.h"
@@ -321,12 +321,23 @@
 +       {0x91, 0x81, 0xa2, 0x85, 0xe7, 0x4c, 0xf1, 0xd4 } }
 +
 +NS_GENERIC_FACTORY_CONSTRUCTOR_INIT(nsUnixSystemProxySettings, Init)
++NS_DEFINE_NAMED_CID(NS_UNIXSYSTEMPROXYSERVICE_CID);
 +
-+static const nsModuleComponentInfo components[] = {
-+  { "Unix System Proxy Settings Service",
-+    NS_UNIXSYSTEMPROXYSERVICE_CID,
-+    NS_SYSTEMPROXYSETTINGS_CONTRACTID,
-+    nsUnixSystemProxySettingsConstructor }
++static const mozilla::Module::CIDEntry kUnixProxyCIDs[] = {
++  { &kNS_UNIXSYSTEMPROXYSERVICE_CID, false, NULL, nsUnixSystemProxySettingsConstructor },
++  { NULL }
 +};
 +
-+NS_IMPL_NSGETMODULE(nsUnixProxyModule, components)
++static const mozilla::Module::ContractIDEntry kUnixProxyContracts[] = {
++  { NS_SYSTEMPROXYSETTINGS_CONTRACTID, &kNS_UNIXSYSTEMPROXYSERVICE_CID },
++  { NULL }
++};
++
++static const mozilla::Module kUnixProxyModule = {
++  mozilla::Module::kVersion,
++  kUnixProxyCIDs,
++  kUnixProxyContracts
++};
++        
++NSMODULE_DEFN(nsUnixProxyModule) = &kUnixProxyModule;
++
diff -r 16a885bc7016 -r 7177cac23915 mozilla-xulrunner193/create-tar.sh
--- a/mozilla-xulrunner193/create-tar.sh	Thu Jul 01 08:30:35 2010 +0200
+++ b/mozilla-xulrunner193/create-tar.sh	Thu Jul 08 03:24:52 2010 +0200
@@ -2,7 +2,7 @@
 
 BRANCH="mozilla-central"
 RELEASE_TAG="default"
-VERSION="1.9.3a"
+VERSION="2.0b"
 
 # mozilla
 hg clone http://hg.mozilla.org/$BRANCH mozilla
diff -r 16a885bc7016 -r 7177cac23915 mozilla-xulrunner193/mozilla-xulrunner193.spec
--- a/mozilla-xulrunner193/mozilla-xulrunner193.spec	Thu Jul 01 08:30:35 2010 +0200
+++ b/mozilla-xulrunner193/mozilla-xulrunner193.spec	Thu Jul 08 03:24:52 2010 +0200
@@ -35,7 +35,7 @@
 License:        GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
 Version:        2.0b
 Release:        1
-%define         releasedate 2010063000
+%define         releasedate 2010070700
 %define         version_internal 2.0b2pre
 %define         apiversion 2.0.0
 %define         uaweight 199900