# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1356346118 -3600
# Node ID 9124c1a643c5eb1b20c9a1617d8ee814b115eeaf
# Parent  31f273919032e5be50c69e8e0346f488152a2d02
18.0b5

diff -r 31f273919032 -r 9124c1a643c5 MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.spec	Thu Nov 29 21:27:35 2012 +0100
+++ b/MozillaFirefox/MozillaFirefox.spec	Mon Dec 24 11:48:38 2012 +0100
@@ -44,7 +44,7 @@
 %else
 BuildRequires:  wireless-tools
 %endif
-BuildRequires:  mozilla-nspr-devel >= 4.9.3
+BuildRequires:  mozilla-nspr-devel >= 4.9.4
 BuildRequires:  mozilla-nss-devel >= 3.14
 BuildRequires:  nss-shared-helper-devel
 %if %suse_version > 1140
@@ -54,7 +54,7 @@
 %endif
 Version:        %{mainver}
 Release:        0
-%define         releasedate 2012112800
+%define         releasedate 2012122200
 Provides:       firefox = %{mainver}
 Provides:       firefox = %{version}-%{release}
 Provides:       web_browser
diff -r 31f273919032 -r 9124c1a643c5 MozillaFirefox/create-tar.sh
--- a/MozillaFirefox/create-tar.sh	Thu Nov 29 21:27:35 2012 +0100
+++ b/MozillaFirefox/create-tar.sh	Mon Dec 24 11:48:38 2012 +0100
@@ -2,7 +2,7 @@
 
 CHANNEL="beta"
 BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_18_0b2_RELEASE"
+RELEASE_TAG="FIREFOX_18_0b5_RELEASE"
 VERSION="17.99"
 
 # mozilla
diff -r 31f273919032 -r 9124c1a643c5 firefox-kde.patch
--- a/firefox-kde.patch	Thu Nov 29 21:27:35 2012 +0100
+++ b/firefox-kde.patch	Mon Dec 24 11:48:38 2012 +0100
@@ -2,7 +2,7 @@
 new file mode 100644
 --- /dev/null
 +++ b/browser/base/content/browser-kde.xul
-@@ -0,0 +1,1273 @@
+@@ -0,0 +1,1274 @@
 +#filter substitution
 +<?xml version="1.0"?>
 +# -*- Mode: HTML -*-
@@ -578,6 +578,7 @@
 +            <image id="password-notification-icon" class="notification-anchor-icon" role="button"/>
 +            <image id="webapps-notification-icon" class="notification-anchor-icon" role="button"/>
 +            <image id="plugins-notification-icon" class="notification-anchor-icon" role="button"/>
++            <image id="blocked-plugins-notification-icon" class="notification-anchor-icon" role="button"/>
 +          </box>
 +          <!-- Use onclick instead of normal popup= syntax since the popup
 +               code fires onmousedown, and hence eats our favicon drag events.
diff -r 31f273919032 -r 9124c1a643c5 mozilla-kde.patch
--- a/mozilla-kde.patch	Thu Nov 29 21:27:35 2012 +0100
+++ b/mozilla-kde.patch	Mon Dec 24 11:48:38 2012 +0100
@@ -2114,7 +2114,7 @@
                                            const int32_t      aPort,
                                            nsACString & aResult)
  {
-+  if( nsKDEUtils::kdeSupport()) {
++  if (nsKDEUtils::kdeSupport())
 +    return GetProxyFromKDE(aScheme, aHost, aPort, aResult);
 +
    if (mProxySettings) {
diff -r 31f273919032 -r 9124c1a643c5 mozilla-shared-nss-db.patch
--- a/mozilla-shared-nss-db.patch	Thu Nov 29 21:27:35 2012 +0100
+++ b/mozilla-shared-nss-db.patch	Mon Dec 24 11:48:38 2012 +0100
@@ -7,7 +7,7 @@
 diff --git a/configure.in b/configure.in
 --- a/configure.in
 +++ b/configure.in
-@@ -8099,16 +8099,31 @@ AC_SUBST(QCMS_LIBS)
+@@ -8108,16 +8108,31 @@ AC_SUBST(QCMS_LIBS)
  
  dnl ========================================================
  dnl HarfBuzz
@@ -42,11 +42,11 @@
 diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in
 --- a/security/manager/ssl/src/Makefile.in
 +++ b/security/manager/ssl/src/Makefile.in
-@@ -90,10 +90,13 @@ DEFINES += \
-   -DDLL_SUFFIX=\"$(DLL_SUFFIX)\" \
+@@ -93,10 +93,13 @@ DEFINES += \
    $(NULL)
  
  EXPORTS += \
+   CryptoTask.h \
    nsNSSShutDown.h \
    ScopedNSSTypes.h \
    $(NULL)
@@ -59,13 +59,15 @@
 diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp
 --- a/security/manager/ssl/src/nsNSSComponent.cpp
 +++ b/security/manager/ssl/src/nsNSSComponent.cpp
-@@ -1,14 +1,21 @@
- /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*-
-  *
+@@ -3,16 +3,23 @@
   * This Source Code Form is subject to the terms of the Mozilla Public
   * License, v. 2.0. If a copy of the MPL was not distributed with this
   * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
  
+ #ifdef MOZ_LOGGING
+ #define FORCE_PR_LOG 1
+ #endif
+ 
 +#ifdef MOZ_ENABLE_NSSHELPER
 +#pragma GCC visibility push(default)
 +#include <nss-shared-helper.h>
@@ -81,7 +83,7 @@
  #include "nsNetUtil.h"
  #include "nsAppDirectoryServiceDefs.h"
  #include "nsDirectoryService.h"
-@@ -1730,18 +1737,34 @@ nsNSSComponent::InitializeNSS(bool showW
+@@ -1735,18 +1742,34 @@ nsNSSComponent::InitializeNSS(bool showW
      ConfigureInternalPKCS11Token();
  
      // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs