1
0

- update to Firefox 56.0 (boo#1060445)

* Find Options/Preferences more quickly with new search function
  * Media is no longer auto-played when opened in a background tab
  * Enable CSS Grid Layout View
- requires NSPR 4.16 and NSS 3.32.1

OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=603
This commit is contained in:
Wolfgang Rosenauer 2017-09-28 08:44:46 +00:00 committed by Git OBS Bridge
parent 8462a9b8f6
commit 9b2ce29f83
16 changed files with 269 additions and 213 deletions

View File

@ -1,3 +1,12 @@
-------------------------------------------------------------------
Thu Sep 28 08:28:29 UTC 2017 - wr@rosenauer.org
- update to Firefox 56.0 (boo#1060445)
* Find Options/Preferences more quickly with new search function
* Media is no longer auto-played when opened in a background tab
* Enable CSS Grid Layout View
- requires NSPR 4.16 and NSS 3.32.1
------------------------------------------------------------------- -------------------------------------------------------------------
Thu Sep 28 07:53:13 UTC 2017 - dimstar@opensuse.org Thu Sep 28 07:53:13 UTC 2017 - dimstar@opensuse.org

View File

@ -18,11 +18,11 @@
# changed with every update # changed with every update
%define major 55 %define major 56
%define mainver %major.0.3 %define mainver %major.0
%define update_channel release %define update_channel release
%define branding 1 %define branding 1
%define releasedate 20170824000000 %define releasedate 20170926190823
# PIE, full relro (x86_64 for now) # PIE, full relro (x86_64 for now)
%define build_hardened 1 %define build_hardened 1
@ -73,8 +73,8 @@ BuildRequires: libiw-devel
BuildRequires: libnotify-devel BuildRequires: libnotify-devel
BuildRequires: libproxy-devel BuildRequires: libproxy-devel
BuildRequires: makeinfo BuildRequires: makeinfo
BuildRequires: mozilla-nspr-devel >= 4.15 BuildRequires: mozilla-nspr-devel >= 4.16
BuildRequires: mozilla-nss-devel >= 3.31 BuildRequires: mozilla-nss-devel >= 3.32.1
BuildRequires: python-devel BuildRequires: python-devel
BuildRequires: rust >= 1.15.1 BuildRequires: rust >= 1.15.1
BuildRequires: rust-std BuildRequires: rust-std
@ -90,6 +90,7 @@ BuildRequires: pkgconfig(gtk+-3.0) >= 3.4.0
BuildRequires: pkgconfig(gtk+-unix-print-3.0) BuildRequires: pkgconfig(gtk+-unix-print-3.0)
BuildRequires: pkgconfig(libffi) BuildRequires: pkgconfig(libffi)
BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libpulse)
#BuildRequires: llvm-clang-devel >= 3.9.0
# libavcodec is required for H.264 support but the # libavcodec is required for H.264 support but the
# openSUSE version is currently not able to play H.264 # openSUSE version is currently not able to play H.264
# therefore the Packman version is required # therefore the Packman version is required
@ -351,6 +352,7 @@ ac_add_options --enable-startup-notification
ac_add_options --enable-update-channel=%{update_channel} ac_add_options --enable-update-channel=%{update_channel}
ac_add_options --with-mozilla-api-keyfile=%{SOURCE18} ac_add_options --with-mozilla-api-keyfile=%{SOURCE18}
ac_add_options --with-google-api-keyfile=%{SOURCE19} ac_add_options --with-google-api-keyfile=%{SOURCE19}
ac_add_options --disable-stylo
%if %branding %if %branding
ac_add_options --enable-official-branding ac_add_options --enable-official-branding
%endif %endif
@ -576,7 +578,7 @@ exit 0
%{progdir}/application.ini %{progdir}/application.ini
%{progdir}/chrome.manifest %{progdir}/chrome.manifest
%{progdir}/dependentlibs.list %{progdir}/dependentlibs.list
%{progdir}/icudt58l.dat %{progdir}/icudt59l.dat
%{progdir}/*.so %{progdir}/*.so
%{progdir}/omni.ja %{progdir}/omni.ja
%{progdir}/fonts/ %{progdir}/fonts/

View File

@ -2,10 +2,10 @@
<constraints> <constraints>
<hardware> <hardware>
<disk> <disk>
<size unit="G">18</size> <size unit="G">13</size>
</disk> </disk>
<memory> <memory>
<size unit="M">7000</size> <size unit="M">6000</size>
</memory> </memory>
</hardware> </hardware>
<overwrite> <overwrite>

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:8ab1d8d34c78ec2a2acae648582d499c8d2c80b496c6e33016c51acf1dfb25e3 oid sha256:4d06bd7c006d22e249f2a537935a7df6a27375790f35c5f5e54d52987cfaef05
size 28364 size 28376

View File

@ -7,8 +7,8 @@
CHANNEL="release" CHANNEL="release"
BRANCH="releases/mozilla-$CHANNEL" BRANCH="releases/mozilla-$CHANNEL"
RELEASE_TAG="FIREFOX_55_0_3_RELEASE" # 55.0.3 build2 RELEASE_TAG="8fbf05f4b92125e081984f5e39b559b83e5cc729" # 56 build6
VERSION="55.0.3" VERSION="56.0"
# mozilla # mozilla
if [ -d mozilla ]; then if [ -d mozilla ]; then

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:3f128780884d758bc065642534ae736a7200bcec5913794505b32e5ebcc80608
size 249204976

View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:59eae64165c9d5917e4c934862a956fcc7aad424d4afd056e3941a210d0735e3
size 271865016

View File

@ -1,11 +1,11 @@
# HG changeset patch # HG changeset patch
# Parent 9ccba8e6b5fad738ce924ff40b4c5aa6f4bc12dd # Parent 05209af7fdfec897f5f574c691184ba27049b0ff
diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul
new file mode 100644 new file mode 100644
--- /dev/null --- /dev/null
+++ b/browser/base/content/browser-kde.xul +++ b/browser/base/content/browser-kde.xul
@@ -0,0 +1,1306 @@ @@ -0,0 +1,1320 @@
+#filter substitution +#filter substitution
+<?xml version="1.0"?> +<?xml version="1.0"?>
+# -*- Mode: HTML -*- +# -*- Mode: HTML -*-
@ -72,14 +72,9 @@ new file mode 100644
+# wishes to include *must* go into the global-scripts.inc file +# wishes to include *must* go into the global-scripts.inc file
+# so that they can be shared by macBrowserOverlay.xul. +# so that they can be shared by macBrowserOverlay.xul.
+#include global-scripts.inc +#include global-scripts.inc
+<script type="application/javascript" src="chrome://browser/content/nsContextMenu.js"/>
+ +
+<script type="application/javascript" src="chrome://global/content/contentAreaUtils.js"/> +<script type="application/javascript" src="chrome://global/content/contentAreaUtils.js"/>
+ +
+<script type="application/javascript" src="chrome://browser/content/downloads/downloads.js"/>
+<script type="application/javascript" src="chrome://browser/content/downloads/indicator.js"/>
+<script type="application/javascript" src="chrome://browser/content/places/editBookmarkOverlay.js"/>
+
+# All sets except for popupsets (commands, keys, stringbundles and broadcasters) *must* go into the +# All sets except for popupsets (commands, keys, stringbundles and broadcasters) *must* go into the
+# browser-sets.inc file for sharing with hiddenWindow.xul. +# browser-sets.inc file for sharing with hiddenWindow.xul.
+#define FULL_BROWSER_WINDOW +#define FULL_BROWSER_WINDOW
@ -110,9 +105,9 @@ new file mode 100644
+ hidden="true" + hidden="true"
+ oncommand="gBrowser.openNonRemoteWindow(TabContextMenu.contextTab);"/> + oncommand="gBrowser.openNonRemoteWindow(TabContextMenu.contextTab);"/>
+#endif +#endif
+ <menuseparator id="context_sendTabToDevice_separator" hidden="true"/> + <menuseparator id="context_sendTabToDevice_separator"/>
+ <menu id="context_sendTabToDevice" label="&sendTabToDevice.label;" + <menu id="context_sendTabToDevice" label="&sendTabToDevice.label;"
+ accesskey="&sendTabToDevice.accesskey;" hidden="true"> + accesskey="&sendTabToDevice.accesskey;">
+ <menupopup id="context_sendTabToDevicePopupMenu" + <menupopup id="context_sendTabToDevicePopupMenu"
+ onpopupshowing="gSync.populateSendTabToDevicesMenu(event.target, TabContextMenu.contextTab.linkedBrowser.currentURI.spec, TabContextMenu.contextTab.linkedBrowser.contentTitle);"/> + onpopupshowing="gSync.populateSendTabToDevicesMenu(event.target, TabContextMenu.contextTab.linkedBrowser.currentURI.spec, TabContextMenu.contextTab.linkedBrowser.contentTitle);"/>
+ </menu> + </menu>
@ -455,58 +450,42 @@ new file mode 100644
+ </hbox> + </hbox>
+ </panel> + </panel>
+ +
+ <panel id="page-action-panel" +#ifdef MOZ_PHOTON_THEME
+ <panel id="pageActionPanel"
+ class="cui-widget-panel" + class="cui-widget-panel"
+ role="group" + role="group"
+ type="arrow" + type="arrow"
+ hidden="true" + hidden="true"
+ flip="slide" + flip="slide"
+ position="bottomcenter topright" + position="bottomcenter topright"
+ noautofocus="true"> + tabspecific="true"
+ <photonpanelmultiview id="page-action-multiView" + noautofocus="true"
+ mainViewId="page-action-mainView"> + context="pageActionPanelContextMenu"
+ <panelview id="page-action-mainView" + oncontextmenu="BrowserPageActions.onContextMenu(event);"
+ copyURL-title="&copyURLCmd.label;"
+ emailLink-title="&emailPageCmd.label;"
+ sendToDevice-title="&sendToDevice.label2;"
+ sendToDevice-notReadyTitle="&sendToDevice.syncNotReady.label;">
+ <photonpanelmultiview id="pageActionPanelMultiView"
+ mainViewId="pageActionPanelMainView"
+ viewCacheId="appMenu-viewCache">
+ <panelview id="pageActionPanelMainView"
+ class="PanelUI-subView"> + class="PanelUI-subView">
+ <vbox class="panel-subview-body"> + <vbox class="panel-subview-body"/>
+ <toolbarbutton id="page-action-bookmark-button"
+ class="subviewbutton subviewbutton-iconic"
+ observes="bookmarkThisPageBroadcaster"
+ command="Browser:AddBookmarkAs"
+ onclick="gPageActionButton.panel.hidePopup();"/>
+ <toolbarseparator/>
+ <toolbarbutton id="page-action-copy-url-button"
+ class="subviewbutton subviewbutton-iconic"
+ label="&copyURLCmd.label;"
+ command="PageAction:copyURL"/>
+ <toolbarbutton id="page-action-email-link-button"
+ class="subviewbutton subviewbutton-iconic"
+ label="&emailPageCmd.label;"
+ command="PageAction:emailLink"/>
+ <toolbarbutton id="page-action-send-to-device-button"
+ class="subviewbutton subviewbutton-iconic subviewbutton-nav"
+ label="&sendToDevice.label;"
+ closemenu="none"
+ oncommand="gPageActionButton.showSendToDeviceView(this);"/>
+ </vbox>
+ </panelview>
+ <panelview id="page-action-sendToDeviceView"
+ class="PanelUI-subView"
+ title="&sendToDevice.viewTitle;">
+ <vbox id="page-action-sendToDeviceView-body" class="panel-subview-body">
+ <toolbarbutton id="page-action-sendToDevice-fxa-button"
+ class="subviewbutton subviewbutton-iconic"
+ label="&syncBrand.fxAccount.label;"
+ shortcut="&sendToDevice.fxaRequired.label;"
+ oncommand="gPageActionButton.fxaButtonClicked();"/>
+ <toolbarbutton id="page-action-no-devices-button"
+ class="subviewbutton"
+ label="&sendToDevice.noDevices.label;"
+ disabled="true"/>
+ </vbox>
+ </panelview> + </panelview>
+ </photonpanelmultiview> + </photonpanelmultiview>
+ </panel> + </panel>
+ +
+ <menupopup id="pageActionPanelContextMenu"
+ onpopupshowing="BrowserPageActions.onContextMenuShowing(event, this);">
+ <menuitem id="pageActionPanelContextMenu-toggleUrlbar"
+ add-label="&pageAction.addToUrlbar.label;"
+ remove-label="&pageAction.removeFromUrlbar.label;"
+ label="&pageAction.addToUrlbar.label;"
+ oncommand="BrowserPageActions.toggleShownInUrlbarForContextAction();"/>
+ </menupopup>
+#endif
+
+ <!-- Bookmarks and history tooltip --> + <!-- Bookmarks and history tooltip -->
+ <tooltip id="bhTooltip"/> + <tooltip id="bhTooltip"/>
+ +
@ -790,11 +769,19 @@ new file mode 100644
+ class="toolbarbutton-1" + class="toolbarbutton-1"
+ command="Browser:ReloadOrDuplicate" + command="Browser:ReloadOrDuplicate"
+ onclick="checkForMiddleClick(this, event);" + onclick="checkForMiddleClick(this, event);"
+ tooltip="dynamic-shortcut-tooltip"/> + tooltip="dynamic-shortcut-tooltip">
+ <box class="toolbarbutton-animatable-box">
+ <image class="toolbarbutton-animatable-image"/>
+ </box>
+ </toolbarbutton>
+ <toolbarbutton id="stop-button" + <toolbarbutton id="stop-button"
+ class="toolbarbutton-1" + class="toolbarbutton-1"
+ command="Browser:Stop" + command="Browser:Stop"
+ tooltip="dynamic-shortcut-tooltip"/> + tooltip="dynamic-shortcut-tooltip">
+ <box class="toolbarbutton-animatable-box">
+ <image class="toolbarbutton-animatable-image"/>
+ </box>
+ </toolbarbutton>
+ </toolbaritem> + </toolbaritem>
+#endif +#endif
+ <hbox id="urlbar-wrapper" flex="1"> + <hbox id="urlbar-wrapper" flex="1">
@ -818,7 +805,6 @@ new file mode 100644
+ showcommentcolumn="true" + showcommentcolumn="true"
+ showimagecolumn="true" + showimagecolumn="true"
+ enablehistory="true" + enablehistory="true"
+ maxrows="10"
+ newlines="stripsurroundingwhitespace" + newlines="stripsurroundingwhitespace"
+ ontextentered="this.handleCommand(param);" + ontextentered="this.handleCommand(param);"
+ ontextreverted="return this.handleRevert();" + ontextreverted="return this.handleRevert();"
@ -854,8 +840,8 @@ new file mode 100644
+ </box> + </box>
+ <box id="notification-popup-box" + <box id="notification-popup-box"
+ hidden="true" + hidden="true"
+ onmouseover="document.getElementById('identity-icon').classList.add('no-hover');" + onmouseover="document.getElementById('identity-box').classList.add('no-hover');"
+ onmouseout="document.getElementById('identity-icon').classList.remove('no-hover');" + onmouseout="document.getElementById('identity-box').classList.remove('no-hover');"
+ align="center"> + align="center">
+ <image id="default-notification-icon" class="notification-anchor-icon" role="button" + <image id="default-notification-icon" class="notification-anchor-icon" role="button"
+ tooltiptext="&urlbar.defaultNotificationAnchor.tooltip;"/> + tooltiptext="&urlbar.defaultNotificationAnchor.tooltip;"/>
@ -918,6 +904,24 @@ new file mode 100644
+ onclick="FullZoom.reset();" + onclick="FullZoom.reset();"
+ tooltip="dynamic-shortcut-tooltip" + tooltip="dynamic-shortcut-tooltip"
+ hidden="true"/> + hidden="true"/>
+#ifdef MOZ_PHOTON_THEME
+ <image id="pageActionButton"
+ class="urlbar-icon"
+ tooltiptext="&pageActionButton.tooltip;"
+ onclick="BrowserPageActions.mainButtonClicked(event);"/>
+ <hbox id="star-button-box" hidden="true">
+ <image id="star-button"
+ class="urlbar-icon"
+ onclick="BookmarkingUI.onStarCommand(event);">
+ <observes element="bookmarkThisPageBroadcaster" attribute="starred"/>
+ <observes element="bookmarkThisPageBroadcaster" attribute="tooltiptext"/>
+ </image>
+ <hbox id="star-button-animatable-box">
+ <image id="star-button-animatable-image"
+ onclick="BookmarkingUI.onStarCommand(event);"/>
+ </hbox>
+ </hbox>
+#endif
+ </hbox> + </hbox>
+ <hbox id="userContext-icons" hidden="true"> + <hbox id="userContext-icons" hidden="true">
+ <label id="userContext-label"/> + <label id="userContext-label"/>
@ -937,11 +941,6 @@ new file mode 100644
+ class="chromeclass-toolbar-additional" + class="chromeclass-toolbar-additional"
+ command="Browser:Stop" + command="Browser:Stop"
+ tooltip="dynamic-shortcut-tooltip"/> + tooltip="dynamic-shortcut-tooltip"/>
+#else
+ <toolbarbutton id="urlbar-page-action-button"
+ class="chromeclass-toolbar-additional"
+ tooltiptext="&pageActionButton.tooltip;"
+ onclick="gPageActionButton.onEvent(event);"/>
+#endif +#endif
+ </textbox> + </textbox>
+ </hbox> + </hbox>
@ -957,7 +956,11 @@ new file mode 100644
+ <toolbarbutton id="bookmarks-menu-button" + <toolbarbutton id="bookmarks-menu-button"
+ class="toolbarbutton-1 chromeclass-toolbar-additional" + class="toolbarbutton-1 chromeclass-toolbar-additional"
+ removable="true" + removable="true"
+#ifdef MOZ_PHOTON_THEME
+ type="menu"
+#else
+ type="menu-button" + type="menu-button"
+#endif
+ label="&bookmarksMenuButton.label;" + label="&bookmarksMenuButton.label;"
+ tooltip="dynamic-shortcut-tooltip" + tooltip="dynamic-shortcut-tooltip"
+ anchor="dropmarker" + anchor="dropmarker"
@ -974,7 +977,7 @@ new file mode 100644
+ placespopup="true" + placespopup="true"
+ context="placesContext" + context="placesContext"
+ openInTabs="children" + openInTabs="children"
+ oncommand="BookmarksEventHandler.onCommand(event, this.parentNode._placesView);" + oncommand="BookmarksEventHandler.onCommand(event);"
+ onclick="BookmarksEventHandler.onClick(event, this.parentNode._placesView);" + onclick="BookmarksEventHandler.onClick(event, this.parentNode._placesView);"
+ onpopupshowing="BookmarkingUI.onPopupShowing(event); + onpopupshowing="BookmarkingUI.onPopupShowing(event);
+ BookmarkingUI.attachPlacesView(event, this);" + BookmarkingUI.attachPlacesView(event, this);"
@ -1083,7 +1086,13 @@ new file mode 100644
+ <toolbarbutton id="nav-bar-overflow-button" + <toolbarbutton id="nav-bar-overflow-button"
+ class="toolbarbutton-1 chromeclass-toolbar-additional overflow-button" + class="toolbarbutton-1 chromeclass-toolbar-additional overflow-button"
+ skipintoolbarset="true" + skipintoolbarset="true"
+ tooltiptext="&navbarOverflow.label;"/> + tooltiptext="&navbarOverflow.label;">
+#ifdef MOZ_PHOTON_ANIMATIONS
+ <box class="toolbarbutton-animatable-box">
+ <image class="toolbarbutton-animatable-image"/>
+ </box>
+#endif
+ </toolbarbutton>
+ +
+ <toolbaritem id="PanelUI-button" + <toolbaritem id="PanelUI-button"
+ class="chromeclass-toolbar-additional" + class="chromeclass-toolbar-additional"
@ -1138,7 +1147,7 @@ new file mode 100644
+ id="PlacesToolbar" + id="PlacesToolbar"
+ context="placesContext" + context="placesContext"
+ onclick="BookmarksEventHandler.onClick(event, this._placesView);" + onclick="BookmarksEventHandler.onClick(event, this._placesView);"
+ oncommand="BookmarksEventHandler.onCommand(event, this._placesView);" + oncommand="BookmarksEventHandler.onCommand(event);"
+ tooltip="bhTooltip" + tooltip="bhTooltip"
+ popupsinherittooltip="true"> + popupsinherittooltip="true">
+ <hbox flex="1"> + <hbox flex="1">
@ -1207,8 +1216,13 @@ new file mode 100644
+ tooltip="dynamic-shortcut-tooltip"/> + tooltip="dynamic-shortcut-tooltip"/>
+#ifdef MOZ_PHOTON_THEME +#ifdef MOZ_PHOTON_THEME
+ <toolbarbutton id="library-button" class="toolbarbutton-1 chromeclass-toolbar-additional" + <toolbarbutton id="library-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
+ oncommand="PanelUI.showSubView('appMenu-libraryView', this, null, true);" + oncommand="PanelUI.showSubView('appMenu-libraryView', this, null, event);"
+ label="&places.library.title;"/> + closemenu="none"
+ label="&places.library.title;">
+ <box class="toolbarbutton-animatable-box">
+ <image class="toolbarbutton-animatable-image"/>
+ </box>
+ </toolbarbutton>
+#endif +#endif
+ </toolbarpalette> + </toolbarpalette>
+ </toolbox> + </toolbox>
@ -1397,7 +1411,7 @@ diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/ns
diff --git a/browser/components/preferences/in-content/main.js b/browser/components/preferences/in-content/main.js diff --git a/browser/components/preferences/in-content/main.js b/browser/components/preferences/in-content/main.js
--- a/browser/components/preferences/in-content/main.js --- a/browser/components/preferences/in-content/main.js
+++ b/browser/components/preferences/in-content/main.js +++ b/browser/components/preferences/in-content/main.js
@@ -39,16 +39,23 @@ var gMainPane = { @@ -41,16 +41,23 @@ var gMainPane = {
// way to get all file type association prefs. So we don't know // way to get all file type association prefs. So we don't know
// when the user will select the default. We refresh here periodically // when the user will select the default. We refresh here periodically
// in case the default changes. On other Windows OS's defaults can also // in case the default changes. On other Windows OS's defaults can also
@ -1421,7 +1435,7 @@ diff --git a/browser/components/preferences/in-content/main.js b/browser/compone
defaultPerformancePref.addEventListener("change", () => { defaultPerformancePref.addEventListener("change", () => {
this.updatePerformanceSettingsBox({duringChangeEvent: true}); this.updatePerformanceSettingsBox({duringChangeEvent: true});
}); });
@@ -780,16 +787,27 @@ var gMainPane = { @@ -875,16 +882,27 @@ var gMainPane = {
let alwaysCheckPref = document.getElementById("browser.shell.checkDefaultBrowser"); let alwaysCheckPref = document.getElementById("browser.shell.checkDefaultBrowser");
alwaysCheckPref.value = true; alwaysCheckPref.value = true;
@ -1452,7 +1466,7 @@ diff --git a/browser/components/preferences/in-content/main.js b/browser/compone
diff --git a/browser/components/shell/moz.build b/browser/components/shell/moz.build diff --git a/browser/components/shell/moz.build b/browser/components/shell/moz.build
--- a/browser/components/shell/moz.build --- a/browser/components/shell/moz.build
+++ b/browser/components/shell/moz.build +++ b/browser/components/shell/moz.build
@@ -37,16 +37,18 @@ if CONFIG['OS_ARCH'] == 'WINNT': @@ -38,16 +38,18 @@ if CONFIG['OS_ARCH'] == 'WINNT':
] ]
elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa': elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'cocoa':
SOURCES += [ SOURCES += [
@ -1764,7 +1778,7 @@ new file mode 100644
diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in
--- a/browser/installer/package-manifest.in --- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in
@@ -662,16 +662,18 @@ @@ -664,16 +664,18 @@
@RESPATH@/browser/defaults/blocklists @RESPATH@/browser/defaults/blocklists
@RESPATH@/browser/defaults/pinning @RESPATH@/browser/defaults/pinning

View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:9fbaebedf8a157d402467a75b015868951567deb369b68b5e8c4fc823ce2ec79
size 46655584

3
l10n-56.0.tar.xz Normal file
View File

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:0a4704c6ae33b92f0f861cba02ab93bc5fe05b7429b7adc7e9180793556ef398
size 47661016

View File

@ -1,96 +1,96 @@
ach f26087a6a6fd ach e7adc49e1901
af eeac1ca62457 af a175ec808407
an a4f5fb57979d an c02780857019
ar 2f0c4d6a3863 ar 6688a184a4ee
as ecbc1fafe3fb as 1b201809c30b
ast 5b37651ec44d ast 5b0c1d37dfc4
az d3d47516000e az 46f153ea025d
be 8c4022c8401a be e639859bd80d
bg 0ed29af471d6 bg 45ac10a8eebb
bn-BD d318bfc6fe59 bn-BD 78e42794be0a
bn-IN cd84ee209b9c bn-IN b12cd5984010
br 2be494f41cb3 br 0c692a161e6a
bs 18b79a52d6d3 bs c566dcff9228
ca 806e39b4de56 ca 843005ebdf57
cak dad0ddc1d964 cak a201a160f1aa
cs 61f3b8744fd4 cs 673e3c5d7e6d
cy 32cf6d9aa756 cy d7785e84b2d5
da 554288f1d152 da d10cb0ccbfdf
de bcb514eb5627 de cbcbb67b7446
dsb f076d4d42002 dsb 91d7f449c8b8
el 13ee5cd21a66 el 9fae6e0cf73a
en-GB 0b2996f2530f en-GB 4efed4b7a026
en-ZA 7e04b235c4f3 en-ZA 41d36ec15733
eo bdb64d29938d eo 75689f423fee
es-AR ce262833fb6c es-AR 008298fdc822
es-CL b0a5fe0dd439 es-CL 0719cf9a02c5
es-ES 0d6629322408 es-ES 89444d0f0c5e
es-MX 1f8e97ae724d es-MX a3b2c719d335
et 52df77b40a67 et f94a081742e2
eu 4a7550dc8250 eu e70ce824af92
fa 45ef3a098c22 fa bd0a632a347e
ff 8025b165aead ff e9ec23d286da
fi a9b647644be7 fi dee2606c0c52
fr b8b7c09d3f1f fr 444f6f248cda
fy-NL bc875e89b956 fy-NL 5442947be711
ga-IE 3e543d62ad63 ga-IE 520a91e1b869
gd f937bddd78eb gd 7b8d318d7172
gl df4a43546115 gl df4a43546115
gn fdc6b354f3a4 gn de90f7d4ad27
gu-IN 408c035790bb gu-IN 49c0059e7b20
he 0c53c3756f7d he 14abb07c8067
hi-IN 8db91f7f5793 hi-IN 627e4866fa52
hr d317c15ea672 hr 840d6fce9f2d
hsb 4fac422aa702 hsb 79b769f56afb
hu 5671194f7ec1 hu 75d6acab27ff
hy-AM e86992a0c0ee hy-AM 3543e3c61d51
id 00395930bb83 id 80d249bfce07
is f8474352b98d is df02eb864aba
it 5698ddc38e5e it 54ebd710b0b9
ja 0701d1112fe5 ja 0f3bea597ba3
ja-JP-mac 35cc3be4ea6c ja-JP-mac 7f49be227f5d
ka b2f753a8a642 ka ee6c8ed935e1
kab c79bbdfb6e57 kab f53aac551d7a
kk 34777b3d0e58 kk 07823d99b937
km 3bf31b0b6d9e km 3bf31b0b6d9e
kn 085cc4cfccad kn c3db01aad2bf
ko 2a8956fc58a2 ko 9508383b1bb7
lij 217da84c31d3 lij c585863b419f
lt f8beb0ee9ef4 lt 74e2d1cc81a1
lv a2d7fa888232 lv 6e57fc56b250
mai b78d319868ff mai 7c33a3406453
mk 26b755e4f87b mk b97e85f1e93e
ml 818f2d7fc3b1 ml de8be9445c41
mr b84d162a2888 mr 61ad0573f895
ms e5b008cb44eb ms 25a747386aab
my 4a0dc350bdec my 088ce3f4319d
nb-NO d50a43efc007 nb-NO 1d197e5f990c
nl a8f7ad7a0e39 nl 5676db0716a9
nn-NO e00fbf3066c1 nn-NO fcd11b7086e5
or 11e8e75808ae or f21324a0ed10
pa-IN f01bcb8c13a2 pa-IN 4b71dd06d0e8
pl d76f3ba7ebd5 pl b71e63bbbddd
pt-BR 7cf0629777d1 pt-BR e0e7a5821812
pt-PT a762c23994b3 pt-PT 333e82cca862
rm f16da0c1a769 rm 6b8e6367d9d0
ro 6538d74548a9 ro 84d897edfd6c
ru 4feb4e4200f5 ru aee79cd84afb
si d91975c0b4d8 si d91975c0b4d8
sk 0b32ca1321b2 sk 8fa0e53e20c2
sl ad8ee6b5e9eb sl 2abb9b1c667a
son abb58457c998 son be7a56e6d7fe
sq 4374d5e275dd sq d9137ed745db
sr baec6e6f600d sr 6839a5986d5b
sv-SE bf5faf4c09d4 sv-SE 621c743144e6
ta 8de385a48ec1 ta aae2aa13babf
te 0064b2051ea7 te d9cf4d3c33e0
th 52f4abb2b927 th 34c1c62bb3cf
tr d9f5398e98f8 tr 921c1b013006
uk a95815527227 uk 03b177ac056c
ur a8390b38a5dc ur d97e35bba2d8
uz 6a7dac5f89c9 uz 4807645f175b
vi d931c17a2ff7 vi fa843de1fbed
xh c2ac7c43e358 xh 7011a348aa3b
zh-CN e61f2d1a43f5 zh-CN 3ebe225f8ae8
zh-TW 75d29bef92f2 zh-TW 99c6d5ce2901

View File

@ -1,5 +1,5 @@
# HG changeset patch # HG changeset patch
# Parent 172cd661ceed38b3161c6246f6729f4d8370dce3 # Parent faadbf89d1cb02eefec4c5dfd3ab86bc20d815d5
Description: Add KDE integration to Firefox (toolkit parts) Description: Add KDE integration to Firefox (toolkit parts)
Author: Wolfgang Rosenauer <wolfgang@rosenauer.org> Author: Wolfgang Rosenauer <wolfgang@rosenauer.org>
Author: Lubos Lunak <lunak@suse.com> Author: Lubos Lunak <lunak@suse.com>
@ -9,7 +9,7 @@ Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=140751
diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
--- a/modules/libpref/Preferences.cpp --- a/modules/libpref/Preferences.cpp
+++ b/modules/libpref/Preferences.cpp +++ b/modules/libpref/Preferences.cpp
@@ -32,16 +32,17 @@ @@ -33,16 +33,17 @@
#include "nsIZipReader.h" #include "nsIZipReader.h"
#include "nsPrefBranch.h" #include "nsPrefBranch.h"
#include "nsXPIDLString.h" #include "nsXPIDLString.h"
@ -27,7 +27,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
#include "prefread.h" #include "prefread.h"
#include "prefapi_private_data.h" #include "prefapi_private_data.h"
@@ -1219,16 +1220,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char @@ -1435,16 +1436,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char
static nsresult pref_LoadPrefsInDirList(const char *listId) static nsresult pref_LoadPrefsInDirList(const char *listId)
{ {
@ -62,7 +62,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
return NS_OK; return NS_OK;
bool hasMore; bool hasMore;
@@ -1244,17 +1263,17 @@ static nsresult pref_LoadPrefsInDirList( @@ -1460,17 +1479,17 @@ static nsresult pref_LoadPrefsInDirList(
nsAutoCString leaf; nsAutoCString leaf;
path->GetNativeLeafName(leaf); path->GetNativeLeafName(leaf);
@ -81,7 +81,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp
{ {
nsZipItemPtr<char> manifest(jarReader, name, true); nsZipItemPtr<char> manifest(jarReader, name, true);
NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE); NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE);
@@ -1348,24 +1367,36 @@ static nsresult pref_InitInitialObjects( @@ -1566,24 +1585,36 @@ pref_InitInitialObjects()
/* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */ /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */
static const char* specialFiles[] = { static const char* specialFiles[] = {
#if defined(XP_MACOSX) #if defined(XP_MACOSX)
@ -706,7 +706,7 @@ diff --git a/toolkit/content/widgets/preferences-kde.xml b/toolkit/content/widge
new file mode 100644 new file mode 100644
--- /dev/null --- /dev/null
+++ b/toolkit/content/widgets/preferences-kde.xml +++ b/toolkit/content/widgets/preferences-kde.xml
@@ -0,0 +1,1380 @@ @@ -0,0 +1,1409 @@
+<?xml version="1.0"?> +<?xml version="1.0"?>
+ +
+<!DOCTYPE bindings [ +<!DOCTYPE bindings [
@ -742,19 +742,19 @@ new file mode 100644
+ <method name="_constructAfterChildren"> + <method name="_constructAfterChildren">
+ <body> + <body>
+ <![CDATA[ + <![CDATA[
+ // This method will be called after each one of the child + // This method will be called after the last of the child
+ // <preference> elements is constructed. Its purpose is to propagate + // <preference> elements is constructed. Its purpose is to propagate
+ // the values to the associated form elements + // the values to the associated form elements. Sometimes the code for
+ // some <preference> initializers depend on other <preference> elements
+ // being initialized so we wait and call updateElements on all of them
+ // once the last one has been constructed. See bugs 997570 and 992185.
+ +
+ var elements = this.getElementsByTagName("preference"); + var elements = this.getElementsByTagName("preference");
+ for (let element of elements) { + for (let element of elements) {
+ if (!element._constructed) {
+ return;
+ }
+ }
+ for (let element of elements) {
+ element.updateElements(); + element.updateElements();
+ } + }
+
+ this._constructAfterChildrenCalled = true;
+ ]]> + ]]>
+ </body> + </body>
+ </method> + </method>
@ -821,6 +821,25 @@ new file mode 100644
+ ]]> + ]]>
+ </getter> + </getter>
+ </property> + </property>
+
+ <!-- We want to call _constructAfterChildren after all child
+ <preference> elements have been constructed. To do this, we get
+ and store the node list of all child <preference> elements in the
+ constructor, and maintain a count which is incremented in the
+ constructor of <preference>. _constructAfterChildren is called
+ when the count matches the length of the list. -->
+ <field name="_constructedChildrenCount">0</field>
+ <field name="_preferenceChildren">null</field>
+ <!-- Some <preference> elements are added dynamically after
+ _constructAfterChildren has already been called - we want to
+ avoid looping over all of them again in this case so we remember
+ if we already called it. -->
+ <field name="_constructAfterChildrenCalled">false</field>
+ <constructor>
+ <![CDATA[
+ this._preferenceChildren = this.getElementsByTagName("preference");
+ ]]>
+ </constructor>
+ </implementation> + </implementation>
+ </binding> + </binding>
+ +
@ -828,8 +847,6 @@ new file mode 100644
+ <implementation> + <implementation>
+ <constructor> + <constructor>
+ <![CDATA[ + <![CDATA[
+ this._constructed = true;
+
+ // if the element has been inserted without the name attribute set, + // if the element has been inserted without the name attribute set,
+ // we have nothing to do here + // we have nothing to do here
+ if (!this.name) + if (!this.name)
@ -862,9 +879,21 @@ new file mode 100644
+ +
+ // Don't use the value setter here, we don't want updateElements to be prematurely fired. + // Don't use the value setter here, we don't want updateElements to be prematurely fired.
+ this._value = preference ? preference.value : this.valueFromPreferences; + this._value = preference ? preference.value : this.valueFromPreferences;
+ } else + } else {
+ this._value = this.valueFromPreferences; + this._value = this.valueFromPreferences;
+ this.preferences._constructAfterChildren(); + }
+ if (this.preferences._constructAfterChildrenCalled) {
+ // This <preference> was added after _constructAfterChildren() was already called.
+ // We can directly call updateElements().
+ this.updateElements();
+ return;
+ }
+ this.preferences._constructedChildrenCount++;
+ if (this.preferences._constructedChildrenCount ==
+ this.preferences._preferenceChildren.length) {
+ // This is the last <preference>, time to updateElements() on all of them.
+ this.preferences._constructAfterChildren();
+ }
+ ]]> + ]]>
+ </constructor> + </constructor>
+ <destructor> + <destructor>
@ -2090,7 +2119,7 @@ new file mode 100644
diff --git a/toolkit/mozapps/downloads/nsHelperAppDlg.js b/toolkit/mozapps/downloads/nsHelperAppDlg.js diff --git a/toolkit/mozapps/downloads/nsHelperAppDlg.js b/toolkit/mozapps/downloads/nsHelperAppDlg.js
--- a/toolkit/mozapps/downloads/nsHelperAppDlg.js --- a/toolkit/mozapps/downloads/nsHelperAppDlg.js
+++ b/toolkit/mozapps/downloads/nsHelperAppDlg.js +++ b/toolkit/mozapps/downloads/nsHelperAppDlg.js
@@ -625,17 +625,17 @@ nsUnknownContentTypeDialog.prototype = { @@ -628,17 +628,17 @@ nsUnknownContentTypeDialog.prototype = {
else else
typeString = mimeInfo.MIMEType; typeString = mimeInfo.MIMEType;
} }
@ -2109,7 +2138,7 @@ diff --git a/toolkit/mozapps/downloads/nsHelperAppDlg.js b/toolkit/mozapps/downl
}, },
// Returns true if opening the default application makes sense. // Returns true if opening the default application makes sense.
@@ -799,17 +799,17 @@ nsUnknownContentTypeDialog.prototype = { @@ -802,17 +802,17 @@ nsUnknownContentTypeDialog.prototype = {
switch (this.dialogElement("openHandler").selectedIndex) { switch (this.dialogElement("openHandler").selectedIndex) {
case 0: case 0:
// No app need be specified in this case. // No app need be specified in this case.
@ -2128,15 +2157,15 @@ diff --git a/toolkit/mozapps/downloads/nsHelperAppDlg.js b/toolkit/mozapps/downl
this.mDialog.document.documentElement.getButton("accept").disabled = !ok; this.mDialog.document.documentElement.getButton("accept").disabled = !ok;
}, },
@@ -1066,30 +1066,56 @@ nsUnknownContentTypeDialog.prototype = { @@ -1067,30 +1067,57 @@ nsUnknownContentTypeDialog.prototype = {
if (params.handlerApp &&
params.handlerApp.executable && params.handlerApp.executable &&
params.handlerApp.executable.isFile()) { params.handlerApp.executable.isFile()) {
// Remember the file they chose to run. // Remember the file they chose to run.
this.chosenApp = params.handlerApp; this.chosenApp = params.handlerApp;
} }
} } else if ("@mozilla.org/applicationchooser;1" in Components.classes) {
else {
#if MOZ_WIDGET_GTK == 3
- var nsIApplicationChooser = Components.interfaces.nsIApplicationChooser; - var nsIApplicationChooser = Components.interfaces.nsIApplicationChooser;
- var appChooser = Components.classes["@mozilla.org/applicationchooser;1"] - var appChooser = Components.classes["@mozilla.org/applicationchooser;1"]
- .createInstance(nsIApplicationChooser); - .createInstance(nsIApplicationChooser);
@ -2147,7 +2176,8 @@ diff --git a/toolkit/mozapps/downloads/nsHelperAppDlg.js b/toolkit/mozapps/downl
- contentTypeDialogObj.chosenApp = aResult.QueryInterface(Components.interfaces.nsILocalHandlerApp); - contentTypeDialogObj.chosenApp = aResult.QueryInterface(Components.interfaces.nsILocalHandlerApp);
+ // handle the KDE case which is implemented in the filepicker + // handle the KDE case which is implemented in the filepicker
+ // therefore falling back to Gtk2 like behaviour if KDE is running + // therefore falling back to Gtk2 like behaviour if KDE is running
+ // FIXME this should be better handled in the nsIApplicationChooser interface + // FIXME this should be better handled in the nsIApplicationChooser
+ // interface
+ var env = Components.classes["@mozilla.org/process/environment;1"] + var env = Components.classes["@mozilla.org/process/environment;1"]
+ .getService(Components.interfaces.nsIEnvironment); + .getService(Components.interfaces.nsIEnvironment);
+ if (env.get('KDE_FULL_SESSION') == "true") + if (env.get('KDE_FULL_SESSION') == "true")
@ -2190,7 +2220,7 @@ diff --git a/toolkit/mozapps/downloads/nsHelperAppDlg.js b/toolkit/mozapps/downl
+ // The finishChooseApp is called from appChooserCallback + // The finishChooseApp is called from appChooserCallback
+ return; + return;
+ } + }
#else } else {
var nsIFilePicker = Components.interfaces.nsIFilePicker; var nsIFilePicker = Components.interfaces.nsIFilePicker;
var fp = Components.classes["@mozilla.org/filepicker;1"] var fp = Components.classes["@mozilla.org/filepicker;1"]
.createInstance(nsIFilePicker); .createInstance(nsIFilePicker);

View File

@ -1,13 +1,13 @@
# HG changeset patch # HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org> # User Wolfgang Rosenauer <wr@rosenauer.org>
# Parent 5a29924228527f8882c83cf62d470963ea1ce62e # Parent 5a29924228527f8882c83cf62d470963ea1ce62e
# Parent 4f39ed617c2f151a3a15903c7ae4471b66774e9e # Parent 242f2521ed48bb63b91582956b5e4af80bcb3378
Bug 583793 - Firefox interface language set to LANG, ignores LANGUAGE Bug 583793 - Firefox interface language set to LANG, ignores LANGUAGE
diff --git a/intl/locale/nsLocaleService.cpp b/intl/locale/nsLocaleService.cpp diff --git a/intl/locale/nsLocaleService.cpp b/intl/locale/nsLocaleService.cpp
--- a/intl/locale/nsLocaleService.cpp --- a/intl/locale/nsLocaleService.cpp
+++ b/intl/locale/nsLocaleService.cpp +++ b/intl/locale/nsLocaleService.cpp
@@ -114,16 +114,17 @@ nsLocaleService::nsLocaleService(void) @@ -116,16 +116,17 @@ nsLocaleService::nsLocaleService(void)
NS_ENSURE_SUCCESS_VOID(rv); NS_ENSURE_SUCCESS_VOID(rv);
#endif #endif
#if defined(XP_UNIX) && !defined(XP_MACOSX) #if defined(XP_UNIX) && !defined(XP_MACOSX)
@ -25,7 +25,7 @@ diff --git a/intl/locale/nsLocaleService.cpp b/intl/locale/nsLocaleService.cpp
for( i = 0; i < LocaleListLength; i++ ) { for( i = 0; i < LocaleListLength; i++ ) {
nsresult result; nsresult result;
// setlocale( , "") evaluates LC_* and LANG // setlocale( , "") evaluates LC_* and LANG
@@ -149,16 +150,36 @@ nsLocaleService::nsLocaleService(void) @@ -151,16 +152,37 @@ nsLocaleService::nsLocaleService(void)
} else { } else {
CopyASCIItoUTF16(lang, platformLocale); CopyASCIItoUTF16(lang, platformLocale);
result = nsPosixLocale::GetXPLocale(lang, xpLocale); result = nsPosixLocale::GetXPLocale(lang, xpLocale);
@ -54,6 +54,7 @@ diff --git a/intl/locale/nsLocaleService.cpp b/intl/locale/nsLocaleService.cpp
+ } + }
+ } + }
+ } + }
+
resultLocale->AddCategory(category, xpLocale); resultLocale->AddCategory(category, xpLocale);
resultLocale->AddCategory(category_platform, platformLocale); resultLocale->AddCategory(category_platform, platformLocale);
} }

View File

@ -9,7 +9,7 @@ retrieving revision 1.1
diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
--- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp --- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
+++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp +++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp
@@ -53,23 +53,27 @@ nsUnixSystemProxySettings::GetMainThread @@ -54,23 +54,27 @@ nsUnixSystemProxySettings::GetMainThread
// dbus prevents us from being threadsafe, but this routine should not block anyhow // dbus prevents us from being threadsafe, but this routine should not block anyhow
*aMainThreadOnly = true; *aMainThreadOnly = true;
return NS_OK; return NS_OK;

View File

@ -1,7 +1,7 @@
# HG changeset patch # HG changeset patch
# User Petr Cerny <pcerny@novell.com> # User Petr Cerny <pcerny@novell.com>
# Parent 7308e4a7c1f769f4bbbc90870b849cadd99495a6 # Parent 7308e4a7c1f769f4bbbc90870b849cadd99495a6
# Parent 03565086f1e230cf6f0f6c01bf9a792c732de50b # Parent fe1932b7223a298863663244accc524d474a9f6d
Bug 634334 - call to the ntlm_auth helper fails Bug 634334 - call to the ntlm_auth helper fails
diff --git a/extensions/auth/nsAuthSambaNTLM.cpp b/extensions/auth/nsAuthSambaNTLM.cpp diff --git a/extensions/auth/nsAuthSambaNTLM.cpp b/extensions/auth/nsAuthSambaNTLM.cpp

View File

@ -1,2 +1,2 @@
REV=10a244c0f835 REV=8fbf05f4b921
REPO=http://hg.mozilla.org/releases/mozilla-release REPO=http://hg.mozilla.org/releases/mozilla-release