# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1298470479 -3600
# Node ID 298263f797bedfadf6767eda11a3e3203b064302
# Parent  9ba8fb8909c4404d0ea040db9edba5438b5c87cc
update to 2.0b12/4.0b12

diff -r 9ba8fb8909c4 -r 298263f797be MozillaFirefox/MozillaFirefox.changes
--- a/MozillaFirefox/MozillaFirefox.changes	Thu Feb 17 20:14:47 2011 +0100
+++ b/MozillaFirefox/MozillaFirefox.changes	Wed Feb 23 15:14:39 2011 +0100
@@ -1,8 +1,11 @@
 -------------------------------------------------------------------
-Wed Feb  2 19:16:15 UTC 2011 - wr@rosenauer.org
+Fri Feb  4 09:32:50 UTC 2011 - wr@rosenauer.org
 
 - update to version 4.0b11
-- rebased some patches
+  * loads of bugfixes compared to last beta
+  * added "Do Not Track" option
+- rebased patches
+- disable testpilot
 
 -------------------------------------------------------------------
 Fri Jan 28 08:56:12 UTC 2011 - wr@rosenauer.org
diff -r 9ba8fb8909c4 -r 298263f797be MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.spec	Thu Feb 17 20:14:47 2011 +0100
+++ b/MozillaFirefox/MozillaFirefox.spec	Wed Feb 23 15:14:39 2011 +0100
@@ -39,7 +39,7 @@
 Provides:       web_browser
 Provides:       firefox = %{version}-%{release}
 Provides:       firefox = %{mainver}
-%define         releasedate 2011020200
+%define         releasedate 2011020300
 Summary:        Mozilla Firefox Web Browser
 Url:            http://www.mozilla.org/
 Group:          Productivity/Networking/Web/Browsers
diff -r 9ba8fb8909c4 -r 298263f797be firefox-browser-css.patch
--- a/firefox-browser-css.patch	Thu Feb 17 20:14:47 2011 +0100
+++ b/firefox-browser-css.patch	Wed Feb 23 15:14:39 2011 +0100
@@ -9,13 +9,13 @@
 diff --git a/browser/themes/gnomestripe/browser/browser.css b/browser/themes/gnomestripe/browser/browser.css
 --- a/browser/themes/gnomestripe/browser/browser.css
 +++ b/browser/themes/gnomestripe/browser/browser.css
-@@ -990,16 +990,30 @@ toolbar[iconsize="small"] #feed-button {
+@@ -954,16 +954,30 @@ toolbar[iconsize="small"] #feed-button {
  }
  
- .urlbar-over-link-host-label,
- .urlbar-over-link-path-label {
-   padding: 0;
-   margin: 0;
+ #urlbar-display {
+   margin-top: 0;
+   margin-bottom: 0;
+   color: GrayText;
  }
  
 +#PopupAutoCompleteRichResult .autocomplete-richlistitem {
diff -r 9ba8fb8909c4 -r 298263f797be firefox-kde.patch
--- a/firefox-kde.patch	Thu Feb 17 20:14:47 2011 +0100
+++ b/firefox-kde.patch	Wed Feb 23 15:14:39 2011 +0100
@@ -23,7 +23,7 @@
 new file mode 100644
 --- /dev/null
 +++ b/browser/base/content/browser-kde.xul
-@@ -0,0 +1,1066 @@
+@@ -0,0 +1,1077 @@
 +#filter substitution
 +<?xml version="1.0"?>
 +# -*- Mode: HTML -*-
@@ -151,7 +151,7 @@
 +      <menu id="context_tabViewMenu" label="&moveToGroup.label;"
 +            accesskey="&moveToGroup.accesskey;">
 +        <menupopup id="context_tabViewMenuPopup"
-+                   onpopupshowing="if (event.target == this) TabView.updateContextMenu(TabContextMenu.contextTab, this);">
++                   onpopupshowing="if (event.target == this) TabView.moveToGroupPopupShowing(event);">
 +          <menuseparator id="context_tabViewNamedGroups" hidden="true"/>
 +          <menuitem id="context_tabViewNewGroup" label="&moveToNewGroup.label;"
 +                    oncommand="TabView.moveTabTo(TabContextMenu.contextTab, null);"/>
@@ -493,6 +493,8 @@
 +           defaultmode="icons" mode="icons"
 +#ifdef WINCE
 +           defaulticonsize="small" iconsize="small"
++#else
++           iconsize="large"
 +#endif
 +           tabsontop="true"
 +           persist="tabsontop">
@@ -868,7 +870,16 @@
 +                     tooltiptext="&listAllTabs.label;"
 +                     removable="true">
 +        <menupopup id="alltabs-popup"
-+                   position="after_end"/>
++                   position="after_end">
++          <menuitem id="menu_tabview"
++                    class="menuitem-iconic"
++                    key="key_tabview"
++                    label="&viewTabGroups.label;"
++                    command="Browser:ToggleTabView"
++                    observes="tabviewGroupsNumber"
++                    keepme="true"/>
++          <menuseparator id="alltabs-popup-separator" keepme="true"/>
++        </menupopup>
 +      </toolbarbutton>
 +
 +      <toolbarbutton id="tabs-closebutton"
@@ -1026,7 +1037,7 @@
 +      <toolbarbutton id="addonbar-closebutton"
 +                     tooltiptext="&addonBarCloseButton.tooltip;"
 +                     oncommand="setToolbarVisibility(this.parentNode, false);"/>
-+      <statusbar id="status-bar"/>
++      <statusbar id="status-bar" ordinal="1000"/>
 +    </toolbar>
 +  </vbox>
 +
@@ -1096,7 +1107,7 @@
 @@ -22,16 +22,18 @@ browser.jar:
  *       content/browser/aboutHome.css                 (content/aboutHome.css)
          content/browser/aboutHome-restore-icon.png    (content/aboutHome-restore-icon.png)
-         content/browser/aboutHome-restore-icon-rtl.png (content/aboutHome-restore-icon-rtl.png)
+         content/browser/aboutHome-restore-icon-small.png    (content/aboutHome-restore-icon-small.png)
          content/browser/aboutRobots-icon.png          (content/aboutRobots-icon.png)
          content/browser/aboutRobots-widget-left.png   (content/aboutRobots-widget-left.png)
  *       content/browser/browser.css                   (content/browser.css)
diff -r 9ba8fb8909c4 -r 298263f797be firefox-shellservice.patch
--- a/firefox-shellservice.patch	Thu Feb 17 20:14:47 2011 +0100
+++ b/firefox-shellservice.patch	Wed Feb 23 15:14:39 2011 +0100
@@ -1,5 +1,5 @@
 # HG changeset patch
-# Parent e46704258210bc68bc65773f60a0d32cb2ce767d
+# Parent 948830682920db68e4b039f5babc34dea0040415
 Bug 611953 - GNOME 3.0 readiness (based on patch 3)
 
 diff --git a/browser/components/shell/src/nsGNOMEShellService.cpp b/browser/components/shell/src/nsGNOMEShellService.cpp
@@ -217,7 +217,7 @@
      nsresult rv;
 -    nsCOMPtr<nsIGIOService> giovfs =
 -      do_GetService(NS_GIOSERVICE_CONTRACTID, &rv);
--    NS_ENSURE_SUCCESS(rv, rv);
+-    NS_ENSURE_SUCCESS(rv, NS_OK);
 +    unsigned int i;
  
      nsCOMPtr<nsIStringBundleService> bundleService =
diff -r 9ba8fb8909c4 -r 298263f797be mozilla-gio-launch-uri.patch
--- a/mozilla-gio-launch-uri.patch	Thu Feb 17 20:14:47 2011 +0100
+++ b/mozilla-gio-launch-uri.patch	Wed Feb 23 15:14:39 2011 +0100
@@ -1,13 +1,13 @@
 # HG changeset patch
-# Parent f81b405b9adebc56c3af5cfbf2f74cf01c22956b
+# Parent 7d47a19639db505e19282ac69c305c636d0fec18
 
 diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
 --- a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
 +++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
-@@ -51,16 +51,18 @@
- #include <contentaction/contentaction.h>
+@@ -53,16 +53,18 @@
  #include "nsContentHandlerApp.h"
  #endif
+ #endif
  
  #include "nsMIMEInfoUnix.h"
  #include "nsCommonRegistry.h"
@@ -23,7 +23,7 @@
  #include "nsKDEUtils.h"
  #endif
  
-@@ -170,38 +172,47 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
+@@ -172,38 +174,47 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
      }
      if (!mDefaultApplication)
        return NS_ERROR_FILE_NOT_FOUND;
diff -r 9ba8fb8909c4 -r 298263f797be mozilla-kde.patch
--- a/mozilla-kde.patch	Thu Feb 17 20:14:47 2011 +0100
+++ b/mozilla-kde.patch	Wed Feb 23 15:14:39 2011 +0100
@@ -89,7 +89,7 @@
  }
  
  //----------------------------------------------------------------------------------------
-@@ -826,28 +845,40 @@ static nsresult pref_InitDefaults()
+@@ -890,24 +909,36 @@ static nsresult pref_InitInitialObjects(
    /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */
    static const char* specialFiles[] = {
  #if defined(XP_MAC) || defined(XP_MACOSX)
@@ -99,22 +99,18 @@
  #elif defined(XP_UNIX)
        "unix.js"
 +      , "" // placeholder for KDE  (empty is otherwise harmless)
- #if defined(VMS)
-       , "openvms.js"
- #elif defined(_AIX)
+ #if defined(_AIX)
        , "aix.js"
  #endif
  #elif defined(XP_OS2)
        "os2pref.js"
- #elif defined(XP_BEOS)
-       "beos.js"
  #endif
    };
  
 +  if(nsKDEUtils::kdeSession()) { // TODO what if some setup actually requires the helper?
 +    for( int i = 0;
-+         i < NS_ARRAY_LENGTH(specialFiles);
-+         ++i ) {
++        i < NS_ARRAY_LENGTH(specialFiles);
++        ++i ) {
 +      if( *specialFiles[ i ] == '\0' ) {
 +        specialFiles[ i ] = "kde.js";
 +        break;
@@ -127,8 +123,8 @@
      NS_WARNING("Error parsing application default preferences.");
    }
  
-   return NS_OK;
- }
+   rv = pref_LoadPrefsInDirList(NS_APP_PREFS_DEFAULTS_DIR_LIST);
+   NS_ENSURE_SUCCESS(rv, rv);
  
 diff --git a/toolkit/components/downloads/src/Makefile.in b/toolkit/components/downloads/src/Makefile.in
 --- a/toolkit/components/downloads/src/Makefile.in
@@ -2155,9 +2151,9 @@
  CPPSRCS += nsNativeAppSupportQt.cpp
  CPPSRCS += nsQAppInstance.cpp
  EXPORTS += nsQAppInstance.h
- ifdef MOZ_ENABLE_MEEGOTOUCH
- MOCSRCS += moc_MozMeegoAppService.cpp
- CPPSRCS += moc_MozMeegoAppService.cpp
+ else
+ CPPSRCS += nsNativeAppSupportDefault.cpp
+ endif
 diff --git a/toolkit/xre/nsKDEUtils.cpp b/toolkit/xre/nsKDEUtils.cpp
 new file mode 100644
 --- /dev/null
@@ -2949,13 +2945,13 @@
 diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
 --- a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
 +++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
-@@ -48,28 +48,31 @@
- #include <QDesktopServices>
- #include <QUrl>
+@@ -50,28 +50,31 @@
  #include <QString>
+ #if (MOZ_ENABLE_CONTENTACTION)
  #include <contentaction/contentaction.h>
  #include "nsContentHandlerApp.h"
  #endif
+ #endif
  
  #include "nsMIMEInfoUnix.h"
 -#include "nsGNOMERegistry.h"
@@ -2983,7 +2979,7 @@
        nsCAutoString spec;
        aURI->GetAsciiSpec(spec);
        if (hildon_uri_open(spec.get(), action, nsnull))
-@@ -91,22 +94,22 @@ nsMIMEInfoUnix::LoadUriInternal(nsIURI *
+@@ -93,22 +96,22 @@ nsMIMEInfoUnix::LoadUriInternal(nsIURI *
  
    return rv;
  }
@@ -3008,7 +3004,7 @@
    if (*_retval)
      return NS_OK;
  
-@@ -149,32 +152,49 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
+@@ -151,32 +154,49 @@ nsMIMEInfoUnix::LaunchDefaultWithFile(ns
      ContentAction::Action::defaultActionForFile(uri, QString(mSchemeOrType.get()));
    if (action.isValid()) {
      action.trigger();
@@ -3063,7 +3059,7 @@
 --- a/uriloader/exthandler/unix/nsOSHelperAppService.cpp
 +++ b/uriloader/exthandler/unix/nsOSHelperAppService.cpp
 @@ -44,17 +44,17 @@
- #if (MOZ_PLATFORM_MAEMO == 6)
+ #if defined(MOZ_ENABLE_CONTENTACTION)
  #include <contentaction/contentaction.h>
  #include <QString>
  #endif
@@ -3665,11 +3661,11 @@
  endif
  
  ifdef MOZ_PLATFORM_MAEMO
- CFLAGS          += $(MOZ_PLATFORM_MAEMO_CFLAGS)
+ CFLAGS          += $(MOZ_PLATFORM_MAEMO_CFLAGS) $(MOZ_QT_CFLAGS)
 diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
 --- a/xpcom/io/nsLocalFileUnix.cpp
 +++ b/xpcom/io/nsLocalFileUnix.cpp
-@@ -91,16 +91,17 @@
+@@ -93,16 +93,17 @@
  #include "prproces.h"
  #include "nsIDirectoryEnumerator.h"
  #include "nsISimpleEnumerator.h"
@@ -3687,7 +3683,7 @@
  #include "prmem.h"
  #include "plbase64.h"
  
-@@ -1820,44 +1821,50 @@ nsLocalFile::Launch()
+@@ -1822,44 +1823,50 @@ nsLocalFile::Launch()
  
      return NS_OK;
  }
@@ -3752,7 +3748,7 @@
        return rv;
      }
      return NS_ERROR_FAILURE;
-@@ -1883,16 +1890,23 @@ nsLocalFile::Launch()
+@@ -1885,16 +1892,23 @@ nsLocalFile::Launch()
  
      if (nsnull == connection)
        return NS_ERROR_FAILURE;
diff -r 9ba8fb8909c4 -r 298263f797be mozilla-language.patch
--- a/mozilla-language.patch	Thu Feb 17 20:14:47 2011 +0100
+++ b/mozilla-language.patch	Wed Feb 23 15:14:39 2011 +0100
@@ -1,37 +1,30 @@
 # HG changeset patch
 # User Wolfgang Rosenauer <wr@rosenauer.org>
-# Parent 4a8194d5971401441da4f4f3bbd2730e506da4bc
+# Parent 05766406681babf9a5a433649b5ba2b9741b9962
 Bug 583793 - Firefox interface language set to LANG, ignores LANGUAGE
 
 diff --git a/intl/locale/src/nsLocaleService.cpp b/intl/locale/src/nsLocaleService.cpp
 --- a/intl/locale/src/nsLocaleService.cpp
 +++ b/intl/locale/src/nsLocaleService.cpp
-@@ -192,22 +192,24 @@ nsLocaleService::nsLocaleService(void)
-             return; 
+@@ -181,16 +181,17 @@ nsLocaleService::nsLocaleService(void)
          }
  
- #ifdef MOZ_ENABLE_MEEGOTOUCH
-         // Create a snapshot of the gconf locale values into the
-         // corresponding environment variables to obey system settings
-         // as accurately as possible.
-         CopyGConfToEnv("/meegotouch/i18n/language", "LANG");
-+        CopyGConfToEnv("/meegotouch/i18n/language", "LANGUAGE");
-         CopyGConfToEnv("/meegotouch/i18n/lc_collate", NSILOCALE_COLLATE);
-         CopyGConfToEnv("/meegotouch/i18n/lc_monetary", NSILOCALE_MONETARY);
-         CopyGConfToEnv("/meegotouch/i18n/lc_numeric", NSILOCALE_NUMERIC);
-         CopyGConfToEnv("/meegotouch/i18n/lc_time", NSILOCALE_TIME);
+ 
+ #ifdef MOZ_WIDGET_QT
+         const char* lang = QLocale::languageToString(QLocale::system().language()).toAscii();
+ #else
+         // Get system configuration
+         const char* lang = getenv("LANG");
++        const char* language = getenv("LANGUAGE");
  #endif
-         // Get system configuration
-+        const char* language = getenv("LANGUAGE");
-         const char* lang = getenv("LANG");
+ 
          for( i = 0; i < LocaleListLength; i++ ) {
              nsresult result;
              // setlocale( , "") evaluates LC_* and LANG
              char* lc_temp = setlocale(posix_locale_category[i], "");
              CopyASCIItoUTF16(LocaleList[i], category);
              category_platform = category;
-             category_platform.AppendLiteral("##PLATFORM");
-@@ -222,16 +224,21 @@ nsLocaleService::nsLocaleService(void)
+@@ -206,16 +207,21 @@ nsLocaleService::nsLocaleService(void)
                  else {
                      CopyASCIItoUTF16(lang, platformLocale);
                      result = posixConverter->GetXPLocale(lang, xpLocale);
diff -r 9ba8fb8909c4 -r 298263f797be mozilla-xulrunner20/create-tar.sh
--- a/mozilla-xulrunner20/create-tar.sh	Thu Feb 17 20:14:47 2011 +0100
+++ b/mozilla-xulrunner20/create-tar.sh	Wed Feb 23 15:14:39 2011 +0100
@@ -1,8 +1,8 @@
 #!/bin/bash
 
 BRANCH="mozilla-central"
-RELEASE_TAG="FIREFOX_4_0b11_RELEASE"
-VERSION="2.0b11"
+RELEASE_TAG="FIREFOX_4_0b12_RELEASE"
+VERSION="2.0b12"
 
 # mozilla
 hg clone http://hg.mozilla.org/$BRANCH mozilla
diff -r 9ba8fb8909c4 -r 298263f797be mozilla-xulrunner20/mozilla-xulrunner20.spec
--- a/mozilla-xulrunner20/mozilla-xulrunner20.spec	Thu Feb 17 20:14:47 2011 +0100
+++ b/mozilla-xulrunner20/mozilla-xulrunner20.spec	Wed Feb 23 15:14:39 2011 +0100
@@ -1,5 +1,5 @@
 #
-# spec file for package mozilla-xulrunner20 (Version 2.0b11)
+# spec file for package mozilla-xulrunner20
 #
 # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #               2006-2011 Wolfgang Rosenauer
@@ -20,7 +20,7 @@
 
 
 Name:           mozilla-xulrunner20
-BuildRequires:  autoconf213 gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python startup-notification-devel zip pkg-config fdupes hunspell-devel yasm Mesa-devel nss-shared-helper-devel
+BuildRequires:  Mesa-devel autoconf213 fdupes gcc-c++ hunspell-devel libcurl-devel libgnomeui-devel libidl-devel libnotify-devel nss-shared-helper-devel pkg-config python startup-notification-devel yasm zip
 # needed for brp-check-bytecode-version (jar, fastjar would do as well)
 BuildRequires:  unzip
 %if %suse_version > 1110
@@ -189,6 +189,7 @@
 
 
 %if %crashreporter
+
 %package buildsymbols
 License:        GPLv2+ ; LGPLv2.1+ ; MPLv1.1+
 Summary:        Breakpad buildsymbols for %{name}
@@ -539,6 +540,7 @@
 %endif
 
 %if %localize
+
 %files translations-common -f %{_tmppath}/translations.common
 %defattr(-,root,root)
 %dir %{_libdir}/xulrunner-%{version_internal}/
@@ -551,6 +553,7 @@
 %endif
 
 %if %crashreporter
+
 %files buildsymbols
 %defattr(-,root,root)
 %{_datadir}/mozilla/