1
0

- update to Firefox 23.0 (bnc#833389)

* MFSA 2013-63/CVE-2013-1701/CVE-2013-1702
    Miscellaneous memory safety hazards
  * MFSA 2013-64/CVE-2013-1704 (bmo#883313)
    Use after free mutating DOM during SetBody
  * MFSA 2013-65/CVE-2013-1705 (bmo#882865)
    Buffer underflow when generating CRMF requests
  * MFSA 2013-67/CVE-2013-1708 (bmo#879924)
    Crash during WAV audio file decoding
  * MFSA 2013-68/CVE-2013-1709 (bmo#838253)
    Document URI misrepresentation and masquerading
  * MFSA 2013-69/CVE-2013-1710 (bmo#871368)
    CRMF requests allow for code execution and XSS attacks
  * MFSA 2013-70/CVE-2013-1711 (bmo#843829)
    Bypass of XrayWrappers using XBL Scopes
  * MFSA 2013-72/CVE-2013-1713 (bmo#887098)
    Wrong principal used for validating URI for some Javascript
    components
  * MFSA 2013-73/CVE-2013-1714 (bmo#879787)
    Same-origin bypass with web workers and XMLHttpRequest
  * MFSA 2013-75/CVE-2013-1717 (bmo#406541, bmo#738397)
    Local Java applets may read contents of local file system
- requires NSPR 4.10 and NSS 3.15

OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=345
This commit is contained in:
Wolfgang Rosenauer 2013-08-07 12:18:59 +00:00 committed by Git OBS Bridge
parent a7d7992747
commit 2e3fd693c1
15 changed files with 242 additions and 253 deletions

View File

@ -1,3 +1,30 @@
-------------------------------------------------------------------
Sun Aug 4 18:30:11 UTC 2013 - wr@rosenauer.org
- update to Firefox 23.0 (bnc#833389)
* MFSA 2013-63/CVE-2013-1701/CVE-2013-1702
Miscellaneous memory safety hazards
* MFSA 2013-64/CVE-2013-1704 (bmo#883313)
Use after free mutating DOM during SetBody
* MFSA 2013-65/CVE-2013-1705 (bmo#882865)
Buffer underflow when generating CRMF requests
* MFSA 2013-67/CVE-2013-1708 (bmo#879924)
Crash during WAV audio file decoding
* MFSA 2013-68/CVE-2013-1709 (bmo#838253)
Document URI misrepresentation and masquerading
* MFSA 2013-69/CVE-2013-1710 (bmo#871368)
CRMF requests allow for code execution and XSS attacks
* MFSA 2013-70/CVE-2013-1711 (bmo#843829)
Bypass of XrayWrappers using XBL Scopes
* MFSA 2013-72/CVE-2013-1713 (bmo#887098)
Wrong principal used for validating URI for some Javascript
components
* MFSA 2013-73/CVE-2013-1714 (bmo#879787)
Same-origin bypass with web workers and XMLHttpRequest
* MFSA 2013-75/CVE-2013-1717 (bmo#406541, bmo#738397)
Local Java applets may read contents of local file system
- requires NSPR 4.10 and NSS 3.15
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jul 3 17:14:35 UTC 2013 - dmueller@suse.com Wed Jul 3 17:14:35 UTC 2013 - dmueller@suse.com

View File

@ -17,7 +17,7 @@
# #
%define major 22 %define major 23
%define mainver %major.0 %define mainver %major.0
%define update_channel release %define update_channel release
@ -50,8 +50,8 @@ BuildRequires: libproxy-devel
%else %else
BuildRequires: wireless-tools BuildRequires: wireless-tools
%endif %endif
BuildRequires: mozilla-nspr-devel >= 4.9.6 BuildRequires: mozilla-nspr-devel >= 4.10
BuildRequires: mozilla-nss-devel >= 3.14.3 BuildRequires: mozilla-nss-devel >= 3.15
BuildRequires: nss-shared-helper-devel BuildRequires: nss-shared-helper-devel
%if %suse_version > 1210 %if %suse_version > 1210
BuildRequires: pkgconfig(gstreamer-%gstreamer_ver) BuildRequires: pkgconfig(gstreamer-%gstreamer_ver)
@ -60,7 +60,7 @@ BuildRequires: pkgconfig(gstreamer-plugins-base-%gstreamer_ver)
%endif %endif
Version: %{mainver} Version: %{mainver}
Release: 0 Release: 0
%define releasedate 2013062200 %define releasedate 2013080200
Provides: firefox = %{mainver} Provides: firefox = %{mainver}
Provides: firefox = %{version}-%{release} Provides: firefox = %{version}-%{release}
Provides: web_browser Provides: web_browser
@ -553,7 +553,6 @@ exit 0
%{progdir}/browser/defaults %{progdir}/browser/defaults
%{progdir}/browser/icons/ %{progdir}/browser/icons/
%{progdir}/browser/chrome/icons %{progdir}/browser/chrome/icons
#%{progdir}/browser/distribution/
%{progdir}/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} %{progdir}/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}
%{progdir}/browser/searchplugins/ %{progdir}/browser/searchplugins/
%{progdir}/browser/blocklist.xml %{progdir}/browser/blocklist.xml

View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:a468c61153c99687cbed6e5e6554e7faf61005a35e6a08a119b623d08c6c4018 oid sha256:34148975da7c5dcdb35064b99fbc499948d452cd30948bdb1a22711187b4f98a
size 29912 size 29940

View File

@ -2,8 +2,8 @@
CHANNEL="release" CHANNEL="release"
BRANCH="releases/mozilla-$CHANNEL" BRANCH="releases/mozilla-$CHANNEL"
RELEASE_TAG="FIREFOX_22_0_RELEASE" RELEASE_TAG="FIREFOX_23_0_RELEASE"
VERSION="22.0" VERSION="23.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:bc2f8ebd513c6a99ddb09f36d8bf20ca2aa1f7445d088dccbfaa2293939141f9
size 112536902

View File

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

View File

@ -1,10 +1,10 @@
# HG changeset patch # HG changeset patch
# Parent c2eac57908647987ed11893ad45262a32122dff4 # Parent a5cc092ab98bc6d4c1b09b5cc86791bae1313c73
diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in
--- a/browser/app/Makefile.in --- a/browser/app/Makefile.in
+++ b/browser/app/Makefile.in +++ b/browser/app/Makefile.in
@@ -134,16 +134,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d @@ -136,16 +136,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d
endif endif
ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2) ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
@ -54,9 +54,9 @@ diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/M
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
@@ -572,18 +572,21 @@ @@ -574,18 +574,21 @@
@BINPATH@/browser/distribution/extensions/testpilot@labs.mozilla.com.xpi @BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
#endif @BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
@BINPATH@/chrome/toolkit@JAREXT@ @BINPATH@/chrome/toolkit@JAREXT@
@BINPATH@/chrome/toolkit.manifest @BINPATH@/chrome/toolkit.manifest
@BINPATH@/chrome/recording.manifest @BINPATH@/chrome/recording.manifest

View File

@ -2,7 +2,7 @@ diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser
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,1225 @@ @@ -0,0 +1,1196 @@
+#filter substitution +#filter substitution
+<?xml version="1.0"?> +<?xml version="1.0"?>
+# -*- Mode: HTML -*- +# -*- Mode: HTML -*-
@ -187,83 +187,40 @@ new file mode 100644
+ hidden="true" + hidden="true"
+ consumeoutsideclicks="true" + consumeoutsideclicks="true"
+ align="start" + align="start"
+ orient="horizontal"
+ role="alert"> + role="alert">
+ <hbox flex="1">
+ <image id="social-activation-icon" class="popup-notification-icon"/> + <image id="social-activation-icon" class="popup-notification-icon"/>
+ <vbox flex="1"> + <vbox flex="1">
+ <description id="social-activation-message" class="popup-notification-description"/> + <description id="social-activation-message" class="popup-notification-description">&social.activated.description;</description>
+ <spacer flex="1"/> + <spacer flex="1"/>
+ <hbox pack="end" align="center" class="popup-notification-button-container"> + <hbox pack="start" align="center" class="popup-notification-button-container">
+#ifndef XP_UNIX + <label id="social-undoactivation-button"
+ <button id="social-undoactivation-button" + class="text-link"
+ label="&social.activated.undobutton.label;" + value="&social.activated.undo.label;"
+ accesskey="&social.activated.undobutton.accesskey;" + accesskey="&social.activated.undo.accesskey;"
+ onclick="SocialUI.undoActivation(this);"/> + onclick="SocialUI.undoActivation(this);"/>
+ <button default="true" + <spacer flex="1"/>
+ <button id="social-activation-button"
+ default="true"
+ autofocus="autofocus" + autofocus="autofocus"
+ label="&social.ok.label;" + label="&social.ok.label;"
+ accesskey="&social.ok.accesskey;" + accesskey="&social.ok.accesskey;"
+ oncommand="SocialUI.notificationPanel.hidePopup();"/> + oncommand="SocialUI.activationPanel.hidePopup();"/>
+#else
+ <button default="true"
+ autofocus="autofocus"
+ label="&social.ok.label;"
+ accesskey="&social.ok.accesskey;"
+ oncommand="SocialUI.notificationPanel.hidePopup();"/>
+ <button id="social-undoactivation-button"
+ label="&social.activated.undobutton.label;"
+ accesskey="&social.activated.undobutton.accesskey;"
+ onclick="SocialUI.undoActivation(this);"/>
+#endif
+ </hbox> + </hbox>
+ </vbox> + </vbox>
+ </hbox>
+ </panel> + </panel>
+ +
+ <panel id="unsharePopup" + <panel id="social-share-panel"
+ class="social-panel"
+ type="arrow" + type="arrow"
+ orient="vertical" + orient="horizontal"
+ ignorekeys="true" + onpopupshowing="SocialShare.onShowing()"
+ hidden="true" + onpopuphidden="SocialShare.onHidden()"
+ onpopupshown="SocialShareButton.panelShown(event);"
+ consumeoutsideclicks="true" + consumeoutsideclicks="true"
+ level="top"> + hidden="true">
+ <!-- Note that 'label', 'accesskey', 'value' and 'aria-label' attributes + <vbox class="social-share-toolbar">
+ for many of these elements are supplied by the provider and filled + <vbox id="social-share-provider-buttons" flex="1"/>
+ in at runtime
+ -->
+ <row id="unsharePopupHeader" align="center">
+ <vbox align="center">
+ <image id="socialUserPortrait" onclick="SocialUI.showProfile();"/>
+ </vbox> + </vbox>
+ <vbox id="unsharePopupText">
+ <button id="socialUserDisplayName" pack="start"
+ oncommand="SocialUI.showProfile();"/>
+ <spacer flex="1"/>
+ <label id="socialUserRecommendedText"/>
+ </vbox>
+ </row>
+ <hbox id="unsharePopupBottomButtons" pack="end">
+#ifndef XP_UNIX
+ <button id="unsharePopupStopSharingButton"
+ class="unsharePopupBottomButton"
+ command="Social:UnsharePage"/>
+ <button id="unsharePopupContinueSharingButton"
+ class="unsharePopupBottomButton"
+ default="true"
+ autofocus="autofocus"
+ oncommand="SocialShareButton.dismissUnsharePopup();"/>
+#else
+ <button id="unsharePopupContinueSharingButton"
+ class="unsharePopupBottomButton"
+ default="true"
+ autofocus="autofocus"
+ oncommand="SocialShareButton.dismissUnsharePopup();"/>
+ <button id="unsharePopupStopSharingButton"
+ class="unsharePopupBottomButton"
+ command="Social:UnsharePage"/>
+#endif
+ </hbox>
+ </panel> + </panel>
+ +
+ <panel id="social-notification-panel" + <panel id="social-notification-panel"
@ -455,6 +412,13 @@ new file mode 100644
+ </popupnotificationcontent> + </popupnotificationcontent>
+ </popupnotification> + </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"> + <popupnotification id="pointerLock-notification" hidden="true">
+ <popupnotificationcontent orient="vertical" align="start"> + <popupnotificationcontent orient="vertical" align="start">
+ <separator class="thin"/> + <separator class="thin"/>
@ -531,7 +495,7 @@ new file mode 100644
+ toolbarname="&navbarCmd.label;" accesskey="&navbarCmd.accesskey;" + toolbarname="&navbarCmd.label;" accesskey="&navbarCmd.accesskey;"
+ fullscreentoolbar="true" mode="icons" customizable="true" + fullscreentoolbar="true" mode="icons" customizable="true"
+ iconsize="large" + iconsize="large"
+ defaultset="unified-back-forward-button,urlbar-container,reload-button,stop-button,search-container,webrtc-status-button,downloads-button,home-button,bookmarks-menu-button-container,window-controls" + defaultset="unified-back-forward-button,urlbar-container,reload-button,stop-button,search-container,webrtc-status-button,bookmarks-menu-button,downloads-button,home-button,window-controls"
+ context="toolbar-context-menu"> + context="toolbar-context-menu">
+ +
+ <toolbaritem id="unified-back-forward-button" class="chromeclass-toolbar-additional" + <toolbaritem id="unified-back-forward-button" class="chromeclass-toolbar-additional"
@ -589,10 +553,12 @@ new file mode 100644
+ <image id="plugins-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="web-notifications-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="blocked-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"/> + <image id="mixed-content-blocked-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="webRTC-shareDevices-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="webRTC-sharingDevices-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="webRTC-sharingDevices-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="pointerLock-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="pointerLock-notification-icon" class="notification-anchor-icon" role="button"/>
+ <image id="servicesInstall-notification-icon" class="notification-anchor-icon" role="button"/>
+ </box> + </box>
+ <!-- Use onclick instead of normal popup= syntax since the popup + <!-- Use onclick instead of normal popup= syntax since the popup
+ code fires onmousedown, and hence eats our favicon drag events. + code fires onmousedown, and hence eats our favicon drag events.
@ -620,16 +586,9 @@ new file mode 100644
+ hidden="true" + hidden="true"
+ tooltiptext="&pageReportIcon.tooltip;" + tooltiptext="&pageReportIcon.tooltip;"
+ onclick="gPopupBlockerObserver.onReportButtonClick(event);"/> + onclick="gPopupBlockerObserver.onReportButtonClick(event);"/>
+
+ <label id="share-button-status" collapsed="true" role="status"/>
+ <image id="share-button"
+ class="urlbar-icon"
+ hidden="true"
+ onclick="SocialShareButton.onClick(event);"/>
+
+ <image id="star-button" + <image id="star-button"
+ class="urlbar-icon" + class="urlbar-icon"
+ onclick="PlacesStarButton.onClick(event);"/> + onclick="BookmarkingUI.onCommand(event);"/>
+ <image id="go-button" + <image id="go-button"
+ class="urlbar-icon" + class="urlbar-icon"
+ tooltiptext="&goEndCap.tooltip;" + tooltiptext="&goEndCap.tooltip;"
@ -680,73 +639,16 @@ new file mode 100644
+ oncommand="WebrtcIndicator.menuCommand(event.target);"/> + oncommand="WebrtcIndicator.menuCommand(event.target);"/>
+ </toolbarbutton> + </toolbarbutton>
+ +
+ <toolbarbutton id="home-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
+ persist="class" removable="true"
+ label="&homeButton.label;"
+ ondragover="homeButtonObserver.onDragOver(event)"
+ ondragenter="homeButtonObserver.onDragOver(event)"
+ ondrop="homeButtonObserver.onDrop(event)"
+ ondragexit="homeButtonObserver.onDragExit(event)"
+ onclick="BrowserGoHome(event);"
+ aboutHomeOverrideTooltip="&abouthome.pageTitle;"/>
+
+ <toolbaritem id="social-toolbar-item"
+ class="chromeclass-toolbar-additional"
+ removable="false"
+ title="&socialToolbar.title;"
+ hidden="true"
+ skipintoolbarset="true"
+ observes="socialActiveBroadcaster">
+ <toolbarbutton id="social-provider-button"
+ class="toolbarbutton-1"
+ type="menu">
+ <menupopup id="social-statusarea-popup">
+ <menuitem class="social-statusarea-user menuitem-iconic" pack="start" align="center"
+ observes="socialBroadcaster_userDetails"
+ oncommand="SocialUI.showProfile(); document.getElementById('social-statusarea-popup').hidePopup();">
+ <image class="social-statusarea-user-portrait"
+ observes="socialBroadcaster_userDetails"/>
+ <vbox>
+ <label class="social-statusarea-loggedInStatus"
+ observes="socialBroadcaster_userDetails"/>
+ </vbox>
+ </menuitem>
+#ifndef XP_WIN
+ <menuseparator class="social-statusarea-separator"/>
+#endif
+ <menuitem class="social-toggle-sidebar-menuitem"
+ type="checkbox"
+ autocheck="false"
+ command="Social:ToggleSidebar"
+ label="&social.toggleSidebar.label;"
+ accesskey="&social.toggleSidebar.accesskey;"/>
+ <menuitem class="social-toggle-notifications-menuitem"
+ type="checkbox"
+ autocheck="false"
+ command="Social:ToggleNotifications"
+ label="&social.toggleNotifications.label;"
+ accesskey="&social.toggleNotifications.accesskey;"/>
+ <menuitem class="social-toggle-menuitem" command="Social:Toggle"/>
+ <menuseparator class="social-statusarea-separator"/>
+ <menuseparator class="social-provider-menu" hidden="true"/>
+ <menuitem class="social-addons-menuitem" command="Social:Addons"
+ label="&social.addons.label;"/>
+ </menupopup>
+ </toolbarbutton>
+ </toolbaritem>
+
+ <toolbaritem id="bookmarks-menu-button-container"
+ class="chromeclass-toolbar-additional"
+ removable="true"
+ title="&bookmarksMenuButton.label;">
+ <toolbarbutton id="bookmarks-menu-button" + <toolbarbutton id="bookmarks-menu-button"
+ class="toolbarbutton-1 chromeclass-toolbar-additional"
+ persist="class"
+ removable="true"
+ type="menu" + type="menu"
+ class="toolbarbutton-1"
+ label="&bookmarksMenuButton.label;" + label="&bookmarksMenuButton.label;"
+ tooltiptext="&bookmarksMenuButton.tooltip;" + tooltiptext="&bookmarksMenuButton.tooltip;"
+ ondragenter="PlacesMenuDNDHandler.onDragEnter(event);" + ondragenter="PlacesMenuDNDHandler.onDragEnter(event);"
+ ondragover="PlacesMenuDNDHandler.onDragOver(event);" + ondragover="PlacesMenuDNDHandler.onDragOver(event);"
+ ondragexit="PlacesMenuDNDHandler.onDragExit(event);" + ondragleave="PlacesMenuDNDHandler.onDragLeave(event);"
+ ondrop="PlacesMenuDNDHandler.onDrop(event);"> + ondrop="PlacesMenuDNDHandler.onDrop(event);">
+ <menupopup id="BMB_bookmarksPopup" + <menupopup id="BMB_bookmarksPopup"
+ placespopup="true" + placespopup="true"
@ -754,7 +656,7 @@ new file mode 100644
+ openInTabs="children" + openInTabs="children"
+ oncommand="BookmarksEventHandler.onCommand(event, this.parentNode._placesView);" + oncommand="BookmarksEventHandler.onCommand(event, this.parentNode._placesView);"
+ onclick="BookmarksEventHandler.onClick(event, this.parentNode._placesView);" + onclick="BookmarksEventHandler.onClick(event, this.parentNode._placesView);"
+ onpopupshowing="BookmarksMenuButton.onPopupShowing(event); + onpopupshowing="BookmarkingUI.onPopupShowing(event);
+ if (!this.parentNode._placesView) + if (!this.parentNode._placesView)
+ new PlacesMenu(event, 'place:folder=BOOKMARKS_MENU');" + new PlacesMenu(event, 'place:folder=BOOKMARKS_MENU');"
+ tooltip="bhTooltip" popupsinherittooltip="true"> + tooltip="bhTooltip" popupsinherittooltip="true">
@ -818,6 +720,75 @@ new file mode 100644
+ class="menuitem-iconic"/> + class="menuitem-iconic"/>
+ </menupopup> + </menupopup>
+ </toolbarbutton> + </toolbarbutton>
+
+ <toolbarbutton id="home-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
+ persist="class" removable="true"
+ label="&homeButton.label;"
+ ondragover="homeButtonObserver.onDragOver(event)"
+ ondragenter="homeButtonObserver.onDragOver(event)"
+ ondrop="homeButtonObserver.onDrop(event)"
+ ondragexit="homeButtonObserver.onDragExit(event)"
+ onclick="BrowserGoHome(event);"
+ aboutHomeOverrideTooltip="&abouthome.pageTitle;"/>
+
+ <toolbarbutton id="social-share-button"
+ class="toolbarbutton-1 chromeclass-toolbar-additional"
+ hidden="true"
+ label="&sharePageCmd.label;"
+ tooltiptext="&sharePageCmd.label;"
+ command="Social:SharePage"/>
+
+ <toolbaritem id="social-toolbar-item"
+ class="chromeclass-toolbar-additional"
+ removable="false"
+ title="&socialToolbar.title;"
+ hidden="true"
+ skipintoolbarset="true"
+ observes="socialActiveBroadcaster">
+ <toolbarbutton id="social-provider-button"
+ class="toolbarbutton-1"
+ type="menu">
+ <menupopup id="social-statusarea-popup">
+ <menuitem class="social-statusarea-user menuitem-iconic" pack="start" align="center"
+ observes="socialBroadcaster_userDetails"
+ oncommand="SocialUI.showProfile(); document.getElementById('social-statusarea-popup').hidePopup();">
+ <image class="social-statusarea-user-portrait"
+ observes="socialBroadcaster_userDetails"/>
+ <vbox>
+ <label class="social-statusarea-loggedInStatus"
+ observes="socialBroadcaster_userDetails"/>
+ </vbox>
+ </menuitem>
+#ifndef XP_WIN
+ <menuseparator class="social-statusarea-separator"/>
+#endif
+ <menuitem class="social-toggle-sidebar-menuitem"
+ type="checkbox"
+ autocheck="false"
+ command="Social:ToggleSidebar"
+ label="&social.toggleSidebar.label;"
+ accesskey="&social.toggleSidebar.accesskey;"/>
+ <menuitem class="social-toggle-notifications-menuitem"
+ type="checkbox"
+ autocheck="false"
+ command="Social:ToggleNotifications"
+ label="&social.toggleNotifications.label;"
+ accesskey="&social.toggleNotifications.accesskey;"/>
+ <menuitem class="social-toggle-menuitem" command="Social:Toggle"/>
+ <menuseparator/>
+ <menuseparator class="social-provider-menu" hidden="true"/>
+ <menuitem class="social-addons-menuitem" command="Social:Addons"
+ label="&social.addons.label;"/>
+ <menuitem label="&social.learnMore.label;"
+ accesskey="&social.learnMore.accesskey;"
+ oncommand="SocialUI.showLearnMore();"/>
+ </menupopup>
+ </toolbarbutton>
+ <toolbarbutton id="social-mark-button"
+ class="toolbarbutton-1"
+ hidden="true"
+ disabled="true"
+ command="Social:TogglePageMark"/>
+ </toolbaritem> + </toolbaritem>
+ +
+ <hbox id="window-controls" hidden="true" pack="end"> + <hbox id="window-controls" hidden="true" pack="end">
@ -1231,7 +1202,7 @@ new file mode 100644
diff --git a/browser/base/jar.mn b/browser/base/jar.mn diff --git a/browser/base/jar.mn b/browser/base/jar.mn
--- a/browser/base/jar.mn --- a/browser/base/jar.mn
+++ b/browser/base/jar.mn +++ b/browser/base/jar.mn
@@ -55,16 +55,18 @@ browser.jar: @@ -53,16 +53,18 @@ browser.jar:
content/browser/abouthealthreport/abouthealth.css (content/abouthealthreport/abouthealth.css) content/browser/abouthealthreport/abouthealth.css (content/abouthealthreport/abouthealth.css)
#endif #endif
content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png) content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png)
@ -1249,7 +1220,7 @@ diff --git a/browser/base/jar.mn b/browser/base/jar.mn
content/browser/newtab/newTab.css (content/newtab/newTab.css) content/browser/newtab/newTab.css (content/newtab/newTab.css)
content/browser/newtab/preload.xhtml (content/newtab/preload.xhtml) content/browser/newtab/preload.xhtml (content/newtab/preload.xhtml)
* content/browser/pageinfo/pageInfo.xul (content/pageinfo/pageInfo.xul) * content/browser/pageinfo/pageInfo.xul (content/pageinfo/pageInfo.xul)
* content/browser/pageinfo/pageInfo.js (content/pageinfo/pageInfo.js) content/browser/pageinfo/pageInfo.js (content/pageinfo/pageInfo.js)
diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp
--- a/browser/components/build/nsModule.cpp --- a/browser/components/build/nsModule.cpp
+++ b/browser/components/build/nsModule.cpp +++ b/browser/components/build/nsModule.cpp
@ -1336,7 +1307,7 @@ diff --git a/browser/components/preferences/advanced.js b/browser/components/pre
// 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
// be set while the prefs are open. // be set while the prefs are open.
@@ -792,14 +798,25 @@ var gAdvancedPane = { @@ -797,14 +803,25 @@ var gAdvancedPane = {
* Set browser as the operating system default browser. * Set browser as the operating system default browser.
*/ */
setDefaultBrowser: function() setDefaultBrowser: function()
@ -1798,7 +1769,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
@@ -602,19 +602,21 @@ @@ -604,19 +604,21 @@
@BINPATH@/defaults/autoconfig/prefcalls.js @BINPATH@/defaults/autoconfig/prefcalls.js
@BINPATH@/browser/defaults/profile/prefs.js @BINPATH@/browser/defaults/profile/prefs.js

View File

@ -1,12 +1,12 @@
# HG changeset patch # HG changeset patch
# Parent cd1ec2efff2b6c41550ce2b5b9b8ba8182eb9836 # Parent 020e09bf3fc6f17b3041ecf70f1376da37db8645
# User Wolfgang Rosenauer <wr@rosenauer.org> # User Wolfgang Rosenauer <wr@rosenauer.org>
Add searchplugins to chrome packaging for proper localization Add searchplugins to chrome packaging for proper localization
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
--- a/browser/app/profile/firefox.js --- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js
@@ -342,16 +342,20 @@ pref("browser.download.panel.shown", fal @@ -340,16 +340,20 @@ pref("browser.download.panel.shown", fal
pref("browser.download.panel.firstSessionCompleted", false); pref("browser.download.panel.firstSessionCompleted", false);
// search engines URL // search engines URL
@ -55,7 +55,7 @@ diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
DIST_SUBDIRS = browser metro DIST_SUBDIRS = browser metro
else else
DIST_SUBDIRS = $(DIST_SUBDIR) DIST_SUBDIRS = $(DIST_SUBDIR)
@@ -142,20 +144,44 @@ install:: $(addprefix generic/profile/,$ @@ -131,20 +133,44 @@ install:: $(addprefix generic/profile/,$
install:: $(call MERGE_FILES,$(addprefix profile/chrome/,$(PROFILE_CHROME))) install:: $(call MERGE_FILES,$(addprefix profile/chrome/,$(PROFILE_CHROME)))
$(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile/chrome $(SYSINSTALL) $(IFLAGS1) $^ $(DESTDIR)$(mozappdir)/defaults/profile/chrome
@ -92,19 +92,19 @@ diff --git a/browser/locales/Makefile.in b/browser/locales/Makefile.in
@$(MAKE) -C ../../toolkit/locales libs-$* @$(MAKE) -C ../../toolkit/locales libs-$*
@$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$* @$(MAKE) -C ../../services/sync/locales AB_CD=$* XPI_NAME=locale-$*
+ @$(MAKE) -B searchplugins-jar AB_CD=$* XPI_NAME=locale-$* + @$(MAKE) -B searchplugins-jar AB_CD=$* XPI_NAME=locale-$*
ifdef MOZ_WEBAPP_RUNTIME
@$(MAKE) -C ../../webapprt/locales AB_CD=$* XPI_NAME=locale-$*
endif
@$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$* @$(MAKE) -C ../../extensions/spellcheck/locales AB_CD=$* XPI_NAME=locale-$*
@$(MAKE) -C ../../intl/locales AB_CD=$* XPI_NAME=locale-$* @$(MAKE) -C ../../intl/locales AB_CD=$* XPI_NAME=locale-$*
@$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR) @$(MAKE) libs AB_CD=$* XPI_NAME=locale-$* PREF_DIR=$(PREF_DIR)
ifdef MOZ_METRO ifdef MOZ_METRO
@$(MAKE) -C ../metro/locales AB_CD=$* XPI_NAME=locale-$* @$(MAKE) -C ../metro/locales AB_CD=$* XPI_NAME=locale-$*
endif
@$(MAKE) -C $(DEPTH)/$(MOZ_BRANDING_DIRECTORY)/locales AB_CD=$* XPI_NAME=locale-$*
diff --git a/browser/locales/en-US/searchplugins/google.xml b/browser/locales/en-US/searchplugins/google.xml diff --git a/browser/locales/en-US/searchplugins/google.xml b/browser/locales/en-US/searchplugins/google.xml
--- a/browser/locales/en-US/searchplugins/google.xml --- a/browser/locales/en-US/searchplugins/google.xml
+++ b/browser/locales/en-US/searchplugins/google.xml +++ b/browser/locales/en-US/searchplugins/google.xml
@@ -9,24 +9,16 @@ @@ -9,24 +9,16 @@
<Image width="16" height="16">data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAACuUlEQVRYw8VX60sUURSffybWv6MloxeV0Jug+hJB0YMoCCII1E3LnlYKlVkkUZKaRFEGFlgfMntYhlopVpaP1HXuPPbOzOmcOw/XZbed3ZndvXBYlr17zu+8fudcaWmlLKEsQWlFmUOBAsucY4tsSmQ8gjJTBMOpQjYjkoMGSiStUpHCnknmpXz+uLdJgY5eDsN/TJA1C9KdkUkTjraoWXXlBGDNaQZd/VwoP3xHhbVnGOxvVuHLL1MY5QZArEODbfUMllX70+kbACl8N2qAxgE2XmCLfltZI8O3CRtEXLVg00Xm2ynfAOoeacLA2+9G2t8P3lK98Lf3JsIH8OmH7eEzTEGmO6NT9p3JuBU+ADUB/40ASdsb+5KiFxAAw6pfHkt/p/G5Lu6MTZvhAyDP3VPdrqW90/zSRnmjWw8fwLG7C0VGOV5/dnGll2OXfEVeoFpZcUoOHwBJ0wvdA0FtdwS5YF0dg93XFHg1ZMDrYQNW17KcSC1nJtx3U4XH77nwdui3CaZDhAM/TSiP5c6qUhAu33qJeRFp6UnkpSMQgC1JAKZlC3Y1KsUFQEJ5dw/1/8kHWuEARKtk2HNdgctPdTENewYN0fPJxypUG1Zh74/PWsDQS2K8E/c12NmgQMU5BhXYksT/yaehSw8PgEuxn7HSUydhKkjuZIQ+N5xnwQEcv2cTkIGR3uxjzNY81LwoVLZpwQF0D3ChjCad33RRqujQchIYgDuG/2KbRX0CcDckP22ZFUBnH/dCWtuZ3SMqygTmv3/MCKcIt19RvFHMTbu6M1Eu7Yh9IwbMMEt0SGhdcOi2ClPzC9vvLBp48oELMLSq1SMv0HfakD+i5zuuKuHzwCqccmSMph6NY1pOqdWoNgbHTcEDB3AvjOZBxSV/mJT8aVZWwsdpmeQ8zyNOJOJFMBx3bJFN6R++on7RvMlpZAAAAABJRU5ErkJggg==</Image> <Image width="16" height="16">data:image/x-icon;base64,AAABAAIAEBAAAAAAAAB9AQAAJgAAACAgAAAAAAAA8gIAAKMBAACJUE5HDQoaCgAAAA1JSERSAAAAEAAAABAIBgAAAB/z/2EAAAFESURBVDjLpZNJSwNBEIXnt4lE4kHxovgT9BDwJHqPy0HEEOJBiAuCRg+KUdC4QS4KrpC4gCBGE3NQ48JsnZ6eZ3UOM6gjaePhQU93v6+qq2q0pqgeJj2S8EdJT1hr0OxBtKCD5iEd8QxDYpvhvOBAuMDKURX9C9aPu4GA1GEVkzvMg10UBfYveWAWgYAP00V01fa+R9M2bA51wJvhIn3qR+ybt3D3JNQBE5sMjCIOLFpoHzOwdsLRO22qA6R6kiZiWwxUvy/PUQZIhYZ1vFM9cvcOOsYNdcBgysISdSJBnZjJMlR0Fw8vAp0xoz5gao/h+NZBy4i/10XGwrPA+hmvDyhVRG2Avu/LwcrkFADZa16L1h330w1RNgc3DiJzCpPYRm1bpveXX11clQR28xwblHpk1vq1iP/5mcoS0CoXDZiL0vsJ+dzfl+3T/VYAAAAASUVORK5CYIKJUE5HDQoaCgAAAA1JSERSAAAAIAAAACAIBgAAAHN6evQAAAK5SURBVFjDxVfrSxRRFJ9/Jta/oyWjF5XQm6D6EkHRgygIIgjUTcueVgqVWSRRkppEUQYWWB8ye1iGWilWlo/Ude489s7M6Zw7D9dlt53dmd29cFiWvXvO77x+51xpaaUsoSxBaUWZQ4ECy5xji2xKZDyCMlMEw6lCNiOSgwZKJK1SkcKeSealfP64t0mBjl4Ow39MkDUL0p2RSROOtqhZdeUEYM1pBl39XCg/fEeFtWcY7G9W4csvUxjlBkCsQ4Nt9QyWVfvT6RsAKXw3aoDGATZeYIt+W1kjw7cJG0RctWDTRebbKd8A6h5pwsDb70ba3w/eUr3wt/cmwgfw6Yft4TNMQaY7o1P2ncm4FT4ANQH/jQBJ2xv7kqIXEADDql8eS3+n8bku7oxNm+EDIM/dU92upb3T/NJGeaNbDx/AsbsLRUY5Xn92caWXY5d8RV6gWllxSg4fAEnTC90DQW13BLlgXR2D3dcUeDVkwOthA1bXspxILWcm3HdThcfvufB26LcJpkOEAz9NKI/lzqpSEC7feol5EWnpSeSlIxCALUkApmULdjUqxQVAQnl3D/X/yQda4QBEq2TYc12By091MQ17Bg3R88nHKlQbVmHvj89awNBLYrwT9zXY2aBAxTkGFdiSxP/Jp6FLDw+AS7GfsdJTJ2EqSO5khD43nGfBARy/ZxOQgZHe7GPM1jzUvChUtmnBAXQPcKGMJp3fdFGq6NByEhiAO4b/YptFfQJwNyQ/bZkVQGcf90Ja25ndIyrKBOa/f8wIpwi3X1G8UcxNu7ozUS7tiH0jBswwS3RIaF1w6LYKU/ML2+8sGnjygQswtKrVIy/Qd9qQP6LnO64q4fPAKpxyZIymHo1jWk6p1ag2BsdNwQMHcC+M5kHFJX+YlPxpVlbCx2mZ5DzPI04k4kUwHHdskU3pH76iftG8yWlkAAAAAElFTkSuQmCC</Image>
<Url type="application/x-suggestions+json" method="GET" template="https://www.google.com/complete/search?client=firefox&amp;q={searchTerms}"/> <Url type="application/x-suggestions+json" method="GET" template="https://www.google.com/complete/search?client=firefox&amp;q={searchTerms}"/>
<Url type="text/html" method="GET" template="https://www.google.com/search"> <Url type="text/html" method="GET" template="https://www.google.com/search">
<Param name="q" value="{searchTerms}"/> <Param name="q" value="{searchTerms}"/>
@ -131,7 +131,7 @@ diff --git a/browser/locales/en-US/searchplugins/google.xml b/browser/locales/en
diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn
--- a/browser/locales/jar.mn --- a/browser/locales/jar.mn
+++ b/browser/locales/jar.mn +++ b/browser/locales/jar.mn
@@ -116,16 +116,17 @@ @@ -119,14 +119,15 @@
locale/browser/syncQuota.properties (%chrome/browser/syncQuota.properties) locale/browser/syncQuota.properties (%chrome/browser/syncQuota.properties)
#endif #endif
% locale browser-region @AB_CD@ %locale/browser-region/ % locale browser-region @AB_CD@ %locale/browser-region/
@ -144,8 +144,6 @@ diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn
% override chrome://global/locale/netError.dtd chrome://browser/locale/netError.dtd % override chrome://global/locale/netError.dtd chrome://browser/locale/netError.dtd
% override chrome://global/locale/appstrings.properties chrome://browser/locale/appstrings.properties % override chrome://global/locale/appstrings.properties chrome://browser/locale/appstrings.properties
% override chrome://mozapps/locale/downloads/settingsChange.dtd chrome://browser/locale/downloads/settingsChange.dtd % override chrome://mozapps/locale/downloads/settingsChange.dtd chrome://browser/locale/downloads/settingsChange.dtd
% locale testpilot @AB_CD@ %locale/feedback/
locale/feedback/main.dtd (%feedback/main.dtd)
locale/feedback/main.properties (%feedback/main.properties)
% locale pdf.js @AB_CD@ %locale/pdfviewer/ % locale pdf.js @AB_CD@ %locale/pdfviewer/
locale/pdfviewer/viewer.properties (%pdfviewer/viewer.properties) locale/pdfviewer/viewer.properties (%pdfviewer/viewer.properties)
locale/pdfviewer/chrome.properties (%pdfviewer/chrome.properties)

View File

@ -1,19 +1,19 @@
# HG changeset patch # HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org> # User Wolfgang Rosenauer <wr@rosenauer.org>
# Parent be9f4eae7dc69ed989cc9f9259b3bb73d1f5dbf9 # Parent fd73fd56ea00523bcdca2ad4be06d3640888fd58
Do not overwrite the locale dynamic pref from xulrunner's all.js with a wrong default value Do not overwrite the locale dynamic pref from xulrunner's all.js with a wrong default value
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
--- a/browser/app/profile/firefox.js --- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js
@@ -231,17 +231,17 @@ pref("xpinstall.whitelist.add.36", "getp @@ -207,17 +207,17 @@ pref("extensions.{972ce4c6-7e08-4474-a28
pref("xpinstall.whitelist.add", "addons.mozilla.org");
pref("xpinstall.whitelist.add.36", "getpersonas.com");
pref("xpinstall.whitelist.add.180", "marketplace.firefox.com");
pref("lightweightThemes.update.enabled", true); pref("lightweightThemes.update.enabled", true);
pref("keyword.enabled", true); pref("keyword.enabled", true);
// Override the default keyword.URL. Empty value means
// "use the search service's default engine"
pref("keyword.URL", "");
-pref("general.useragent.locale", "@AB_CD@"); -pref("general.useragent.locale", "@AB_CD@");
+pref("general.useragent.locale", "chrome://global/locale/intl.properties"); +pref("general.useragent.locale", "chrome://global/locale/intl.properties");

View File

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

3
l10n-23.0.tar.bz2 Normal file
View File

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

View File

@ -7,7 +7,7 @@ Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=140751
diff --git a/modules/libpref/src/Makefile.in b/modules/libpref/src/Makefile.in diff --git a/modules/libpref/src/Makefile.in b/modules/libpref/src/Makefile.in
--- a/modules/libpref/src/Makefile.in --- a/modules/libpref/src/Makefile.in
+++ b/modules/libpref/src/Makefile.in +++ b/modules/libpref/src/Makefile.in
@@ -52,14 +52,15 @@ endif @@ -56,14 +56,15 @@ endif
# Optimizer bug with GCC 3.2.2 on OS/2 # Optimizer bug with GCC 3.2.2 on OS/2
ifeq ($(OS_ARCH), OS2) ifeq ($(OS_ARCH), OS2)
nsPrefService.$(OBJ_SUFFIX): nsPrefService.cpp nsPrefService.$(OBJ_SUFFIX): nsPrefService.cpp
@ -220,7 +220,7 @@ diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/compon
#include "AndroidBridge.h" #include "AndroidBridge.h"
#endif #endif
@@ -2590,16 +2594,25 @@ nsDownload::SetState(DownloadState aStat @@ -2603,16 +2607,25 @@ nsDownload::SetState(DownloadState aStat
nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID)); nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID));
// Master pref to control this function. // Master pref to control this function.
@ -246,7 +246,7 @@ diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/compon
int64_t goat = PR_Now() - mStartTime; int64_t goat = PR_Now() - mStartTime;
showTaskbarAlert = goat > alertIntervalUSec; showTaskbarAlert = goat > alertIntervalUSec;
@@ -2626,19 +2639,20 @@ nsDownload::SetState(DownloadState aStat @@ -2639,19 +2652,20 @@ nsDownload::SetState(DownloadState aStat
// retention policy, there's no reason to make the text clickable // retention policy, there's no reason to make the text clickable
// because if it is, they'll click open the download manager and // because if it is, they'll click open the download manager and
// the items they downloaded will have been removed. // the items they downloaded will have been removed.
@ -271,7 +271,7 @@ diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/compon
diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
--- a/toolkit/content/jar.mn --- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn
@@ -49,29 +49,33 @@ toolkit.jar: @@ -50,29 +50,33 @@ toolkit.jar:
content/global/viewZoomOverlay.js (viewZoomOverlay.js) content/global/viewZoomOverlay.js (viewZoomOverlay.js)
*+ content/global/bindings/autocomplete.xml (widgets/autocomplete.xml) *+ content/global/bindings/autocomplete.xml (widgets/autocomplete.xml)
content/global/bindings/browser.xml (widgets/browser.xml) content/global/bindings/browser.xml (widgets/browser.xml)
@ -299,12 +299,12 @@ diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
+% override chrome://global/content/bindings/preferences.xml chrome://global/content/bindings/preferences-kde.xml desktop=kde +% override chrome://global/content/bindings/preferences.xml chrome://global/content/bindings/preferences-kde.xml desktop=kde
content/global/bindings/progressmeter.xml (widgets/progressmeter.xml) content/global/bindings/progressmeter.xml (widgets/progressmeter.xml)
content/global/bindings/radio.xml (widgets/radio.xml) content/global/bindings/radio.xml (widgets/radio.xml)
content/global/bindings/remote-browser.xml (widgets/remote-browser.xml)
content/global/bindings/resizer.xml (widgets/resizer.xml) content/global/bindings/resizer.xml (widgets/resizer.xml)
content/global/bindings/richlistbox.xml (widgets/richlistbox.xml) content/global/bindings/richlistbox.xml (widgets/richlistbox.xml)
content/global/bindings/scale.xml (widgets/scale.xml) content/global/bindings/scale.xml (widgets/scale.xml)
content/global/bindings/scrollbar.xml (widgets/scrollbar.xml) content/global/bindings/scrollbar.xml (widgets/scrollbar.xml)
content/global/bindings/scrollbox.xml (widgets/scrollbox.xml) content/global/bindings/scrollbox.xml (widgets/scrollbox.xml)
content/global/bindings/splitter.xml (widgets/splitter.xml)
diff --git a/toolkit/content/widgets/dialog-kde.xml b/toolkit/content/widgets/dialog-kde.xml diff --git a/toolkit/content/widgets/dialog-kde.xml b/toolkit/content/widgets/dialog-kde.xml
new file mode 100644 new file mode 100644
--- /dev/null --- /dev/null
@ -2203,10 +2203,10 @@ diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/sy
diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in
--- a/toolkit/xre/Makefile.in --- a/toolkit/xre/Makefile.in
+++ b/toolkit/xre/Makefile.in +++ b/toolkit/xre/Makefile.in
@@ -63,17 +63,18 @@ else @@ -60,17 +60,18 @@ DEFINES += -DWIN32_LEAN_AND_MEAN -DUNICO
else
ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
CMMSRCS = nsNativeAppSupportCocoa.mm CMMSRCS = nsNativeAppSupportCocoa.mm
EXPORTS += MacQuirks.h
else else
ifeq ($(MOZ_WIDGET_TOOLKIT),os2) ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
CPPSRCS += nsNativeAppSupportOS2.cpp CPPSRCS += nsNativeAppSupportOS2.cpp
@ -2221,8 +2221,8 @@ diff --git a/toolkit/xre/Makefile.in b/toolkit/xre/Makefile.in
CPPSRCS += $(MOCSRCS) CPPSRCS += $(MOCSRCS)
CPPSRCS += nsNativeAppSupportQt.cpp CPPSRCS += nsNativeAppSupportQt.cpp
CPPSRCS += nsQAppInstance.cpp CPPSRCS += nsQAppInstance.cpp
EXPORTS += nsQAppInstance.h
else else
CPPSRCS += nsNativeAppSupportDefault.cpp
diff --git a/toolkit/xre/nsKDEUtils.cpp b/toolkit/xre/nsKDEUtils.cpp diff --git a/toolkit/xre/nsKDEUtils.cpp b/toolkit/xre/nsKDEUtils.cpp
new file mode 100644 new file mode 100644
--- /dev/null --- /dev/null
@ -2642,8 +2642,8 @@ diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in
OSHELPER += nsMIMEInfoAndroid.cpp OSHELPER += nsMIMEInfoAndroid.cpp
OSHELPER += nsAndroidHandlerApp.cpp OSHELPER += nsAndroidHandlerApp.cpp
OSHELPER += nsExternalSharingAppService.cpp OSHELPER += nsExternalSharingAppService.cpp
EXPORTS += nsExternalSharingAppService.h
OSHELPER += nsExternalURLHandlerService.cpp OSHELPER += nsExternalURLHandlerService.cpp
endif
diff --git a/uriloader/exthandler/unix/nsCommonRegistry.cpp b/uriloader/exthandler/unix/nsCommonRegistry.cpp diff --git a/uriloader/exthandler/unix/nsCommonRegistry.cpp b/uriloader/exthandler/unix/nsCommonRegistry.cpp
new file mode 100644 new file mode 100644
--- /dev/null --- /dev/null
@ -3031,8 +3031,7 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
nsresult nsOSHelperAppService::GetFileTokenForPath(const PRUnichar * platformAppPath, nsIFile ** aFile) nsresult nsOSHelperAppService::GetFileTokenForPath(const PRUnichar * platformAppPath, nsIFile ** aFile)
{ {
@@ -1265,17 +1265,17 @@ nsOSHelperAppService::GetFromExtension(c @@ -1266,17 +1266,17 @@ nsOSHelperAppService::GetFromExtension(c
minorType,
mime_types_description, mime_types_description,
true); true);
@ -3040,30 +3039,31 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
#ifdef MOZ_WIDGET_GTK2 #ifdef MOZ_WIDGET_GTK2
LOG(("Looking in GNOME registry\n")); LOG(("Looking in GNOME registry\n"));
- nsMIMEInfoBase *gnomeInfo = nsGNOMERegistry::GetFromExtension(aFileExt).get(); nsRefPtr<nsMIMEInfoBase> gnomeInfo =
+ nsMIMEInfoBase *gnomeInfo = nsCommonRegistry::GetFromExtension(aFileExt).get(); - nsGNOMERegistry::GetFromExtension(aFileExt);
+ nsCommonRegistry::GetFromExtension(aFileExt);
if (gnomeInfo) { if (gnomeInfo) {
LOG(("Got MIMEInfo from GNOME registry\n")); LOG(("Got MIMEInfo from GNOME registry\n"));
return gnomeInfo; return gnomeInfo.forget();
} }
#endif #endif
rv = LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt), rv = LookUpTypeAndDescription(NS_ConvertUTF8toUTF16(aFileExt),
majorType, majorType,
@@ -1391,17 +1391,17 @@ nsOSHelperAppService::GetFromType(const @@ -1389,17 +1389,17 @@ nsOSHelperAppService::GetFromType(const
#ifdef MOZ_WIDGET_GTK2 #ifdef MOZ_WIDGET_GTK2
nsMIMEInfoBase *gnomeInfo = nullptr; nsRefPtr<nsMIMEInfoBase> gnomeInfo;
if (handler.IsEmpty()) { if (handler.IsEmpty()) {
// No useful data yet. Check the GNOME registry. Unfortunately, newer // No useful data yet. Check the GNOME registry. Unfortunately, newer
// GNOME versions no longer have type-to-extension mappings, so we might // GNOME versions no longer have type-to-extension mappings, so we might
// get back a MIMEInfo without any extensions set. In that case we'll have // get back a MIMEInfo without any extensions set. In that case we'll have
// to look in our mime.types files for the extensions. // to look in our mime.types files for the extensions.
LOG(("Looking in GNOME registry\n")); LOG(("Looking in GNOME registry\n"));
- gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType).get(); - gnomeInfo = nsGNOMERegistry::GetFromType(aMIMEType);
+ gnomeInfo = nsCommonRegistry::GetFromType(aMIMEType).get(); + gnomeInfo = nsCommonRegistry::GetFromType(aMIMEType);
if (gnomeInfo && gnomeInfo->HasExtensions()) { if (gnomeInfo && gnomeInfo->HasExtensions()) {
LOG(("Got MIMEInfo from GNOME registry, and it has extensions set\n")); LOG(("Got MIMEInfo from GNOME registry, and it has extensions set\n"));
return gnomeInfo; return gnomeInfo.forget();
} }
} }
#endif #endif
@ -3072,7 +3072,7 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
diff --git a/widget/gtk2/Makefile.in b/widget/gtk2/Makefile.in diff --git a/widget/gtk2/Makefile.in b/widget/gtk2/Makefile.in
--- a/widget/gtk2/Makefile.in --- a/widget/gtk2/Makefile.in
+++ b/widget/gtk2/Makefile.in +++ b/widget/gtk2/Makefile.in
@@ -102,11 +102,14 @@ DEFINES += -DCAIRO_GFX -DMOZ_APP_NAME=' @@ -96,11 +96,14 @@ DEFINES += -DCAIRO_GFX -DMOZ_APP_NAME='
INCLUDES += \ INCLUDES += \
-I$(srcdir)/../xpwidgets \ -I$(srcdir)/../xpwidgets \
@ -3438,7 +3438,7 @@ diff --git a/widget/gtk2/nsFilePicker.h b/widget/gtk2/nsFilePicker.h
diff --git a/xpcom/components/Makefile.in b/xpcom/components/Makefile.in diff --git a/xpcom/components/Makefile.in b/xpcom/components/Makefile.in
--- a/xpcom/components/Makefile.in --- a/xpcom/components/Makefile.in
+++ b/xpcom/components/Makefile.in +++ b/xpcom/components/Makefile.in
@@ -46,10 +46,11 @@ LOCAL_INCLUDES = \ @@ -34,10 +34,11 @@ LOCAL_INCLUDES = \
# we don't want the shared lib, but we want to force the creation of a static lib. # we don't want the shared lib, but we want to force the creation of a static lib.
FORCE_STATIC_LIB = 1 FORCE_STATIC_LIB = 1
@ -3584,7 +3584,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in diff --git a/xpcom/io/Makefile.in b/xpcom/io/Makefile.in
--- a/xpcom/io/Makefile.in --- a/xpcom/io/Makefile.in
+++ b/xpcom/io/Makefile.in +++ b/xpcom/io/Makefile.in
@@ -113,17 +113,17 @@ include $(topsrcdir)/ipc/chromium/chromi @@ -77,17 +77,17 @@ include $(topsrcdir)/ipc/chromium/chromi
DEFINES += -D_IMPL_NS_COM DEFINES += -D_IMPL_NS_COM
ifeq ($(OS_ARCH),Linux) ifeq ($(OS_ARCH),Linux)

View File

@ -7,7 +7,7 @@ References:
diff --git a/configure.in b/configure.in diff --git a/configure.in b/configure.in
--- a/configure.in --- a/configure.in
+++ b/configure.in +++ b/configure.in
@@ -8303,16 +8303,31 @@ AC_SUBST(QCMS_LIBS) @@ -8309,16 +8309,31 @@ AC_SUBST(QCMS_LIBS)
dnl ======================================================== dnl ========================================================
dnl HarfBuzz dnl HarfBuzz
@ -42,24 +42,18 @@ diff --git a/configure.in b/configure.in
diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in
--- a/security/manager/ssl/src/Makefile.in --- a/security/manager/ssl/src/Makefile.in
+++ b/security/manager/ssl/src/Makefile.in +++ b/security/manager/ssl/src/Makefile.in
@@ -93,16 +93,19 @@ DEFINES += \ @@ -87,10 +87,13 @@ endif
CSRCS += md4.c
EXPORTS += \ DEFINES += \
CryptoTask.h \ -DNSS_ENABLE_ECC \
nsNSSShutDown.h \ -DDLL_PREFIX=\"$(DLL_PREFIX)\" \
ScopedNSSTypes.h \ -DDLL_SUFFIX=\"$(DLL_SUFFIX)\" \
nsRandomGenerator.h \
$(NULL) $(NULL)
+LOCAL_INCLUDES += $(NSSHELPER_CFLAGS) +LOCAL_INCLUDES += $(NSSHELPER_CFLAGS)
+EXTRA_DSO_LDOPTS += $(NSSHELPER_LIBS) +EXTRA_DSO_LDOPTS += $(NSSHELPER_LIBS)
+ +
EXPORTS_NAMESPACES = mozilla
EXPORTS_mozilla += \
PublicSSL.h \
$(NULL)
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk
diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp
@ -82,14 +76,14 @@ diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/
+#endif +#endif
+ +
#include "nsNSSComponent.h" #include "nsNSSComponent.h"
#include "CertVerifier.h"
#include "nsNSSCallbacks.h" #include "nsNSSCallbacks.h"
#include "nsNSSIOLayer.h" #include "nsNSSIOLayer.h"
#include "nsCertVerificationThread.h" #include "nsCertVerificationThread.h"
#include "nsNetUtil.h" #include "nsNetUtil.h"
#include "nsAppDirectoryServiceDefs.h" @@ -1721,18 +1728,34 @@ nsNSSComponent::InitializeNSS(bool showW
#include "nsDirectoryService.h"
@@ -1682,18 +1689,34 @@ nsNSSComponent::InitializeNSS(bool showW
ConfigureInternalPKCS11Token(); ConfigureInternalPKCS11Token();
// The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs
@ -129,7 +123,7 @@ diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/
diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
--- a/toolkit/library/Makefile.in --- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in +++ b/toolkit/library/Makefile.in
@@ -501,17 +501,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO @@ -510,17 +510,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO
endif endif
endif endif
endif endif

View File

@ -1,2 +1,2 @@
REV=0d4b9c74be55 REV=5efffaf39814
REPO=http://hg.mozilla.org/releases/mozilla-release REPO=http://hg.mozilla.org/releases/mozilla-release