# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1329992306 -3600
# Node ID 6a1811ef3174fe1f99e8531180ef005418a29e47
# Parent  20f8b5f0aea6213841c9a481f08911a79044f2fd
update for 11.0b4
- removed obsolete NSS compat patch
- updated KDE patches

diff -r 20f8b5f0aea6 -r 6a1811ef3174 MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.spec	Tue Feb 21 21:10:03 2012 +0100
+++ b/MozillaFirefox/MozillaFirefox.spec	Thu Feb 23 11:18:26 2012 +0100
@@ -48,7 +48,7 @@
 BuildRequires:  nss-shared-helper-devel
 Version:        %{mainver}
 Release:        0
-%define         releasedate 2012021500
+%define         releasedate 2012022200
 Provides:       web_browser
 Provides:       firefox = %{version}-%{release}
 Provides:       firefox = %{mainver}
@@ -89,7 +89,6 @@
 Patch12:        mozilla-linux3.patch
 Patch14:        mozilla-disable-neon-option.patch
 Patch15:        mozilla-yarr-pcre.patch
-Patch16:        mozilla-nss-compat.patch
 # Firefox/browser
 Patch31:        firefox-browser-css.patch
 Patch32:        firefox-cross-desktop.patch
@@ -218,7 +217,6 @@
 %patch12 -p1
 %patch14 -p1
 #%patch15 -p1
-%patch16 -p1
 #
 %patch31 -p1
 %patch32 -p1
diff -r 20f8b5f0aea6 -r 6a1811ef3174 MozillaFirefox/create-tar.sh
--- a/MozillaFirefox/create-tar.sh	Tue Feb 21 21:10:03 2012 +0100
+++ b/MozillaFirefox/create-tar.sh	Thu Feb 23 11:18:26 2012 +0100
@@ -2,7 +2,7 @@
 
 CHANNEL="beta"
 BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_11_0b3_RELEASE"
+RELEASE_TAG="FIREFOX_11_0b4_RELEASE"
 VERSION="10.99"
 
 # mozilla
diff -r 20f8b5f0aea6 -r 6a1811ef3174 MozillaFirefox/mozilla-nss-compat.patch
--- a/MozillaFirefox/mozilla-nss-compat.patch	Tue Feb 21 21:10:03 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1 +0,0 @@
-../mozilla-nss-compat.patch
\ No newline at end of file
diff -r 20f8b5f0aea6 -r 6a1811ef3174 firefox-kde.patch
--- a/firefox-kde.patch	Tue Feb 21 21:10:03 2012 +0100
+++ b/firefox-kde.patch	Thu Feb 23 11:18:26 2012 +0100
@@ -2,7 +2,7 @@
 new file mode 100644
 --- /dev/null
 +++ b/browser/base/content/browser-kde.xul
-@@ -0,0 +1,1111 @@
+@@ -0,0 +1,1125 @@
 +#filter substitution
 +<?xml version="1.0"?>
 +# -*- Mode: HTML -*-
@@ -42,6 +42,7 @@
 +#   Patrick Walton <pcwalton@mozilla.com>
 +#   David Dahl <ddahl@mozilla.com>
 +#   Frank Yan <fyan@mozilla.com>
++#   Victor Porof <vporof@mozilla.com>
 +#
 +# Alternatively, the contents of this file may be used under the terms of
 +# either the GNU General Public License Version 2 or later (the "GPL"), or
@@ -59,7 +60,8 @@
 +
 +<?xml-stylesheet href="chrome://browser/content/browser.css" type="text/css"?>
 +<?xml-stylesheet href="chrome://browser/content/places/places.css" type="text/css"?>
-+<?xml-stylesheet href="chrome://global/skin/webConsole.css" type="text/css"?>
++<?xml-stylesheet href="chrome://browser/skin/devtools/common.css" type="text/css"?>
++<?xml-stylesheet href="chrome://browser/skin/devtools/webconsole.css" type="text/css"?>
 +<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?>
 +
 +<?xul-overlay href="chrome://global/content/editMenuOverlay.xul"?>
@@ -284,7 +286,11 @@
 +                               if (gContextMenu.shouldDisplay)
 +                                 updateEditUIVisibility();
 +                               return gContextMenu.shouldDisplay;"
-+               onpopuphiding="if (event.target == this) { gContextMenu = null; updateEditUIVisibility(); }">
++               onpopuphiding="if (event.target != this)
++                                return;
++                              gContextMenu.hiding();
++                              gContextMenu = null;
++                              updateEditUIVisibility();">
 +#include browser-context.inc
 +    </menupopup>
 +
@@ -517,8 +523,6 @@
 +                 ontextentered="this.handleCommand(param);"
 +                 ontextreverted="return this.handleRevert();"
 +                 pageproxystate="invalid"
-+                 onsearchbegin="LocationBarHelpers._searchBegin();"
-+                 onsearchcomplete="LocationBarHelpers._searchComplete();"
 +                 onfocus="document.getElementById('identity-box').style.MozUserFocus= 'normal'"
 +                 onblur="setTimeout(function() document.getElementById('identity-box').style.MozUserFocus = '', 0);">
 +          <box id="notification-popup-box" hidden="true" align="center">
@@ -539,7 +543,6 @@
 +            <hbox id="identity-box-inner" align="center">
 +              <stack id="page-proxy-stack"
 +                     onclick="PageProxyClickHandler(event);">
-+                <image id="urlbar-throbber" busy="false"/>
 +                <image id="page-proxy-favicon" validate="never"
 +                       pageproxystate="invalid"
 +                       onerror="this.removeAttribute('src');"/>
@@ -974,14 +977,16 @@
 +    <splitter id="devtools-side-splitter" hidden="true"/>
 +    <vbox id="devtools-sidebar-box" hidden="true"
 +          style="min-width: 18em; width: 22em; max-width: 42em;" persist="width">
-+      <toolbar id="devtools-sidebar-toolbar" nowindowdrag="true"/>
++      <toolbar id="devtools-sidebar-toolbar"
++               class="devtools-toolbar"
++               nowindowdrag="true"/>
 +      <deck id="devtools-sidebar-deck" flex="1"/>
 +    </vbox>
 +    <vbox id="browser-border-end" hidden="true" layer="true"/>
 +  </hbox>
 +
 +  <hbox id="full-screen-warning-container" hidden="true" fadeout="true">
-+    <hbox style="min-width: 100%;" pack="center"> <!-- Inner hbox needed due to bug 579776. -->
++    <hbox style="width: 100%;" pack="center"> <!-- Inner hbox needed due to bug 579776. -->
 +      <hbox id="full-screen-warning-message">
 +        <description id="full-screen-warning-text" value="&domFullScreenWarning.label;"></description>
 +      </hbox>
@@ -990,6 +995,7 @@
 +
 +  <vbox id="browser-bottombox" layer="true">
 +    <toolbar id="inspector-toolbar"
++             class="devtools-toolbar"
 +             nowindowdrag="true"
 +             hidden="true">
 +      <vbox flex="1">
@@ -1004,6 +1010,7 @@
 +                         tooltiptext="&inspectCloseButton.tooltiptext;"/>
 +#endif
 +          <toolbarbutton id="inspector-inspect-toolbutton"
++                         class="devtools-toolbarbutton"
 +                         label="&inspectButton.label;"
 +                         accesskey="&inspectButton.accesskey;"
 +                         command="Inspector:Inspect"/>
@@ -1011,7 +1018,14 @@
 +                          flex="1" orient="horizontal"
 +                          clicktoscroll="true"/>
 +          <hbox id="inspector-tools">
++            <toolbarbutton id="inspector-3D-button"
++                           class="devtools-toolbarbutton"
++                           hidden="true"
++                           label="&inspect3DButton.label;"
++                           accesskey="&inspect3DButton.accesskey;"
++                           command="Inspector:Tilt"/>
 +            <toolbarbutton id="inspector-style-button"
++                           class="devtools-toolbarbutton"
 +                           label="&inspectStyleButton.label;"
 +                           accesskey="&inspectStyleButton.accesskey;"
 +                           command="Inspector:Sidebar"/>
diff -r 20f8b5f0aea6 -r 6a1811ef3174 mozilla-kde.patch
--- a/mozilla-kde.patch	Tue Feb 21 21:10:03 2012 +0100
+++ b/mozilla-kde.patch	Thu Feb 23 11:18:26 2012 +0100
@@ -666,7 +666,7 @@
 +        <parameter name="evt"/>
 +        <body>
 +        <![CDATA[
-+          if (evt.getPreventDefault())
++          if (evt.defaultPrevented)
 +            return;
 +
 +          var btn = this.getButton(this.defaultButton);
@@ -684,7 +684,7 @@
 +      <handler event="keypress" keycode="VK_RETURN"
 +               group="system" action="this._hitEnter(event);"/>
 +      <handler event="keypress" keycode="VK_ESCAPE" group="system">
-+        if (!event.getPreventDefault())
++        if (!event.defaultPrevented)
 +          this.cancelDialog();
 +      </handler>
 +#ifdef XP_MACOSX
diff -r 20f8b5f0aea6 -r 6a1811ef3174 mozilla-nss-compat.patch
--- a/mozilla-nss-compat.patch	Tue Feb 21 21:10:03 2012 +0100
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,50 +0,0 @@
-# HG changeset patch
-# Parent f241f48841a5d480f898cb7c34f3438aaa9a6c40
-# User Brian Smith <bsmith@mozilla.com>
-Bug 713934, Part 2, version 1: Update SetCertVerificationResult to use SSL_AuthCertificateComplete, r?honzab
-
-diff --git a/security/manager/ssl/src/nsNSSIOLayer.cpp b/security/manager/ssl/src/nsNSSIOLayer.cpp
---- a/security/manager/ssl/src/nsNSSIOLayer.cpp
-+++ b/security/manager/ssl/src/nsNSSIOLayer.cpp
-@@ -964,31 +964,31 @@ nsNSSSocketInfo::SetCertVerificationWait
- 
- void
- nsNSSSocketInfo::SetCertVerificationResult(PRErrorCode errorCode,
-                                            SSLErrorMessageType errorMessageType)
- {
-   NS_ASSERTION(mCertVerificationState == waiting_for_cert_verification,
-                "Invalid state transition to cert_verification_finished");
- 
--  if (errorCode != 0) {
--    SetCanceled(errorCode, errorMessageType);
--  } else if (mFd) {
--    // We haven't closed the connection already, so restart it
--    SECStatus rv = SSL_RestartHandshakeAfterAuthCertificate(mFd);
--    if (rv != SECSuccess) {
-+  if (mFd) {
-+    SECStatus rv = SSL_AuthCertificateComplete(mFd, errorCode);
-+    // Only replace errorCode if there was originally no error
-+    if (rv != SECSuccess && errorCode == 0) {
-       errorCode = PR_GetError();
-+      errorMessageType = PlainErrorMessage;
-       if (errorCode == 0) {
--        NS_ERROR("SSL_RestartHandshakeAfterAuthCertificate didn't set error code");
-+        NS_ERROR("SSL_AuthCertificateComplete didn't set error code");
-         errorCode = PR_INVALID_STATE_ERROR;
-       }
--      SetCanceled(errorCode, PlainErrorMessage);
-     }
--  } else {
--    // If we closed the connection alreay, we don't have anything to do
-+  }
-+
-+  if (errorCode) {
-+    SetCanceled(errorCode, errorMessageType);
-   }
- 
-   mCertVerificationState = after_cert_verification;
- }
- 
- nsresult nsNSSSocketInfo::GetSSLStatus(nsISSLStatus** _result)
- {
-   NS_ENSURE_ARG_POINTER(_result);
diff -r 20f8b5f0aea6 -r 6a1811ef3174 series
--- a/series	Tue Feb 21 21:10:03 2012 +0100
+++ b/series	Thu Feb 23 11:18:26 2012 +0100
@@ -17,7 +17,6 @@
 mozilla-sle11.patch
 mozilla-linux3.patch
 mozilla-disable-neon-option.patch
-mozilla-nss-compat.patch
 #mozilla-yarr-pcre.patch
 
 # Firefox patches
diff -r 20f8b5f0aea6 -r 6a1811ef3174 xulrunner/create-tar.sh
--- a/xulrunner/create-tar.sh	Tue Feb 21 21:10:03 2012 +0100
+++ b/xulrunner/create-tar.sh	Thu Feb 23 11:18:26 2012 +0100
@@ -2,7 +2,7 @@
 
 CHANNEL="beta"
 BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_11_0b3_RELEASE"
+RELEASE_TAG="FIREFOX_11_0b4_RELEASE"
 VERSION="10.99"
 
 # mozilla
diff -r 20f8b5f0aea6 -r 6a1811ef3174 xulrunner/xulrunner.spec
--- a/xulrunner/xulrunner.spec	Tue Feb 21 21:10:03 2012 +0100
+++ b/xulrunner/xulrunner.spec	Thu Feb 23 11:18:26 2012 +0100
@@ -46,7 +46,7 @@
 BuildRequires:  mozilla-nss-devel >= 3.13.2
 Version:        10.99
 Release:        0
-%define         releasedate 2012021500
+%define         releasedate 2012022200
 %define         version_internal 11.0
 %define         apiversion 11
 %define         uaweight 1100000
@@ -198,7 +198,7 @@
 %endif
 %patch14 -p1
 %patch16 -p1
-%patch17 -p1
+#%patch17 -p1
 
 %build
 # no need to add build time to binaries