Hello community, here is the log from the commit of package MozillaFirefox for openSUSE:Factory checked in at 2018-07-04 23:51:19 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/MozillaFirefox (Old) and /work/SRC/openSUSE:Factory/.MozillaFirefox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "MozillaFirefox" Wed Jul 4 23:51:19 2018 rev:274 rq:619394 version:61.0 Changes: -------- --- /work/SRC/openSUSE:Factory/MozillaFirefox/MozillaFirefox.changes 2018-05-27 13:02:40.813231602 +0200 +++ /work/SRC/openSUSE:Factory/.MozillaFirefox.new/MozillaFirefox.changes 2018-07-04 23:51:24.428138834 +0200 @@ -1,0 +2,85 @@ +Sat Jun 23 07:25:51 UTC 2018 - [email protected] + +- update to Firefox 61.0 + * Performance enhancements + * Various improvements for dark theme support will provide a more + consistent experience across the entire Firefox UI + * OpenSearch plugins offered by web pages can now be added from the + page action menu for easier installation + * Improved support for allowing WebExtensions to manage and hide tabs + MFSA 2018-15 (bsc#1098998) + * CVE-2018-12359 (bmo#1459162) + Buffer overflow using computed size of canvas element + * CVE-2018-12360 (bmo#1459693) + Use-after-free when using focus() + * CVE-2018-12361 (bmo#1463244) + Integer overflow in SwizzleData + * CVE-2018-12358 (bmo#1467852) + Same-origin bypass using service worker and redirection + * CVE-2018-12362 (bmo#1452375) + Integer overflow in SSSE3 scaler + * CVE-2018-5156 (bmo#1453127) + Media recorder segmentation fault when track type is changed during capture + * CVE-2018-12363 (bmo#1464784) + Use-after-free when appending DOM nodes + * CVE-2018-12364 (bmo#1436241) + CSRF attacks through 307 redirects and NPAPI plugins + * CVE-2018-12365 (bmo#1459206) + Compromised IPC child process can list local filenames + * CVE-2018-12371 (bmo#1465686) + Integer overflow in Skia library during edge builder allocation + * CVE-2018-12366 (bmo#1464039) + Invalid data handling during QCMS transformations + * CVE-2018-12367 (bmo#1462891) + Timing attack mitigation of PerformanceNavigationTiming + * CVE-2018-12369 (bmo#1454909) + WebExtension security permission checks bypassed by embedded experiments + * CVE-2018-12370 (bmo#1456652) + SameSite cookie protections bypassed when exiting Reader View + * CVE-2018-5186 (bmo#1464872,bmo#1463329,bmo#1419373,bmo#1412882, + bmo#1413033,bmo#1444673,bmo#1454448,bmo#1453505,bmo#1438671) + Memory safety bugs fixed in Firefox 61 + * CVE-2018-5187 (bmo#1461324,bmo#1414829,bmo#1395246,bmo#1467938, + bmo#1461619,bmo#1425930,bmo#1438556,bmo#1454285,bmo#1459568, + bmo#1463884) + Memory safety bugs fixed in Firefox 60 and Firefox ESR 60.1 + * CVE-2018-5188 (bmo#1456189,bmo#1456975,bmo#1465898,bmo#1392739, + bmo#1451297,bmo#1464063,bmo#1437842,bmo#1442722,bmo#1452576, + bmo#1450688,bmo#1458264,bmo#1458270,bmo#1465108,bmo#1464829, + bmo#1464079,bmo#1463494,bmo#1458048) + Memory safety bugs fixed in Firefox 60, Firefox ESR 60.1, and Firefox ESR 52.9 +- requires NSS 3.37.3 +- requires python >= 3.5 to build +- removed obsolete patches + mozilla-i586-DecoderDoctorLogger.patch + mozilla-i586-domPrefs.patch + mozilla-fix-skia-aarch64.patch + mozilla-bmo1375074.patch + mozilla-enable-csd.patch +- patch for new no-return warnings (mozilla-no-return.patch) +- do not disable system installed locales (mozilla-bmo1464766.patch) + +------------------------------------------------------------------- +Fri Jun 8 10:52:13 UTC 2018 - [email protected] + +- Add conditional for pkgconfig(gconf-2.0) BuildRequires, and pass + conditional --disable-gconf to configure: no longer pull in + obsolete gconf2 for Tumbleweed. + +------------------------------------------------------------------- +Thu Jun 7 12:11:06 UTC 2018 - [email protected] + +- update to Firefox 60.0.2 + * requires NSS 3.36.4 + MFSA 2018-14 (bsc#1096449) + * CVE-2018-6126 (bmo#1462682) + Heap buffer overflow rasterizing paths in SVG with Skia + +------------------------------------------------------------------- +Wed Jun 6 18:57:52 UTC 2018 - [email protected] + +- Add upstream patch to fix boo#1093059 instead of '-ffixed-x28' + workaround: + * mozilla-bmo1375074.patch + +------------------------------------------------------------------- @@ -6 +91 @@ - (contributed by [email protected]) + (contributed by [email protected]) Old: ---- firefox-60.0.1.source.tar.xz firefox-60.0.1.source.tar.xz.asc l10n-60.0.1.tar.xz mozilla-enable-csd.patch mozilla-fix-skia-aarch64.patch mozilla-i586-DecoderDoctorLogger.patch mozilla-i586-domPrefs.patch New: ---- firefox-61.0.source.tar.xz firefox-61.0.source.tar.xz.asc l10n-61.0.tar.xz mozilla-bmo1464766.patch mozilla-no-return.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox.spec ++++++ --- /var/tmp/diff_new_pack.1AHBcM/_old 2018-07-04 23:53:14.452017291 +0200 +++ /var/tmp/diff_new_pack.1AHBcM/_new 2018-07-04 23:53:14.452017291 +0200 @@ -18,12 +18,14 @@ # changed with every update -%define major 60 -%define mainver %major.0.1 +%define major 61 +%define mainver %major.0 +%define orig_version 61.0 +%define orig_suffix %{nil} %define update_channel release %define branding 1 -%define releasedate 20180516032328 -%define source_prefix firefox-%{mainver} +%define releasedate 20180621125625 +%define source_prefix firefox-%{orig_version} # PIE, full relro (x86_64 for now) %define build_hardened 1 @@ -58,6 +60,7 @@ BuildRequires: autoconf213 BuildRequires: dbus-1-glib-devel BuildRequires: fdupes +BuildRequires: memory-constraints %if 0%{?suse_version} <= 1320 BuildRequires: gcc7-c++ %else @@ -72,9 +75,10 @@ BuildRequires: libproxy-devel BuildRequires: makeinfo BuildRequires: mozilla-nspr-devel >= 4.19 -BuildRequires: mozilla-nss-devel >= 3.36.1 +BuildRequires: mozilla-nss-devel >= 3.37.3 BuildRequires: python-devel BuildRequires: python2-xml +BuildRequires: python3 >= 3.5 BuildRequires: rust >= 1.24 BuildRequires: rust-std BuildRequires: startup-notification-devel @@ -83,7 +87,9 @@ BuildRequires: xorg-x11-libXt-devel BuildRequires: yasm BuildRequires: zip +%if 0%{?suse_version} < 1550 BuildRequires: pkgconfig(gconf-2.0) +%endif BuildRequires: pkgconfig(gdk-x11-2.0) BuildRequires: pkgconfig(glib-2.0) >= 2.22 BuildRequires: pkgconfig(gobject-2.0) @@ -121,13 +127,13 @@ License: MPL-2.0 Group: Productivity/Networking/Web/Browsers Url: http://www.mozilla.org/ -Source: http://ftp.mozilla.org/pub/firefox/releases/%{version}/source/firefox-%{version}.source.tar.xz +Source: http://ftp.mozilla.org/pub/firefox/releases/%{version}/source/firefox-%{orig_version}%{orig_suffix}.source.tar.xz Source1: MozillaFirefox.desktop Source2: MozillaFirefox-rpmlintrc Source3: mozilla.sh.in Source5: source-stamp.txt Source6: kde.js -Source7: l10n-%{version}.tar.xz +Source7: l10n-%{orig_version}%{orig_suffix}.tar.xz Source8: firefox-mimeinfo.xml Source9: firefox.js Source10: compare-locales.tar.xz @@ -142,7 +148,7 @@ # please get your own set of keys. Source18: mozilla-api-key Source19: google-api-key -Source20: http://ftp.mozilla.org/pub/firefox/releases/%{version}/source/firefox-%{version}.source.tar.xz.asc +Source20: http://ftp.mozilla.org/pub/firefox/releases/%{version}/source/firefox-%{orig_version}%{orig_suffix}.source.tar.xz.asc Source21: mozilla.keyring # Gecko/Toolkit Patch1: mozilla-nongnome-proxies.patch @@ -153,10 +159,8 @@ Patch6: mozilla-reduce-files-per-UnifiedBindings.patch Patch7: mozilla-aarch64-startup-crash.patch Patch8: mozilla-bmo256180.patch -Patch9: mozilla-i586-DecoderDoctorLogger.patch -Patch10: mozilla-i586-domPrefs.patch -Patch11: mozilla-enable-csd.patch -Patch12: mozilla-fix-skia-aarch64.patch +Patch9: mozilla-no-return.patch +Patch10: mozilla-bmo1464766.patch # Firefox/browser Patch101: firefox-kde.patch Patch102: firefox-branded-icons.patch @@ -266,12 +270,8 @@ %endif %patch7 -p1 %patch8 -p1 -%ifarch %ix86 %patch9 -p1 %patch10 -p1 -%endif -%patch11 -p1 -%patch12 -p1 # Firefox %patch101 -p1 %patch102 -p1 @@ -305,10 +305,6 @@ %if 0%{?suse_version} > 1320 export CFLAGS="$CFLAGS -fno-delete-null-pointer-checks" %endif -%ifarch aarch64 -# Workaround crash on startup. boo#1093059 -export CFLAGS="$CFLAGS -ffixed-x28" -%endif %ifarch %arm export CFLAGS="${CFLAGS/-g / }" %endif @@ -329,6 +325,7 @@ export RUSTFLAGS="-Cdebuginfo=0" %endif export MOZCONFIG=$RPM_BUILD_DIR/mozconfig +%limit_build -m 1500 cat << EOF > $MOZCONFIG mk_add_options MOZILLA_OFFICIAL=1 mk_add_options BUILD_OFFICIAL=1 @@ -340,6 +337,9 @@ ac_add_options --includedir=%{_includedir} ac_add_options --enable-release ac_add_options --enable-default-toolkit=cairo-gtk3 +%if 0%{?suse_version} >= 1550 +ac_add_options --disable-gconf +%endif %if 0%{?build_hardened} ac_add_options --enable-pie %endif @@ -418,6 +418,7 @@ install -m 644 %{SOURCE9} %{buildroot}%{progdir}/browser/defaults/preferences/firefox.js # install additional locales %if %localize +mkdir -p %{buildroot}%{progdir}/browser/extensions truncate -s 0 %{_tmppath}/translations.{common,other} sed -r '/^(ja-JP-mac|en-US|)$/d;s/ .*$//' $RPM_BUILD_DIR/%{source_prefix}/browser/locales/shipped-locales \ | xargs -P 8 -n 1 -I {} /bin/sh -c ' @@ -576,11 +577,9 @@ %dir %{progdir} %dir %{progdir}/browser/ %dir %{progdir}/browser/chrome/ -%dir %{progdir}/browser/extensions/ %{progdir}/browser/defaults %{progdir}/browser/features/ %{progdir}/browser/chrome/icons -%{progdir}/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}.xpi %{progdir}/browser/blocklist.xml %{progdir}/browser/chrome.manifest %{progdir}/browser/omni.ja @@ -597,7 +596,6 @@ %{progdir}/application.ini %{progdir}/chrome.manifest %{progdir}/dependentlibs.list -#%{progdir}/icudt*.dat %{progdir}/*.so %{progdir}/omni.ja %{progdir}/fonts/ ++++++ compare-locales.tar.xz ++++++ ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.1AHBcM/_old 2018-07-04 23:53:14.576017154 +0200 +++ /var/tmp/diff_new_pack.1AHBcM/_new 2018-07-04 23:53:14.580017150 +0200 @@ -7,45 +7,15 @@ CHANNEL="release" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_60_0_1_RELEASE" -VERSION="60.0.1" +RELEASE_TAG="785d242a5b01d5f1094882aa2144d8e5e2791e06" +VERSION="61.0" +VERSION_SUFFIX="" +LOCALE_FILE="firefox-$VERSION/browser/locales/l10n-changesets.json" # 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 - pushd mozilla - _repourl=$(hg paths) - case "$_repourl" in - *$BRANCH*) - echo "updating previous tree" - hg pull - popd - ;; - * ) - echo "removing obsolete tree" - popd - rm -rf mozilla - ;; - esac -fi -if [ ! -d mozilla ]; then - echo "cloning new $BRANCH..." - hg clone http://hg.mozilla.org/$BRANCH mozilla -fi -pushd mozilla -hg update --check -[ "$RELEASE_TAG" == "default" ] || hg update -r $RELEASE_TAG -# get repo and source stamp -echo -n "REV=" > ../source-stamp.txt -hg -R . parent --template="{node|short}\n" >> ../source-stamp.txt -echo -n "REPO=" >> ../source-stamp.txt -hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" >> ../source-stamp.txt -popd - # use parallel compression, if available compression='-J' pixz -h > /dev/null 2>&1 @@ -53,13 +23,52 @@ compression='-Ipixz' fi -echo "creating archive..." -tar $compression -cf firefox-$VERSION.source.tar.xz --exclude=.hgtags --exclude=.hgignore --exclude=.hg --exclude=CVS mozilla +# we might have an upstream archive already and can skip the checkout +if [ -e firefox-$VERSION$VERSION_SUFFIX.source.tar.xz ]; then + echo "skip firefox checkout and use available archive" + # still need to extract the locale information from the archive + echo "extract locale changesets" + tar -xf firefox-$VERSION$VERSION_SUFFIX.source.tar.xz $LOCALE_FILE +else + # mozilla + if [ -d firefox-$VERSION ]; then + pushd firefox-$VERSION + _repourl=$(hg paths) + case "$_repourl" in + *$BRANCH*) + echo "updating previous tree" + hg pull + popd + ;; + * ) + echo "removing obsolete tree" + popd + rm -rf firefox-$VERSION + ;; + esac + fi + if [ ! -d firefox-$VERSION ]; then + echo "cloning new $BRANCH..." + hg clone http://hg.mozilla.org/$BRANCH firefox-$VERSION + fi + pushd firefox-$VERSION + hg update --check + [ "$RELEASE_TAG" == "default" ] || hg update -r $RELEASE_TAG + # get repo and source stamp + echo -n "REV=" > ../source-stamp.txt + hg -R . parent --template="{node|short}\n" >> ../source-stamp.txt + echo -n "REPO=" >> ../source-stamp.txt + hg showconfig paths.default 2>/dev/null | head -n1 | sed -e "s/^ssh:/http:/" >> ../source-stamp.txt + popd + + echo "creating archive..." + tar $compression -cf firefox-$VERSION$VERSION_SUFFIX.source.tar.xz --exclude=.hgtags --exclude=.hgignore --exclude=.hg --exclude=CVS firefox-$VERSION +fi # l10n echo "fetching locales..." test ! -d l10n && mkdir l10n -jq -r 'to_entries[]| "\(.key) \(.value|.revision)"' mozilla/browser/locales/l10n-changesets.json | \ +jq -r 'to_entries[]| "\(.key) \(.value|.revision)"' $LOCALE_FILE | \ while read locale changeset ; do case $locale in ja-JP-mac|en-US) @@ -73,7 +82,7 @@ esac done echo "creating l10n archive..." -tar $compression -cf l10n-$VERSION.tar.xz --exclude=.hgtags --exclude=.hgignore --exclude=.hg l10n +tar $compression -cf l10n-$VERSION$VERSION_SUFFIX.tar.xz --exclude=.hgtags --exclude=.hgignore --exclude=.hg l10n # compare-locales echo "creating compare-locales" ++++++ firefox-60.0.1.source.tar.xz -> firefox-61.0.source.tar.xz ++++++ /work/SRC/openSUSE:Factory/MozillaFirefox/firefox-60.0.1.source.tar.xz /work/SRC/openSUSE:Factory/.MozillaFirefox.new/firefox-61.0.source.tar.xz differ: char 16, line 1 ++++++ firefox-branded-icons.patch ++++++ --- /var/tmp/diff_new_pack.1AHBcM/_old 2018-07-04 23:53:14.620017106 +0200 +++ /var/tmp/diff_new_pack.1AHBcM/_new 2018-07-04 23:53:14.620017106 +0200 @@ -1,11 +1,11 @@ # HG changeset patch # Parent e0751ad74e835e80041a61ea00c2a63bf6fbe2de -# Parent 38e46d7f98d3e392de95d83660ecd147b30dc9aa +# Parent 8a401a01454e9f5e8a357262d774e0ff348d9bc1 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 -@@ -17,12 +17,15 @@ def FirefoxBranding(): +@@ -22,12 +22,15 @@ def FirefoxBranding(): FINAL_TARGET_FILES.VisualElements += [ 'VisualElements_150.png', 'VisualElements_70.png', @@ -24,9 +24,9 @@ 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 -@@ -601,20 +601,23 @@ - @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/chrome.manifest - @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf +@@ -404,20 +404,23 @@ + @RESPATH@/browser/chrome/pdfjs.manifest + @RESPATH@/browser/chrome/pdfjs/* @RESPATH@/chrome/toolkit@JAREXT@ @RESPATH@/chrome/toolkit.manifest @RESPATH@/chrome/recording.manifest @@ -46,5 +46,5 @@ ; [Webide Files] @RESPATH@/browser/chrome/webide@JAREXT@ @RESPATH@/browser/chrome/webide.manifest - @RESPATH@/browser/@PREF_DIR@/webide-prefs.js + @RESPATH@/browser/@PREF_DIR@/webide.js ++++++ firefox-kde.patch ++++++ --- /var/tmp/diff_new_pack.1AHBcM/_old 2018-07-04 23:53:14.628017097 +0200 +++ /var/tmp/diff_new_pack.1AHBcM/_new 2018-07-04 23:53:14.632017092 +0200 @@ -1,11 +1,11 @@ # HG changeset patch -# Parent 1b44c077e473c5a7d02fab26e2a220ebf219e0ab +# Parent 242712e5a1879111d1a93a5d55dfae3fd5d47abc 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,1280 @@ +@@ -0,0 +1,1293 @@ +#filter substitution +<?xml version="1.0"?> +# -*- Mode: HTML -*- @@ -21,14 +21,17 @@ +<?xml-stylesheet href="chrome://browser/skin/controlcenter/panel.css" type="text/css"?> +<?xml-stylesheet href="chrome://browser/skin/customizableui/panelUI.css" type="text/css"?> +<?xml-stylesheet href="chrome://browser/skin/downloads/downloads.css"?> ++<?xml-stylesheet href="chrome://browser/skin/places/places.css"?> ++<?xml-stylesheet href="chrome://browser/skin/places/editBookmark.css"?> +<?xml-stylesheet href="chrome://browser/skin/" type="text/css"?> +<?xml-stylesheet href="chrome://browser/content/tabbrowser.css" type="text/css"?> -+ -+<?xul-overlay href="chrome://browser/content/places/placesOverlay.xul"?> ++<?xml-stylesheet href="chrome://browser/skin/compacttheme.css" type="text/css" alternate="yes" title="Light/Dark"?> + +# All DTD information is stored in a separate file so that it can be shared by +# hiddenWindow.xul. ++<!DOCTYPE window [ +#include browser-doctype.inc ++]> + +<window id="main-window" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"; @@ -51,14 +54,12 @@ + titlemodifier_normal="&mainWindow.titlemodifier;" + titlemodifier_privatebrowsing="&mainWindow.titlemodifier; &mainWindow.titlePrivateBrowsingSuffix;" +#endif -+#ifdef CAN_DRAW_IN_TITLEBAR +#ifdef XP_WIN + chromemargin="0,2,2,2" +#else + chromemargin="0,-1,-1,-1" +#endif + tabsintitlebar="true" -+#endif + titlemenuseparator="&mainWindow.titlemodifiermenuseparator;" + windowtype="navigator:browser" + macanimationtype="document" @@ -68,18 +69,33 @@ + retargetdocumentfocus="urlbar" + persist="screenX screenY width height sizemode"> + -+# All JS files which are not content (only) dependent that browser.xul -+# wishes to include *must* go into the global-scripts.inc file -+# so that they can be shared by macBrowserOverlay.xul. ++# All JS files which are needed by browser.xul and other top level windows to ++# support MacOS specific features *must* go into the global-scripts.inc file so ++# that they can be shared with macWindow.inc.xul. +#include global-scripts.inc + +<script type="application/javascript"> + Services.scriptloader.loadSubScript("chrome://global/content/contentAreaUtils.js", this); + Services.scriptloader.loadSubScript("chrome://browser/content/tabbrowser.js", this); ++ ++ ChromeUtils.defineModuleGetter(window, ++ "PlacesUtils", "resource://gre/modules/PlacesUtils.jsm"); ++ ChromeUtils.defineModuleGetter(window, ++ "PlacesUIUtils", "resource:///modules/PlacesUIUtils.jsm"); ++ ChromeUtils.defineModuleGetter(window, ++ "PlacesTransactions", "resource://gre/modules/PlacesTransactions.jsm"); ++ ++ ChromeUtils.import("resource://gre/modules/XPCOMUtils.jsm"); ++ XPCOMUtils.defineLazyScriptGetter(window, "PlacesTreeView", ++ "chrome://browser/content/places/treeView.js"); ++ XPCOMUtils.defineLazyScriptGetter(window, ++ ["PlacesInsertionPoint", "PlacesController", "PlacesControllerDragHelper"], ++ "chrome://browser/content/places/controller.js"); +</script> + -+# All sets except for popupsets (commands, keys, stringbundles and broadcasters) *must* go into the -+# browser-sets.inc file for sharing with hiddenWindow.xul. ++# All sets except for popupsets (commands, keys, stringbundles and broadcasters) ++# *must* go into the browser-sets.inc file so that they can be shared with other ++# top level windows in macWindow.inc.xul. +#define FULL_BROWSER_WINDOW +#include browser-sets.inc +#undef FULL_BROWSER_WINDOW @@ -219,7 +235,7 @@ + <description id="editBookmarkPanelDescription"/> + </vbox> + </row> -+ <vbox id="editBookmarkPanelContent" flex="1" hidden="true"/> ++#include ../../components/places/content/editBookmarkPanel.inc.xul + <hbox id="editBookmarkPanelBottomButtons" pack="end"> +#ifdef XP_UNIX + <button id="editBookmarkPanelDoneButton" @@ -403,7 +419,7 @@ +#include browser-context.inc + </menupopup> + -+ <menupopup id="placesContext"/> ++#include ../../components/places/content/placesContextMenu.inc.xul + + <panel id="ctrlTab-panel" hidden="true" norestorefocus="true" level="top"> + <hbox> @@ -432,7 +448,8 @@ + copyURL-title="&pageAction.copyLink.label;" + emailLink-title="&emailPageCmd.label;" + sendToDevice-title="&pageAction.sendTabToDevice.label;" -+ sendToDevice-notReadyTitle="&sendToDevice.syncNotReady.label;"> ++ sendToDevice-notReadyTitle="&sendToDevice.syncNotReady.label;" ++ shareURL-title="&pageAction.shareUrl.label;"> + <panelmultiview id="pageActionPanelMultiView" + mainViewId="pageActionPanelMainView" + viewCacheId="appMenu-viewCache"> @@ -480,8 +497,7 @@ + oncommand="BrowserPageActions.openAboutAddonsForContextAction();"/> + </menupopup> + -+ <!-- Bookmarks and history tooltip --> -+ <tooltip id="bhTooltip"/> ++#include ../../components/places/content/bookmarksHistoryTooltip.inc.xul + + <tooltip id="tabbrowser-tab-tooltip" onpopupshowing="gBrowser.createTooltip(event);"/> + @@ -515,15 +531,6 @@ + </vbox> + </hbox> + -+ <hbox id="bookmarked-notification-container" mousethrough="always"> -+ <vbox id="bookmarked-notification-anchor"> -+ <vbox id="bookmarked-notification"/> -+ </vbox> -+ <vbox id="bookmarked-notification-dropmarker-anchor"> -+ <image id="bookmarked-notification-dropmarker-icon"/> -+ </vbox> -+ </hbox> -+ + <tooltip id="dynamic-shortcut-tooltip" + onpopupshowing="UpdateDynamicShortcutTooltipText(this);"/> + @@ -589,7 +596,6 @@ + </popupset> + <box id="appMenu-viewCache" hidden="true"/> + -+#ifdef CAN_DRAW_IN_TITLEBAR +<vbox id="titlebar"> + <hbox id="titlebar-content"> + <spacer id="titlebar-spacer" flex="1"/> @@ -611,7 +617,6 @@ +#endif + </hbox> +</vbox> -+#endif + + <toolbox id="navigator-toolbox"> + <!-- Menu --> @@ -626,17 +631,15 @@ +#endif + context="toolbar-context-menu"> + <toolbaritem id="menubar-items" align="center"> -+# The entire main menubar is placed into browser-menubar.inc, so that it can be shared by -+# hiddenWindow.xul. ++# The entire main menubar is placed into browser-menubar.inc, so that it can be ++# shared with other top level windows in macWindow.inc.xul. +#include browser-menubar.inc + </toolbaritem> + -+#ifdef CAN_DRAW_IN_TITLEBAR +#ifndef XP_MACOSX + <hbox class="titlebar-placeholder" type="caption-buttons" ordinal="1000" + skipintoolbarset="true"/> +#endif -+#endif + </toolbar> + + <toolbar id="TabsToolbar" @@ -645,13 +648,9 @@ + customizable="true" + mode="icons" + aria-label="&tabsToolbar.label;" -+ context="toolbar-context-menu" -+ collapsed="true"> -+ -+#ifdef CAN_DRAW_IN_TITLEBAR ++ context="toolbar-context-menu"> + <hbox class="titlebar-placeholder" type="pre-tabs" + skipintoolbarset="true"/> -+#endif + + <tabs id="tabbrowser-tabs" + flex="1" @@ -675,7 +674,7 @@ + removable="true"/> + + <toolbarbutton id="alltabs-button" -+ class="toolbarbutton-1 chromeclass-toolbar-additional tabs-alltabs-button" ++ class="toolbarbutton-1 chromeclass-toolbar-additional tabs-alltabs-button badged-button" + type="menu" + label="&listAllTabs.label;" + tooltiptext="&listAllTabs.label;" @@ -692,21 +691,23 @@ + <menupopup id="alltabs_containersMenuTab" /> + </menu> + <menuseparator id="alltabs-popup-separator-2"/> ++ <menu id="alltabs_hiddenTabs" ++ label="&hiddenTabs.label;"> ++ <menupopup id="alltabs_hiddenTabsMenu"/> ++ </menu> ++ <menuseparator id="alltabs-popup-separator-3"/> + </menupopup> + </toolbarbutton> + -+#ifdef CAN_DRAW_IN_TITLEBAR + <hbox class="titlebar-placeholder" type="post-tabs" + ordinal="1000" + skipintoolbarset="true"/> -+#endif + + <button class="accessibility-indicator" tooltiptext="&accessibilityIndicator.tooltip;" + ordinal="1000" + aria-live="polite" skipintoolbarset="true"/> + <hbox class="private-browsing-indicator" skipintoolbarset="true" + ordinal="1000"/> -+#ifdef CAN_DRAW_IN_TITLEBAR + <hbox class="titlebar-placeholder" type="caption-buttons" +#ifndef XP_MACOSX + ordinal="1000" @@ -717,7 +718,6 @@ + <hbox class="titlebar-placeholder" type="fullscreen-button" + skipintoolbarset="true"/> +#endif -+#endif + </toolbar> + + <toolbar id="nav-bar" @@ -876,7 +876,7 @@ + <image id="midi-notification-icon" class="notification-anchor-icon midi-icon" role="button" + tooltiptext="&urlbar.midiNotificationAnchor.tooltip;"/> + <image id="webauthn-notification-icon" class="notification-anchor-icon" role="button" -+ tooltiptext="&urlbar.defaultNotificationAnchor.tooltip;"/> ++ tooltiptext="&urlbar.webAuthnAnchor.tooltip;"/> + </box> + <image id="connection-icon"/> + <image id="extension-icon"/> @@ -1228,8 +1228,12 @@ + onselect="if (event.target.localName == 'tabpanels') gBrowser.updateCurrentBrowser();"> + <tabpanels flex="1" class="plain" selectedIndex="0" id="tabbrowser-tabpanels"> + <notificationbox flex="1" notificationside="top"> -+ <hbox flex="1" class="browserSidebarContainer"> -+ <vbox flex="1" class="browserContainer"> ++ <!-- Set large flex to allow the devtools toolbox to set a flex attribute. ++ We don't want the toolbox to actually take up free space, but we do want it to collapse when the window shrinks, and with flex=0 it can't. ++ When the toolbox is on the bottom it's a sibling of browserSidebarContainer, ++ and when it's on the side it's a sibling of browserContainer. --> ++ <hbox flex="10000" class="browserSidebarContainer"> ++ <vbox flex="10000" class="browserContainer"> + <stack flex="1" class="browserStack"> + <browser id="tabbrowser-initialBrowser" type="content" + message="true" messagemanagergroup="browsers" @@ -1240,6 +1244,15 @@ + selectmenulist="ContentSelectDropdown" + datetimepicker="DateTimePickerPanel"/> + </stack> ++ <hbox id="statuspanel" inactive="true" layer="true"> ++ <hbox id="statuspanel-inner"> ++ <label id="statuspanel-label" ++ role="status" ++ aria-live="off" ++ flex="1" ++ crop="end"/> ++ </hbox> ++ </hbox> + </vbox> + </hbox> + </notificationbox> @@ -1289,7 +1302,7 @@ diff --git a/browser/base/jar.mn b/browser/base/jar.mn --- a/browser/base/jar.mn +++ b/browser/base/jar.mn -@@ -42,16 +42,18 @@ browser.jar: +@@ -44,16 +44,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) @@ -1330,7 +1343,7 @@ #include "rdf.h" #include "nsFeedSniffer.h" -@@ -32,18 +32,16 @@ using namespace mozilla::browser; +@@ -31,18 +31,16 @@ using namespace mozilla::browser; ///////////////////////////////////////////////////////////////////////////// @@ -1349,9 +1362,9 @@ NS_GENERIC_FACTORY_CONSTRUCTOR(nsFeedSniffer) -@@ -64,17 +62,17 @@ NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID) - NS_GENERIC_FACTORY_CONSTRUCTOR(nsSessionStoreUtils) - NS_DEFINE_NAMED_CID(NS_SESSIONSTOREUTILS_CID); +@@ -60,17 +58,17 @@ NS_DEFINE_NAMED_CID(NS_WINIEHISTORYENUME + NS_DEFINE_NAMED_CID(NS_SHELLSERVICE_CID); + #endif static const mozilla::Module::CIDEntry kBrowserCIDs[] = { { &kNS_BROWSERDIRECTORYPROVIDER_CID, false, nullptr, DirectoryProviderConstructor }, @@ -1371,7 +1384,7 @@ 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 -@@ -333,16 +333,23 @@ var gMainPane = { +@@ -327,16 +327,23 @@ var gMainPane = { this._backoffIndex++ : backoffTimes.length - 1]); }; @@ -1395,7 +1408,7 @@ performanceSettingsLink.setAttribute("href", performanceSettingsUrl); this.updateDefaultPerformanceSettingsPref(); -@@ -1060,16 +1067,27 @@ var gMainPane = { +@@ -868,16 +875,27 @@ var gMainPane = { // Reset exponential backoff delay time in order to do visual update in pollForDefaultBrowser. this._backoffIndex = 0; @@ -1442,9 +1455,9 @@ if SOURCES: FINAL_LIBRARY = 'browsercomps' - EXTRA_COMPONENTS += [ - 'nsSetDefaultBrowser.js', - 'nsSetDefaultBrowser.manifest', + EXTRA_JS_MODULES += [ + 'HeadlessShell.jsm', + 'ShellService.jsm', diff --git a/browser/components/shell/nsKDEShellService.cpp b/browser/components/shell/nsKDEShellService.cpp new file mode 100644 --- /dev/null @@ -1537,7 +1550,7 @@ +} + +NS_IMETHODIMP -+nsKDEShellService::SetDesktopBackground(nsIDOMElement* aElement, ++nsKDEShellService::SetDesktopBackground(dom::Element* aElement, + int32_t aPosition, + const nsACString& aImageName) +{ @@ -1677,8 +1690,8 @@ + nsKDEShellService() : mCheckedThisSession(false) { } + + NS_DECL_ISUPPORTS -+ NS_DECL_NSIGNOMESHELLSERVICE + NS_DECL_NSISHELLSERVICE ++ NS_DECL_NSIGNOMESHELLSERVICE + + nsresult Init(); + @@ -1739,7 +1752,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 -@@ -646,16 +646,18 @@ +@@ -452,16 +452,18 @@ @RESPATH@/browser/defaults/blocklists @RESPATH@/browser/defaults/pinning @@ -1748,13 +1761,13 @@ ; gre location for now. @RESPATH@/defaults/pref/channel-prefs.js -+@BINPATH@/defaults/pref/kde.js ++@RESPATH@/defaults/pref/kde.js + - ; Remote control protocol prefs - ; defined in ../../testing/marionette/prefs/marionette.js - @RESPATH@/defaults/pref/marionette.js - ; Services (gre) prefs @RESPATH@/defaults/pref/services-sync.js ; [Layout Engine Resources] + ; Style Sheets, Graphics and other Resources used by the layout engine. + @RESPATH@/res/EditorOverride.css + @RESPATH@/res/contenteditable.css + @RESPATH@/res/designmode.css ++++++ l10n-60.0.1.tar.xz -> l10n-61.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/MozillaFirefox/l10n-60.0.1.tar.xz /work/SRC/openSUSE:Factory/.MozillaFirefox.new/l10n-61.0.tar.xz differ: char 26, line 1 ++++++ mozilla-bmo1464766.patch ++++++ # HG changeset patch # User Mike Hommey <[email protected]> # Date 1527491713 -32400 # Node ID c28becad0c10b906454d7e424f9a9402799ea8dd # Parent 86eaa6799cf51660c0b598937121305b8f70c84d Bug 1464766 - Allow to relax the addon signature requirements. r?rhelmer diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js @@ -1134,16 +1134,19 @@ pref("print.print_via_parent", true); pref("print.print_via_parent", false); #endif // Pref used by the spellchecker extension to control the // maximum number of misspelled words that will be underlined // in a document. pref("extensions.spellcheck.inline.max-misspellings", 500); +// Add-on manager scoped allowing unsigned addons. None by default. +pref("extensions.unsignedScopes", 12, locked); + // Prefs used by libeditor. Prefs specific to seamonkey composer // belong in comm-central/editor/ui/composer.js pref("editor.use_custom_colors", false); pref("editor.singleLine.pasteNewlines", 2); pref("editor.use_css", false); pref("editor.css.default_length_unit", "px"); pref("editor.resizing.preserve_ratio", true); diff --git a/toolkit/mozapps/extensions/content/extensions.js b/toolkit/mozapps/extensions/content/extensions.js --- a/toolkit/mozapps/extensions/content/extensions.js +++ b/toolkit/mozapps/extensions/content/extensions.js @@ -42,16 +42,17 @@ XPCOMUtils.defineLazyPreferenceGetter(th const PREF_DISCOVERURL = "extensions.webservice.discoverURL"; const PREF_DISCOVER_ENABLED = "extensions.getAddons.showPane"; const PREF_GETADDONS_CACHE_ENABLED = "extensions.getAddons.cache.enabled"; const PREF_GETADDONS_CACHE_ID_ENABLED = "extensions.%ID%.getAddons.cache.enabled"; const PREF_UI_TYPE_HIDDEN = "extensions.ui.%TYPE%.hidden"; const PREF_UI_LASTCATEGORY = "extensions.ui.lastCategory"; const PREF_LEGACY_EXCEPTIONS = "extensions.legacy.exceptions"; const PREF_LEGACY_ENABLED = "extensions.legacy.enabled"; +const PREF_UNSIGNED_SCOPES = "extensions.unsignedScopes"; const LOADING_MSG_DELAY = 100; const UPDATES_RECENT_TIMESPAN = 2 * 24 * 3600000; // 2 days (in milliseconds) const UPDATES_RELEASENOTES_TRANSFORMFILE = "chrome://mozapps/content/extensions/updateinfo.xsl"; const XMLURI_PARSE_ERROR = "http://www.mozilla.org/newlayout/xml/parsererror.xml";; @@ -223,19 +224,21 @@ function loadView(aViewId) { function isCorrectlySigned(aAddon) { // Add-ons without an "isCorrectlySigned" property are correctly signed as // they aren't the correct type for signing. return aAddon.isCorrectlySigned !== false; } function isDisabledUnsigned(addon) { - let signingRequired = (addon.type == "locale") ? - AddonSettings.LANGPACKS_REQUIRE_SIGNING : - AddonSettings.REQUIRE_SIGNING; + let unsignedScopes = Services.prefs.getIntPref(PREF_UNSIGNED_SCOPES, 0); + let signingRequired = !(addon.scope & unsignedScopes) && + ((addon.type == "locale") ? + AddonSettings.LANGPACKS_REQUIRE_SIGNING : + AddonSettings.REQUIRE_SIGNING); return signingRequired && !isCorrectlySigned(addon); } function isLegacyExtension(addon) { let legacy = false; if (addon.type == "extension" && !addon.isWebExtension) { legacy = true; } diff --git a/toolkit/mozapps/extensions/internal/XPIDatabase.jsm b/toolkit/mozapps/extensions/internal/XPIDatabase.jsm --- a/toolkit/mozapps/extensions/internal/XPIDatabase.jsm +++ b/toolkit/mozapps/extensions/internal/XPIDatabase.jsm @@ -78,16 +78,17 @@ const KEY_PROFILEDIR = const FILE_JSON_DB = "extensions.json"; // The last version of DB_SCHEMA implemented in SQLITE const LAST_SQLITE_DB_SCHEMA = 14; const PREF_BLOCKLIST_ITEM_URL = "extensions.blocklist.itemURL"; const PREF_DB_SCHEMA = "extensions.databaseSchema"; const PREF_EM_AUTO_DISABLED_SCOPES = "extensions.autoDisableScopes"; +const PREF_EM_UNSIGNED_SCOPES = "extensions.unsignedScopes"; const PREF_EM_EXTENSION_FORMAT = "extensions."; const PREF_PENDING_OPERATIONS = "extensions.pendingOperations"; const PREF_XPI_SIGNATURES_DEV_ROOT = "xpinstall.signatures.dev-root"; const TOOLKIT_ID = "[email protected]"; const KEY_APP_SYSTEM_ADDONS = "app-system-addons"; const KEY_APP_SYSTEM_DEFAULTS = "app-system-defaults"; @@ -1959,17 +1960,19 @@ this.XPIDatabase = { * Calculates whether an add-on should be appDisabled or not. * * @param {AddonInternal} aAddon * The add-on to check * @returns {boolean} * True if the add-on should not be appDisabled */ isUsableAddon(aAddon) { - if (this.mustSign(aAddon.type) && !aAddon.isCorrectlySigned) { + let unsignedScopes = Services.prefs.getIntPref(PREF_EM_UNSIGNED_SCOPES, 0); + if (!(aAddon._installLocation.scope & unsignedScopes) && + this.mustSign(aAddon.type) && !aAddon.isCorrectlySigned) { logger.warn(`Add-on ${aAddon.id} is not correctly signed.`); if (Services.prefs.getBoolPref(PREF_XPI_SIGNATURES_DEV_ROOT, false)) { logger.warn(`Preference ${PREF_XPI_SIGNATURES_DEV_ROOT} is set.`); } return false; } if (aAddon.blocklistState == nsIBlocklistService.STATE_BLOCKED) { ++++++ mozilla-kde.patch ++++++ --- /var/tmp/diff_new_pack.1AHBcM/_old 2018-07-04 23:53:14.732016982 +0200 +++ /var/tmp/diff_new_pack.1AHBcM/_new 2018-07-04 23:53:14.736016978 +0200 @@ -1,5 +1,5 @@ # HG changeset patch -# Parent d7a4d772ba2afb3ac43e2f2f234ffa55bcf50e70 +# Parent 8671b358718cb8898a55fada20fc9999408daefe Description: Add KDE integration to Firefox (toolkit parts) Author: Wolfgang Rosenauer <[email protected]> Author: Lubos Lunak <[email protected]> @@ -9,7 +9,7 @@ diff --git a/modules/libpref/Preferences.cpp b/modules/libpref/Preferences.cpp --- a/modules/libpref/Preferences.cpp +++ b/modules/libpref/Preferences.cpp -@@ -76,16 +76,17 @@ +@@ -77,16 +77,17 @@ #include "nsXPCOMCID.h" #include "nsXPCOM.h" #include "nsXULAppAPI.h" @@ -27,7 +27,7 @@ using namespace mozilla; #ifdef DEBUG -@@ -3868,25 +3869,37 @@ Preferences::InitInitialObjects() +@@ -4201,25 +4202,37 @@ Preferences::InitInitialObjects(bool aIs // application pref files for backwards compatibility. static const char* specialFiles[] = { #if defined(XP_MACOSX) @@ -65,7 +65,7 @@ // Load jar:$app/omni.jar!/defaults/preferences/*.js // or jar:$gre/omni.jar!/defaults/preferences/*.js. -@@ -3935,17 +3948,17 @@ Preferences::InitInitialObjects() +@@ -4268,17 +4281,17 @@ Preferences::InitInitialObjects(bool aIs } nsCOMPtr<nsIFile> path = do_QueryInterface(elem); @@ -79,17 +79,17 @@ } } - #ifdef MOZ_WIDGET_ANDROID - // Set up the correct default for toolkit.telemetry.enabled. If this build - // has MOZ_TELEMETRY_ON_BY_DEFAULT *or* we're on the beta channel, telemetry - // is on by default, otherwise not. This is necessary so that beta users who - // are testing final release builds don't flipflop defaults. + if (XRE_IsParentProcess()) { + SetupTelemetryPref(); + } + + NS_CreateServicesFromCategory(NS_PREFSERVICE_APPDEFAULTS_TOPIC_ID, diff --git a/modules/libpref/moz.build b/modules/libpref/moz.build --- a/modules/libpref/moz.build +++ b/modules/libpref/moz.build -@@ -27,16 +27,20 @@ XPIDL_MODULE = 'pref' - EXPORTS.mozilla += [ +@@ -29,16 +29,20 @@ EXPORTS.mozilla += [ 'Preferences.h', + 'StaticPrefs.h', ] UNIFIED_SOURCES += [ @@ -171,7 +171,7 @@ diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn --- a/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn -@@ -69,16 +69,18 @@ toolkit.jar: +@@ -68,16 +68,18 @@ toolkit.jar: content/global/bindings/checkbox.xml (widgets/checkbox.xml) content/global/bindings/colorpicker.xml (widgets/colorpicker.xml) content/global/bindings/datekeeper.js (widgets/datekeeper.js) @@ -183,13 +183,13 @@ +* content/global/bindings/dialog-kde.xml (widgets/dialog-kde.xml) +% override chrome://global/content/bindings/dialog.xml chrome://global/content/bindings/dialog-kde.xml desktop=kde content/global/bindings/editor.xml (widgets/editor.xml) - content/global/bindings/filefield.xml (widgets/filefield.xml) * content/global/bindings/findbar.xml (widgets/findbar.xml) content/global/bindings/general.xml (widgets/general.xml) content/global/bindings/groupbox.xml (widgets/groupbox.xml) content/global/bindings/listbox.xml (widgets/listbox.xml) content/global/bindings/menu.xml (widgets/menu.xml) content/global/bindings/menulist.xml (widgets/menulist.xml) + content/global/bindings/notification.xml (widgets/notification.xml) diff --git a/toolkit/content/widgets/dialog-kde.xml b/toolkit/content/widgets/dialog-kde.xml new file mode 100644 --- /dev/null @@ -676,45 +676,7 @@ diff --git a/toolkit/mozapps/downloads/nsHelperAppDlg.js b/toolkit/mozapps/downloads/nsHelperAppDlg.js --- a/toolkit/mozapps/downloads/nsHelperAppDlg.js +++ b/toolkit/mozapps/downloads/nsHelperAppDlg.js -@@ -627,17 +627,17 @@ nsUnknownContentTypeDialog.prototype = { - else - typeString = mimeInfo.MIMEType; - } - // When the length is unknown, contentLength would be -1 - if (this.mLauncher.contentLength >= 0) { - let [size, unit] = DownloadUtils. - convertByteUnits(this.mLauncher.contentLength); - type.value = this.dialogElement("strings") -- .getFormattedString("orderedFileSizeWithType", -+ .getFormattedString("orderedFileSizeWithType", - [typeString, size, unit]); - } - else { - type.value = typeString; - } - }, - - // Returns true if opening the default application makes sense. -@@ -801,17 +801,17 @@ nsUnknownContentTypeDialog.prototype = { - switch (this.dialogElement("openHandler").selectedIndex) { - case 0: - // No app need be specified in this case. - ok = true; - break; - case 1: - // only enable the OK button if we have a default app to use or if - // the user chose an app.... -- ok = this.chosenApp || /\S/.test(this.dialogElement("otherHandler").getAttribute("path")); -+ ok = this.chosenApp || /\S/.test(this.dialogElement("otherHandler").getAttribute("path")); - break; - } - } - - // Enable Ok button if ok to press. - this.mDialog.document.documentElement.getButton("accept").disabled = !ok; - }, - -@@ -1066,30 +1066,60 @@ nsUnknownContentTypeDialog.prototype = { +@@ -1035,30 +1035,60 @@ nsUnknownContentTypeDialog.prototype = { if (params.handlerApp && params.handlerApp.executable && @@ -1371,7 +1333,7 @@ 'android/nsExternalSharingAppService.cpp', 'android/nsExternalURLHandlerService.cpp', 'android/nsMIMEInfoAndroid.cpp', -@@ -124,16 +126,17 @@ include('/ipc/chromium/chromium-config.m +@@ -122,16 +124,17 @@ include('/ipc/chromium/chromium-config.m FINAL_LIBRARY = 'xul' LOCAL_INCLUDES += [ @@ -1808,7 +1770,7 @@ diff --git a/widget/gtk/moz.build b/widget/gtk/moz.build --- a/widget/gtk/moz.build +++ b/widget/gtk/moz.build -@@ -121,16 +121,17 @@ else: +@@ -122,16 +122,17 @@ else: include('/ipc/chromium/chromium-config.mozbuild') FINAL_LIBRARY = 'xul' @@ -2204,7 +2166,7 @@ const char* directive; int argc; -@@ -444,16 +445,17 @@ ParseManifest(NSLocationType aType, File +@@ -441,16 +442,17 @@ ParseManifest(NSLocationType aType, File NS_NAMED_LITERAL_STRING(kRemoteEnabled, "remoteenabled"); NS_NAMED_LITERAL_STRING(kRemoteRequired, "remoterequired"); NS_NAMED_LITERAL_STRING(kApplication, "application"); @@ -2222,7 +2184,7 @@ NS_NAMED_LITERAL_STRING(kMain, "main"); NS_NAMED_LITERAL_STRING(kContent, "content"); -@@ -499,44 +501,49 @@ ParseManifest(NSLocationType aType, File +@@ -496,44 +498,49 @@ ParseManifest(NSLocationType aType, File CopyUTF8toUTF16(s, abi); abi.Insert(char16_t('_'), 0); abi.Insert(osTarget, 0); @@ -2272,7 +2234,7 @@ process = kMain; } -@@ -638,25 +645,27 @@ ParseManifest(NSLocationType aType, File +@@ -635,25 +642,27 @@ ParseManifest(NSLocationType aType, File TriState stOsVersion = eUnspecified; TriState stOs = eUnspecified; TriState stABI = eUnspecified; @@ -2300,7 +2262,7 @@ } #if defined(MOZ_WIDGET_ANDROID) -@@ -701,16 +710,17 @@ ParseManifest(NSLocationType aType, File +@@ -698,16 +707,17 @@ ParseManifest(NSLocationType aType, File } if (!ok || @@ -2321,16 +2283,16 @@ diff --git a/xpcom/components/moz.build b/xpcom/components/moz.build --- a/xpcom/components/moz.build +++ b/xpcom/components/moz.build -@@ -44,12 +44,13 @@ FINAL_LIBRARY = 'xul' +@@ -43,12 +43,13 @@ FINAL_LIBRARY = 'xul' + LOCAL_INCLUDES += [ '!..', '../base', '../build', '../ds', - '../reflect/xptinfo', '/chrome', '/modules/libjar', -+ '/toolkit/xre' ++ '/toolkit/xre', ] if 'gtk' in CONFIG['MOZ_WIDGET_TOOLKIT']: ++++++ mozilla-no-return.patch ++++++ # HG changeset patch # User Wolfgang Rosenauer <[email protected]> # Parent 242712e5a1879111d1a93a5d55dfae3fd5d47abc diff --git a/intl/icu/source/i18n/number_grouping.cpp b/intl/icu/source/i18n/number_grouping.cpp --- a/intl/icu/source/i18n/number_grouping.cpp +++ b/intl/icu/source/i18n/number_grouping.cpp @@ -43,16 +43,17 @@ Grouper Grouper::forStrategy(UGroupingSt case UNUM_GROUPING_MIN2: return {-2, -2, -3}; case UNUM_GROUPING_ON_ALIGNED: return {-4, -4, 1}; case UNUM_GROUPING_THOUSANDS: return {3, 3, 1}; default: U_ASSERT(FALSE); + return {0, 0, 0}; } } void Grouper::setLocaleData(const impl::ParsedPatternInfo &patternInfo, const Locale& locale) { if (fGrouping1 != -2 && fGrouping2 != -4) { return; } auto grouping1 = static_cast<int16_t> (patternInfo.positive.groupingSizes & 0xffff); diff --git a/media/libcubeb/src/cubeb_utils.cpp b/media/libcubeb/src/cubeb_utils.cpp --- a/media/libcubeb/src/cubeb_utils.cpp +++ b/media/libcubeb/src/cubeb_utils.cpp @@ -14,10 +14,11 @@ size_t cubeb_sample_size(cubeb_sample_fo case CUBEB_SAMPLE_S16BE: return sizeof(int16_t); case CUBEB_SAMPLE_FLOAT32LE: case CUBEB_SAMPLE_FLOAT32BE: return sizeof(float); default: // should never happen as all cases are handled above. assert(false); + return sizeof(float); } } ++++++ source-stamp.txt ++++++ --- /var/tmp/diff_new_pack.1AHBcM/_old 2018-07-04 23:53:14.784016925 +0200 +++ /var/tmp/diff_new_pack.1AHBcM/_new 2018-07-04 23:53:14.784016925 +0200 @@ -1,2 +1,2 @@ -REV=03d4f76300be +REV=785d242a5b01 REPO=http://hg.mozilla.org/releases/mozilla-release
