Hello community, here is the log from the commit of package MozillaFirefox for openSUSE:Factory checked in at 2014-10-15 16:41:15 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/MozillaFirefox (Old) and /work/SRC/openSUSE:Factory/.MozillaFirefox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "MozillaFirefox" Changes: -------- --- /work/SRC/openSUSE:Factory/MozillaFirefox/MozillaFirefox.changes 2014-09-24 13:09:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.MozillaFirefox.new/MozillaFirefox.changes 2014-10-15 16:42:06.000000000 +0200 @@ -1,0 +2,40 @@ +Sat Oct 11 08:48:24 UTC 2014 - [email protected] + +- update to Firefox 33.0 (bnc#900941) + New features: + * OpenH264 support (sandboxed) + * Enhanced Tiles + * Improved search experience through the location bar + * Slimmer and faster JavaScript strings + * New CSP (Content Security Policy) backend + * Support for connecting to HTTP proxy over HTTPS + * Improved reliability of the session restoration + * Proprietary window.crypto properties/functions removed + Security: + * MFSA 2014-74/CVE-2014-1574/CVE-2014-1575 + Miscellaneous memory safety hazards + * MFSA 2014-75/CVE-2014-1576 (bmo#1041512) + Buffer overflow during CSS manipulation + * MFSA 2014-76/CVE-2014-1577 (bmo#1012609) + Web Audio memory corruption issues with custom waveforms + * MFSA 2014-77/CVE-2014-1578 (bmo#1063327) + Out-of-bounds write with WebM video + * MFSA 2014-78/CVE-2014-1580 (bmo#1063733) + Further uninitialized memory use during GIF rendering + * MFSA 2014-79/CVE-2014-1581 (bmo#1068218) + Use-after-free interacting with text directionality + * MFSA 2014-80/CVE-2014-1582/CVE-2014-1584 (bmo#1049095, bmo#1066190) + Key pinning bypasses + * MFSA 2014-81/CVE-2014-1585/CVE-2014-1586 (bmo#1062876, bmo#1062981) + Inconsistent video sharing within iframe + * MFSA 2014-82/CVE-2014-1583 (bmo#1015540) + Accessing cross-origin objects via the Alarms API + (only relevant for installed web apps) +- requires NSPR 4.10.7 +- requires NSS 3.17.1 +- removed obsolete patches: + * mozilla-ppc.patch + * mozilla-libproxy-compat.patch +- added basic appdata information + +------------------------------------------------------------------- Old: ---- firefox-32.0.2-source.tar.xz l10n-32.0.2.tar.xz mozilla-libproxy-compat.patch mozilla-ppc.patch New: ---- firefox-33.0-source.tar.xz firefox-appdata.xml l10n-33.0.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox.spec ++++++ --- /var/tmp/diff_new_pack.pJ1BEL/_old 2014-10-15 16:42:11.000000000 +0200 +++ /var/tmp/diff_new_pack.pJ1BEL/_new 2014-10-15 16:42:11.000000000 +0200 @@ -17,8 +17,8 @@ # -%define major 32 -%define mainver %major.0.2 +%define major 33 +%define mainver %major.0 %define update_channel release %if %suse_version > 1210 @@ -54,8 +54,8 @@ %else BuildRequires: wireless-tools %endif -BuildRequires: mozilla-nspr-devel >= 4.10.6 -BuildRequires: mozilla-nss-devel >= 3.16.4 +BuildRequires: mozilla-nspr-devel >= 4.10.7 +BuildRequires: mozilla-nss-devel >= 3.17.1 BuildRequires: nss-shared-helper-devel BuildRequires: pkgconfig(libpulse) %if %suse_version > 1210 @@ -74,7 +74,7 @@ %endif Version: %{mainver} Release: 0 -%define releasedate 2014092000 +%define releasedate 2014101000 Provides: firefox = %{mainver} Provides: firefox = %{version}-%{release} Provides: web_browser @@ -102,6 +102,7 @@ Source12: mozilla-get-app-id Source13: add-plugins.sh.in Source14: create-tar.sh +Source15: firefox-appdata.xml # Gecko/Toolkit Patch1: toolkit-download-folder.patch Patch2: mozilla-nongnome-proxies.patch @@ -115,9 +116,6 @@ Patch10: mozilla-sle11.patch Patch11: mozilla-icu-strncat.patch Patch12: mozilla-arm-disable-edsp.patch -Patch13: mozilla-ppc.patch -Patch14: mozilla-libproxy-compat.patch - # Firefox/browser Patch101: firefox-kde.patch Patch102: firefox-kde-114.patch @@ -255,9 +253,6 @@ %endif %patch11 -p1 %patch12 -p1 -%patch13 -p1 -%patch14 -p1 - # Firefox %patch101 -p1 %if %suse_version >= 1140 @@ -450,6 +445,9 @@ # additional mime-types mkdir -p $RPM_BUILD_ROOT%{_datadir}/mime/packages cp %{SOURCE8} $RPM_BUILD_ROOT%{_datadir}/mime/packages/%{progname}.xml +# appdata +mkdir -p $RPM_BUILD_ROOT%{_datadir}/appdata +cp %{SOURCE15} $RPM_BUILD_ROOT%{_datadir}/appdata/%{desktop_file_name}.appdata.xml # install man-page mkdir -p $RPM_BUILD_ROOT%{_mandir}/man1/ cp %{SOURCE11} $RPM_BUILD_ROOT%{_mandir}/man1/%{progname}.1 @@ -614,6 +612,7 @@ %{_datadir}/applications/%{desktop_file_name}.desktop %{_datadir}/mime/packages/%{progname}.xml %{_datadir}/pixmaps/firefox* +%{_datadir}/appdata/ %dir %{_datadir}/mozilla %dir %{_datadir}/mozilla/extensions %dir %{_datadir}/mozilla/extensions/%{firefox_appid} ++++++ compare-locales.tar.xz ++++++ ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.pJ1BEL/_old 2014-10-15 16:42:12.000000000 +0200 +++ /var/tmp/diff_new_pack.pJ1BEL/_new 2014-10-15 16:42:12.000000000 +0200 @@ -2,8 +2,8 @@ CHANNEL="release" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_32_0_2_RELEASE" -VERSION="32.0.2" +RELEASE_TAG="FIREFOX_33_0_RELEASE" +VERSION="33.0" # mozilla if [ -d mozilla ]; then ++++++ firefox-32.0.2-source.tar.xz -> firefox-33.0-source.tar.xz ++++++ /work/SRC/openSUSE:Factory/MozillaFirefox/firefox-32.0.2-source.tar.xz /work/SRC/openSUSE:Factory/.MozillaFirefox.new/firefox-33.0-source.tar.xz differ: char 26, line 1 ++++++ firefox-branded-icons.patch ++++++ --- /var/tmp/diff_new_pack.pJ1BEL/_old 2014-10-15 16:42:12.000000000 +0200 +++ /var/tmp/diff_new_pack.pJ1BEL/_new 2014-10-15 16:42:12.000000000 +0200 @@ -1,5 +1,5 @@ # HG changeset patch -# Parent 17ccae9100af86bc65f924b87545184af2f4ada9 +# Parent 8f03aa18c51f9c014f32aba7750f6b7927f9256e diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in --- a/browser/app/Makefile.in @@ -54,7 +54,7 @@ diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in -@@ -629,18 +629,21 @@ +@@ -623,18 +623,21 @@ @BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf @BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png @BINPATH@/chrome/toolkit@JAREXT@ @@ -71,8 +71,8 @@ #endif ; [Webide Files] - #ifdef MOZ_DEVTOOLS_WEBIDE @BINPATH@/browser/chrome/webide@JAREXT@ @BINPATH@/browser/chrome/webide.manifest @BINPATH@/browser/@PREF_DIR@/webide-prefs.js - #endif + + ; shell icons ++++++ firefox-kde.patch ++++++ --- /var/tmp/diff_new_pack.pJ1BEL/_old 2014-10-15 16:42:12.000000000 +0200 +++ /var/tmp/diff_new_pack.pJ1BEL/_new 2014-10-15 16:42:12.000000000 +0200 @@ -2,7 +2,7 @@ new file mode 100644 --- /dev/null +++ b/browser/base/content/browser-kde.xul -@@ -0,0 +1,1206 @@ +@@ -0,0 +1,1238 @@ +#filter substitution +<?xml version="1.0"?> +# -*- Mode: HTML -*- @@ -181,7 +181,7 @@ + </row> + <vbox id="editBookmarkPanelContent" flex="1" hidden="true"/> + <hbox id="editBookmarkPanelBottomButtons" pack="end"> -+#ifdef XP_UNIX ++#ifndef XP_UNIX + <button id="editBookmarkPanelDoneButton" + class="editBookmarkPanelBottomButton" + label="&editBookmark.done.label;" @@ -231,7 +231,7 @@ + <hbox id="UITourTooltipButtons" flex="1" align="center"/> + </vbox> + </panel> -+ <!-- type="default" forces frames to be created so that the panel's size can be determined --> ++ <!-- type="default" forces frames to be created so that the panel's size can be determined --> + <panel id="UITourHighlightContainer" + type="default" + hidden="true" @@ -272,16 +272,48 @@ + noautofocus="true" + position="topcenter topright"/> + ++ <panel id="loop-notification-panel" ++ class="loop-panel social-panel" ++ type="arrow" ++ hidden="true" ++ noautofocus="true"/> ++ ++ <panel id="loop-panel" ++ class="loop-panel social-panel" ++ type="arrow" ++ orient="horizontal" ++ hidden="true"/> ++ + <menupopup id="toolbar-context-menu" + onpopupshowing="onViewToolbarsPopupShowing(event, document.getElementById('viewToolbarsMenuSeparator'));"> + <menuitem oncommand="gCustomizeMode.addToPanel(document.popupNode)" + accesskey="&customizeMenu.moveToPanel.accesskey;" + label="&customizeMenu.moveToPanel.label;" ++ contexttype="toolbaritem" + class="customize-context-moveToPanel"/> + <menuitem oncommand="gCustomizeMode.removeFromArea(document.popupNode)" + accesskey="&customizeMenu.removeFromToolbar.accesskey;" + label="&customizeMenu.removeFromToolbar.label;" ++ contexttype="toolbaritem" + class="customize-context-removeFromToolbar"/> ++ <menuitem id="toolbar-context-reloadAllTabs" ++ class="toolbaritem-tabsmenu" ++ contexttype="tabbar" ++ oncommand="gBrowser.reloadAllTabs();" ++ label="&toolbarContextMenu.reloadAllTabs.label;" ++ accesskey="&toolbarContextMenu.reloadAllTabs.accesskey;"/> ++ <menuitem id="toolbar-context-bookmarkAllTabs" ++ class="toolbaritem-tabsmenu" ++ contexttype="tabbar" ++ command="Browser:BookmarkAllTabs" ++ label="&toolbarContextMenu.bookmarkAllTabs.label;" ++ accesskey="&toolbarContextMenu.bookmarkAllTabs.accesskey;"/> ++ <menuitem id="toolbar-context-undoCloseTab" ++ class="toolbaritem-tabsmenu" ++ contexttype="tabbar" ++ label="&toolbarContextMenu.undoCloseTab.label;" ++ accesskey="&toolbarContextMenu.undoCloseTab.accesskey;" ++ observes="History:UndoCloseTab"/> + <menuseparator/> + <menuseparator id="viewToolbarsMenuSeparator"/> + <!-- XXXgijs: we're using oncommand handler here to avoid the event being @@ -536,8 +568,7 @@ +#endif +#endif + context="toolbar-context-menu"> -+ <toolbaritem id="menubar-items" align="center" -+ cui-areatype="toolbar"> ++ <toolbaritem id="menubar-items" align="center"> +# The entire main menubar is placed into browser-menubar.inc, so that it can be shared by +# hiddenWindow.xul. +#include browser-menubar.inc @@ -574,7 +605,6 @@ + flex="1" + setfocus="false" + tooltip="tabbrowser-tab-tooltip" -+ cui-areatype="toolbar" + stopwatchid="FX_TAB_CLICK_MS"> + <tab class="tabbrowser-tab" selected="true" fadein="true"/> + </tabs> @@ -605,8 +635,12 @@ + key="key_tabview" + label="&viewTabGroups.label;" + command="Browser:ToggleTabView" -+ cui-areatype="toolbar" + observes="tabviewGroupsNumber"/> ++ <menuitem id="alltabs_undoCloseTab" ++ class="menuitem-iconic" ++ key="key_undoCloseTab" ++ label="&undoCloseTab.label;" ++ observes="History:UndoCloseTab"/> + <menuseparator id="alltabs-popup-separator"/> + </menupopup> + </toolbarbutton> @@ -640,7 +674,7 @@ + aria-label="&navbarCmd.label;" + fullscreentoolbar="true" mode="icons" customizable="true" + iconsize="small" -+ defaultset="urlbar-container,search-container,webrtc-status-button,bookmarks-menu-button,downloads-button,home-button,social-share-button,social-toolbar-item" ++ defaultset="urlbar-container,search-container,bookmarks-menu-button,downloads-button,home-button,loop-call-button,social-share-button,social-toolbar-item" + customizationtarget="nav-bar-customization-target" + overflowable="true" + overflowbutton="nav-bar-overflow-button" @@ -651,12 +685,10 @@ + <hbox id="nav-bar-customization-target" flex="1"> + <toolbaritem id="urlbar-container" flex="400" persist="width" + title="&locationItem.title;" removable="false" -+ cui-areatype="toolbar" + class="chromeclass-location" overflows="false"> + <toolbarbutton id="back-button" class="toolbarbutton-1 chromeclass-toolbar-additional" + label="&backCmd.label;" + command="Browser:BackOrBackDuplicate" -+ cui-areatype="toolbar" + onclick="checkForMiddleClick(this, event);" + tooltip="back-button-tooltip" + context="backForwardMenu"/> @@ -664,7 +696,6 @@ + <toolbarbutton id="forward-button" class="toolbarbutton-1 chromeclass-toolbar-additional" + label="&forwardCmd.label;" + command="Browser:ForwardOrForwardDuplicate" -+ cui-areatype="toolbar" + onclick="checkForMiddleClick(this, event);" + tooltip="forward-button-tooltip" + context="backForwardMenu"/> @@ -703,6 +734,8 @@ + <image id="webRTC-sharingDevices-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="webRTC-shareMicrophone-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="webRTC-sharingMicrophone-notification-icon" class="notification-anchor-icon" role="button"/> ++ <image id="webRTC-shareScreen-notification-icon" class="notification-anchor-icon" role="button"/> ++ <image id="webRTC-sharingScreen-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"/> + <image id="translate-notification-icon" class="notification-anchor-icon" role="button"/> @@ -718,6 +751,7 @@ + onkeypress="gIdentityHandler.handleIdentityButtonEvent(event);" + ondragstart="gIdentityHandler.onDragStart(event);"> + <image id="page-proxy-favicon" ++ consumeanchor="identity-box" + onclick="PageProxyClickHandler(event);" + pageproxystate="invalid"/> + <hbox id="identity-icon-labels"> @@ -759,20 +793,6 @@ + <searchbar id="searchbar" flex="1"/> + </toolbaritem> + -+ <toolbarbutton id="webrtc-status-button" -+ class="toolbarbutton-1 chromeclass-toolbar-additional" -+ type="menu" -+ hidden="true" -+ orient="horizontal" -+ label="&webrtcIndicatorButton.label;" -+ tooltiptext="&webrtcIndicatorButton.tooltip;" -+ cui-areatype="toolbar" -+ overflows="false"> -+ <menupopup onpopupshowing="WebrtcIndicator.fillPopup(this);" -+ onpopuphiding="WebrtcIndicator.clearPopup(this);" -+ oncommand="WebrtcIndicator.menuCommand(event.target);"/> -+ </toolbarbutton> -+ + <toolbarbutton id="bookmarks-menu-button" + class="toolbarbutton-1 chromeclass-toolbar-additional" + persist="class" @@ -902,6 +922,21 @@ + cui-areatype="toolbar" + aboutHomeOverrideTooltip="&abouthome.pageTitle;"/> + ++ <!-- XXX Bug 1013989 will provide a label for the button --> ++ <!-- This uses badged to be compatible with the social api code it shares. ++ We may also want it to be badged in the future, for notification ++ purposes. --> ++ <toolbarbutton id="loop-call-button" ++ class="toolbarbutton-1 chromeclass-toolbar-additional" ++ persist="class" ++ type="badged" ++ removable="true" ++ tooltiptext="&loopCallButton.tooltip;" ++ oncommand="LoopUI.openCallPanel(event);" ++ cui-areatype="toolbar" ++ > ++ </toolbarbutton> ++ + + <toolbarbutton id="social-share-button" + class="toolbarbutton-1 chromeclass-toolbar-additional" @@ -915,17 +950,15 @@ + + <toolbarbutton id="nav-bar-overflow-button" + class="toolbarbutton-1 chromeclass-toolbar-additional overflow-button" -+ cui-areatype="toolbar" + skipintoolbarset="true" + tooltiptext="&navbarOverflow.label;"/> + + <toolbaritem id="PanelUI-button" + class="chromeclass-toolbar-additional" -+ cui-areatype="toolbar" + removable="false"> + <toolbarbutton id="PanelUI-menu-button" + class="toolbarbutton-1" -+ cui-areatype="toolbar" ++ consumeanchor="PanelUI-button" + label="&brandShortName;" + tooltiptext="&appmenu.tooltip;"/> + </toolbaritem> @@ -941,7 +974,6 @@ +# Prior to 10.7 there wasn't a native fullscreen button so we use #restore-button +# to exit fullscreen and want it to behave like other toolbar buttons. + class="toolbarbutton-1" -+ cui-areatype="toolbar" +#endif + tooltiptext="&fullScreenRestore.tooltip;" + oncommand="BrowserFullScreen();"/> @@ -1142,7 +1174,7 @@ + <description class="full-screen-description" value="&fullscreenExitHint2.value;"/> + <vbox id="full-screen-approval-pane" align="center"> + <hbox> -+#ifndef XP_UNIX ++#ifdef XP_UNIX + <button label="&fullscreenExitButton.label;" + oncommand="FullScreen.setFullscreenAllowed(false);" + class="full-screen-approval-button"/> @@ -1209,6 +1241,47 @@ +</deck> + +</window> +diff --git a/browser/base/content/browser.xul b/browser/base/content/browser.xul +--- a/browser/base/content/browser.xul ++++ b/browser/base/content/browser.xul +@@ -171,17 +171,17 @@ + class="editBookmarkPanelHeaderButton" + oncommand="StarUI.removeBookmarkButtonCommand();" + accesskey="&editBookmark.removeBookmark.accessKey;"/> + </hbox> + </vbox> + </row> + <vbox id="editBookmarkPanelContent" flex="1" hidden="true"/> + <hbox id="editBookmarkPanelBottomButtons" pack="end"> +-#ifndef XP_UNIX ++#ifdef XP_UNIX + <button id="editBookmarkPanelDoneButton" + class="editBookmarkPanelBottomButton" + label="&editBookmark.done.label;" + default="true" + oncommand="StarUI.panel.hidePopup();"/> + <button id="editBookmarkPanelDeleteButton" + class="editBookmarkPanelBottomButton" + label="&editBookmark.cancel.label;" +@@ -1164,17 +1164,17 @@ + + <hbox id="full-screen-warning-container" hidden="true" fadeout="true"> + <hbox style="width: 100%;" pack="center"> <!-- Inner hbox needed due to bug 579776. --> + <vbox id="full-screen-warning-message" align="center"> + <description id="full-screen-domain-text"/> + <description class="full-screen-description" value="&fullscreenExitHint2.value;"/> + <vbox id="full-screen-approval-pane" align="center"> + <hbox> +-#ifdef XP_UNIX ++#ifndef XP_UNIX + <button label="&fullscreenExitButton.label;" + oncommand="FullScreen.setFullscreenAllowed(false);" + class="full-screen-approval-button"/> + <button label="&fullscreenAllowButton.label;" + oncommand="FullScreen.setFullscreenAllowed(true);" + class="full-screen-approval-button"/> + #else + <button label="&fullscreenAllowButton.label;" diff --git a/browser/base/jar.mn b/browser/base/jar.mn --- a/browser/base/jar.mn +++ b/browser/base/jar.mn @@ -1317,7 +1390,7 @@ // when the user will select the default. We refresh here periodically // in case the default changes. On other Windows OS's defaults can also // be set while the prefs are open. -@@ -875,14 +881,25 @@ var gAdvancedPane = { +@@ -889,14 +895,25 @@ var gAdvancedPane = { * Set browser as the operating system default browser. */ setDefaultBrowser: function() @@ -1799,7 +1872,7 @@ diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in -@@ -666,19 +666,21 @@ +@@ -658,19 +658,21 @@ @BINPATH@/defaults/autoconfig/prefcalls.js @BINPATH@/browser/defaults/profile/prefs.js ++++++ firefox-no-default-ualocale.patch ++++++ --- /var/tmp/diff_new_pack.pJ1BEL/_old 2014-10-15 16:42:12.000000000 +0200 +++ /var/tmp/diff_new_pack.pJ1BEL/_new 2014-10-15 16:42:12.000000000 +0200 @@ -1,19 +1,19 @@ # HG changeset patch # User Wolfgang Rosenauer <[email protected]> -# Parent b7bc98abc45462dec0f6603f3c9a88e772172f29 +# Parent 39f441dc7ba560595404d47506b0ce70180f99fd 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 --- a/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js -@@ -254,17 +254,17 @@ pref("browser.uitour.url", "https://www. - pref("browser.uitour.whitelist.add.260", "www.mozilla.org,support.mozilla.org"); +@@ -259,17 +259,17 @@ pref("browser.uitour.whitelist.add.260", pref("browser.uitour.whitelist.add.340", "about:home"); pref("browser.customizemode.tip0.shown", false); pref("browser.customizemode.tip0.learnMoreUrl", "https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/customize";); pref("keyword.enabled", true); + pref("browser.fixup.domainwhitelist.localhost", true); -pref("general.useragent.locale", "@AB_CD@"); +pref("general.useragent.locale", "chrome://global/locale/intl.properties"); ++++++ l10n-32.0.2.tar.xz -> l10n-33.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/MozillaFirefox/l10n-32.0.2.tar.xz /work/SRC/openSUSE:Factory/.MozillaFirefox.new/l10n-33.0.tar.xz differ: char 26, line 1 ++++++ mozilla-kde.patch ++++++ --- /var/tmp/diff_new_pack.pJ1BEL/_old 2014-10-15 16:42:12.000000000 +0200 +++ /var/tmp/diff_new_pack.pJ1BEL/_new 2014-10-15 16:42:12.000000000 +0200 @@ -44,7 +44,7 @@ #include "prefread.h" #include "prefapi_private_data.h" -@@ -1134,16 +1135,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char +@@ -1167,16 +1168,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char static nsresult pref_LoadPrefsInDirList(const char *listId) { @@ -79,7 +79,7 @@ return NS_OK; bool hasMore; -@@ -1159,17 +1178,17 @@ static nsresult pref_LoadPrefsInDirList( +@@ -1192,17 +1211,17 @@ static nsresult pref_LoadPrefsInDirList( nsAutoCString leaf; path->GetNativeLeafName(leaf); @@ -98,7 +98,7 @@ { nsZipItemPtr<char> manifest(jarReader, name, true); NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE); -@@ -1263,26 +1282,38 @@ static nsresult pref_InitInitialObjects( +@@ -1296,26 +1315,38 @@ static nsresult pref_InitInitialObjects( /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */ static const char* specialFiles[] = { #if defined(XP_MACOSX) @@ -268,7 +268,7 @@ diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn --- a/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn -@@ -55,29 +55,33 @@ toolkit.jar: +@@ -54,29 +54,33 @@ toolkit.jar: content/global/viewZoomOverlay.js (viewZoomOverlay.js) *+ content/global/bindings/autocomplete.xml (widgets/autocomplete.xml) content/global/bindings/browser.xml (widgets/browser.xml) @@ -306,7 +306,7 @@ new file mode 100644 --- /dev/null +++ b/toolkit/content/widgets/dialog-kde.xml -@@ -0,0 +1,449 @@ +@@ -0,0 +1,455 @@ +<?xml version="1.0"?> +<!-- This Source Code Form is subject to the terms of the Mozilla Public + - License, v. 2.0. If a copy of the MPL was not distributed with this @@ -340,9 +340,9 @@ + <xul:button dlgtype="accept" class="dialog-button" xbl:inherits="disabled=buttondisabledaccept"/> +#elif XP_UNIX + > -+ <xul:button dlgtype="help" class="dialog-button" hidden="true"/> ++ <xul:button dlgtype="help" class="dialog-button" hidden="true"/> + <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/> -+ <xul:spacer anonid="spacer" flex="1" hidden="true"/> ++ <xul:spacer anonid="spacer" flex="1"/> + <xul:button dlgtype="accept" class="dialog-button" xbl:inherits="disabled=buttondisabledaccept"/> + <xul:button dlgtype="extra1" class="dialog-button" hidden="true"/> + <xul:button dlgtype="cancel" class="dialog-button"/> @@ -675,8 +675,14 @@ + if (!button.disabled) { + var noCancel = this._fireButtonEvent(aDlgType); + if (noCancel) { -+ if (aDlgType == "accept" || aDlgType == "cancel") ++ if (aDlgType == "accept" || aDlgType == "cancel") { ++ var closingEvent = new CustomEvent("dialogclosing", { ++ bubbles: true, ++ detail: { button: aDlgType }, ++ }); ++ this.dispatchEvent(closingEvent); + window.close(); ++ } + } + return noCancel; + } @@ -2221,7 +2227,7 @@ 'nsNativeAppSupportDefault.cpp', ] - if CONFIG['MOZ_X11']: + if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'gtk3': diff --git a/toolkit/xre/nsKDEUtils.cpp b/toolkit/xre/nsKDEUtils.cpp new file mode 100644 --- /dev/null @@ -3092,7 +3098,7 @@ diff --git a/widget/gtk/Makefile.in b/widget/gtk/Makefile.in --- a/widget/gtk/Makefile.in +++ b/widget/gtk/Makefile.in -@@ -3,11 +3,13 @@ +@@ -3,14 +3,16 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. @@ -3106,6 +3112,9 @@ CFLAGS += $(TK_CFLAGS) CXXFLAGS += $(TK_CFLAGS) + ifdef MOZ_ENABLE_DBUS + CXXFLAGS += $(MOZ_DBUS_GLIB_CFLAGS) + endif diff --git a/widget/gtk/nsFilePicker.cpp b/widget/gtk/nsFilePicker.cpp --- a/widget/gtk/nsFilePicker.cpp +++ b/widget/gtk/nsFilePicker.cpp ++++++ mozilla-shared-nss-db.patch ++++++ --- /var/tmp/diff_new_pack.pJ1BEL/_old 2014-10-15 16:42:12.000000000 +0200 +++ /var/tmp/diff_new_pack.pJ1BEL/_new 2014-10-15 16:42:12.000000000 +0200 @@ -7,7 +7,7 @@ diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in -@@ -8231,16 +8231,31 @@ if test "$MOZ_ENABLE_SKIA"; then +@@ -8193,16 +8193,31 @@ if test "$MOZ_ENABLE_SKIA"; then MOZ_ENABLE_SKIA_GPU=1 AC_DEFINE(USE_SKIA_GPU) AC_SUBST(MOZ_ENABLE_SKIA_GPU) @@ -79,7 +79,7 @@ #include "nsCertVerificationThread.h" #include "nsAppDirectoryServiceDefs.h" #include "nsComponentManagerUtils.h" -@@ -1141,17 +1148,31 @@ nsNSSComponent::InitializeNSS() +@@ -1115,17 +1122,31 @@ nsNSSComponent::InitializeNSS() if (NS_FAILED(rv)) { nsPSMInitPanic::SetPanic(); return NS_ERROR_NOT_AVAILABLE; @@ -115,15 +115,15 @@ diff --git a/toolkit/library/libxul.mk b/toolkit/library/libxul.mk --- a/toolkit/library/libxul.mk +++ b/toolkit/library/libxul.mk -@@ -146,17 +146,17 @@ OS_LIBS += $(call EXPAND_LIBNAME,mfuuid +@@ -145,17 +145,17 @@ endif + ifdef MOZ_WMF + OS_LIBS += $(call EXPAND_LIBNAME,mfuuid wmcodecdspuuid strmiids) endif ifdef MOZ_DIRECTSHOW OS_LIBS += $(call EXPAND_LIBNAME,dmoguids wmcodecdspuuid strmiids msdmo) endif - EXTRA_DSO_LDOPTS += $(LIBS_DIR) - -EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB) +EXTRA_DSO_LDOPTS += $(NSPR_LIBS) $(MOZALLOC_LIB) $(NSSHELPER_LIBS) ++++++ source-stamp.txt ++++++ --- /var/tmp/diff_new_pack.pJ1BEL/_old 2014-10-15 16:42:12.000000000 +0200 +++ /var/tmp/diff_new_pack.pJ1BEL/_new 2014-10-15 16:42:12.000000000 +0200 @@ -1,2 +1,2 @@ -REV=9dcc4d60ede2 +REV=1f22a8cc7aa5 REPO=http://hg.mozilla.org/releases/mozilla-release -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
