rebase patches firefox24
authorWolfgang Rosenauer <wr@rosenauer.org>
Sun, 18 Aug 2013 10:36:27 +0200
branchfirefox24
changeset 662 775530ba0729
parent 661 aac91d5705b1
child 663 faf4f017af5c
rebase patches
MozillaFirefox/MozillaFirefox.spec
firefox-kde.patch
mozilla-ppc.patch
--- a/MozillaFirefox/MozillaFirefox.spec	Wed Aug 14 19:02:25 2013 +0200
+++ b/MozillaFirefox/MozillaFirefox.spec	Sun Aug 18 10:36:27 2013 +0200
@@ -60,7 +60,7 @@
 %endif
 Version:        %{mainver}
 Release:        0
-%define         releasedate 2013071300
+%define         releasedate 2013081600
 Provides:       firefox = %{mainver}
 Provides:       firefox = %{version}-%{release}
 Provides:       web_browser
--- a/firefox-kde.patch	Wed Aug 14 19:02:25 2013 +0200
+++ b/firefox-kde.patch	Sun Aug 18 10:36:27 2013 +0200
@@ -2,7 +2,7 @@
 new file mode 100644
 --- /dev/null
 +++ b/browser/base/content/browser-kde.xul
-@@ -0,0 +1,1196 @@
+@@ -0,0 +1,1097 @@
 +#filter substitution
 +<?xml version="1.0"?>
 +# -*- Mode: HTML -*-
@@ -102,6 +102,8 @@
 +                label="&bookmarkAllTabs.label;"
 +                accesskey="&bookmarkAllTabs.accesskey;"
 +                command="Browser:BookmarkAllTabs"/>
++      <menuitem id="context_closeTabsToTheEnd" label="&closeTabsToTheEnd.label;" accesskey="&closeTabsToTheEnd.accesskey;"
++                oncommand="gBrowser.removeTabsToTheEndFrom(TabContextMenu.contextTab);"/>
 +      <menuitem id="context_closeOtherTabs" label="&closeOtherTabs.label;" accesskey="&closeOtherTabs.accesskey;"
 +                oncommand="gBrowser.removeAllTabsBut(TabContextMenu.contextTab);"/>
 +      <menuseparator/>
@@ -235,6 +237,7 @@
 +           side="right"
 +           type="arrow"
 +           hidden="true"
++           flip="slide"
 +           rolluponmousewheel="true"
 +           consumeoutsideclicks="false"
 +           noautofocus="true"
@@ -289,59 +292,6 @@
 +
 +    <menupopup id="placesContext"/>
 +
-+    <panel id="notification-popup"
-+           type="arrow"
-+           footertype="promobox"
-+           position="after_start"
-+           hidden="true"
-+           orient="vertical"
-+           role="alert"/>
-+
-+    <!-- Popup for site identity information -->
-+    <panel id="identity-popup"
-+           type="arrow"
-+           hidden="true"
-+           noautofocus="true"
-+           consumeoutsideclicks="true"
-+           onpopupshown="gIdentityHandler.onPopupShown(event);"
-+           level="top">
-+      <hbox id="identity-popup-container" align="top">
-+        <image id="identity-popup-icon"/>
-+        <vbox id="identity-popup-content-box">
-+          <label id="identity-popup-connectedToLabel"
-+                 class="identity-popup-label"
-+                 value="&identity.connectedTo;"/>
-+          <label id="identity-popup-connectedToLabel2"
-+                 class="identity-popup-label"
-+                 value="&identity.unverifiedsite2;"/>
-+          <description id="identity-popup-content-host"
-+                       class="identity-popup-description"/>
-+          <label id="identity-popup-runByLabel"
-+                 class="identity-popup-label"
-+                 value="&identity.runBy;"/>
-+          <description id="identity-popup-content-owner"
-+                       class="identity-popup-description"/>
-+          <description id="identity-popup-content-supplemental"
-+                       class="identity-popup-description"/>
-+          <description id="identity-popup-content-verifier"
-+                       class="identity-popup-description"/>
-+          <hbox id="identity-popup-encryption" flex="1">
-+            <vbox>
-+              <image id="identity-popup-encryption-icon"/>
-+            </vbox>
-+            <description id="identity-popup-encryption-label" flex="1"
-+                         class="identity-popup-description"/>
-+          </hbox>
-+          <!-- Footer button to open security page info -->
-+          <hbox id="identity-popup-button-container" pack="end">
-+            <button id="identity-popup-more-info-button"
-+                    label="&identity.moreInfoLinkText;"
-+                    onblur="gIdentityHandler.hideIdentityPopup();"
-+                    oncommand="gIdentityHandler.handleMoreInfoClick(event);"/>
-+          </hbox>
-+        </vbox>
-+      </hbox>
-+    </panel>
 +
 +    <panel id="ctrlTab-panel" class="KUI-panel" hidden="true" norestorefocus="true" level="top">
 +      <hbox>
@@ -384,57 +334,7 @@
 +#endif
 +    </tooltip>
 +
-+    <popupnotification id="webRTC-shareDevices-notification" hidden="true">
-+      <popupnotificationcontent id="webRTC-selectCamera" orient="vertical">
-+        <separator class="thin"/>
-+        <label value="&getUserMedia.selectCamera.label;"
-+               accesskey="&getUserMedia.selectCamera.accesskey;"
-+               control="webRTC-selectCamera-menulist"/>
-+        <menulist id="webRTC-selectCamera-menulist">
-+          <menupopup id="webRTC-selectCamera-menupopup"/>
-+        </menulist>
-+      </popupnotificationcontent>
-+      <popupnotificationcontent id="webRTC-selectMicrophone" orient="vertical">
-+        <separator class="thin"/>
-+        <label value="&getUserMedia.selectMicrophone.label;"
-+               accesskey="&getUserMedia.selectMicrophone.accesskey;"
-+               control="webRTC-selectMicrophone-menulist"/>
-+        <menulist id="webRTC-selectMicrophone-menulist">
-+          <menupopup id="webRTC-selectMicrophone-menupopup"/>
-+        </menulist>
-+      </popupnotificationcontent>
-+    </popupnotification>
-+
-+    <popupnotification id="geolocation-notification" hidden="true">
-+      <popupnotificationcontent orient="vertical" align="start">
-+        <separator class="thin"/>
-+        <label id="geolocation-learnmore-link" class="text-link"/>
-+      </popupnotificationcontent>
-+    </popupnotification>
-+
-+    <popupnotification id="servicesInstall-notification" hidden="true">
-+      <popupnotificationcontent orient="vertical" align="start">
-+        <separator class="thin"/>
-+        <label id="servicesInstall-learnmore-link" class="text-link"/>
-+      </popupnotificationcontent>
-+    </popupnotification>
-+
-+    <popupnotification id="pointerLock-notification" hidden="true">
-+      <popupnotificationcontent orient="vertical" align="start">
-+        <separator class="thin"/>
-+        <label id="pointerLock-cancel" value="&pointerLock.notification.message;"/>
-+      </popupnotificationcontent>
-+    </popupnotification>
-+
-+    <popupnotification id="mixed-content-blocked-notification" hidden="true">
-+      <popupnotificationcontent orient="vertical" align="start">
-+        <separator/>
-+        <description id="mixed-content-blocked-moreinfo">&mixedContentBlocked.moreinfo;</description>
-+        <separator/>
-+        <label id="mixed-content-blocked-helplink" class="text-link"
-+               value="&mixedContentBlocked.helplink;"/>
-+      </popupnotificationcontent>
-+    </popupnotification>
++#include popup-notifications.inc
 +
 +  </popupset>
 +
@@ -552,6 +452,7 @@
 +            <image id="webapps-notification-icon" class="notification-anchor-icon" role="button"/>
 +            <image id="plugins-notification-icon" class="notification-anchor-icon" role="button"/>
 +            <image id="web-notifications-notification-icon" class="notification-anchor-icon" role="button"/>
++            <image id="alert-plugins-notification-icon" class="notification-anchor-icon" role="button"/>
 +            <image id="blocked-plugins-notification-icon" class="notification-anchor-icon" role="button"/>
 +            <image id="plugin-install-notification-icon" class="notification-anchor-icon" role="button"/>
 +            <image id="mixed-content-blocked-notification-icon" class="notification-anchor-icon" role="button"/>
@@ -745,6 +646,9 @@
 +                   hidden="true"
 +                   skipintoolbarset="true"
 +                   observes="socialActiveBroadcaster">
++        <toolbarbutton id="social-notification-icon" class="default-notification-icon toolbarbutton-1 notification-anchor-icon"
++                   oncommand="PopupNotifications._reshowNotifications(this,
++                                document.getElementById('social-sidebar-browser'));"/>
 +        <toolbarbutton id="social-provider-button"
 +                       class="toolbarbutton-1"
 +                       type="menu">
@@ -957,7 +861,6 @@
 +                     ondrop="DownloadsIndicatorView.onDrop(event);"
 +                     ondragover="DownloadsIndicatorView.onDragOver(event);"
 +                     ondragenter="DownloadsIndicatorView.onDragOver(event);"
-+                     ondragleave="DownloadsIndicatorView.onDragLeave(event);"
 +                     label="&downloads.label;"
 +                     tooltiptext="&downloads.tooltip;"/>
 +
@@ -1085,6 +988,7 @@
 +               context="contentAreaContextMenu"
 +               disableglobalhistory="true"
 +               tooltip="aHTMLTooltip"
++               popupnotificationanchor="social-notification-icon"
 +               flex="1"
 +               style="min-width: 14em; width: 18em; max-width: 36em;"/>
 +    </vbox>
@@ -1124,11 +1028,8 @@
 +                         tooltiptext="&devToolbarCloseButton.tooltiptext;"/>
 +#endif
 +          <stack class="gclitoolbar-stack-node" flex="1">
-+            <hbox class="gclitoolbar-prompt">
-+              <label class="gclitoolbar-prompt-label">&#187;</label>
-+            </hbox>
++            <textbox class="gclitoolbar-input-node" rows="1"/>
 +            <hbox class="gclitoolbar-complete-node"/>
-+            <textbox class="gclitoolbar-input-node" rows="1"/>
 +          </stack>
 +          <toolbarbutton id="developer-toolbar-toolbox-button"
 +                         class="developer-toolbar-button"
--- a/mozilla-ppc.patch	Wed Aug 14 19:02:25 2013 +0200
+++ b/mozilla-ppc.patch	Sun Aug 18 10:36:27 2013 +0200
@@ -1,5 +1,5 @@
 # HG changeset patch
-# Parent 2c9bf1336fd0811e0112953334df4c81c717e6ff
+# Parent 21d0e194954e451f0f1935d0ed68ee9eae432ddf
 # User Wolfgang Rosenauer <wr@rosenauer.org>
 Bug 746112 - RegExp hang on ppc64 in execute.
 Bug 750620 - Make double-conversion portable to exotic architectures. TM: mozilla15
@@ -7,7 +7,7 @@
 diff --git a/js/src/yarr/YarrInterpreter.h b/js/src/yarr/YarrInterpreter.h
 --- a/js/src/yarr/YarrInterpreter.h
 +++ b/js/src/yarr/YarrInterpreter.h
-@@ -159,17 +159,17 @@ struct ByteTerm {
+@@ -162,17 +162,17 @@ struct ByteTerm {
          , m_invert(invert)
      {
          atom.characterClass = characterClass;
@@ -26,7 +26,7 @@
          atom.parenthesesDisjunction = parenthesesInfo;
          atom.quantityType = QuantifierFixedCount;
          atom.quantityCount = 1;
-@@ -180,17 +180,17 @@ struct ByteTerm {
+@@ -183,17 +183,17 @@ struct ByteTerm {
          : type(type)
          , m_capture(false)
          , m_invert(invert)
@@ -48,7 +48,7 @@
 diff --git a/js/src/yarr/YarrPattern.h b/js/src/yarr/YarrPattern.h
 --- a/js/src/yarr/YarrPattern.h
 +++ b/js/src/yarr/YarrPattern.h
-@@ -179,17 +179,17 @@ struct PatternTerm {
+@@ -180,17 +180,17 @@ struct PatternTerm {
          , m_capture(false)
          , m_invert(invert)
      {
@@ -70,7 +70,7 @@
 diff --git a/memory/mozjemalloc/jemalloc.c b/memory/mozjemalloc/jemalloc.c
 --- a/memory/mozjemalloc/jemalloc.c
 +++ b/memory/mozjemalloc/jemalloc.c
-@@ -1099,17 +1099,19 @@ struct arena_s {
+@@ -1099,17 +1099,17 @@ struct arena_s {
  static unsigned		ncpus;
  #endif
  
@@ -79,17 +79,16 @@
   * controlling the malloc behavior are defined as compile-time constants
   * for best performance and cannot be altered at runtime.
   */
-+#if !(defined(__powerpc__))
+-#if !defined(__ia64__) && !defined(__sparc__) && !defined(__mips__)
++#if !defined(__ia64__) && !defined(__sparc__) && !defined(__mips__) && !(defined(__powerpc__))
  #define MALLOC_STATIC_SIZES 1
-+#endif
+ #endif
  
  #ifdef MALLOC_STATIC_SIZES
  
  /*
   * VM page size. It must divide the runtime CPU page size or the code
   * will abort.
-  * Platform specific page size conditions copied from js/public/HeapAPI.h
-  */
 diff --git a/mfbt/double-conversion/utils.h b/mfbt/double-conversion/utils.h
 --- a/mfbt/double-conversion/utils.h
 +++ b/mfbt/double-conversion/utils.h