rpm/MozillaFirefox
SHA256
1
0
Fork 0
forked from pool/MozillaFirefox
Code Pull Requests Activity

- update to Firefox 32.0.2

Browse Source 
* 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)

- 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)

- update to Firefox 32.0 (bnc#894370)
  * MFSA 2014-67/CVE-2014-1553/CVE-2014-1554/CVE-2014-1562
- rebased patches
- requires NSS 3.16.4
- removed upstreamed patch
  * mozilla-aarch64-bmo-810631.patch

OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=396
This commit is contained in:
Wolfgang Rosenauer 2014-09-22 16:35:40 +00:00 committed by Git OBS Bridge
parent 5bd4ec3405
commit 6d0dbb410f
17 changed files with 227 additions and 100598 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
MozillaFirefox.changes
View File

@ -1,8 +1,29 @@
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Aug 29 16:39:43 UTC 2014 - wr@rosenauer.org Sat Sep 20 13:33:51 UTC 2014 - wr@rosenauer.org
- update to Firefox 31.1.0esr (bnc#894370) - update to Firefox 32.0.2
* MFSA 2014-67/CVE-2014-1553/CVE-2014-1562 * 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)
-------------------------------------------------------------------
Sat Sep 13 16:58:16 UTC 2014 - wr@rosenauer.org
- 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 - wr@rosenauer.org
- update to Firefox 32.0 (bnc#894370)
* MFSA 2014-67/CVE-2014-1553/CVE-2014-1554/CVE-2014-1562
Miscellaneous memory safety hazards Miscellaneous memory safety hazards
* MFSA 2014-68/CVE-2014-1563 (bmo#1018524) * MFSA 2014-68/CVE-2014-1563 (bmo#1018524)
Use-after-free during DOM interactions with SVG Use-after-free during DOM interactions with SVG
@ -12,10 +33,10 @@ Fri Aug 29 16:39:43 UTC 2014 - wr@rosenauer.org
Out-of-bounds read in Web Audio audio timeline Out-of-bounds read in Web Audio audio timeline
* MFSA 2014-72/CVE-2014-1567 (bmo#1037641) * MFSA 2014-72/CVE-2014-1567 (bmo#1037641)
Use-after-free setting text directionality Use-after-free setting text directionality
- changes to support compilation on 11.4 - rebased patches
* explicit xz BuildRequires - requires NSS 3.16.4
* mozilla-nullptr-gcc45.patch - removed upstreamed patch
* remove unresolved makeinfo BuildRequires * mozilla-aarch64-bmo-810631.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Aug 20 13:50:58 CEST 2014 - behlert@suse.de Wed Aug 20 13:50:58 CEST 2014 - behlert@suse.de

26
MozillaFirefox.spec
View File

@ -17,9 +17,9 @@
# #
%define major 31 %define major 32
%define mainver %major.1.0 %define mainver %major.0.2
%define update_channel esr31 %define update_channel release
%if %suse_version > 1210 %if %suse_version > 1210
%if %suse_version > 1310 %if %suse_version > 1310
@ -40,15 +40,12 @@ BuildRequires: libcurl-devel
BuildRequires: libgnomeui-devel BuildRequires: libgnomeui-devel
BuildRequires: libidl-devel BuildRequires: libidl-devel
BuildRequires: libnotify-devel BuildRequires: libnotify-devel
%if %suse_version > 1140
BuildRequires: makeinfo BuildRequires: makeinfo
%endif
BuildRequires: python-devel BuildRequires: python-devel
BuildRequires: startup-notification-devel BuildRequires: startup-notification-devel
BuildRequires: unzip BuildRequires: unzip
BuildRequires: update-desktop-files BuildRequires: update-desktop-files
BuildRequires: xorg-x11-libXt-devel BuildRequires: xorg-x11-libXt-devel
BuildRequires: xz
BuildRequires: yasm BuildRequires: yasm
BuildRequires: zip BuildRequires: zip
%if %suse_version > 1110 %if %suse_version > 1110
@ -58,7 +55,7 @@ BuildRequires: libproxy-devel
BuildRequires: wireless-tools BuildRequires: wireless-tools
%endif %endif
BuildRequires: mozilla-nspr-devel >= 4.10.6 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: nss-shared-helper-devel
BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libpulse)
%if %suse_version > 1210 %if %suse_version > 1210
@ -77,7 +74,7 @@ Recommends: gstreamer-0_10-plugins-ffmpeg
%endif %endif
Version: %{mainver} Version: %{mainver}
Release: 0 Release: 0
%define releasedate 2014082900 %define releasedate 2014091200
Provides: firefox = %{mainver} Provides: firefox = %{mainver}
Provides: firefox = %{version}-%{release} Provides: firefox = %{version}-%{release}
Provides: web_browser Provides: web_browser
@ -120,9 +117,6 @@ Patch11: mozilla-icu-strncat.patch
Patch12: mozilla-arm-disable-edsp.patch Patch12: mozilla-arm-disable-edsp.patch
Patch13: mozilla-ppc.patch Patch13: mozilla-ppc.patch
Patch14: mozilla-libproxy-compat.patch Patch14: mozilla-libproxy-compat.patch
Patch15: mozilla-nullptr-gcc45.patch
# Gecko/Toolkit AArch64 Porting
Patch30: mozilla-aarch64-bmo-810631.patch
# Firefox/browser # Firefox/browser
Patch101: firefox-kde.patch Patch101: firefox-kde.patch
@ -263,8 +257,6 @@ cd $RPM_BUILD_DIR/mozilla
%patch12 -p1 %patch12 -p1
%patch13 -p1 %patch13 -p1
%patch14 -p1 %patch14 -p1
%patch15 -p1
%patch30 -p1
# Firefox # Firefox
%patch101 -p1 %patch101 -p1
@ -317,6 +309,14 @@ ac_add_options --libdir=%{_libdir}
ac_add_options --sysconfdir=%{_sysconfdir} ac_add_options --sysconfdir=%{_sysconfdir}
ac_add_options --mandir=%{_mandir} ac_add_options --mandir=%{_mandir}
ac_add_options --includedir=%{_includedir} 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-nspr
ac_add_options --with-system-nss ac_add_options --with-system-nss
%if %{localize} %if %{localize}

4
compare-locales.tar.xz
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:328677ca3556b96d5ef845ebb60766e4c786b272baae7ef890a7bb86b0962fa7 oid sha256:4f2b695fb8fdc9ab44ec1187eb30726c0689b4fffbddafb49f2edcb706a6a0b3
size 28428 size 28432

8
create-tar.sh
View File

@ -1,9 +1,9 @@
#!/bin/bash #!/bin/bash
CHANNEL="esr31" CHANNEL="release"
BRANCH="releases/mozilla-$CHANNEL" BRANCH="releases/mozilla-$CHANNEL"
RELEASE_TAG="FIREFOX_31_1_0esr_RELEASE" RELEASE_TAG="FIREFOX_32_0_2_RELEASE"
VERSION="31.1.0" VERSION="32.0.2"
# mozilla # mozilla
if [ -d mozilla ]; then if [ -d mozilla ]; then
@ -47,7 +47,7 @@ for locale in $(awk '{ print $1; }' mozilla/browser/locales/shipped-locales); do
;; ;;
*) *)
echo "fetching $locale ..." 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 [ "$RELEASE_TAG" == "default" ] || hg -R l10n/$locale up -C -r $RELEASE_TAG
;; ;;
esac esac

3
firefox-31.1.0-source.tar.xz
View File

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

3
firefox-32.0.2-source.tar.xz Normal file
View File

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

18
firefox-branded-icons.patch
View File

@ -1,10 +1,10 @@
# HG changeset patch # HG changeset patch
# Parent 9745e5d5cdc7e91dbfc5582b49881668cb6725f7 # Parent 17ccae9100af86bc65f924b87545184af2f4ada9
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
@@ -76,16 +76,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d @@ -75,16 +75,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d
endif endif
ifdef MOZ_WIDGET_GTK ifdef MOZ_WIDGET_GTK
@ -54,7 +54,7 @@ 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
@@ -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}/install.rdf
@BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png @BINPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png
@BINPATH@/chrome/toolkit@JAREXT@ @BINPATH@/chrome/toolkit@JAREXT@
@ -70,9 +70,9 @@ diff --git a/browser/installer/package-manifest.in b/browser/installer/package-m
+@BINPATH@/browser/chrome/icons/default/default256.png +@BINPATH@/browser/chrome/icons/default/default256.png
#endif #endif
; shell icons ; [Webide Files]
#ifdef XP_UNIX #ifdef MOZ_DEVTOOLS_WEBIDE
#ifndef XP_MACOSX @BINPATH@/browser/chrome/webide@JAREXT@
; shell icons @BINPATH@/browser/chrome/webide.manifest
@BINPATH@/browser/icons/*.png @BINPATH@/browser/@PREF_DIR@/webide-prefs.js
#ifdef MOZ_UPDATER #endif

43
firefox-kde.patch
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,1197 @@ @@ -0,0 +1,1206 @@
+#filter substitution +#filter substitution
+<?xml version="1.0"?> +<?xml version="1.0"?>
+# -*- Mode: HTML -*- +# -*- Mode: HTML -*-
@ -106,6 +106,12 @@ new file mode 100644
+ accesskey="&moveToNewWindow.accesskey;" + accesskey="&moveToNewWindow.accesskey;"
+ tbattr="tabbrowser-multiple" + tbattr="tabbrowser-multiple"
+ oncommand="gBrowser.replaceTabWithWindow(TabContextMenu.contextTab);"/> + 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/> + <menuseparator/>
+ <menuitem id="context_reloadAllTabs" label="&reloadAllTabs.label;" accesskey="&reloadAllTabs.accesskey;" + <menuitem id="context_reloadAllTabs" label="&reloadAllTabs.label;" accesskey="&reloadAllTabs.accesskey;"
+ tbattr="tabbrowser-multiple-visible" + tbattr="tabbrowser-multiple-visible"
@ -245,7 +251,7 @@ new file mode 100644
+ onpopuphidden="SocialShare.onHidden()" + onpopuphidden="SocialShare.onHidden()"
+ hidden="true"> + hidden="true">
+ <vbox class="social-share-toolbar"> + <vbox class="social-share-toolbar">
+ <vbox id="social-share-provider-buttons" flex="1"/> + <arrowscrollbox id="social-share-provider-buttons" orient="vertical" flex="1"/>
+ </vbox> + </vbox>
+ </panel> + </panel>
+ +
@ -311,7 +317,7 @@ new file mode 100644
+ oncommand="BrowserFullScreen();"/> + oncommand="BrowserFullScreen();"/>
+ </menupopup> + </menupopup>
+ +
+ <menupopup id="contentAreaContextMenu" pagemenu="start" + <menupopup id="contentAreaContextMenu" pagemenu="#page-menu-separator"
+ onpopupshowing="if (event.target != this) + onpopupshowing="if (event.target != this)
+ return true; + return true;
+ gContextMenu = new nsContextMenu(this, event.shiftKey); + gContextMenu = new nsContextMenu(this, event.shiftKey);
@ -578,7 +584,7 @@ new file mode 100644
+ label="&tabCmd.label;" + label="&tabCmd.label;"
+ command="cmd_newNavigatorTab" + command="cmd_newNavigatorTab"
+ onclick="checkForMiddleClick(this, event);" + onclick="checkForMiddleClick(this, event);"
+ tooltiptext="&newTabButton.tooltip;" + tooltip="dynamic-shortcut-tooltip"
+ ondrop="newTabButtonObserver.onDrop(event)" + ondrop="newTabButtonObserver.onDrop(event)"
+ ondragover="newTabButtonObserver.onDragOver(event)" + ondragover="newTabButtonObserver.onDragOver(event)"
+ ondragenter="newTabButtonObserver.onDragOver(event)" + ondragenter="newTabButtonObserver.onDragOver(event)"
@ -874,6 +880,7 @@ new file mode 100644
+ during the customization of the toolbar, in the palette, and before + during the customization of the toolbar, in the palette, and before
+ the Downloads Indicator overlay is loaded. --> + the Downloads Indicator overlay is loaded. -->
+ <toolbarbutton id="downloads-button" class="toolbarbutton-1 chromeclass-toolbar-additional" + <toolbarbutton id="downloads-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
+ key="key_openDownloads"
+ oncommand="DownloadsIndicatorView.onCommand(event);" + oncommand="DownloadsIndicatorView.onCommand(event);"
+ ondrop="DownloadsIndicatorView.onDrop(event);" + ondrop="DownloadsIndicatorView.onDrop(event);"
+ ondragover="DownloadsIndicatorView.onDragOver(event);" + ondragover="DownloadsIndicatorView.onDragOver(event);"
@ -881,7 +888,7 @@ new file mode 100644
+ label="&downloads.label;" + label="&downloads.label;"
+ removable="true" + removable="true"
+ cui-areatype="toolbar" + cui-areatype="toolbar"
+ tooltiptext="&downloads.tooltip;"/> + tooltip="dynamic-shortcut-tooltip"/>
+ +
+ <toolbarbutton id="home-button" class="toolbarbutton-1 chromeclass-toolbar-additional" + <toolbarbutton id="home-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
+ persist="class" removable="true" + persist="class" removable="true"
@ -890,6 +897,7 @@ new file mode 100644
+ ondragenter="homeButtonObserver.onDragOver(event)" + ondragenter="homeButtonObserver.onDragOver(event)"
+ ondrop="homeButtonObserver.onDrop(event)" + ondrop="homeButtonObserver.onDrop(event)"
+ ondragexit="homeButtonObserver.onDragExit(event)" + ondragexit="homeButtonObserver.onDragExit(event)"
+ key="goHome"
+ onclick="BrowserGoHome(event);" + onclick="BrowserGoHome(event);"
+ cui-areatype="toolbar" + cui-areatype="toolbar"
+ aboutHomeOverrideTooltip="&abouthome.pageTitle;"/> + aboutHomeOverrideTooltip="&abouthome.pageTitle;"/>
@ -897,11 +905,11 @@ new file mode 100644
+ +
+ <toolbarbutton id="social-share-button" + <toolbarbutton id="social-share-button"
+ class="toolbarbutton-1 chromeclass-toolbar-additional" + class="toolbarbutton-1 chromeclass-toolbar-additional"
+ hidden="true"
+ overflows="false"
+ label="&sharePageCmd.label;" + label="&sharePageCmd.label;"
+ tooltiptext="&sharePageCmd.label;" + tooltiptext="&sharePageCmd.label;"
+ cui-areatype="toolbar" + cui-areatype="toolbar"
+ removable="true"
+ hidden="true"
+ command="Social:SharePage"/> + command="Social:SharePage"/>
+ </hbox> + </hbox>
+ +
@ -1011,9 +1019,11 @@ new file mode 100644
+ +
+ <toolbarbutton id="print-button" class="toolbarbutton-1 chromeclass-toolbar-additional" + <toolbarbutton id="print-button" class="toolbarbutton-1 chromeclass-toolbar-additional"
+#ifdef XP_MACOSX +#ifdef XP_MACOSX
+ command="cmd_print" tooltip="dynamic-shortcut-tooltip" + command="cmd_print"
+ tooltip="dynamic-shortcut-tooltip"
+#else +#else
+ command="cmd_printPreview" tooltiptext="&printButton.tooltip;" + command="cmd_printPreview"
+ tooltiptext="&printButton.tooltip;"
+#endif +#endif
+ label="&printButton.label;"/> + label="&printButton.label;"/>
+ +
@ -1070,8 +1080,7 @@ new file mode 100644
+ tabcontainer="tabbrowser-tabs" + tabcontainer="tabbrowser-tabs"
+ contentcontextmenu="contentAreaContextMenu" + contentcontextmenu="contentAreaContextMenu"
+ autocompletepopup="PopupAutoComplete" + autocompletepopup="PopupAutoComplete"
+ selectpopup="ContentSelectDropdown" + selectpopup="ContentSelectDropdown"/>
+ onclick="contentAreaClick(event, false);"/>
+ <chatbar id="pinnedchats" layer="true" mousethrough="always" hidden="true"/> + <chatbar id="pinnedchats" layer="true" mousethrough="always" hidden="true"/>
+ </vbox> + </vbox>
+ <splitter id="social-sidebar-splitter" + <splitter id="social-sidebar-splitter"
@ -1203,7 +1212,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
@@ -65,16 +65,18 @@ browser.jar: @@ -70,16 +70,18 @@ browser.jar:
content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png) content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png)
content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png) content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png)
content/browser/aboutSocialError.xhtml (content/aboutSocialError.xhtml) content/browser/aboutSocialError.xhtml (content/aboutSocialError.xhtml)
@ -1217,11 +1226,11 @@ diff --git a/browser/base/jar.mn b/browser/base/jar.mn
* content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml) * content/browser/browser-tabPreviews.xml (content/browser-tabPreviews.xml)
* content/browser/chatWindow.xul (content/chatWindow.xul) * content/browser/chatWindow.xul (content/chatWindow.xul)
content/browser/content.js (content/content.js) 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.xul (content/newtab/newTab.xul)
* content/browser/newtab/newTab.js (content/newtab/newTab.js) * 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 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
@ -1308,7 +1317,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.
@@ -884,14 +890,25 @@ var gAdvancedPane = { @@ -875,14 +881,25 @@ var gAdvancedPane = {
* Set browser as the operating system default browser. * Set browser as the operating system default browser.
*/ */
setDefaultBrowser: function() setDefaultBrowser: function()
@ -1790,7 +1799,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
@@ -643,19 +643,21 @@ @@ -666,19 +666,21 @@
@BINPATH@/defaults/autoconfig/prefcalls.js @BINPATH@/defaults/autoconfig/prefcalls.js
@BINPATH@/browser/defaults/profile/prefs.js @BINPATH@/browser/defaults/profile/prefs.js

4
firefox-multilocale-chrome.patch
View File

@ -1,5 +1,5 @@
# HG changeset patch # HG changeset patch
# Parent d5435466863cb1f52114a930824f5976ce53c559 # Parent 9e20873aca55242f18dd1b93e863eded6d1d08bd
# 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
@ -128,7 +128,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
@@ -130,14 +130,15 @@ @@ -133,14 +133,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/

6
firefox-no-default-ualocale.patch
View File

@ -1,14 +1,14 @@
# HG changeset patch # HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org> # User Wolfgang Rosenauer <wr@rosenauer.org>
# Parent 5ffbb37bbfc52f549620ff67ce45f218a825cf4e # Parent b7bc98abc45462dec0f6603f3c9a88e772172f29
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
@@ -253,17 +253,17 @@ pref("browser.uitour.pinnedTabUrl", "htt @@ -254,17 +254,17 @@ pref("browser.uitour.url", "https://www.
pref("browser.uitour.url", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/tour/");
pref("browser.uitour.whitelist.add.260", "www.mozilla.org,support.mozilla.org"); 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.shown", false);
pref("browser.customizemode.tip0.learnMoreUrl", "https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/customize"); pref("browser.customizemode.tip0.learnMoreUrl", "https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/customize");

3
l10n-31.1.0.tar.xz
View File

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

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

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

100372
mozilla-aarch64-bmo-810631.patch
View File

File diff suppressed because it is too large Load Diff

108
mozilla-kde.patch
View File

@ -85,7 +85,7 @@ diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferenc
path->GetNativeLeafName(leaf); path->GetNativeLeafName(leaf);
// Do we care if a file provided by this process fails to load? // 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); ReadExtensionPrefs(path);
else else
- pref_LoadPrefsInDir(path, nullptr, 0); - pref_LoadPrefsInDir(path, nullptr, 0);
@ -217,7 +217,7 @@ diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/compon
#include "AndroidBridge.h" #include "AndroidBridge.h"
using namespace mozilla::widget::android; using namespace mozilla::widget::android;
#endif #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)); nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID));
// Master pref to control this function. // Master pref to control this function.
@ -243,7 +243,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;
@@ -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 // 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.
alerts->ShowAlertNotification( alerts->ShowAlertNotification(
@ -268,7 +268,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
@@ -58,29 +58,33 @@ toolkit.jar: @@ -55,29 +55,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)
@ -290,7 +290,7 @@ diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
content/global/bindings/menulist.xml (widgets/menulist.xml) content/global/bindings/menulist.xml (widgets/menulist.xml)
content/global/bindings/notification.xml (widgets/notification.xml) content/global/bindings/notification.xml (widgets/notification.xml)
content/global/bindings/numberbox.xml (widgets/numberbox.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.xml (widgets/preferences.xml)
+*+ content/global/bindings/preferences-kde.xml (widgets/preferences-kde.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 +% override chrome://global/content/bindings/preferences.xml chrome://global/content/bindings/preferences-kde.xml desktop=kde
@ -760,7 +760,7 @@ diff --git a/toolkit/content/widgets/preferences-kde.xml b/toolkit/content/widge
new file mode 100644 new file mode 100644
--- /dev/null --- /dev/null
+++ b/toolkit/content/widgets/preferences-kde.xml +++ b/toolkit/content/widgets/preferences-kde.xml
@@ -0,0 +1,1333 @@ @@ -0,0 +1,1343 @@
+<?xml version="1.0"?> +<?xml version="1.0"?>
+ +
+<!DOCTYPE bindings [ +<!DOCTYPE bindings [
@ -793,6 +793,25 @@ new file mode 100644
+ +
+ <binding id="preferences"> + <binding id="preferences">
+ <implementation implements="nsIObserver"> + <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"> + <method name="observe">
+ <parameter name="aSubject"/> + <parameter name="aSubject"/>
+ <parameter name="aTopic"/> + <parameter name="aTopic"/>
@ -864,6 +883,8 @@ new file mode 100644
+ <implementation> + <implementation>
+ <constructor> + <constructor>
+ <![CDATA[ + <![CDATA[
+ this._constructed = true;
+
+ // if the element has been inserted without the name attribute set, + // if the element has been inserted without the name attribute set,
+ // we have nothing to do here + // we have nothing to do here
+ if (!this.name) + if (!this.name)
@ -889,18 +910,20 @@ new file mode 100644
+ preference = parentPrefs[l]; + 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 + else
+ this._setValue(this.valueFromPreferences, false); + this._value = this.valueFromPreferences;
+ this.preferences._constructAfterChildren();
+ ]]> + ]]>
+ </constructor> + </constructor>
+ <destructor> + <destructor>
+ this.preferences.rootBranchInternal + this.preferences.rootBranchInternal
+ .removeObserver(this.name, this.preferences); + .removeObserver(this.name, this.preferences);
+ </destructor> + </destructor>
+ + <field name="_constructed">false</field>
+ <property name="instantApply"> + <property name="instantApply">
+ <getter> + <getter>
+ return this.getAttribute("instantApply") == "true" || this.preferences.instantApply; + return this.getAttribute("instantApply") == "true" || this.preferences.instantApply;
@ -932,24 +955,19 @@ new file mode 100644
+ <field name="_value">null</field> + <field name="_value">null</field>
+ <method name="_setValue"> + <method name="_setValue">
+ <parameter name="aValue"/> + <parameter name="aValue"/>
+ <parameter name="aUpdate"/>
+ <body> + <body>
+ <![CDATA[ + <![CDATA[
+ if (aUpdate && this.value !== aValue) { + if (this.value !== aValue) {
+ this._value = aValue; + this._value = aValue;
+ if (this.instantApply) + if (this.instantApply)
+ this.valueFromPreferences = aValue; + this.valueFromPreferences = aValue;
+ this.preferences.fireChangedEvent(this); + this.preferences.fireChangedEvent(this);
+ } + }
+ else if (!aUpdate) {
+ this._value = aValue;
+ this.updateElements();
+ }
+ return aValue; + return aValue;
+ ]]> + ]]>
+ </body> + </body>
+ </method> + </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"> + <property name="locked">
+ <getter> + <getter>
@ -1336,7 +1354,7 @@ new file mode 100644
+ </xul:deck> + </xul:deck>
+ </xul:hbox> + </xul:hbox>
+ <xul:hbox anonid="dlg-buttons" class="prefWindow-dlgbuttons" pack="end"> + <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="disclosure" class="dialog-button" hidden="true"/>
+ <xul:button dlgtype="help" class="dialog-button" hidden="true" icon="help"/> + <xul:button dlgtype="help" class="dialog-button" hidden="true" icon="help"/>
+ <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/> + <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/>
@ -1344,14 +1362,6 @@ new file mode 100644
+ <xul:spacer anonid="spacer" flex="1"/> + <xul:spacer anonid="spacer" flex="1"/>
+ <xul:button dlgtype="cancel" class="dialog-button" icon="cancel"/> + <xul:button dlgtype="cancel" class="dialog-button" icon="cancel"/>
+ <xul:button dlgtype="accept" class="dialog-button" icon="accept"/> + <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 +#else
+ <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/> + <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/>
+ <xul:spacer anonid="spacer" flex="1"/> + <xul:spacer anonid="spacer" flex="1"/>
@ -2626,7 +2636,7 @@ diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in
diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build diff --git a/uriloader/exthandler/moz.build b/uriloader/exthandler/moz.build
--- a/uriloader/exthandler/moz.build --- a/uriloader/exthandler/moz.build
+++ b/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: else:
# These files can't be built in unified mode because they force NSPR logging. # These files can't be built in unified mode because they force NSPR logging.
SOURCES += [ SOURCES += [
@ -2709,11 +2719,14 @@ diff --git a/uriloader/exthandler/unix/nsCommonRegistry.h b/uriloader/exthandler
new file mode 100644 new file mode 100644
--- /dev/null --- /dev/null
+++ b/uriloader/exthandler/unix/nsCommonRegistry.h +++ 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 +/* 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 + * 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/. */ + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+ +
+#ifndef nsCommonRegistry_h__
+#define nsCommonRegistry_h__
+
+#include "nsIURI.h" +#include "nsIURI.h"
+#include "nsCOMPtr.h" +#include "nsCOMPtr.h"
+ +
@ -2733,6 +2746,8 @@ new file mode 100644
+ +
+ static already_AddRefed<nsMIMEInfoBase> GetFromType(const nsACString& aMIMEType); + static already_AddRefed<nsMIMEInfoBase> GetFromType(const nsACString& aMIMEType);
+}; +};
+
+#endif
diff --git a/uriloader/exthandler/unix/nsKDERegistry.cpp b/uriloader/exthandler/unix/nsKDERegistry.cpp diff --git a/uriloader/exthandler/unix/nsKDERegistry.cpp b/uriloader/exthandler/unix/nsKDERegistry.cpp
new file mode 100644 new file mode 100644
--- /dev/null --- /dev/null
@ -2830,11 +2845,14 @@ diff --git a/uriloader/exthandler/unix/nsKDERegistry.h b/uriloader/exthandler/un
new file mode 100644 new file mode 100644
--- /dev/null --- /dev/null
+++ b/uriloader/exthandler/unix/nsKDERegistry.h +++ 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 +/* 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 + * 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/. */ + * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
+ +
+#ifndef nsKDERegistry_h__
+#define nsKDERegistry_h__
+
+#include "nsIURI.h" +#include "nsIURI.h"
+#include "nsCOMPtr.h" +#include "nsCOMPtr.h"
+#include "nsTArray.h" +#include "nsTArray.h"
@ -2860,6 +2878,8 @@ new file mode 100644
+ static already_AddRefed<nsMIMEInfoBase> GetFromHelper(const nsTArray<nsCString>& command); + 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 diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
--- a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp --- a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
+++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp +++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp
@ -3584,7 +3604,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
--- a/xpcom/io/nsLocalFileUnix.cpp --- a/xpcom/io/nsLocalFileUnix.cpp
+++ b/xpcom/io/nsLocalFileUnix.cpp +++ b/xpcom/io/nsLocalFileUnix.cpp
@@ -43,16 +43,17 @@ @@ -44,16 +44,17 @@
#include "nsIDirectoryEnumerator.h" #include "nsIDirectoryEnumerator.h"
#include "nsISimpleEnumerator.h" #include "nsISimpleEnumerator.h"
#include "private/pprio.h" #include "private/pprio.h"
@ -3602,7 +3622,7 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
#include "prmem.h" #include "prmem.h"
#include "plbase64.h" #include "plbase64.h"
@@ -1816,46 +1817,52 @@ nsLocalFile::SetPersistentDescriptor(con @@ -1962,53 +1963,55 @@ nsLocalFile::SetPersistentDescriptor(con
return InitWithNativePath(aPersistentDescriptor); return InitWithNativePath(aPersistentDescriptor);
#endif #endif
} }
@ -3613,36 +3633,43 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
#ifdef MOZ_WIDGET_GTK #ifdef MOZ_WIDGET_GTK
- nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID); - nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
- nsCOMPtr<nsIGnomeVFSService> gnomevfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID); - nsCOMPtr<nsIGnomeVFSService> gnomevfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID);
- if (!giovfs && !gnomevfs) - if (!giovfs && !gnomevfs) {
- return NS_ERROR_FAILURE; - return NS_ERROR_FAILURE;
- }
- -
+ nsAutoCString url; + nsAutoCString url;
bool isDirectory; bool isDirectory;
if (NS_FAILED(IsDirectory(&isDirectory))) if (NS_FAILED(IsDirectory(&isDirectory))) {
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
}
+ nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID); + nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
if (isDirectory) { if (isDirectory) {
- if (giovfs) - if (giovfs) {
- return giovfs->ShowURIForInput(mPath); - return giovfs->ShowURIForInput(mPath);
- else - } else
- /* Fallback to GnomeVFS */ - /* Fallback to GnomeVFS */
- {
- return gnomevfs->ShowURIForInput(mPath); - return gnomevfs->ShowURIForInput(mPath);
- }
+ url = mPath; + url = mPath;
} else if (giovfs && NS_SUCCEEDED(giovfs->OrgFreedesktopFileManager1ShowItems(mPath))) { } else if (giovfs && NS_SUCCEEDED(giovfs->OrgFreedesktopFileManager1ShowItems(mPath))) {
return NS_OK; return NS_OK;
} else { } else {
nsCOMPtr<nsIFile> parentDir; nsCOMPtr<nsIFile> parentDir;
nsAutoCString dirPath; nsAutoCString dirPath;
if (NS_FAILED(GetParent(getter_AddRefs(parentDir)))) if (NS_FAILED(GetParent(getter_AddRefs(parentDir)))) {
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
if (NS_FAILED(parentDir->GetNativePath(dirPath))) }
if (NS_FAILED(parentDir->GetNativePath(dirPath))) {
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
}
- if (giovfs) - if (giovfs) {
- return giovfs->ShowURIForInput(dirPath); - return giovfs->ShowURIForInput(dirPath);
- else - } else {
- return gnomevfs->ShowURIForInput(dirPath); - return gnomevfs->ShowURIForInput(dirPath);
- }
+ url = dirPath; + url = dirPath;
} }
+ +
@ -3669,7 +3696,7 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
return rv; return rv;
} }
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
@@ -1863,16 +1870,23 @@ nsLocalFile::Reveal() @@ -2016,16 +2019,22 @@ nsLocalFile::Reveal()
return NS_ERROR_FAILURE; return NS_ERROR_FAILURE;
#endif #endif
} }
@ -3684,7 +3711,6 @@ diff --git a/xpcom/io/nsLocalFileUnix.cpp b/xpcom/io/nsLocalFileUnix.cpp
+ command.AppendElement( mPath ); + command.AppendElement( mPath );
+ return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE; + return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE;
+ } + }
+
nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID); nsCOMPtr<nsIGIOService> giovfs = do_GetService(NS_GIOSERVICE_CONTRACTID);
nsCOMPtr<nsIGnomeVFSService> gnomevfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID); nsCOMPtr<nsIGnomeVFSService> gnomevfs = do_GetService(NS_GNOMEVFSSERVICE_CONTRACTID);
if (giovfs) { if (giovfs) {

55
mozilla-nullptr-gcc45.patch
View File

@ -1,55 +0,0 @@
# HG changeset patch
# Parent c7f2d830f66744f9da21b93f80017d28b5fba9a0
# User Wolfgang Rosenauer <wr@rosenauer.org>
Bug 1044581 - compilation error: bit_reader.cc:12:3: error: 'nullptr' was not declared in this scope
diff --git a/content/media/fmp4/demuxer/bit_reader.cc b/content/media/fmp4/demuxer/bit_reader.cc
--- a/content/media/fmp4/demuxer/bit_reader.cc
+++ b/content/media/fmp4/demuxer/bit_reader.cc
@@ -1,12 +1,13 @@
// Copyright (c) 2012 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "nullptr.h"
#include "mp4_demuxer/bit_reader.h"
#include <algorithm>
namespace mp4_demuxer {
BitReader::BitReader(const uint8_t* data, off_t size)
: data_(data), bytes_left_(size), num_remaining_bits_in_curr_byte_(0) {
DCHECK(data_ != nullptr && bytes_left_ > 0);
diff --git a/content/media/fmp4/moz.build b/content/media/fmp4/moz.build
--- a/content/media/fmp4/moz.build
+++ b/content/media/fmp4/moz.build
@@ -2,16 +2,17 @@
# vim: set filetype=python:
# 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/.
EXPORTS += [
'MP4Decoder.h',
'MP4Reader.h',
+ 'nullptr.h',
'PlatformDecoderModule.h',
]
EXPORTS.mp4_demuxer += [
'demuxer/aac.h',
'demuxer/audio_decoder_config.h',
'demuxer/avc.h',
'demuxer/basictypes.h',
diff --git a/content/media/fmp4/nullptr.h b/content/media/fmp4/nullptr.h
new file mode 100644
--- /dev/null
+++ b/content/media/fmp4/nullptr.h
@@ -0,0 +1,7 @@
+
+// GCC does not understand nullptr until 4.6
+#if defined(__GNUC__) && !defined(__clang__)
+#if __GNUC__ * 100 + __GNUC_MINOR__ < 406
+#define nullptr __null
+#endif
+#endif

12
mozilla-preferences.patch
View File

@ -5,16 +5,16 @@ confusion and therefore is currently the only setting we switch in the unbranded
package unconditionally. package unconditionally.
# HG changeset patch # HG changeset patch
# Parent 5c086bb8e0fa4f1600aced485e6156b0cdcd1755 # Parent 8c1bfc96b05ef1836aad6e9f2af323f63ed1b69c
diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
--- a/modules/libpref/src/init/all.js --- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js +++ b/modules/libpref/src/init/all.js
@@ -1428,17 +1428,17 @@ pref("intl.charsetmenu.mailedit", @@ -1503,17 +1503,17 @@ pref("converter.html2txt.header_strategy
pref("intl.charsetmenu.browser.cache", "");
pref("intl.charsetmenu.mailview.cache", ""); pref("intl.accept_languages", "chrome://global/locale/intl.properties");
pref("intl.charsetmenu.composer.cache", ""); pref("intl.menuitems.alwaysappendaccesskeys","chrome://global/locale/intl.properties");
pref("intl.charsetmenu.browser.cache.size", 5); pref("intl.menuitems.insertseparatorbeforeaccesskeys","chrome://global/locale/intl.properties");
pref("intl.charset.detector", "chrome://global/locale/intl.properties"); pref("intl.charset.detector", "chrome://global/locale/intl.properties");
pref("intl.charset.fallback.override", ""); pref("intl.charset.fallback.override", "");
pref("intl.charset.fallback.tld", true); pref("intl.charset.fallback.tld", true);

4
source-stamp.txt
View File

@ -1,2 +1,2 @@
REV=81747568d309 REV=9dcc4d60ede2
REPO=http://hg.mozilla.org/releases/mozilla-esr31 REPO=http://hg.mozilla.org/releases/mozilla-release