forked from pool/MozillaFirefox
Accepting request 588116 from mozilla:Factory
yet another small tweak to have really all fixes in place also for ARM (libtremor) which was left out from the upstream Firefox tag (and only applied to the Fennec one) - update to Firefox 59.0.1 (bsc#1085671) MFSA 2018-08 * CVE-2018-5146 (bmo#1446062) Vorbis audio processing out of bounds write * CVE-2018-5147 (bmo#1446365) Out of bounds memory write in libtremor (mozilla-bmo1446062.patch) - Added patch: * mozilla-bmo1005535.patch: Enable skia_gpu on big endian platforms. - update to Firefox 59.0 * Performance enhancements * Drag-and-drop to rearrange Top Sites on the Firefox Home page * added features for Firefox Screenshots * Enhanced WebExtensions API * Improved RTC capabilities MFSA 2018-06 (bsc#1085130) * CVE-2018-5127 (bmo#1430557) Buffer overflow manipulating SVG animatedPathSegList * CVE-2018-5128 (bmo#1431336) Use-after-free manipulating editor selection ranges * CVE-2018-5129 (bmo#1428947) Out-of-bounds write with malformed IPC messages * CVE-2018-5130 (bmo#1433005) Mismatched RTP payload type can trigger memory corruption * CVE-2018-5131 (bmo#1440775) Fetch API improperly returns cached copies of no-store/no-cache resources * CVE-2018-5132 (bmo#1408194) OBS-URL: https://build.opensuse.org/request/show/588116 OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/MozillaFirefox?expand=0&rev=267
This commit is contained in:
commit
d01bf65cba
@ -1,3 +1,77 @@
|
||||
-------------------------------------------------------------------
|
||||
Fri Mar 16 06:40:11 UTC 2018 - wr@rosenauer.org
|
||||
|
||||
- update to Firefox 59.0.1 (bsc#1085671)
|
||||
MFSA 2018-08
|
||||
* CVE-2018-5146 (bmo#1446062)
|
||||
Vorbis audio processing out of bounds write
|
||||
* CVE-2018-5147 (bmo#1446365)
|
||||
Out of bounds memory write in libtremor
|
||||
(mozilla-bmo1446062.patch)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Wed Mar 14 19:27:07 UTC 2018 - cgrobertson@suse.com
|
||||
|
||||
- Added patch:
|
||||
* mozilla-bmo1005535.patch:
|
||||
Enable skia_gpu on big endian platforms.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sun Mar 11 22:12:12 UTC 2018 - wr@rosenauer.org
|
||||
|
||||
- update to Firefox 59.0
|
||||
* Performance enhancements
|
||||
* Drag-and-drop to rearrange Top Sites on the Firefox Home page
|
||||
* added features for Firefox Screenshots
|
||||
* Enhanced WebExtensions API
|
||||
* Improved RTC capabilities
|
||||
MFSA 2018-06 (bsc#1085130)
|
||||
* CVE-2018-5127 (bmo#1430557)
|
||||
Buffer overflow manipulating SVG animatedPathSegList
|
||||
* CVE-2018-5128 (bmo#1431336)
|
||||
Use-after-free manipulating editor selection ranges
|
||||
* CVE-2018-5129 (bmo#1428947)
|
||||
Out-of-bounds write with malformed IPC messages
|
||||
* CVE-2018-5130 (bmo#1433005)
|
||||
Mismatched RTP payload type can trigger memory corruption
|
||||
* CVE-2018-5131 (bmo#1440775)
|
||||
Fetch API improperly returns cached copies of no-store/no-cache resources
|
||||
* CVE-2018-5132 (bmo#1408194)
|
||||
WebExtension Find API can search privileged pages
|
||||
* CVE-2018-5133 (bmo#1430511, bmo#1430974)
|
||||
Value of the app.support.baseURL preference is not properly sanitized
|
||||
* CVE-2018-5134 (bmo#1429379)
|
||||
WebExtensions may use view-source: URLs to bypass content restrictions
|
||||
* CVE-2018-5135 (bmo#1431371)
|
||||
WebExtension browserAction can inject scripts into unintended contexts
|
||||
* CVE-2018-5136 (bmo#1419166)
|
||||
Same-origin policy violation with data: URL shared workers
|
||||
* CVE-2018-5137 (bmo#1432870)
|
||||
Script content can access legacy extension non-contentaccessible resources
|
||||
* CVE-2018-5138 (bmo#1432624) (Android only)
|
||||
Android Custom Tab address spoofing through long domain names
|
||||
* CVE-2018-5140 (bmo#1424261)
|
||||
Moz-icon images accessible to web content through moz-icon: protocol
|
||||
* CVE-2018-5141 (bmo#1429093)
|
||||
DOS attack through notifications Push API
|
||||
* CVE-2018-5142 (bmo#1366357)
|
||||
Media Capture and Streams API permissions display incorrect origin
|
||||
with data: and blob: URLs
|
||||
* CVE-2018-5143 (bmo#1422643)
|
||||
Self-XSS pasting javascript: URL with embedded tab into addressbar
|
||||
* CVE-2018-5126
|
||||
Memory safety bugs fixed in Firefox 59
|
||||
* CVE-2018-5125
|
||||
Memory safety bugs fixed in Firefox 59 and Firefox ESR 52.7
|
||||
- requires NSPR 4.18 and NSS 3.35
|
||||
- requires rust >= 1.22.1
|
||||
- removed obsolete patches:
|
||||
mozilla-alsa-sandbox.patch
|
||||
mozilla-enable-csd.patch
|
||||
firefox-no-default-ualocale.patch
|
||||
- removed l10n_changesets.txt since same information is now in
|
||||
Firefox source tree (updated create-tar.sh now requires jq)
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Feb 9 13:37:46 UTC 2018 - astieger@suse.com
|
||||
|
||||
@ -25,7 +99,7 @@ Mon Jan 29 22:32:21 UTC 2018 - wr@rosenauer.org
|
||||
|
||||
- update to Firefox 58.0.1
|
||||
MFSA 2018-05
|
||||
* Arbitrary code execution through unsanitized browser UI (bmo#1432966)
|
||||
* Arbitrary code execution through unsanitized browser UI (bmo#1432966)
|
||||
- use correct language packs
|
||||
- readd mozilla-enable-csd.patch as it only lands for FF59 upstream
|
||||
- allow larger number of nested elements (mozilla-bmo256180.patch)
|
||||
|
@ -18,11 +18,11 @@
|
||||
|
||||
|
||||
# changed with every update
|
||||
%define major 58
|
||||
%define mainver %major.0.2
|
||||
%define major 59
|
||||
%define mainver %major.0.1
|
||||
%define update_channel release
|
||||
%define branding 1
|
||||
%define releasedate 20180207000000
|
||||
%define releasedate 20180315233128
|
||||
|
||||
# PIE, full relro (x86_64 for now)
|
||||
%define build_hardened 1
|
||||
@ -70,11 +70,11 @@ BuildRequires: libiw-devel
|
||||
BuildRequires: libnotify-devel
|
||||
BuildRequires: libproxy-devel
|
||||
BuildRequires: makeinfo
|
||||
BuildRequires: mozilla-nspr-devel >= 4.17
|
||||
BuildRequires: mozilla-nss-devel >= 3.34.1
|
||||
BuildRequires: mozilla-nspr-devel >= 4.18
|
||||
BuildRequires: mozilla-nss-devel >= 3.35
|
||||
BuildRequires: python-devel
|
||||
BuildRequires: python2-xml
|
||||
BuildRequires: rust >= 1.21
|
||||
BuildRequires: rust >= 1.22.1
|
||||
BuildRequires: rust-std
|
||||
BuildRequires: startup-notification-devel
|
||||
BuildRequires: unzip
|
||||
@ -136,7 +136,6 @@ Source13: spellcheck.js
|
||||
Source14: create-tar.sh
|
||||
Source15: firefox-appdata.xml
|
||||
Source16: MozillaFirefox.changes
|
||||
Source17: l10n_changesets.txt
|
||||
# Set up API keys, see http://www.chromium.org/developers/how-tos/api-keys
|
||||
# Note: these are for the openSUSE Firefox builds ONLY. For your own distribution,
|
||||
# please get your own set of keys.
|
||||
@ -150,13 +149,12 @@ Patch4: mozilla-openaes-decl.patch
|
||||
Patch5: mozilla-no-stdcxx-check.patch
|
||||
Patch6: mozilla-reduce-files-per-UnifiedBindings.patch
|
||||
Patch7: mozilla-aarch64-startup-crash.patch
|
||||
Patch8: mozilla-enable-csd.patch
|
||||
Patch9: mozilla-bmo256180.patch
|
||||
Patch10: mozilla-alsa-sandbox.patch
|
||||
Patch8: mozilla-bmo256180.patch
|
||||
Patch9: mozilla-bmo1005535.patch
|
||||
Patch10: mozilla-bmo1446062.patch
|
||||
# Firefox/browser
|
||||
Patch101: firefox-kde.patch
|
||||
Patch102: firefox-no-default-ualocale.patch
|
||||
Patch103: firefox-branded-icons.patch
|
||||
Patch102: firefox-branded-icons.patch
|
||||
|
||||
BuildRoot: %{_tmppath}/%{name}-%{version}-build
|
||||
Requires(post): coreutils shared-mime-info desktop-file-utils
|
||||
@ -269,7 +267,6 @@ cd $RPM_BUILD_DIR/mozilla
|
||||
# Firefox
|
||||
%patch101 -p1
|
||||
%patch102 -p1
|
||||
%patch103 -p1
|
||||
|
||||
%build
|
||||
# no need to add build time to binaries
|
||||
@ -340,7 +337,7 @@ ac_add_options --enable-optimize="-g -O2"
|
||||
ac_add_options --disable-optimize
|
||||
%endif
|
||||
%endif
|
||||
%ifarch ppc ppc64 ppc64le %arm
|
||||
%ifarch %arm
|
||||
ac_add_options --disable-elf-hack
|
||||
%endif
|
||||
ac_add_options --with-system-nspr
|
||||
@ -404,7 +401,7 @@ install -m 644 %{SOURCE9} %{buildroot}%{progdir}/browser/defaults/preferences/fi
|
||||
%if %localize
|
||||
rm -f %{_tmppath}/translations.*
|
||||
touch %{_tmppath}/translations.{common,other}
|
||||
for locale in $(awk '{ print $1; }' %{SOURCE17}); do
|
||||
for locale in $(cat $RPM_BUILD_DIR/mozilla/browser/locales/shipped-locales) ; do
|
||||
case $locale in
|
||||
ja-JP-mac|en-US|'')
|
||||
;;
|
||||
@ -475,10 +472,10 @@ cp %{SOURCE11} %{buildroot}%{_mandir}/man1/%{progname}.1
|
||||
mkdir -p %{buildroot}%{_datadir}/mozilla/extensions/%{firefox_appid}
|
||||
mkdir -p %{buildroot}%{_libdir}/mozilla/extensions/%{firefox_appid}
|
||||
mkdir -p %{buildroot}/usr/share/pixmaps/
|
||||
ln -sf %{progdir}/browser/icons/mozicon128.png %{buildroot}/usr/share/pixmaps/%{progname}.png
|
||||
ln -sf %{progdir}/browser/icons/mozicon128.png %{buildroot}/usr/share/pixmaps/%{progname}-gnome.png
|
||||
ln -sf %{progdir}/browser/chrome/icons/default/default128.png %{buildroot}/usr/share/pixmaps/%{progname}.png
|
||||
ln -sf %{progdir}/browser/chrome/icons/default/default128.png %{buildroot}/usr/share/pixmaps/%{progname}-gnome.png
|
||||
%if %branding
|
||||
for size in 16 22 24 32 48 256; do
|
||||
for size in 16 22 24 32 48 64 128 256; do
|
||||
%else
|
||||
for size in 16 32 48; do
|
||||
%endif
|
||||
@ -566,7 +563,6 @@ exit 0
|
||||
%dir %{progdir}/browser/extensions/
|
||||
%{progdir}/browser/defaults
|
||||
%{progdir}/browser/features/
|
||||
%{progdir}/browser/icons/
|
||||
%{progdir}/browser/chrome/icons
|
||||
%{progdir}/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}.xpi
|
||||
%{progdir}/browser/blocklist.xml
|
||||
@ -585,7 +581,7 @@ exit 0
|
||||
%{progdir}/application.ini
|
||||
%{progdir}/chrome.manifest
|
||||
%{progdir}/dependentlibs.list
|
||||
%{progdir}/icudt59l.dat
|
||||
%{progdir}/icudt*.dat
|
||||
%{progdir}/*.so
|
||||
%{progdir}/omni.ja
|
||||
%{progdir}/fonts/
|
||||
|
@ -5,7 +5,7 @@
|
||||
<size unit="G">16</size>
|
||||
</disk>
|
||||
<memory>
|
||||
<size unit="M">9000</size>
|
||||
<size unit="G">12</size>
|
||||
</memory>
|
||||
</hardware>
|
||||
<overwrite>
|
||||
|
@ -1,3 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:b2528402c5a3381c83db0116efe05064251b57a7597ef936d3d831b57b2870b3
|
||||
size 28816
|
||||
oid sha256:cdd97af0fb4589f385a87d15d405b8416aed9fb644b8688ffb1e87b87a207d1c
|
||||
size 28360
|
||||
|
@ -7,8 +7,13 @@
|
||||
|
||||
CHANNEL="release"
|
||||
BRANCH="releases/mozilla-$CHANNEL"
|
||||
RELEASE_TAG="FIREFOX_58_0_2_RELEASE"
|
||||
VERSION="58.0.2"
|
||||
RELEASE_TAG="FIREFOX_59_0_1_RELEASE"
|
||||
VERSION="59.0.1"
|
||||
|
||||
# check required tools
|
||||
test -x /usr/bin/hg || ( echo "hg missing: execute zypper in mercurial"; exit 5 )
|
||||
test -x /usr/bin/jq || ( echo "jq missing: execute zypper in jq"; exit 5 )
|
||||
|
||||
|
||||
# mozilla
|
||||
if [ -d mozilla ]; then
|
||||
@ -54,19 +59,19 @@ tar $compression -cf firefox-$VERSION-source.tar.xz --exclude=.hgtags --exclude=
|
||||
# l10n
|
||||
echo "fetching locales..."
|
||||
test ! -d l10n && mkdir l10n
|
||||
for locale in $(awk '{ print $1; }' l10n_changesets.txt); do
|
||||
case $locale in
|
||||
ja-JP-mac|en-US)
|
||||
;;
|
||||
*)
|
||||
echo "reading changeset information for $locale"
|
||||
_changeset=$(grep ^$locale l10n_changesets.txt | awk '{ print $2; }')
|
||||
echo "fetching $locale changeset $_changeset ..."
|
||||
hg clone http://hg.mozilla.org/l10n-central/$locale l10n/$locale
|
||||
[ "$RELEASE_TAG" == "default" ] || hg -R l10n/$locale up -C -r $_changeset
|
||||
;;
|
||||
esac
|
||||
done
|
||||
jq -r 'to_entries[]| "\(.key) \(.value|.revision)"' mozilla/browser/locales/l10n-changesets.json | \
|
||||
while read locale changeset ; do
|
||||
case $locale in
|
||||
ja-JP-mac|en-US)
|
||||
;;
|
||||
*)
|
||||
echo "reading changeset information for $locale"
|
||||
echo "fetching $locale changeset $changeset ..."
|
||||
hg clone http://hg.mozilla.org/l10n-central/$locale l10n/$locale
|
||||
[ "$RELEASE_TAG" == "default" ] || hg -R l10n/$locale up -C -r $changeset
|
||||
;;
|
||||
esac
|
||||
done
|
||||
echo "creating l10n archive..."
|
||||
tar $compression -cf l10n-$VERSION.tar.xz --exclude=.hgtags --exclude=.hgignore --exclude=.hg l10n
|
||||
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:4dda38d4eea0b9be6ee116cb304e43d1fdfcf74a32dfcad56068c50255665eb2
|
||||
size 274076776
|
3
firefox-59.0.1-source.tar.xz
Normal file
3
firefox-59.0.1-source.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:880faed22ce6e5c305117e0771ad476995884a7f2599ca72b0587cb96eb57523
|
||||
size 262899092
|
@ -1,39 +1,30 @@
|
||||
# HG changeset patch
|
||||
# Parent e0751ad74e835e80041a61ea00c2a63bf6fbe2de
|
||||
# Parent 75308bbaaf73d672c88cb283591d4aefc7db9804
|
||||
# Parent 38e46d7f98d3e392de95d83660ecd147b30dc9aa
|
||||
|
||||
diff --git a/browser/branding/branding-common.mozbuild b/browser/branding/branding-common.mozbuild
|
||||
--- a/browser/branding/branding-common.mozbuild
|
||||
+++ b/browser/branding/branding-common.mozbuild
|
||||
@@ -38,18 +38,24 @@ def FirefoxBranding():
|
||||
'disk.icns',
|
||||
'document.icns',
|
||||
'dsstore',
|
||||
'firefox.icns',
|
||||
@@ -17,12 +17,15 @@ def FirefoxBranding():
|
||||
FINAL_TARGET_FILES.VisualElements += [
|
||||
'VisualElements_150.png',
|
||||
'VisualElements_70.png',
|
||||
]
|
||||
elif 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']:
|
||||
BRANDING_FILES += [
|
||||
'default16.png',
|
||||
+ 'default22.png',
|
||||
+ 'default24.png',
|
||||
+ 'default256.png',
|
||||
'default32.png',
|
||||
'default48.png',
|
||||
'mozicon128.png',
|
||||
]
|
||||
FINAL_TARGET_FILES.icons += ['mozicon128.png']
|
||||
FINAL_TARGET_FILES.chrome.icons.default += [
|
||||
'default128.png',
|
||||
'default16.png',
|
||||
+ 'default22.png',
|
||||
+ 'default24.png',
|
||||
+ 'default256.png',
|
||||
+ 'default22.png',
|
||||
+ 'default24.png',
|
||||
+ 'default256.png',
|
||||
'default32.png',
|
||||
'default48.png',
|
||||
'default64.png',
|
||||
]
|
||||
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
|
||||
@@ -618,18 +618,21 @@
|
||||
@@ -601,20 +601,23 @@
|
||||
@RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.manifest
|
||||
@RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf
|
||||
@RESPATH@/chrome/toolkit@JAREXT@
|
||||
@ -46,6 +37,8 @@ diff --git a/browser/installer/package-manifest.in b/browser/installer/package-m
|
||||
+@RESPATH@/browser/chrome/icons/default/default24.png
|
||||
@RESPATH@/browser/chrome/icons/default/default32.png
|
||||
@RESPATH@/browser/chrome/icons/default/default48.png
|
||||
@RESPATH@/browser/chrome/icons/default/default64.png
|
||||
@RESPATH@/browser/chrome/icons/default/default128.png
|
||||
+@RESPATH@/browser/chrome/icons/default/default256.png
|
||||
#endif
|
||||
@RESPATH@/browser/features/*
|
||||
|
@ -1,11 +1,11 @@
|
||||
# HG changeset patch
|
||||
# Parent 89cbe8c49d05965b87815143d1944ab6964f12c7
|
||||
# Parent ffcd96e120857e207bd357b2005f0b5bc776e375
|
||||
|
||||
diff --git a/browser/base/content/browser-kde.xul b/browser/base/content/browser-kde.xul
|
||||
new file mode 100644
|
||||
--- /dev/null
|
||||
+++ b/browser/base/content/browser-kde.xul
|
||||
@@ -0,0 +1,1248 @@
|
||||
@@ -0,0 +1,1238 @@
|
||||
+#filter substitution
|
||||
+<?xml version="1.0"?>
|
||||
+# -*- Mode: HTML -*-
|
||||
@ -286,26 +286,26 @@ new file mode 100644
|
||||
+ key="viewBookmarksSidebarKb"
|
||||
+ observes="viewBookmarksSidebar"
|
||||
+ oncommand="SidebarUI.show('viewBookmarksSidebar');">
|
||||
+ <observes element="viewBookmarksSidebar" attribute="checked"/>
|
||||
+ </toolbarbutton>
|
||||
+ <observes element="viewBookmarksSidebar" attribute="checked"/>
|
||||
+ </toolbarbutton>
|
||||
+ <toolbarbutton id="sidebar-switcher-history"
|
||||
+ label="&historyButton.label;"
|
||||
+ class="subviewbutton subviewbutton-iconic"
|
||||
+ key="key_gotoHistory"
|
||||
+ observes="viewHistorySidebar"
|
||||
+ oncommand="SidebarUI.show('viewHistorySidebar');">
|
||||
+ <observes element="viewHistorySidebar" attribute="checked"/>
|
||||
+ </toolbarbutton>
|
||||
+ <observes element="viewHistorySidebar" attribute="checked"/>
|
||||
+ </toolbarbutton>
|
||||
+ <toolbarbutton id="sidebar-switcher-tabs"
|
||||
+ label="&syncedTabs.sidebar.label;"
|
||||
+ class="subviewbutton subviewbutton-iconic"
|
||||
+ observes="viewTabsSidebar"
|
||||
+ oncommand="SidebarUI.show('viewTabsSidebar');">
|
||||
+ <observes element="viewTabsSidebar" attribute="checked"/>
|
||||
+ </toolbarbutton>
|
||||
+ <toolbarseparator/>
|
||||
+ <vbox id="sidebar-extensions"></vbox>
|
||||
+ <observes element="viewTabsSidebar" attribute="checked"/>
|
||||
+ </toolbarbutton>
|
||||
+ <toolbarseparator/>
|
||||
+ <!-- Extension toolbarbuttons go here. -->
|
||||
+ <toolbarseparator id="sidebar-extensions-separator"/>
|
||||
+ <toolbarbutton id="sidebar-reverse-position"
|
||||
+ class="subviewbutton"
|
||||
+ oncommand="SidebarUI.reversePosition()"/>
|
||||
@ -425,15 +425,15 @@ new file mode 100644
|
||||
+ emailLink-title="&emailPageCmd.label;"
|
||||
+ sendToDevice-title="&pageAction.sendTabToDevice.label;"
|
||||
+ sendToDevice-notReadyTitle="&sendToDevice.syncNotReady.label;">
|
||||
+ <photonpanelmultiview id="pageActionPanelMultiView"
|
||||
+ mainViewId="pageActionPanelMainView"
|
||||
+ viewCacheId="appMenu-viewCache">
|
||||
+ <panelmultiview id="pageActionPanelMultiView"
|
||||
+ mainViewId="pageActionPanelMainView"
|
||||
+ viewCacheId="appMenu-viewCache">
|
||||
+ <panelview id="pageActionPanelMainView"
|
||||
+ context="pageActionContextMenu"
|
||||
+ class="PanelUI-subView">
|
||||
+ <vbox class="panel-subview-body"/>
|
||||
+ </panelview>
|
||||
+ </photonpanelmultiview>
|
||||
+ </panelmultiview>
|
||||
+ </panel>
|
||||
+ <panel id="pageActionFeedback"
|
||||
+ role="alert"
|
||||
@ -444,7 +444,8 @@ new file mode 100644
|
||||
+ tabspecific="true"
|
||||
+ noautofocus="true"
|
||||
+ copyURLFeedback="©URLFeedback.label;"
|
||||
+ sendToDeviceFeedback="&sendToDeviceFeedback.label;">
|
||||
+ sendToDeviceFeedback="&sendToDeviceFeedback.label;"
|
||||
+ sendToDeviceOfflineFeedback="&sendToDeviceOfflineFeedback.label;">
|
||||
+ <hbox id="pageActionFeedbackAnimatableBox">
|
||||
+ <image id="pageActionFeedbackAnimatableImage"/>
|
||||
+ </hbox>
|
||||
@ -603,13 +604,10 @@ new file mode 100644
|
||||
+</vbox>
|
||||
+#endif
|
||||
+
|
||||
+<deck flex="1" id="tab-view-deck">
|
||||
+<vbox flex="1" id="browser-panel">
|
||||
+
|
||||
+ <toolbox id="navigator-toolbox" mode="icons">
|
||||
+ <toolbox id="navigator-toolbox">
|
||||
+ <!-- Menu -->
|
||||
+ <toolbar type="menubar" id="toolbar-menubar" class="chromeclass-menubar" customizable="true"
|
||||
+ mode="icons" iconsize="small"
|
||||
+ mode="icons"
|
||||
+#ifdef MENUBAR_CAN_AUTOHIDE
|
||||
+ toolbarname="&menubarCmd.label;"
|
||||
+ accesskey="&menubarCmd.accesskey;"
|
||||
@ -635,7 +633,6 @@ new file mode 100644
|
||||
+ fullscreentoolbar="true"
|
||||
+ customizable="true"
|
||||
+ mode="icons"
|
||||
+ iconsize="small"
|
||||
+ aria-label="&tabsToolbar.label;"
|
||||
+ context="toolbar-context-menu"
|
||||
+ collapsed="true">
|
||||
@ -718,7 +715,6 @@ new file mode 100644
|
||||
+ <toolbar id="nav-bar"
|
||||
+ aria-label="&navbarCmd.label;"
|
||||
+ fullscreentoolbar="true" mode="icons" customizable="true"
|
||||
+ iconsize="small"
|
||||
+ customizationtarget="nav-bar-customization-target"
|
||||
+ overflowable="true"
|
||||
+ overflowbutton="nav-bar-overflow-button"
|
||||
@ -822,6 +818,8 @@ new file mode 100644
|
||||
+ tooltiptext="&urlbar.persistentStorageBlocked.tooltip;"/>
|
||||
+ <image data-permission-id="popup" class="blocked-permission-icon popup-icon" role="button"
|
||||
+ tooltiptext="&urlbar.popupBlocked.tooltip;"/>
|
||||
+ <image data-permission-id="canvas" class="blocked-permission-icon canvas-icon" role="button"
|
||||
+ tooltiptext="&urlbar.canvasBlocked.tooltip;"/>
|
||||
+ </box>
|
||||
+ <box id="notification-popup-box"
|
||||
+ hidden="true"
|
||||
@ -936,7 +934,7 @@ new file mode 100644
|
||||
+
|
||||
+ <toolbarbutton id="library-button" class="toolbarbutton-1 chromeclass-toolbar-additional subviewbutton-nav"
|
||||
+ removable="true"
|
||||
+ onmousedown="PanelUI.showSubView('appMenu-libraryView', this, null, event);"
|
||||
+ onmousedown="PanelUI.showSubView('appMenu-libraryView', this, event);"
|
||||
+ closemenu="none"
|
||||
+ cui-areatype="toolbar"
|
||||
+ tooltiptext="&libraryButton.tooltip;"
|
||||
@ -983,10 +981,8 @@ new file mode 100644
|
||||
+ </hbox>
|
||||
+ </toolbar>
|
||||
+
|
||||
+ <toolbarset id="customToolbars" context="toolbar-context-menu"/>
|
||||
+
|
||||
+ <toolbar id="PersonalToolbar"
|
||||
+ mode="icons" iconsize="small"
|
||||
+ mode="icons"
|
||||
+ class="chromeclass-directories"
|
||||
+ context="toolbar-context-menu"
|
||||
+ toolbarname="&personalbarCmd.label;" accesskey="&personalbarCmd.accesskey;"
|
||||
@ -1160,7 +1156,7 @@ new file mode 100644
|
||||
+ </toolbarbutton>
|
||||
+
|
||||
+ <toolbaritem id="search-container"
|
||||
+ class="chromeclass-toolbar-additional panel-wide-item"
|
||||
+ class="chromeclass-toolbar-additional"
|
||||
+ title="&searchItem.title;"
|
||||
+ align="center"
|
||||
+ flex="100"
|
||||
@ -1247,17 +1243,11 @@ new file mode 100644
|
||||
+ <notificationbox id="global-notificationbox" notificationside="bottom"/>
|
||||
+ </vbox>
|
||||
+
|
||||
+</vbox>
|
||||
+# <iframe id="tab-view"> is dynamically appended as the 2nd child of #tab-view-deck.
|
||||
+# Introducing the iframe dynamically, as needed, was found to be better than
|
||||
+# starting with an empty iframe here in browser.xul from a Ts standpoint.
|
||||
+</deck>
|
||||
+
|
||||
+</window>
|
||||
diff --git a/browser/base/jar.mn b/browser/base/jar.mn
|
||||
--- a/browser/base/jar.mn
|
||||
+++ b/browser/base/jar.mn
|
||||
@@ -52,16 +52,18 @@ browser.jar:
|
||||
@@ -45,16 +45,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/aboutTabCrashed.css (content/aboutTabCrashed.css)
|
||||
@ -1339,7 +1329,7 @@ diff --git a/browser/components/build/nsModule.cpp b/browser/components/build/ns
|
||||
diff --git a/browser/components/preferences/in-content/main.js b/browser/components/preferences/in-content/main.js
|
||||
--- a/browser/components/preferences/in-content/main.js
|
||||
+++ b/browser/components/preferences/in-content/main.js
|
||||
@@ -193,16 +193,23 @@ var gMainPane = {
|
||||
@@ -330,16 +330,23 @@ var gMainPane = {
|
||||
this._backoffIndex++ : backoffTimes.length - 1]);
|
||||
};
|
||||
|
||||
@ -1363,7 +1353,7 @@ diff --git a/browser/components/preferences/in-content/main.js b/browser/compone
|
||||
performanceSettingsLink.setAttribute("href", performanceSettingsUrl);
|
||||
|
||||
this.updateDefaultPerformanceSettingsPref();
|
||||
@@ -898,16 +905,27 @@ var gMainPane = {
|
||||
@@ -1035,16 +1042,27 @@ var gMainPane = {
|
||||
// Reset exponential backoff delay time in order to do visual update in pollForDefaultBrowser.
|
||||
this._backoffIndex = 0;
|
||||
|
||||
@ -1707,7 +1697,7 @@ new file mode 100644
|
||||
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
|
||||
@@ -657,16 +657,18 @@
|
||||
@@ -649,16 +649,18 @@
|
||||
@RESPATH@/browser/defaults/blocklists
|
||||
@RESPATH@/browser/defaults/pinning
|
||||
|
||||
|
@ -1,28 +0,0 @@
|
||||
# HG changeset patch
|
||||
# User Wolfgang Rosenauer <wr@rosenauer.org>
|
||||
# Parent 099312626f5f7c9cb5573a61d0230574ee12a660
|
||||
# Parent 3d1dbfbdfa41b433352fadf3efe4a21cb45a468f
|
||||
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
|
||||
@@ -219,17 +219,17 @@ pref("browser.uitour.requireSecure", tru
|
||||
pref("browser.uitour.themeOrigin", "https://addons.mozilla.org/%LOCALE%/firefox/themes/");
|
||||
pref("browser.uitour.url", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/tour/");
|
||||
// How long to show a Hearbeat survey (two hours, in seconds)
|
||||
pref("browser.uitour.surveyDuration", 7200);
|
||||
|
||||
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");
|
||||
pref("general.skins.selectedSkin", "classic/1.0");
|
||||
|
||||
pref("general.smoothScroll", true);
|
||||
#ifdef UNIX_BUT_NOT_MAC
|
||||
pref("general.autoScroll", false);
|
||||
#else
|
||||
pref("general.autoScroll", true);
|
||||
#endif
|
@ -1,3 +1,3 @@
|
||||
pref("intl.locale.matchOS", true);
|
||||
pref("intl.locale.requested", "");
|
||||
pref("browser.preferences.instantApply", true);
|
||||
pref("geo.wifi.uri", "https://location.services.mozilla.com/v1/geolocate?key=%MOZILLA_API_KEY%");
|
||||
|
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:c98a457396f881f7b9c32de341b7ed3025d64dc44352d8a977459217596b9981
|
||||
size 53030504
|
3
l10n-59.0.1.tar.xz
Normal file
3
l10n-59.0.1.tar.xz
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:de5f9a8916fe43c9e79d1cdc7b5a85892600c0b11b5ed57618e009680b154e23
|
||||
size 49070588
|
@ -1,97 +0,0 @@
|
||||
ach 51053376f3b4
|
||||
af 9699e648d04f
|
||||
an 35bf2af54c6e
|
||||
ar 11e28461eedd
|
||||
as f48681f3cb1c
|
||||
ast a0365b2d2204
|
||||
az c9f8178b760e
|
||||
be 6a81fe13730e
|
||||
bg f5f7827ddaf6
|
||||
bn-BD 40173c2773dc
|
||||
bn-IN 8a4d7efa4656
|
||||
br 87dd84f3fb15
|
||||
bs f9194e1b9d1f
|
||||
ca 2393377daf04
|
||||
cak 358337cd8e62
|
||||
cs b2f2d66e474f
|
||||
cy cd528119b1f0
|
||||
da 3d4f38f6c602
|
||||
de c4580757245b
|
||||
dsb 6cae073a841f
|
||||
el 7c198d3d5d8c
|
||||
en-GB 108b5a928fb5
|
||||
en-ZA 5b50bebf4e4f
|
||||
eo eb148ada0d56
|
||||
es-AR 08d927e7ad92
|
||||
es-CL 02584a2d25b7
|
||||
es-ES 1c9d3c3c689d
|
||||
es-MX 6435282dbc75
|
||||
et e29f6a05d5a8
|
||||
eu 756e60b234ec
|
||||
fa 8aee74bd73fe
|
||||
ff b529c4fc084b
|
||||
fi 124ad6d2caeb
|
||||
fr 87ec33d89386
|
||||
fy-NL 3705ebdd28f5
|
||||
ga-IE 2453123d83ab
|
||||
gd da7de9b6e635
|
||||
gl 99003c9cd063
|
||||
gn 54547111d875
|
||||
gu-IN 88180147b7f5
|
||||
he 9837e2cc4a95
|
||||
hi-IN e1dddb32c7d0
|
||||
hr 1699e5d11dfc
|
||||
hsb b779311b0bd0
|
||||
hu 5f446a971f03
|
||||
hy-AM 024da8b34b46
|
||||
id 0f0141ed9bb6
|
||||
is 4b3c58c9d645
|
||||
it 6e2c7978b0e7
|
||||
ja f30c0c2f2bc4
|
||||
ja-JP-mac 4230da7b0695
|
||||
ka 6650158784f6
|
||||
kab 6b3c6e707013
|
||||
kk 1e85339bcb5c
|
||||
km d934d1e2fbba
|
||||
kn 9d356f38d208
|
||||
ko 6370c2a0f030
|
||||
lij 0ab26fda46bc
|
||||
lt 450e1219d46f
|
||||
lv 78a846f93b16
|
||||
mai 53cf7cd14176
|
||||
mk 3d22bc5b8e99
|
||||
ml 128c7b806403
|
||||
mr 074d705e44b7
|
||||
ms 7fa602755a3b
|
||||
my eee9ab816d7c
|
||||
nb-NO 963968719128
|
||||
ne-NP c318f683bdb7
|
||||
nl fca30e75c8a2
|
||||
nn-NO 484b14dee153
|
||||
or 9420e75f84ba
|
||||
pa-IN 5634ac6e7d9b
|
||||
pl 45fa8ed87819
|
||||
pt-BR 38d2f920e7b1
|
||||
pt-PT 60446c901737
|
||||
rm cf0859e63177
|
||||
ro 7fea5671214f
|
||||
ru 67b070efcbd9
|
||||
si 5b5533ef2e97
|
||||
sk 4c17a502b748
|
||||
sl 8c446da2c7c5
|
||||
son 914d74ec145e
|
||||
sq 704b52416e5e
|
||||
sr cbf4a5eafb4d
|
||||
sv-SE 2e8d40795c69
|
||||
ta 26d7cbe37e4a
|
||||
te 9338813fedc1
|
||||
th aa91b43781fe
|
||||
tr a392fcf83ab9
|
||||
uk 214311bf7877
|
||||
ur 60247a51a921
|
||||
uz 51175e255277
|
||||
vi 2731355cccc7
|
||||
xh a756d272d1fe
|
||||
zh-CN 9ab59b4c446a
|
||||
zh-TW a56ff00fa7b0
|
||||
|
@ -1,12 +1,12 @@
|
||||
# HG changeset patch
|
||||
# Parent a5cfa3aa11a9d3391df49de6fc5a0e5232c12c10
|
||||
# Parent 6906d2adcc834114de3118365cb75b113df8564e
|
||||
# Parent 3005da37da3f1e2c568b1675307d10860182d214
|
||||
Bug 991344 - Rpi3: Firefox crashes after a few seconds of usage
|
||||
|
||||
diff --git a/netwerk/base/nsIOService.cpp b/netwerk/base/nsIOService.cpp
|
||||
--- a/netwerk/base/nsIOService.cpp
|
||||
+++ b/netwerk/base/nsIOService.cpp
|
||||
@@ -892,17 +892,23 @@ nsIOService::NewChannelFromURIWithProxyF
|
||||
@@ -887,17 +887,23 @@ nsIOService::NewChannelFromURIWithProxyF
|
||||
"doesn't support nsIUploadChannel2. An extension has "
|
||||
"supplied a non-functional http protocol handler. This will "
|
||||
"break behavior and in future releases not work at all.");
|
||||
|
@ -1,12 +0,0 @@
|
||||
--- mozilla/security/sandbox/linux/moz.build 2018-02-06 07:58:27.127145777 +0100
|
||||
+++ mozilla/security/sandbox/linux/moz.build 2018-02-06 08:01:22.213706297 +0100
|
||||
@@ -77,6 +77,9 @@
|
||||
'SandboxOpenedFiles.cpp',
|
||||
]
|
||||
|
||||
+if CONFIG['MOZ_ALSA']:
|
||||
+ DEFINES['MOZ_ALSA'] = True
|
||||
+
|
||||
# This copy of SafeSPrintf doesn't need to avoid the Chromium logging
|
||||
# dependency like the one in libxul does, but this way the behavior is
|
||||
# consistent. See also the comment in SandboxLogging.h.
|
123
mozilla-bmo1005535.patch
Normal file
123
mozilla-bmo1005535.patch
Normal file
@ -0,0 +1,123 @@
|
||||
# HG changeset patch
|
||||
# Parent 376f185a0a757fe128be665adbb705f4a56461bc
|
||||
# User Steve Singer <steve@ssinger.info>
|
||||
# Parent 23e95bbe4d5553a2ba9dda2a4a96a2029253597c
|
||||
Bug 1005535 - Get skia GPU building on big endian.
|
||||
|
||||
diff --git a/gfx/skia/skia/include/core/SkColorPriv.h b/gfx/skia/skia/include/core/SkColorPriv.h
|
||||
--- a/gfx/skia/skia/include/core/SkColorPriv.h
|
||||
+++ b/gfx/skia/skia/include/core/SkColorPriv.h
|
||||
@@ -27,37 +27,27 @@
|
||||
* For easier compatibility with Skia's GPU backend, we further restrict these
|
||||
* to either (in memory-byte-order) RGBA or BGRA. Note that this "order" does
|
||||
* not directly correspond to the same shift-order, since we have to take endianess
|
||||
* into account.
|
||||
*
|
||||
* Here we enforce this constraint.
|
||||
*/
|
||||
|
||||
-#ifdef SK_CPU_BENDIAN
|
||||
- #define SK_RGBA_R32_SHIFT 24
|
||||
- #define SK_RGBA_G32_SHIFT 16
|
||||
- #define SK_RGBA_B32_SHIFT 8
|
||||
- #define SK_RGBA_A32_SHIFT 0
|
||||
|
||||
- #define SK_BGRA_B32_SHIFT 24
|
||||
- #define SK_BGRA_G32_SHIFT 16
|
||||
- #define SK_BGRA_R32_SHIFT 8
|
||||
- #define SK_BGRA_A32_SHIFT 0
|
||||
-#else
|
||||
#define SK_RGBA_R32_SHIFT 0
|
||||
#define SK_RGBA_G32_SHIFT 8
|
||||
#define SK_RGBA_B32_SHIFT 16
|
||||
#define SK_RGBA_A32_SHIFT 24
|
||||
|
||||
#define SK_BGRA_B32_SHIFT 0
|
||||
#define SK_BGRA_G32_SHIFT 8
|
||||
#define SK_BGRA_R32_SHIFT 16
|
||||
#define SK_BGRA_A32_SHIFT 24
|
||||
-#endif
|
||||
+
|
||||
|
||||
#if defined(SK_PMCOLOR_IS_RGBA) && defined(SK_PMCOLOR_IS_BGRA)
|
||||
#error "can't define PMCOLOR to be RGBA and BGRA"
|
||||
#endif
|
||||
|
||||
#define LOCAL_PMCOLOR_SHIFTS_EQUIVALENT_TO_RGBA \
|
||||
(SK_A32_SHIFT == SK_RGBA_A32_SHIFT && \
|
||||
SK_R32_SHIFT == SK_RGBA_R32_SHIFT && \
|
||||
diff --git a/gfx/skia/skia/include/core/SkImageInfo.h b/gfx/skia/skia/include/core/SkImageInfo.h
|
||||
--- a/gfx/skia/skia/include/core/SkImageInfo.h
|
||||
+++ b/gfx/skia/skia/include/core/SkImageInfo.h
|
||||
@@ -78,17 +78,17 @@ enum SkColorType {
|
||||
|
||||
kLastEnum_SkColorType = kRGBA_F16_SkColorType,
|
||||
|
||||
#if SK_PMCOLOR_BYTE_ORDER(B,G,R,A)
|
||||
kN32_SkColorType = kBGRA_8888_SkColorType,
|
||||
#elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A)
|
||||
kN32_SkColorType = kRGBA_8888_SkColorType,
|
||||
#else
|
||||
- #error "SK_*32_SHFIT values must correspond to BGRA or RGBA byte order"
|
||||
+ kN32_SkColorType = kBGRA_8888_SkColorType
|
||||
#endif
|
||||
};
|
||||
|
||||
static int SkColorTypeBytesPerPixel(SkColorType ct) {
|
||||
static const uint8_t gSize[] = {
|
||||
0, // Unknown
|
||||
1, // Alpha_8
|
||||
2, // RGB_565
|
||||
diff --git a/gfx/skia/skia/include/gpu/GrColor.h b/gfx/skia/skia/include/gpu/GrColor.h
|
||||
--- a/gfx/skia/skia/include/gpu/GrColor.h
|
||||
+++ b/gfx/skia/skia/include/gpu/GrColor.h
|
||||
@@ -69,17 +69,17 @@ static inline GrColor GrColorPackA4(unsi
|
||||
#define GrColorUnpackG(color) (((color) >> GrColor_SHIFT_G) & 0xFF)
|
||||
#define GrColorUnpackB(color) (((color) >> GrColor_SHIFT_B) & 0xFF)
|
||||
#define GrColorUnpackA(color) (((color) >> GrColor_SHIFT_A) & 0xFF)
|
||||
|
||||
/**
|
||||
* Since premultiplied means that alpha >= color, we construct a color with
|
||||
* each component==255 and alpha == 0 to be "illegal"
|
||||
*/
|
||||
-#define GrColor_ILLEGAL (~(0xFF << GrColor_SHIFT_A))
|
||||
+#define GrColor_ILLEGAL ((uint32_t)(~(0xFF << GrColor_SHIFT_A)))
|
||||
|
||||
#define GrColor_WHITE 0xFFFFFFFF
|
||||
#define GrColor_TRANSPARENT_BLACK 0x0
|
||||
|
||||
/**
|
||||
* Assert in debug builds that a GrColor is premultiplied.
|
||||
*/
|
||||
static inline void GrColorIsPMAssert(GrColor SkDEBUGCODE(c)) {
|
||||
diff --git a/gfx/skia/skia/include/gpu/GrTypes.h b/gfx/skia/skia/include/gpu/GrTypes.h
|
||||
--- a/gfx/skia/skia/include/gpu/GrTypes.h
|
||||
+++ b/gfx/skia/skia/include/gpu/GrTypes.h
|
||||
@@ -321,25 +321,23 @@ enum GrPixelConfig {
|
||||
*/
|
||||
kRGBA_half_GrPixelConfig,
|
||||
|
||||
kLast_GrPixelConfig = kRGBA_half_GrPixelConfig
|
||||
};
|
||||
static const int kGrPixelConfigCnt = kLast_GrPixelConfig + 1;
|
||||
|
||||
// Aliases for pixel configs that match skia's byte order.
|
||||
-#ifndef SK_CPU_LENDIAN
|
||||
- #error "Skia gpu currently assumes little endian"
|
||||
-#endif
|
||||
+
|
||||
#if SK_PMCOLOR_BYTE_ORDER(B,G,R,A)
|
||||
static const GrPixelConfig kSkia8888_GrPixelConfig = kBGRA_8888_GrPixelConfig;
|
||||
#elif SK_PMCOLOR_BYTE_ORDER(R,G,B,A)
|
||||
static const GrPixelConfig kSkia8888_GrPixelConfig = kRGBA_8888_GrPixelConfig;
|
||||
#else
|
||||
- #error "SK_*32_SHIFT values must correspond to GL_BGRA or GL_RGBA format."
|
||||
+ static const GrPixelConfig kSkia8888_GrPixelConfig = kBGRA_8888_GrPixelConfig;
|
||||
#endif
|
||||
|
||||
// Returns true if the pixel config is a GPU-specific compressed format
|
||||
// representation.
|
||||
static inline bool GrPixelConfigIsCompressed(GrPixelConfig config) {
|
||||
switch (config) {
|
||||
case kETC1_GrPixelConfig:
|
||||
return true;
|
116
mozilla-bmo1446062.patch
Normal file
116
mozilla-bmo1446062.patch
Normal file
@ -0,0 +1,116 @@
|
||||
|
||||
# HG changeset patch
|
||||
# User Thomas Daede <daede003@umn.edu>
|
||||
# Date 1521175629 25200
|
||||
# Node ID 5cd5586a2f48424a9031a3fa4c782954a9df9a52
|
||||
# Parent 494e5d5278ba6f5fdda9a2bb9ac7ca772653ee4a
|
||||
Bug 1446062: libtremor Vorbis fix. r=jmspeex a=dveditz
|
||||
|
||||
diff --git a/media/libtremor/lib/tremor_codebook.c b/media/libtremor/lib/tremor_codebook.c
|
||||
--- a/media/libtremor/lib/tremor_codebook.c
|
||||
+++ b/media/libtremor/lib/tremor_codebook.c
|
||||
@@ -253,26 +253,26 @@ long vorbis_book_decodevs_add(codebook *
|
||||
|
||||
if(shift>=0){
|
||||
for (i = 0; i < step; i++) {
|
||||
entry[i]=decode_packed_entry_number(book,b);
|
||||
if(entry[i]==-1)return(-1);
|
||||
t[i] = book->valuelist+entry[i]*book->dim;
|
||||
}
|
||||
for(i=0,o=0;i<book->dim;i++,o+=step)
|
||||
- for (j=0;j<step;j++)
|
||||
+ for (j=0;o+j<n && j<step;j++)
|
||||
a[o+j]+=t[j][i]>>shift;
|
||||
}else{
|
||||
for (i = 0; i < step; i++) {
|
||||
entry[i]=decode_packed_entry_number(book,b);
|
||||
if(entry[i]==-1)return(-1);
|
||||
t[i] = book->valuelist+entry[i]*book->dim;
|
||||
}
|
||||
for(i=0,o=0;i<book->dim;i++,o+=step)
|
||||
- for (j=0;j<step;j++)
|
||||
+ for (j=0;o+j<n && j<step;j++)
|
||||
a[o+j]+=t[j][i]<<-shift;
|
||||
}
|
||||
}
|
||||
return(0);
|
||||
}
|
||||
|
||||
/* decode vector / dim granularity gaurding is done in the upper layer */
|
||||
long vorbis_book_decodev_add(codebook *book,ogg_int32_t *a,
|
||||
@@ -282,25 +282,25 @@ long vorbis_book_decodev_add(codebook *b
|
||||
ogg_int32_t *t;
|
||||
int shift=point-book->binarypoint;
|
||||
|
||||
if(shift>=0){
|
||||
for(i=0;i<n;){
|
||||
entry = decode_packed_entry_number(book,b);
|
||||
if(entry==-1)return(-1);
|
||||
t = book->valuelist+entry*book->dim;
|
||||
- for (j=0;j<book->dim;)
|
||||
+ for (j=0;i<n && j<book->dim;)
|
||||
a[i++]+=t[j++]>>shift;
|
||||
}
|
||||
}else{
|
||||
for(i=0;i<n;){
|
||||
entry = decode_packed_entry_number(book,b);
|
||||
if(entry==-1)return(-1);
|
||||
t = book->valuelist+entry*book->dim;
|
||||
- for (j=0;j<book->dim;)
|
||||
+ for (j=0;i<n && j<book->dim;)
|
||||
a[i++]+=t[j++]<<-shift;
|
||||
}
|
||||
}
|
||||
}
|
||||
return(0);
|
||||
}
|
||||
|
||||
/* unlike the others, we guard against n not being an integer number
|
||||
@@ -347,41 +347,41 @@ long vorbis_book_decodev_set(codebook *b
|
||||
/* decode vector / dim granularity gaurding is done in the upper layer */
|
||||
long vorbis_book_decodevv_add(codebook *book,ogg_int32_t **a,\
|
||||
long offset,int ch,
|
||||
oggpack_buffer *b,int n,int point){
|
||||
if(book->used_entries>0){
|
||||
long i,j,entry;
|
||||
int chptr=0;
|
||||
int shift=point-book->binarypoint;
|
||||
-
|
||||
+ int m=offset+n;
|
||||
if(shift>=0){
|
||||
|
||||
- for(i=offset;i<offset+n;){
|
||||
+ for(i=offset;i<m;){
|
||||
entry = decode_packed_entry_number(book,b);
|
||||
if(entry==-1)return(-1);
|
||||
{
|
||||
const ogg_int32_t *t = book->valuelist+entry*book->dim;
|
||||
- for (j=0;j<book->dim;j++){
|
||||
+ for (j=0;i<m && j<book->dim;j++){
|
||||
a[chptr++][i]+=t[j]>>shift;
|
||||
if(chptr==ch){
|
||||
chptr=0;
|
||||
i++;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}else{
|
||||
|
||||
- for(i=offset;i<offset+n;){
|
||||
+ for(i=offset;i<m;){
|
||||
entry = decode_packed_entry_number(book,b);
|
||||
if(entry==-1)return(-1);
|
||||
{
|
||||
const ogg_int32_t *t = book->valuelist+entry*book->dim;
|
||||
- for (j=0;j<book->dim;j++){
|
||||
+ for (j=0;i<m && j<book->dim;j++){
|
||||
a[chptr++][i]+=t[j]<<-shift;
|
||||
if(chptr==ch){
|
||||
chptr=0;
|
||||
i++;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
File diff suppressed because it is too large
Load Diff
1596
mozilla-kde.patch
1596
mozilla-kde.patch
File diff suppressed because it is too large
Load Diff
@ -1,11 +1,11 @@
|
||||
# HG changeset patch
|
||||
# User Wolfgang Rosenauer <wr@rosenauer.org>
|
||||
# Parent 8f6d1846ca837387965573161577b1c5a483bcda
|
||||
# Parent f62746698c37af9593338fe75fbff6b319cd370c
|
||||
|
||||
diff --git a/config/config.mk b/config/config.mk
|
||||
--- a/config/config.mk
|
||||
+++ b/config/config.mk
|
||||
@@ -579,17 +579,16 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),android)
|
||||
@@ -471,17 +471,16 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),android)
|
||||
# of the linker command line), if libmozglue.so ends up after libc.so, all
|
||||
# hell breaks loose, so better safe than sorry, and check it's actually the
|
||||
# case.
|
||||
|
@ -1,13 +1,13 @@
|
||||
# HG changeset patch
|
||||
# User Petr Cerny <pcerny@novell.com>
|
||||
# Parent 7308e4a7c1f769f4bbbc90870b849cadd99495a6
|
||||
# Parent 6a285f641aa53b55ec6480a8a7945a179e5c1506
|
||||
# Parent 46dd9332e67440fb779e99a694a2bf0edf5c203e
|
||||
Bug 634334 - call to the ntlm_auth helper fails
|
||||
|
||||
diff --git a/extensions/auth/nsAuthSambaNTLM.cpp b/extensions/auth/nsAuthSambaNTLM.cpp
|
||||
--- a/extensions/auth/nsAuthSambaNTLM.cpp
|
||||
+++ b/extensions/auth/nsAuthSambaNTLM.cpp
|
||||
@@ -169,17 +169,17 @@ static uint8_t* ExtractMessage(const nsA
|
||||
@@ -170,17 +170,17 @@ static uint8_t* ExtractMessage(const nsA
|
||||
nsresult
|
||||
nsAuthSambaNTLM::SpawnNTLMAuthHelper()
|
||||
{
|
||||
|
@ -1,2 +1,2 @@
|
||||
REV=849c090094db
|
||||
REV=3db9e3d52b17
|
||||
REPO=http://hg.mozilla.org/releases/mozilla-release
|
||||
|
Loading…
Reference in New Issue
Block a user