# HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org>
# Date 1351060014 -7200
# Node ID 9852e10fdf9ba95a67444b8a9068c42521bd64df
# Parent  9069817b5cacd8f274a0523f635a29c240ae94b8
bump to 17.0b3

diff -r 9069817b5cac -r 9852e10fdf9b MozillaFirefox/MozillaFirefox.changes
--- a/MozillaFirefox/MozillaFirefox.changes	Mon Oct 15 16:08:40 2012 +0200
+++ b/MozillaFirefox/MozillaFirefox.changes	Wed Oct 24 08:26:54 2012 +0200
@@ -1,7 +1,8 @@
 -------------------------------------------------------------------
-Mon Oct 15 14:07:12 UTC 2012 - wr@rosenauer.org
-
-- update to Firefox 17.0b1
+Wed Oct 24 06:24:39 UTC 2012 - wr@rosenauer.org
+
+- update to Firefox 17.0b3
+- rebased patches
 - use internal NSPR for now (bmo#776877)
 
 -------------------------------------------------------------------
diff -r 9069817b5cac -r 9852e10fdf9b MozillaFirefox/MozillaFirefox.spec
--- a/MozillaFirefox/MozillaFirefox.spec	Mon Oct 15 16:08:40 2012 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Wed Oct 24 08:26:54 2012 +0200
@@ -54,7 +54,7 @@
 %endif
 Version:        %{mainver}
 Release:        0
-%define         releasedate 2012100900
+%define         releasedate 2012102300
 Provides:       firefox = %{mainver}
 Provides:       firefox = %{version}-%{release}
 Provides:       web_browser
diff -r 9069817b5cac -r 9852e10fdf9b MozillaFirefox/create-tar.sh
--- a/MozillaFirefox/create-tar.sh	Mon Oct 15 16:08:40 2012 +0200
+++ b/MozillaFirefox/create-tar.sh	Wed Oct 24 08:26:54 2012 +0200
@@ -2,7 +2,7 @@
 
 CHANNEL="beta"
 BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_17_0b1_RELEASE"
+RELEASE_TAG="FIREFOX_17_0b3_RELEASE"
 VERSION="16.99"
 
 # mozilla
diff -r 9069817b5cac -r 9852e10fdf9b firefox-kde.patch
--- a/firefox-kde.patch	Mon Oct 15 16:08:40 2012 +0200
+++ b/firefox-kde.patch	Wed Oct 24 08:26:54 2012 +0200
@@ -2,7 +2,7 @@
 new file mode 100644
 --- /dev/null
 +++ b/browser/base/content/browser-kde.xul
-@@ -0,0 +1,1261 @@
+@@ -0,0 +1,1268 @@
 +#filter substitution
 +<?xml version="1.0"?>
 +# -*- Mode: HTML -*-
@@ -195,7 +195,7 @@
 +          <description id="social-activation-message" class="popup-notification-description"/>
 +          <spacer flex="1"/>
 +          <hbox pack="end" align="center" class="popup-notification-button-container">
-+#ifdef XP_UNIX
++#ifndef XP_UNIX
 +        <button id="social-undoactivation-button"
 +                label="&social.activated.undobutton.label;"
 +                accesskey="&social.activated.undobutton.accesskey;"
@@ -245,7 +245,7 @@
 +        </vbox>
 +      </row>
 +      <hbox id="unsharePopupBottomButtons" pack="end">
-+#ifdef XP_UNIX
++#ifndef XP_UNIX
 +        <button id="unsharePopupStopSharingButton"
 +                class="unsharePopupBottomButton"
 +                command="Social:UnsharePage"/>
@@ -272,9 +272,7 @@
 +           type="arrow"
 +           hidden="true"
 +           consumeoutsideclicks="true"
-+           noautofocus="true">
-+      <box id="social-notification-box" flex="1"></box>
-+    </panel>
++           noautofocus="true"/>
 +    <panel id="social-flyout-panel"
 +           class="social-panel"
 +           onpopupshown="SocialFlyout.onShown()"
@@ -678,21 +676,30 @@
 +                       class="toolbarbutton-1"
 +                       type="menu">
 +          <menupopup id="social-statusarea-popup">
-+            <hbox id="social-statusarea-user" pack="start" align="center"
++            <menuitem id="social-statusarea-user" pack="start" align="center" class="menuitem-iconic"
 +                  onclick="SocialUI.showProfile(); document.getElementById('social-statusarea-popup').hidePopup();">
 +              <image id="social-statusarea-user-portrait"/>
 +              <vbox>
-+                <button id="social-statusarea-notloggedin"
-+                        class="link" label="&social.notLoggedIn.label;"/>
-+                <button id="social-statusarea-username" class="link"/>
++                <label id="social-statusarea-notloggedin"
++                       value="&social.notLoggedIn.label;"/>
++                <label id="social-statusarea-username"/>
 +              </vbox>
-+            </hbox>
++            </menuitem>
++#ifndef XP_WIN
++            <menuseparator/>
++#endif
 +            <menuitem id="social-toggle-sidebar-menuitem"
 +                      type="checkbox"
 +                      autocheck="false"
 +                      command="Social:ToggleSidebar"
 +                      label="&social.toggleSidebar.label;"
 +                      accesskey="&social.toggleSidebar.accesskey;"/>
++            <menuitem id="social-toggle-notifications-menuitem"
++                      type="checkbox"
++                      autocheck="false"
++                      command="Social:ToggleNotifications"
++                      label="&social.toggleNotifications.label;"
++                      accesskey="&social.toggleNotifications.accesskey;"/>
 +          </menupopup>
 +        </toolbarbutton>
 +      </toolbaritem>
@@ -1367,12 +1374,12 @@
  #ifdef HAVE_SHELL_SERVICE
      this.updateSetDefaultBrowser();
  #ifdef XP_WIN
-     let shellSvc = getShellService();
      // In Windows 8 we launch the control panel since it's the only
      // way to get all file type association prefs. So we don't know
      // when the user will select the default.  We refresh here periodically
-     // in case the default changes. 
-@@ -737,14 +743,25 @@ var gAdvancedPane = {
+     // in case the default changes.  On other Windows OS's defaults can also
+     // be set while the prefs are open.
+@@ -725,14 +731,25 @@ var gAdvancedPane = {
     * Set browser as the operating system default browser.
     */
    setDefaultBrowser: function()
@@ -1834,7 +1841,7 @@
 diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
 --- a/browser/installer/package-manifest.in
 +++ b/browser/installer/package-manifest.in
-@@ -559,18 +559,20 @@
+@@ -561,18 +561,20 @@
  @BINPATH@/@PREF_DIR@/services-sync.js
  #endif
  @BINPATH@/greprefs.js
diff -r 9069817b5cac -r 9852e10fdf9b xulrunner/create-tar.sh
--- a/xulrunner/create-tar.sh	Mon Oct 15 16:08:40 2012 +0200
+++ b/xulrunner/create-tar.sh	Wed Oct 24 08:26:54 2012 +0200
@@ -2,7 +2,7 @@
 
 CHANNEL="beta"
 BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_17_0b1_RELEASE"
+RELEASE_TAG="FIREFOX_17_0b3_RELEASE"
 VERSION="16.99"
 
 # mozilla
diff -r 9069817b5cac -r 9852e10fdf9b xulrunner/xulrunner.changes
--- a/xulrunner/xulrunner.changes	Mon Oct 15 16:08:40 2012 +0200
+++ b/xulrunner/xulrunner.changes	Wed Oct 24 08:26:54 2012 +0200
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Oct 24 06:25:36 UTC 2012 - wr@rosenauer.org
+
+- update to 17.0b3
+- rebased patches
+- use internal NSPR for now (bmo#776877)
+
 -------------------------------------------------------------------
 Thu Oct 11 01:50:19 UTC 2012 - wr@rosenauer.org
 
diff -r 9069817b5cac -r 9852e10fdf9b xulrunner/xulrunner.spec
--- a/xulrunner/xulrunner.spec	Mon Oct 15 16:08:40 2012 +0200
+++ b/xulrunner/xulrunner.spec	Wed Oct 24 08:26:54 2012 +0200
@@ -46,7 +46,7 @@
 BuildRequires:  mozilla-nss-devel >= 3.13.6
 Version:        16.99
 Release:        0
-%define         releasedate 2012101100
+%define         releasedate 2012102300
 %define         version_internal 17.0
 %define         apiversion 17
 %define         uaweight 1700000