Hello community, here is the log from the commit of package MozillaFirefox for openSUSE:Factory checked in at 2014-09-24 13:09:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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-04 07:55:58.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.MozillaFirefox.new/MozillaFirefox.changes 2014-09-24 13:09:20.000000000 +0200 @@ -2 +2 @@ -Fri Aug 29 16:39:43 UTC 2014 - [email protected] +Sat Sep 20 13:33:51 UTC 2014 - [email protected] @@ -4,2 +4,24 @@ -- update to Firefox 31.1.0esr (bnc#894370) - * MFSA 2014-67/CVE-2014-1553/CVE-2014-1562 +- update to Firefox 32.0.2 + * just a version bump for our builds + * fixed the in application update process for certain environments + (in application update is not enabled in openSUSE and Linux + is unaffected in any case) +- build with --disable-optimize for 13.1 and above for i586 to + workaround miscompilations (bnc#896624) +- use some more build flags to align with upstream + +------------------------------------------------------------------- +Sat Sep 13 16:58:16 UTC 2014 - [email protected] + +- update to Firefox 32.0.1 + * fixed stability issues for computers with multiple graphics cards + * mixed content icon may be incorrectly displayed instead of lock + icon for SSL sites in 32.0 ( + * WebRTC: setRemoteDescription() silently fails if no success + callback is specified (bmo#1063971) + +------------------------------------------------------------------- +Sun Aug 31 07:44:54 UTC 2014 - [email protected] + +- update to Firefox 32.0 (bnc#894370) + * MFSA 2014-67/CVE-2014-1553/CVE-2014-1554/CVE-2014-1562 @@ -15,4 +37,4 @@ -- changes to support compilation on 11.4 - * explicit xz BuildRequires - * mozilla-nullptr-gcc45.patch - * remove unresolved makeinfo BuildRequires +- rebased patches +- requires NSS 3.16.4 +- removed upstreamed patch + * mozilla-aarch64-bmo-810631.patch Old: ---- firefox-31.1.0-source.tar.xz l10n-31.1.0.tar.xz mozilla-aarch64-bmo-810631.patch mozilla-nullptr-gcc45.patch New: ---- firefox-32.0.2-source.tar.xz l10n-32.0.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox.spec ++++++ --- /var/tmp/diff_new_pack.2mU4RI/_old 2014-09-24 13:09:33.000000000 +0200 +++ /var/tmp/diff_new_pack.2mU4RI/_new 2014-09-24 13:09:33.000000000 +0200 @@ -17,9 +17,9 @@ # -%define major 31 -%define mainver %major.1.0 -%define update_channel esr31 +%define major 32 +%define mainver %major.0.2 +%define update_channel release %if %suse_version > 1210 %if %suse_version > 1310 @@ -40,15 +40,12 @@ BuildRequires: libgnomeui-devel BuildRequires: libidl-devel BuildRequires: libnotify-devel -%if %suse_version > 1140 BuildRequires: makeinfo -%endif BuildRequires: python-devel BuildRequires: startup-notification-devel BuildRequires: unzip BuildRequires: update-desktop-files BuildRequires: xorg-x11-libXt-devel -BuildRequires: xz BuildRequires: yasm BuildRequires: zip %if %suse_version > 1110 @@ -58,7 +55,7 @@ BuildRequires: wireless-tools %endif BuildRequires: mozilla-nspr-devel >= 4.10.6 -BuildRequires: mozilla-nss-devel >= 3.16.2 +BuildRequires: mozilla-nss-devel >= 3.16.4 BuildRequires: nss-shared-helper-devel BuildRequires: pkgconfig(libpulse) %if %suse_version > 1210 @@ -77,7 +74,7 @@ %endif Version: %{mainver} Release: 0 -%define releasedate 2014082900 +%define releasedate 2014092000 Provides: firefox = %{mainver} Provides: firefox = %{version}-%{release} Provides: web_browser @@ -120,9 +117,6 @@ Patch12: mozilla-arm-disable-edsp.patch Patch13: mozilla-ppc.patch Patch14: mozilla-libproxy-compat.patch -Patch15: mozilla-nullptr-gcc45.patch -# Gecko/Toolkit AArch64 Porting -Patch30: mozilla-aarch64-bmo-810631.patch # Firefox/browser Patch101: firefox-kde.patch @@ -263,8 +257,6 @@ %patch12 -p1 %patch13 -p1 %patch14 -p1 -%patch15 -p1 -%patch30 -p1 # Firefox %patch101 -p1 @@ -317,6 +309,14 @@ ac_add_options --sysconfdir=%{_sysconfdir} ac_add_options --mandir=%{_mandir} ac_add_options --includedir=%{_includedir} +ac_add_options --enable-release +ac_add_options --enable-stdcxx-compat +%ifarch %ix86 +%if %suse_version > 1230 +ac_add_options --disable-optimize +%endif +%endif +ac_add_options --enable-elf-hack ac_add_options --with-system-nspr ac_add_options --with-system-nss %if %{localize} ++++++ compare-locales.tar.xz ++++++ ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.2mU4RI/_old 2014-09-24 13:09:33.000000000 +0200 +++ /var/tmp/diff_new_pack.2mU4RI/_new 2014-09-24 13:09:33.000000000 +0200 @@ -1,9 +1,9 @@ #!/bin/bash -CHANNEL="esr31" +CHANNEL="release" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_31_1_0esr_RELEASE" -VERSION="31.1.0" +RELEASE_TAG="FIREFOX_32_0_2_RELEASE" +VERSION="32.0.2" # mozilla if [ -d mozilla ]; then @@ -47,7 +47,7 @@ ;; *) echo "fetching $locale ..." - hg clone http://hg.mozilla.org/releases/l10n/mozilla-release/$locale l10n/$locale + hg clone http://hg.mozilla.org/releases/l10n/mozilla-$CHANNEL/$locale l10n/$locale [ "$RELEASE_TAG" == "default" ] || hg -R l10n/$locale up -C -r $RELEASE_TAG ;; esac ++++++ firefox-31.1.0-source.tar.xz -> firefox-32.0.2-source.tar.xz ++++++ /work/SRC/openSUSE:Factory/MozillaFirefox/firefox-31.1.0-source.tar.xz /work/SRC/openSUSE:Factory/.MozillaFirefox.new/firefox-32.0.2-source.tar.xz differ: char 26, line 1 ++++++ firefox-branded-icons.patch ++++++ --- /var/tmp/diff_new_pack.2mU4RI/_old 2014-09-24 13:09:33.000000000 +0200 +++ /var/tmp/diff_new_pack.2mU4RI/_new 2014-09-24 13:09:33.000000000 +0200 @@ -1,10 +1,10 @@ # HG changeset patch -# Parent 9745e5d5cdc7e91dbfc5582b49881668cb6725f7 +# Parent 17ccae9100af86bc65f924b87545184af2f4ada9 diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in --- a/browser/app/Makefile.in +++ b/browser/app/Makefile.in -@@ -76,16 +76,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d +@@ -75,16 +75,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d endif ifdef MOZ_WIDGET_GTK @@ -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 -@@ -613,18 +613,21 @@ +@@ -629,18 +629,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@ @@ -70,9 +70,9 @@ +@BINPATH@/browser/chrome/icons/default/default256.png #endif - ; shell icons - #ifdef XP_UNIX - #ifndef XP_MACOSX - ; shell icons - @BINPATH@/browser/icons/*.png - #ifdef MOZ_UPDATER + ; [Webide Files] + #ifdef MOZ_DEVTOOLS_WEBIDE + @BINPATH@/browser/chrome/webide@JAREXT@ + @BINPATH@/browser/chrome/webide.manifest + @BINPATH@/browser/@PREF_DIR@/webide-prefs.js + #endif ++++++ firefox-kde.patch ++++++ --- /var/tmp/diff_new_pack.2mU4RI/_old 2014-09-24 13:09:33.000000000 +0200 +++ /var/tmp/diff_new_pack.2mU4RI/_new 2014-09-24 13:09:33.000000000 +0200 @@ -2,7 +2,7 @@ new file mode 100644 --- /dev/null +++ b/browser/base/content/browser-kde.xul -@@ -0,0 +1,1197 @@ +@@ -0,0 +1,1206 @@ +#filter substitution +<?xml version="1.0"?> +# -*- Mode: HTML -*- @@ -106,6 +106,12 @@ + accesskey="&moveToNewWindow.accesskey;" + tbattr="tabbrowser-multiple" + oncommand="gBrowser.replaceTabWithWindow(TabContextMenu.contextTab);"/> ++#ifdef E10S_TESTING_ONLY ++ <menuitem id="context_openNonRemoteWindow" label="Open in new non-e10s window" ++ tbattr="tabbrowser-remote" ++ hidden="true" ++ oncommand="gBrowser.openNonRemoteWindow(TabContextMenu.contextTab);"/> ++#endif + <menuseparator/> + <menuitem id="context_reloadAllTabs" label="&reloadAllTabs.label;" accesskey="&reloadAllTabs.accesskey;" + tbattr="tabbrowser-multiple-visible" @@ -245,7 +251,7 @@ + onpopuphidden="SocialShare.onHidden()" + hidden="true"> + <vbox class="social-share-toolbar"> -+ <vbox id="social-share-provider-buttons" flex="1"/> ++ <arrowscrollbox id="social-share-provider-buttons" orient="vertical" flex="1"/> + </vbox> + </panel> + @@ -311,7 +317,7 @@ + oncommand="BrowserFullScreen();"/> + </menupopup> + -+ <menupopup id="contentAreaContextMenu" pagemenu="start" ++ <menupopup id="contentAreaContextMenu" pagemenu="#page-menu-separator" + onpopupshowing="if (event.target != this) + return true; + gContextMenu = new nsContextMenu(this, event.shiftKey); @@ -578,7 +584,7 @@ + label="&tabCmd.label;" + command="cmd_newNavigatorTab" + onclick="checkForMiddleClick(this, event);" -+ tooltiptext="&newTabButton.tooltip;" ++ tooltip="dynamic-shortcut-tooltip" + ondrop="newTabButtonObserver.onDrop(event)" + ondragover="newTabButtonObserver.onDragOver(event)" + ondragenter="newTabButtonObserver.onDragOver(event)" @@ -874,6 +880,7 @@ + during the customization of the toolbar, in the palette, and before + the Downloads Indicator overlay is loaded. --> + <toolbarbutton id="downloads-button" class="toolbarbutton-1 chromeclass-toolbar-additional" ++ key="key_openDownloads" + oncommand="DownloadsIndicatorView.onCommand(event);" + ondrop="DownloadsIndicatorView.onDrop(event);" + ondragover="DownloadsIndicatorView.onDragOver(event);" @@ -881,7 +888,7 @@ + label="&downloads.label;" + removable="true" + cui-areatype="toolbar" -+ tooltiptext="&downloads.tooltip;"/> ++ tooltip="dynamic-shortcut-tooltip"/> + + <toolbarbutton id="home-button" class="toolbarbutton-1 chromeclass-toolbar-additional" + persist="class" removable="true" @@ -890,6 +897,7 @@ + ondragenter="homeButtonObserver.onDragOver(event)" + ondrop="homeButtonObserver.onDrop(event)" + ondragexit="homeButtonObserver.onDragExit(event)" ++ key="goHome" + onclick="BrowserGoHome(event);" + cui-areatype="toolbar" + aboutHomeOverrideTooltip="&abouthome.pageTitle;"/> @@ -897,11 +905,11 @@ + + <toolbarbutton id="social-share-button" + class="toolbarbutton-1 chromeclass-toolbar-additional" -+ hidden="true" -+ overflows="false" + label="&sharePageCmd.label;" + tooltiptext="&sharePageCmd.label;" + cui-areatype="toolbar" ++ removable="true" ++ hidden="true" + command="Social:SharePage"/> + </hbox> + @@ -1011,9 +1019,11 @@ + + <toolbarbutton id="print-button" class="toolbarbutton-1 chromeclass-toolbar-additional" +#ifdef XP_MACOSX -+ command="cmd_print" tooltip="dynamic-shortcut-tooltip" ++ command="cmd_print" ++ tooltip="dynamic-shortcut-tooltip" +#else -+ command="cmd_printPreview" tooltiptext="&printButton.tooltip;" ++ command="cmd_printPreview" ++ tooltiptext="&printButton.tooltip;" +#endif + label="&printButton.label;"/> + @@ -1070,8 +1080,7 @@ + tabcontainer="tabbrowser-tabs" + contentcontextmenu="contentAreaContextMenu" + autocompletepopup="PopupAutoComplete" -+ selectpopup="ContentSelectDropdown" -+ onclick="contentAreaClick(event, false);"/> ++ selectpopup="ContentSelectDropdown"/> + <chatbar id="pinnedchats" layer="true" mousethrough="always" hidden="true"/> + </vbox> + <splitter id="social-sidebar-splitter" @@ -1203,7 +1212,7 @@ diff --git a/browser/base/jar.mn b/browser/base/jar.mn --- a/browser/base/jar.mn +++ b/browser/base/jar.mn -@@ -65,16 +65,18 @@ browser.jar: +@@ -70,16 +70,18 @@ browser.jar: content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png) content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png) content/browser/aboutSocialError.xhtml (content/aboutSocialError.xhtml) @@ -1217,11 +1226,11 @@ * content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) * content/browser/chatWindow.xul (content/chatWindow.xul) content/browser/content.js (content/content.js) - content/browser/fonts/ClearSans-Regular.woff (content/fonts/ClearSans-Regular.woff) - content/browser/fonts/FiraSans-Regular.woff (content/fonts/FiraSans-Regular.woff) - content/browser/fonts/FiraSans-Light.woff (content/fonts/FiraSans-Light.woff) content/browser/newtab/newTab.xul (content/newtab/newTab.xul) * content/browser/newtab/newTab.js (content/newtab/newTab.js) + content/browser/newtab/newTab.css (content/newtab/newTab.css) + * content/browser/pageinfo/pageInfo.xul (content/pageinfo/pageInfo.xul) + content/browser/pageinfo/pageInfo.js (content/pageinfo/pageInfo.js) diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/nsModule.cpp --- a/browser/components/build/nsModule.cpp +++ b/browser/components/build/nsModule.cpp @@ -1308,7 +1317,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. -@@ -884,14 +890,25 @@ var gAdvancedPane = { +@@ -875,14 +881,25 @@ var gAdvancedPane = { * Set browser as the operating system default browser. */ setDefaultBrowser: function() @@ -1790,7 +1799,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 -@@ -643,19 +643,21 @@ +@@ -666,19 +666,21 @@ @BINPATH@/defaults/autoconfig/prefcalls.js @BINPATH@/browser/defaults/profile/prefs.js ++++++ firefox-multilocale-chrome.patch ++++++ --- /var/tmp/diff_new_pack.2mU4RI/_old 2014-09-24 13:09:33.000000000 +0200 +++ /var/tmp/diff_new_pack.2mU4RI/_new 2014-09-24 13:09:33.000000000 +0200 @@ -1,5 +1,5 @@ # HG changeset patch -# Parent d5435466863cb1f52114a930824f5976ce53c559 +# Parent 9e20873aca55242f18dd1b93e863eded6d1d08bd # User Wolfgang Rosenauer <[email protected]> Add searchplugins to chrome packaging for proper localization @@ -128,7 +128,7 @@ diff --git a/browser/locales/jar.mn b/browser/locales/jar.mn --- a/browser/locales/jar.mn +++ b/browser/locales/jar.mn -@@ -130,14 +130,15 @@ +@@ -133,14 +133,15 @@ locale/browser/syncQuota.properties (%chrome/browser/syncQuota.properties) #endif % locale browser-region @AB_CD@ %locale/browser-region/ ++++++ firefox-no-default-ualocale.patch ++++++ --- /var/tmp/diff_new_pack.2mU4RI/_old 2014-09-24 13:09:33.000000000 +0200 +++ /var/tmp/diff_new_pack.2mU4RI/_new 2014-09-24 13:09:33.000000000 +0200 @@ -1,14 +1,14 @@ # HG changeset patch # User Wolfgang Rosenauer <[email protected]> -# Parent 5ffbb37bbfc52f549620ff67ce45f218a825cf4e +# Parent b7bc98abc45462dec0f6603f3c9a88e772172f29 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 -@@ -253,17 +253,17 @@ pref("browser.uitour.pinnedTabUrl", "htt - pref("browser.uitour.url", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/tour/";); +@@ -254,17 +254,17 @@ pref("browser.uitour.url", "https://www. pref("browser.uitour.whitelist.add.260", "www.mozilla.org,support.mozilla.org"); + 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";); ++++++ l10n-31.1.0.tar.xz -> l10n-32.0.2.tar.xz ++++++ /work/SRC/openSUSE:Factory/MozillaFirefox/l10n-31.1.0.tar.xz /work/SRC/openSUSE:Factory/.MozillaFirefox.new/l10n-32.0.2.tar.xz differ: char 27, line 1 ++++++ mozilla-kde.patch ++++++ --- /var/tmp/diff_new_pack.2mU4RI/_old 2014-09-24 13:09:33.000000000 +0200 +++ /var/tmp/diff_new_pack.2mU4RI/_new 2014-09-24 13:09:33.000000000 +0200 @@ -85,7 +85,7 @@ path->GetNativeLeafName(leaf); // Do we care if a file provided by this process fails to load? - if (Substring(leaf, leaf.Length() - 4).Equals(NS_LITERAL_CSTRING(".xpi"))) + if (Substring(leaf, leaf.Length() - 4).EqualsLiteral(".xpi")) ReadExtensionPrefs(path); else - pref_LoadPrefsInDir(path, nullptr, 0); @@ -217,7 +217,7 @@ #include "AndroidBridge.h" using namespace mozilla::widget::android; #endif -@@ -2722,16 +2726,25 @@ nsDownload::SetState(DownloadState aStat +@@ -2729,16 +2733,25 @@ nsDownload::SetState(DownloadState aStat nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID)); // Master pref to control this function. @@ -243,7 +243,7 @@ int64_t goat = PR_Now() - mStartTime; showTaskbarAlert = goat > alertIntervalUSec; -@@ -2759,19 +2772,20 @@ nsDownload::SetState(DownloadState aStat +@@ -2766,19 +2779,20 @@ nsDownload::SetState(DownloadState aStat // because if it is, they'll click open the download manager and // the items they downloaded will have been removed. alerts->ShowAlertNotification( @@ -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 -@@ -58,29 +58,33 @@ toolkit.jar: +@@ -55,29 +55,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) @@ -290,7 +290,7 @@ content/global/bindings/menulist.xml (widgets/menulist.xml) content/global/bindings/notification.xml (widgets/notification.xml) content/global/bindings/numberbox.xml (widgets/numberbox.xml) - * content/global/bindings/popup.xml (widgets/popup.xml) + content/global/bindings/popup.xml (widgets/popup.xml) *+ content/global/bindings/preferences.xml (widgets/preferences.xml) +*+ content/global/bindings/preferences-kde.xml (widgets/preferences-kde.xml) +% override chrome://global/content/bindings/preferences.xml chrome://global/content/bindings/preferences-kde.xml desktop=kde @@ -760,7 +760,7 @@ new file mode 100644 --- /dev/null +++ b/toolkit/content/widgets/preferences-kde.xml -@@ -0,0 +1,1333 @@ +@@ -0,0 +1,1343 @@ +<?xml version="1.0"?> + +<!DOCTYPE bindings [ @@ -793,6 +793,25 @@ + + <binding id="preferences"> + <implementation implements="nsIObserver"> ++ <method name="_constructAfterChildren"> ++ <body> ++ <![CDATA[ ++ // This method will be called after each one of the child ++ // <preference> elements is constructed. Its purpose is to propagate ++ // the values to the associated form elements ++ ++ var elements = this.getElementsByTagName("preference"); ++ for (let element of elements) { ++ if (!element._constructed) { ++ return; ++ } ++ } ++ for (let element of elements) { ++ element.updateElements(); ++ } ++ ]]> ++ </body> ++ </method> + <method name="observe"> + <parameter name="aSubject"/> + <parameter name="aTopic"/> @@ -864,6 +883,8 @@ + <implementation> + <constructor> + <![CDATA[ ++ this._constructed = true; ++ + // if the element has been inserted without the name attribute set, + // we have nothing to do here + if (!this.name) @@ -889,18 +910,20 @@ + preference = parentPrefs[l]; + } + } -+ this._setValue(preference ? preference.value -+ : this.valueFromPreferences, false); ++ ++ // Don't use the value setter here, we don't want updateElements to be prematurely fired. ++ this._value = preference ? preference.value : this.valueFromPreferences; + } + else -+ this._setValue(this.valueFromPreferences, false); ++ this._value = this.valueFromPreferences; ++ this.preferences._constructAfterChildren(); + ]]> + </constructor> + <destructor> + this.preferences.rootBranchInternal + .removeObserver(this.name, this.preferences); + </destructor> -+ ++ <field name="_constructed">false</field> + <property name="instantApply"> + <getter> + return this.getAttribute("instantApply") == "true" || this.preferences.instantApply; @@ -932,24 +955,19 @@ + <field name="_value">null</field> + <method name="_setValue"> + <parameter name="aValue"/> -+ <parameter name="aUpdate"/> + <body> + <![CDATA[ -+ if (aUpdate && this.value !== aValue) { ++ if (this.value !== aValue) { + this._value = aValue; + if (this.instantApply) + this.valueFromPreferences = aValue; + this.preferences.fireChangedEvent(this); + } -+ else if (!aUpdate) { -+ this._value = aValue; -+ this.updateElements(); -+ } + return aValue; + ]]> + </body> + </method> -+ <property name="value" onget="return this._value" onset="return this._setValue(val, true);"/> ++ <property name="value" onget="return this._value" onset="return this._setValue(val);"/> + + <property name="locked"> + <getter> @@ -1336,7 +1354,7 @@ + </xul:deck> + </xul:hbox> + <xul:hbox anonid="dlg-buttons" class="prefWindow-dlgbuttons" pack="end"> -+#ifdef XP_UNIX_GNOME ++#ifndef XP_UNIX + <xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/> + <xul:button dlgtype="help" class="dialog-button" hidden="true" icon="help"/> + <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/> @@ -1344,14 +1362,6 @@ + <xul:spacer anonid="spacer" flex="1"/> + <xul:button dlgtype="cancel" class="dialog-button" icon="cancel"/> + <xul:button dlgtype="accept" class="dialog-button" icon="accept"/> -+#elif XP_UNIX -+ <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/> -+ <xul:spacer anonid="spacer" flex="1"/> -+ <xul:button dlgtype="accept" class="dialog-button" icon="accept"/> -+ <xul:button dlgtype="extra1" class="dialog-button" hidden="true"/> -+ <xul:button dlgtype="cancel" class="dialog-button" icon="cancel"/> -+ <xul:button dlgtype="help" class="dialog-button" hidden="true" icon="help"/> -+ <xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/> +#else + <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/> + <xul:spacer anonid="spacer" flex="1"/> @@ -2626,7 +2636,7 @@ diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build --- a/uriloader/exthandler/moz.build +++ b/uriloader/exthandler/moz.build -@@ -80,17 +80,19 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco +@@ -75,17 +75,19 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'coco else: # These files can't be built in unified mode because they force NSPR logging. SOURCES += [ @@ -2709,11 +2719,14 @@ new file mode 100644 --- /dev/null +++ b/uriloader/exthandler/unix/nsCommonRegistry.h -@@ -0,0 +1,23 @@ +@@ -0,0 +1,28 @@ +/* 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 + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + ++#ifndef nsCommonRegistry_h__ ++#define nsCommonRegistry_h__ ++ +#include "nsIURI.h" +#include "nsCOMPtr.h" + @@ -2733,6 +2746,8 @@ + + static already_AddRefed<nsMIMEInfoBase> GetFromType(const nsACString& aMIMEType); +}; ++ ++#endif diff --git a/uriloader/exthandler/unix/nsKDERegistry.cpp b/uriloader/exthandler/unix/nsKDERegistry.cpp new file mode 100644 --- /dev/null @@ -2830,11 +2845,14 @@ new file mode 100644 --- /dev/null +++ b/uriloader/exthandler/unix/nsKDERegistry.h -@@ -0,0 +1,29 @@ +@@ -0,0 +1,34 @@ +/* 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 + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ + ++#ifndef nsKDERegistry_h__ ++#define nsKDERegistry_h__ ++ +#include "nsIURI.h" +#include "nsCOMPtr.h" +#include "nsTArray.h" @@ -2860,6 +2878,8 @@ + static already_AddRefed<nsMIMEInfoBase> GetFromHelper(const nsTArray<nsCString>& command); + +}; ++ ++#endif //nsKDERegistry_h__ diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp --- a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp +++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp @@ -3584,7 +3604,7 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp --- a/xpcom/io/nsLocalFileUnix.cpp +++ b/xpcom/io/nsLocalFileUnix.cpp -@@ -43,16 +43,17 @@ +@@ -44,16 +44,17 @@ #include "nsIDirectoryEnumerator.h" #include "nsISimpleEnumerator.h" #include "private/pprio.h" @@ -3602,8 +3622,8 @@ #include "prmem.h" #include "plbase64.h" -@@ -1816,46 +1817,52 @@ nsLocalFile::SetPersistentDescriptor(con - return InitWithNativePath(aPersistentDescriptor); +@@ -1962,53 +1963,55 @@ nsLocalFile::SetPersistentDescriptor(con + return InitWithNativePath(aPersistentDescriptor); #endif } @@ -3611,66 +3631,73 @@ nsLocalFile::Reveal() { #ifdef MOZ_WIDGET_GTK -- nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID); -- nsCOMPtr<nsIGnomeVFSService> gnomevfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID); -- if (!giovfs && !gnomevfs) -- return NS_ERROR_FAILURE; +- nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID); +- nsCOMPtr<nsIGnomeVFSService> gnomevfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID); +- if (!giovfs && !gnomevfs) { +- return NS_ERROR_FAILURE; +- } - -+ nsAutoCString url; - bool isDirectory; - if (NS_FAILED(IsDirectory(&isDirectory))) - return NS_ERROR_FAILURE; - -+ nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID); - if (isDirectory) { -- if (giovfs) -- return giovfs->ShowURIForInput(mPath); -- else -- /* Fallback to GnomeVFS */ -- return gnomevfs->ShowURIForInput(mPath); -+ url = mPath; - } else if (giovfs && NS_SUCCEEDED(giovfs->OrgFreedesktopFileManager1ShowItems(mPath))) { - return NS_OK; - } else { - nsCOMPtr<nsIFile> parentDir; - nsAutoCString dirPath; - if (NS_FAILED(GetParent(getter_AddRefs(parentDir)))) - return NS_ERROR_FAILURE; - if (NS_FAILED(parentDir->GetNativePath(dirPath))) - return NS_ERROR_FAILURE; - -- if (giovfs) -- return giovfs->ShowURIForInput(dirPath); -- else -- return gnomevfs->ShowURIForInput(dirPath); -+ url = dirPath; ++ nsAutoCString url; + bool isDirectory; + if (NS_FAILED(IsDirectory(&isDirectory))) { + return NS_ERROR_FAILURE; + } + ++ nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID); + if (isDirectory) { +- if (giovfs) { +- return giovfs->ShowURIForInput(mPath); +- } else +- /* Fallback to GnomeVFS */ +- { +- return gnomevfs->ShowURIForInput(mPath); +- } ++ url = mPath; + } else if (giovfs && NS_SUCCEEDED(giovfs->OrgFreedesktopFileManager1ShowItems(mPath))) { + return NS_OK; + } else { + nsCOMPtr<nsIFile> parentDir; + nsAutoCString dirPath; + if (NS_FAILED(GetParent(getter_AddRefs(parentDir)))) { + return NS_ERROR_FAILURE; + } + if (NS_FAILED(parentDir->GetNativePath(dirPath))) { + return NS_ERROR_FAILURE; } + +- if (giovfs) { +- return giovfs->ShowURIForInput(dirPath); +- } else { +- return gnomevfs->ShowURIForInput(dirPath); +- } ++ url = dirPath; + } + -+ if(nsKDEUtils::kdeSupport()) { -+ nsTArray<nsCString> command; -+ command.AppendElement( NS_LITERAL_CSTRING("REVEAL") ); -+ command.AppendElement( mPath ); -+ return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE; -+ } ++ if(nsKDEUtils::kdeSupport()) { ++ nsTArray<nsCString> command; ++ command.AppendElement( NS_LITERAL_CSTRING("REVEAL") ); ++ command.AppendElement( mPath ); ++ return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE; ++ } + -+ nsCOMPtr<nsIGnomeVFSService> gnomevfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID); -+ if (!giovfs && !gnomevfs) -+ return NS_ERROR_FAILURE; ++ nsCOMPtr<nsIGnomeVFSService> gnomevfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID); ++ if (!giovfs && !gnomevfs) ++ return NS_ERROR_FAILURE; + -+ if (giovfs) -+ return giovfs->ShowURIForInput(url); -+ else -+ return gnomevfs->ShowURIForInput(url); ++ if (giovfs) ++ return giovfs->ShowURIForInput(url); ++ else ++ return gnomevfs->ShowURIForInput(url); #elif defined(MOZ_WIDGET_COCOA) - CFURLRef url; - if (NS_SUCCEEDED(GetCFURL(&url))) { - nsresult rv = CocoaFileUtils::RevealFileInFinder(url); - ::CFRelease(url); - return rv; - } - return NS_ERROR_FAILURE; -@@ -1863,16 +1870,23 @@ nsLocalFile::Reveal() - return NS_ERROR_FAILURE; + CFURLRef url; + if (NS_SUCCEEDED(GetCFURL(&url))) { + nsresult rv = CocoaFileUtils::RevealFileInFinder(url); + ::CFRelease(url); + return rv; + } + return NS_ERROR_FAILURE; +@@ -2016,16 +2019,22 @@ nsLocalFile::Reveal() + return NS_ERROR_FAILURE; #endif } @@ -3678,18 +3705,17 @@ nsLocalFile::Launch() { #ifdef MOZ_WIDGET_GTK -+ if( nsKDEUtils::kdeSupport()) { -+ nsTArray<nsCString> command; -+ command.AppendElement( NS_LITERAL_CSTRING("OPEN") ); -+ command.AppendElement( mPath ); -+ return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE; -+ } -+ - nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID); - nsCOMPtr<nsIGnomeVFSService> gnomevfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID); - if (giovfs) { - return giovfs->ShowURIForInput(mPath); - } else if (gnomevfs) { - /* GnomeVFS fallback */ - return gnomevfs->ShowURIForInput(mPath); - } ++ if( nsKDEUtils::kdeSupport()) { ++ nsTArray<nsCString> command; ++ command.AppendElement( NS_LITERAL_CSTRING("OPEN") ); ++ command.AppendElement( mPath ); ++ return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE; ++ } + nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID); + nsCOMPtr<nsIGnomeVFSService> gnomevfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID); + if (giovfs) { + return giovfs->ShowURIForInput(mPath); + } else if (gnomevfs) { + /* GnomeVFS fallback */ + return gnomevfs->ShowURIForInput(mPath); + } ++++++ mozilla-preferences.patch ++++++ --- /var/tmp/diff_new_pack.2mU4RI/_old 2014-09-24 13:09:33.000000000 +0200 +++ /var/tmp/diff_new_pack.2mU4RI/_new 2014-09-24 13:09:33.000000000 +0200 @@ -5,16 +5,16 @@ package unconditionally. # HG changeset patch -# Parent 5c086bb8e0fa4f1600aced485e6156b0cdcd1755 +# Parent 8c1bfc96b05ef1836aad6e9f2af323f63ed1b69c diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js --- a/modules/libpref/src/init/all.js +++ b/modules/libpref/src/init/all.js -@@ -1428,17 +1428,17 @@ pref("intl.charsetmenu.mailedit", - pref("intl.charsetmenu.browser.cache", ""); - pref("intl.charsetmenu.mailview.cache", ""); - pref("intl.charsetmenu.composer.cache", ""); - pref("intl.charsetmenu.browser.cache.size", 5); +@@ -1503,17 +1503,17 @@ pref("converter.html2txt.header_strategy + + pref("intl.accept_languages", "chrome://global/locale/intl.properties"); + pref("intl.menuitems.alwaysappendaccesskeys","chrome://global/locale/intl.properties"); + pref("intl.menuitems.insertseparatorbeforeaccesskeys","chrome://global/locale/intl.properties"); pref("intl.charset.detector", "chrome://global/locale/intl.properties"); pref("intl.charset.fallback.override", ""); pref("intl.charset.fallback.tld", true); ++++++ source-stamp.txt ++++++ --- /var/tmp/diff_new_pack.2mU4RI/_old 2014-09-24 13:09:33.000000000 +0200 +++ /var/tmp/diff_new_pack.2mU4RI/_new 2014-09-24 13:09:33.000000000 +0200 @@ -1,2 +1,2 @@ -REV=81747568d309 -REPO=http://hg.mozilla.org/releases/mozilla-esr31 +REV=9dcc4d60ede2 +REPO=http://hg.mozilla.org/releases/mozilla-release -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
