Hello community, here is the log from the commit of package MozillaFirefox for openSUSE:Factory checked in at 2015-08-14 14:45:37 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/MozillaFirefox (Old) and /work/SRC/openSUSE:Factory/.MozillaFirefox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "MozillaFirefox" Changes: -------- --- /work/SRC/openSUSE:Factory/MozillaFirefox/MozillaFirefox.changes 2015-08-10 09:15:20.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.MozillaFirefox.new/MozillaFirefox.changes 2015-08-14 14:45:39.000000000 +0200 @@ -1,0 +2,56 @@ +Fri Aug 7 07:49:49 UTC 2015 - [email protected] + +- update to Firefox 40.0 (bnc#940806) + * Added protection against unwanted software downloads + * Suggested Tiles show sites of interest, based on categories + from your recent browsing history + * Hello allows adding a link to conversations to provide context + on what the conversation will be about + * New style for add-on manager based on the in-content + preferences style + * Improved scrolling, graphics, and video playback performance + with off main thread compositing (GNU/Linux only) + * Graphic blocklist mechanism improved: Firefox version ranges + can be specified, limiting the number of devices blocked + security fixes: + * MFSA 2015-79/CVE-2015-4473/CVE-2015-4474 + Miscellaneous memory safety hazards + * MFSA 2015-80/CVE-2015-4475 (bmo#1175396) + Out-of-bounds read with malformed MP3 file + * MFSA 2015-81/CVE-2015-4477 (bmo#1179484) + Use-after-free in MediaStream playback + * MFSA 2015-82/CVE-2015-4478 (bmo#1105914) + Redefinition of non-configurable JavaScript object properties + * MFSA 2015-83/CVE-2015-4479/CVE-2015-4480/CVE-2015-4493 + Overflow issues in libstagefright + * MFSA 2015-84/CVE-2015-4481 (bmo1171518) + Arbitrary file overwriting through Mozilla Maintenance Service + with hard links (only affected Windows) + * MFSA 2015-85/CVE-2015-4482 (bmo#1184500) + Out-of-bounds write with Updater and malicious MAR file + (does not affect openSUSE RPM packages which do not ship the + updater) + * MFSA 2015-86/CVE-2015-4483 (bmo#1148732) + Feed protocol with POST bypasses mixed content protections + * MFSA 2015-87/CVE-2015-4484 (bmo#1171540) + Crash when using shared memory in JavaScript + * MFSA 2015-88/CVE-2015-4491 (bmo#1184009) + Heap overflow in gdk-pixbuf when scaling bitmap images + * MFSA 2015-89/CVE-2015-4485/CVE-2015-4486 (bmo#1177948, bmo#1178148) + Buffer overflows on Libvpx when decoding WebM video + * MFSA 2015-90/CVE-2015-4487/CVE-2015-4488/CVE-2015-4489 + Vulnerabilities found through code inspection + * MFSA 2015-91/CVE-2015-4490 (bmo#1086999) + Mozilla Content Security Policy allows for asterisk wildcards + in violation of CSP specification + * MFSA 2015-92/CVE-2015-4492 (bmo#1185820) + Use-after-free in XMLHttpRequest with shared workers +- added mozilla-no-stdcxx-check.patch +- removed obsolete patches + * mozilla-add-glibcxx_use_cxx11_abi.patch + * firefox-multilocale-chrome.patch +- rebased patches +- requires version 40 of the branding package +- removed browser/searchplugins/ location as it's not valid anymore + +------------------------------------------------------------------- Old: ---- firefox-39.0.3-source.tar.xz firefox-multilocale-chrome.patch l10n-39.0.3.tar.xz mozilla-add-glibcxx_use_cxx11_abi.patch New: ---- firefox-40.0-source.tar.xz l10n-40.0.tar.xz mozilla-no-stdcxx-check.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox.spec ++++++ --- /var/tmp/diff_new_pack.ihAqu3/_old 2015-08-14 14:45:51.000000000 +0200 +++ /var/tmp/diff_new_pack.ihAqu3/_new 2015-08-14 14:45:51.000000000 +0200 @@ -18,10 +18,10 @@ # changed with every update -%define major 39 -%define mainver %major.0.3 +%define major 40 +%define mainver %major.0 %define update_channel release -%define releasedate 2015080600 +%define releasedate 2015080700 # general build definitions %if "%{update_channel}" != "aurora" @@ -146,18 +146,17 @@ Patch12: mozilla-openaes-decl.patch Patch14: mozilla-skia-be-le.patch Patch15: mozilla-bmo1005535.patch -Patch16: mozilla-add-glibcxx_use_cxx11_abi.patch -Patch17: mozilla-arm64-libjpeg-turbo.patch +Patch16: mozilla-arm64-libjpeg-turbo.patch +Patch17: mozilla-no-stdcxx-check.patch # Firefox/browser Patch101: firefox-kde.patch Patch102: firefox-no-default-ualocale.patch -Patch103: firefox-multilocale-chrome.patch -Patch104: firefox-branded-icons.patch +Patch103: firefox-branded-icons.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires(post): coreutils shared-mime-info desktop-file-utils Requires(postun): shared-mime-info desktop-file-utils %if %branding -Requires: %{name}-branding > 20.0 +Requires: %{name}-branding > 39.0 %endif Requires: mozilla-nspr >= %(rpm -q --queryformat '%{VERSION}' mozilla-nspr) Requires: mozilla-nss >= %(rpm -q --queryformat '%{VERSION}' mozilla-nss) @@ -225,7 +224,7 @@ #BRAND: It's also possible to create a file #BRAND: /usr/lib/firefox/defaults/preferences/firefox-$vendor.js to set #BRAND: custom preference overrides. -#BRAND: It's also possible to drop files in /usr/lib/firefox/searchplugins +#BRAND: It's also possible to drop files in /usr/lib/firefox/distribution/searchplugins/common/ %description branding-upstream This package provides upstream look and feel for %{appname}. @@ -267,7 +266,6 @@ %patch101 -p1 %patch102 -p1 %patch103 -p1 -%patch104 -p1 %build # no need to add build time to binaries @@ -380,7 +378,6 @@ mkdir -p %{buildroot}%{progdir} cp -rf $RPM_BUILD_DIR/obj/dist/firefox/* %{buildroot}%{progdir} mkdir -p %{buildroot}%{progdir}/distribution/extensions -mkdir -p %{buildroot}%{progdir}/browser/searchplugins mkdir -p %{buildroot}%{progdir}/browser/defaults/preferences/ # install gre prefs install -m 644 %{SOURCE13} %{buildroot}%{progdir}/defaults/pref/ @@ -558,7 +555,6 @@ %{progdir}/browser/icons/ %{progdir}/browser/chrome/icons %{progdir}/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} -%{progdir}/browser/searchplugins/ %{progdir}/browser/blocklist.xml %{progdir}/browser/chrome.manifest %{progdir}/browser/omni.ja ++++++ compare-locales.tar.xz ++++++ ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.ihAqu3/_old 2015-08-14 14:45:51.000000000 +0200 +++ /var/tmp/diff_new_pack.ihAqu3/_new 2015-08-14 14:45:51.000000000 +0200 @@ -2,8 +2,8 @@ CHANNEL="release" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_39_0_3_RELEASE" -VERSION="39.0.3" +RELEASE_TAG="FIREFOX_40_0_RELEASE" +VERSION="40.0" # mozilla if [ -d mozilla ]; then ++++++ firefox-39.0.3-source.tar.xz -> firefox-40.0-source.tar.xz ++++++ /work/SRC/openSUSE:Factory/MozillaFirefox/firefox-39.0.3-source.tar.xz /work/SRC/openSUSE:Factory/.MozillaFirefox.new/firefox-40.0-source.tar.xz differ: char 26, line 1 ++++++ firefox-branded-icons.patch ++++++ --- /var/tmp/diff_new_pack.ihAqu3/_old 2015-08-14 14:45:51.000000000 +0200 +++ /var/tmp/diff_new_pack.ihAqu3/_new 2015-08-14 14:45:51.000000000 +0200 @@ -1,10 +1,11 @@ # HG changeset patch # Parent e0751ad74e835e80041a61ea00c2a63bf6fbe2de +# Parent dbca8a673de340999f67eb321169b44cc4109faf diff --git a/browser/app/Makefile.in b/browser/app/Makefile.in --- a/browser/app/Makefile.in +++ b/browser/app/Makefile.in -@@ -62,16 +62,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d +@@ -55,16 +55,21 @@ GARBAGE += $(addprefix $(FINAL_TARGET)/d endif ifdef MOZ_WIDGET_GTK @@ -26,37 +27,31 @@ $(NSINSTALL) -D $(DIST)/bin/defaults/pref $(call py_action,preprocessor,-Fsubstitution $(PREF_PPFLAGS) $(ACDEFINES) $^ -o $(DIST)/bin/defaults/pref/channel-prefs.js) endif -diff --git a/browser/branding/official/Makefile.in b/browser/branding/official/Makefile.in ---- a/browser/branding/official/Makefile.in -+++ b/browser/branding/official/Makefile.in -@@ -35,18 +35,21 @@ BRANDING_FILES := \ - document.icns \ - dsstore \ - $(NULL) - endif - - ifdef MOZ_WIDGET_GTK - BRANDING_FILES := \ - default16.png \ -+ default22.png \ -+ default24.png \ - default32.png \ - default48.png \ -+ default256.png \ - mozicon128.png \ - $(NULL) - endif - - BRANDING_DEST := $(DIST)/branding - BRANDING_TARGET := export - INSTALL_TARGETS += BRANDING - +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 +@@ -32,12 +32,15 @@ elif CONFIG['MOZ_WIDGET_TOOLKIT'] == 'co + 'disk.icns', + 'document.icns', + 'dsstore', + 'firefox.icns', + ] + elif CONFIG['MOZ_WIDGET_GTK']: + BRANDING_FILES += [ + 'default16.png', ++ 'default22.png', ++ 'default24.png', ++ 'default256.png', + 'default32.png', + 'default48.png', + 'mozicon128.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 -@@ -654,18 +654,21 @@ - @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf +@@ -669,18 +669,21 @@ @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/icon.png + @RESPATH@/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}/install.rdf @RESPATH@/chrome/toolkit@JAREXT@ @RESPATH@/chrome/toolkit.manifest @RESPATH@/chrome/recording.manifest ++++++ firefox-kde.patch ++++++ --- /var/tmp/diff_new_pack.ihAqu3/_old 2015-08-14 14:45:51.000000000 +0200 +++ /var/tmp/diff_new_pack.ihAqu3/_new 2015-08-14 14:45:51.000000000 +0200 @@ -1,11 +1,11 @@ # HG changeset patch -# Parent cd94ee18bd0cdda7f5eb5503d8d072efe02a8033 +# Parent c6048238765dab77cd0c9a45e7afb1157316938b 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,1308 @@ +@@ -0,0 +1,1314 @@ +#filter substitution +<?xml version="1.0"?> +# -*- Mode: HTML -*- @@ -788,6 +788,7 @@ + <image id="default-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="identity-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="geo-notification-icon" class="notification-anchor-icon" role="button"/> ++ <image id="push-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="addons-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="indexedDB-notification-icon" class="notification-anchor-icon" role="button"/> + <image id="password-notification-icon" class="notification-anchor-icon" role="button"/> @@ -838,7 +839,7 @@ + <image id="readinglist-addremove-button" + class="urlbar-icon" + hidden="true" -+ onclick="ReadingListUI.togglePageByBrowser(gBrowser.selectedBrowser);"/> ++ onclick="ReadingListUI.buttonClick(event);"/> + <image id="reader-mode-button" + class="urlbar-icon" + hidden="true" @@ -1298,13 +1299,18 @@ + + <svg:svg height="0"> +#include tab-shape.inc.svg -+ <svg:clipPath id="urlbar-back-button-clip-path" clipPathUnits="userSpaceOnUse"> ++ <svg:clipPath id="urlbar-back-button-clip-path"> +#ifndef XP_MACOSX -+ <svg:path d="m 1,-5 l 0,7.8 c 2.5,3.2 4,6.2 4,10.2 c 0,4 -1.5,7 -4,10 l 0,22l10000,0 l 0,-50 l -10000,0 z"/> ++ <svg:path d="M -9,-4 l 0,1 a 15 15 0 0,1 0,30 l 0,1 l 10000,0 l 0,-32 l -10000,0 z" /> +#else + <svg:path d="M -11,-5 a 16 16 0 0 1 0,34 l 10000,0 l 0,-34 l -10000,0 z"/> +#endif + </svg:clipPath> ++#ifdef XP_WIN ++ <svg:clipPath id="urlbar-back-button-clip-path-win10"> ++ <svg:path d="M -6,-2 l 0,1 a 15 15 0 0,1 0,30 l 0,1 l 10000,0 l 0,-32 l -10000,0 z" /> ++ </svg:clipPath> ++#endif + </svg:svg> + +</vbox> @@ -1336,7 +1342,7 @@ <button id="editBookmarkPanelDeleteButton" class="editBookmarkPanelBottomButton" label="&editBookmark.cancel.label;" -@@ -1234,17 +1234,17 @@ +@@ -1235,17 +1235,17 @@ <hbox id="full-screen-warning-container" hidden="true" fadeout="true"> <hbox style="width: 100%;" pack="center"> <!-- Inner hbox needed due to bug 579776. --> @@ -1463,7 +1469,7 @@ // when the user will select the default. We refresh here periodically // in case the default changes. On other Windows OS's defaults can also // be set while the prefs are open. -@@ -549,16 +555,27 @@ var gMainPane = { +@@ -524,16 +530,27 @@ var gMainPane = { */ setDefaultBrowser: function() { @@ -1931,7 +1937,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 -@@ -698,19 +698,21 @@ +@@ -703,19 +703,21 @@ @RESPATH@/defaults/autoconfig/prefcalls.js @RESPATH@/browser/defaults/profile/prefs.js ++++++ firefox-no-default-ualocale.patch ++++++ --- /var/tmp/diff_new_pack.ihAqu3/_old 2015-08-14 14:45:51.000000000 +0200 +++ /var/tmp/diff_new_pack.ihAqu3/_new 2015-08-14 14:45:51.000000000 +0200 @@ -1,14 +1,14 @@ # HG changeset patch # User Wolfgang Rosenauer <[email protected]> # Parent 099312626f5f7c9cb5573a61d0230574ee12a660 -# Parent 9e46107bf33966236739600abba9dc8d97fd9d7f +# Parent ab1135c098843a4a4c5153bd361b964986fccefa 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 -@@ -251,17 +251,17 @@ pref("browser.uitour.url", "https://www. - pref("browser.uitour.readerViewTrigger", "^https:\/\/www\.mozilla\.org\/[^\/]+\/firefox\/reading\/start"); +@@ -254,17 +254,17 @@ pref("browser.uitour.url", "https://www. + pref("browser.uitour.readerViewTrigger", "^https:\\/\\/www\\.mozilla\\.org\\/[^\\/]+\\/firefox\\/reading\\/start"); pref("browser.customizemode.tip0.shown", false); pref("browser.customizemode.tip0.learnMoreUrl", "https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/customize";); ++++++ l10n-39.0.3.tar.xz -> l10n-40.0.tar.xz ++++++ /work/SRC/openSUSE:Factory/MozillaFirefox/l10n-39.0.3.tar.xz /work/SRC/openSUSE:Factory/.MozillaFirefox.new/l10n-40.0.tar.xz differ: char 26, line 1 ++++++ mozilla-arm-disable-edsp.patch ++++++ --- /var/tmp/diff_new_pack.ihAqu3/_old 2015-08-14 14:45:51.000000000 +0200 +++ /var/tmp/diff_new_pack.ihAqu3/_new 2015-08-14 14:45:51.000000000 +0200 @@ -1,6 +1,7 @@ # HG changeset patch # User Adrian Schröter <[email protected]> # Parent b945e0c3b145b6b2245f42bab52f911c2d1f6759 +# Parent 4ecf304db9dc3ea6259b6f16ed5af1022ff1034c disable ESDP support (no BNC or BMO reference yet :-() diff --git a/mozglue/build/arm.h b/mozglue/build/arm.h ++++++ mozilla-arm64-libjpeg-turbo.patch ++++++ --- /var/tmp/diff_new_pack.ihAqu3/_old 2015-08-14 14:45:51.000000000 +0200 +++ /var/tmp/diff_new_pack.ihAqu3/_new 2015-08-14 14:45:51.000000000 +0200 @@ -1,8 +1,15 @@ -Index: mozilla/configure.in -=================================================================== ---- mozilla.orig/configure.in -+++ mozilla/configure.in -@@ -6241,7 +6241,7 @@ fi +# HG changeset patch +# Parent af95b352f0be4eb2e337867450f25f4c2456a47f + +diff --git a/configure.in b/configure.in +--- a/configure.in ++++ b/configure.in +@@ -6202,27 +6202,29 @@ if test -n "$LIBJPEG_TURBO_X86_ASM" -o - + if test "$_YASM_MAJOR_VERSION" -lt "1" -o \( "$_YASM_MAJOR_VERSION" -eq "1" -a "$_YASM_MINOR_VERSION" -lt "1" \) ; then + AC_MSG_ERROR([Yasm 1.1 or greater is required to build with libjpeg-turbo's optimized JPEG decoding routines, but you appear to have version $_YASM_MAJOR_VERSION.$_YASM_MINOR_VERSION. Upgrade to the newest version or configure with --disable-libjpeg-turbo to use the pure C JPEG decoder. See https://developer.mozilla.org/en/YASM for more details.]) + fi + fi + fi dnl If we're on an ARM system which supports libjpeg-turbo's asm routines and dnl --disable-libjpeg-turbo wasn't passed, use the C compiler as the assembler. @@ -11,7 +18,10 @@ echo "Using $AS as the assembler for ARM code." LIBJPEG_TURBO_AS=$AS fi -@@ -6252,6 +6252,8 @@ elif test -n "$LIBJPEG_TURBO_X64_ASM"; t + + if test -n "$LIBJPEG_TURBO_X86_ASM"; then + AC_DEFINE(LIBJPEG_TURBO_X86_ASM) + elif test -n "$LIBJPEG_TURBO_X64_ASM"; then AC_DEFINE(LIBJPEG_TURBO_X64_ASM) elif test -n "$LIBJPEG_TURBO_ARM_ASM"; then AC_DEFINE(LIBJPEG_TURBO_ARM_ASM) @@ -20,3 +30,8 @@ elif test -n "$MOZ_LIBJPEG_TURBO"; then dnl Warn if we're not building the optimized routines, even though the user dnl didn't specify --disable-libjpeg-turbo. + AC_MSG_WARN([No assembler or assembly support for libjpeg-turbo. Using unoptimized C routines.]) + fi + + dnl ======================================================== + dnl = Enable compilation of specific extension modules ++++++ mozilla-bmo1005535.patch ++++++ --- /var/tmp/diff_new_pack.ihAqu3/_old 2015-08-14 14:45:51.000000000 +0200 +++ /var/tmp/diff_new_pack.ihAqu3/_new 2015-08-14 14:45:51.000000000 +0200 @@ -1,13 +1,13 @@ # HG changeset patch # Parent b7eb1ce0237d6125b75bc8ff1cb3afc328d6e78c # User Steve Singer <[email protected]> -# Parent d7af74fb513bcca581012f17ea248b1692db5d97 +# Parent 4e6bb9847daccf128ad3eab9be087ef63f9b974c Bug 1005535 - Get skia GPU building on big endian. diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in -@@ -8198,21 +8198,21 @@ dnl Skia +@@ -8208,21 +8208,21 @@ dnl Skia dnl ======================================================== if test "$MOZ_ENABLE_SKIA"; then AC_DEFINE(MOZ_ENABLE_SKIA) ++++++ mozilla-icu-strncat.patch ++++++ --- /var/tmp/diff_new_pack.ihAqu3/_old 2015-08-14 14:45:51.000000000 +0200 +++ /var/tmp/diff_new_pack.ihAqu3/_new 2015-08-14 14:45:51.000000000 +0200 @@ -1,6 +1,7 @@ # HG changeset patch # Parent 29be2a4daa0f512d22bde85b97b5460839026571 # User Wolfgang Rosenauer <[email protected]> +# Parent a7d16f0faf5d4881dbea524340f881d5850710e4 From: Jan Engelhardt <[email protected]> Reference: http://bugs.icu-project.org/trac/ticket/7808 ++++++ mozilla-kde.patch ++++++ --- /var/tmp/diff_new_pack.ihAqu3/_old 2015-08-14 14:45:51.000000000 +0200 +++ /var/tmp/diff_new_pack.ihAqu3/_new 2015-08-14 14:45:51.000000000 +0200 @@ -1,5 +1,5 @@ # HG changeset patch -# Parent 214f99f3ce4f1f8ae9b3d18da44e5d66b3105663 +# Parent 5f8cbb078ab0d5696255c2f514c6333666b47da9 Description: Add KDE integration to Firefox (toolkit parts) Author: Wolfgang Rosenauer <[email protected]> Author: Lubos Lunak <[email protected]> @@ -46,7 +46,7 @@ #include "prefread.h" #include "prefapi_private_data.h" -@@ -1165,16 +1166,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char +@@ -1154,16 +1155,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char static nsresult pref_LoadPrefsInDirList(const char *listId) { @@ -81,7 +81,7 @@ return NS_OK; bool hasMore; -@@ -1190,17 +1209,17 @@ static nsresult pref_LoadPrefsInDirList( +@@ -1179,17 +1198,17 @@ static nsresult pref_LoadPrefsInDirList( nsAutoCString leaf; path->GetNativeLeafName(leaf); @@ -100,7 +100,7 @@ { nsZipItemPtr<char> manifest(jarReader, name, true); NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE); -@@ -1294,26 +1313,38 @@ static nsresult pref_InitInitialObjects( +@@ -1283,26 +1302,38 @@ static nsresult pref_InitInitialObjects( /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */ static const char* specialFiles[] = { #if defined(XP_MACOSX) @@ -184,7 +184,7 @@ diff --git a/toolkit/components/downloads/moz.build b/toolkit/components/downloads/moz.build --- a/toolkit/components/downloads/moz.build +++ b/toolkit/components/downloads/moz.build -@@ -52,14 +52,15 @@ if not CONFIG['MOZ_SUITE']: +@@ -67,14 +67,15 @@ if not CONFIG['MOZ_SUITE']: ] FAIL_ON_WARNINGS = True @@ -225,7 +225,7 @@ #include "AndroidBridge.h" #endif -@@ -2716,16 +2720,25 @@ nsDownload::SetState(DownloadState aStat +@@ -2711,16 +2715,25 @@ nsDownload::SetState(DownloadState aStat nsCOMPtr<nsIPrefBranch> pref(do_GetService(NS_PREFSERVICE_CONTRACTID)); // Master pref to control this function. @@ -251,7 +251,7 @@ int64_t goat = PR_Now() - mStartTime; showTaskbarAlert = goat > alertIntervalUSec; -@@ -2756,16 +2769,17 @@ nsDownload::SetState(DownloadState aStat +@@ -2751,16 +2764,17 @@ nsDownload::SetState(DownloadState aStat NS_LITERAL_STRING(DOWNLOAD_MANAGER_ALERT_ICON), title, message, !removeWhenDone, mPrivate ? NS_LITERAL_STRING("private") : NS_LITERAL_STRING("non-private"), @@ -272,7 +272,7 @@ diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn --- a/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn -@@ -57,29 +57,33 @@ toolkit.jar: +@@ -60,29 +60,33 @@ toolkit.jar: content/global/viewZoomOverlay.js (viewZoomOverlay.js) *+ content/global/bindings/autocomplete.xml (widgets/autocomplete.xml) content/global/bindings/browser.xml (widgets/browser.xml) @@ -310,7 +310,7 @@ new file mode 100644 --- /dev/null +++ b/toolkit/content/widgets/dialog-kde.xml -@@ -0,0 +1,455 @@ +@@ -0,0 +1,460 @@ +<?xml version="1.0"?> +<!-- This Source Code Form is subject to the terms of the Mozilla Public + - License, v. 2.0. If a copy of the MPL was not distributed with this @@ -344,7 +344,7 @@ + <xul:button dlgtype="accept" class="dialog-button" xbl:inherits="disabled=buttondisabledaccept"/> +#elif XP_UNIX + > -+ <xul:button dlgtype="help" class="dialog-button" hidden="true"/> ++ <xul:button dlgtype="help" class="dialog-button" hidden="true"/> + <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/> + <xul:spacer anonid="spacer" flex="1"/> + <xul:button dlgtype="accept" class="dialog-button" xbl:inherits="disabled=buttondisabledaccept"/> @@ -426,11 +426,16 @@ + sizeToContent(); + } + -+ var xOffset = (opener.outerWidth - window.outerWidth) / 2; -+ var yOffset = opener.outerHeight / 5; -+ -+ var newX = opener.screenX + xOffset; -+ var newY = opener.screenY + yOffset; ++ if (opener) { ++ var xOffset = (opener.outerWidth - window.outerWidth) / 2; ++ var yOffset = opener.outerHeight / 5; ++ ++ var newX = opener.screenX + xOffset; ++ var newY = opener.screenY + yOffset; ++ } else { ++ newX = (screen.availWidth - window.outerWidth) / 2; ++ newY = (screen.availHeight - window.outerHeight) / 2; ++ } + + // ensure the window is fully onscreen (if smaller than the screen) + if (newX < screen.availLeft) @@ -770,7 +775,7 @@ new file mode 100644 --- /dev/null +++ b/toolkit/content/widgets/preferences-kde.xml -@@ -0,0 +1,1350 @@ +@@ -0,0 +1,1357 @@ +<?xml version="1.0"?> + +<!DOCTYPE bindings [ @@ -1394,9 +1399,11 @@ + <constructor> + <![CDATA[ + if (this.type != "child") { -+ var psvc = Components.classes["@mozilla.org/preferences-service;1"] -+ .getService(Components.interfaces.nsIPrefBranch); -+ this.instantApply = psvc.getBoolPref("browser.preferences.instantApply"); ++ if (!this._instantApplyInitialized) { ++ let psvc = Components.classes["@mozilla.org/preferences-service;1"] ++ .getService(Components.interfaces.nsIPrefBranch); ++ this.instantApply = psvc.getBoolPref("browser.preferences.instantApply"); ++ } + if (this.instantApply) { + var docElt = document.documentElement; + var acceptButton = docElt.getButton("accept"); @@ -1466,8 +1473,13 @@ + ]]> + </destructor> + ++ <!-- Derived bindings can set this to true to cause us to skip ++ reading the browser.preferences.instantApply pref in the constructor. ++ Then they can set instantApply to their wished value. --> ++ <field name="_instantApplyInitialized">false</field> ++ <!-- Controls whether changed pref values take effect immediately. --> + <field name="instantApply">false</field> -+ ++ + <property name="preferencePanes" + onget="return this.getElementsByTagName('prefpane');"/> + @@ -2124,7 +2136,7 @@ diff --git a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp --- a/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp +++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp -@@ -14,16 +14,18 @@ +@@ -14,16 +14,17 @@ #include "prenv.h" #include "nsPrintfCString.h" #include "nsNetUtil.h" @@ -2133,7 +2145,6 @@ #include "nsInterfaceHashtable.h" #include "mozilla/Attributes.h" #include "nsIURI.h" -+#include "nsVoidArray.h" +#include "nsKDEUtils.h" class nsUnixSystemProxySettings final : public nsISystemProxySettings { @@ -2143,7 +2154,7 @@ nsUnixSystemProxySettings() : mSchemeProxySettings(4) -@@ -38,16 +40,17 @@ private: +@@ -38,16 +39,17 @@ private: nsCOMPtr<nsIGSettingsService> mGSettings; nsCOMPtr<nsIGSettingsCollection> mProxySettings; nsInterfaceHashtable<nsCStringHashKey, nsIGSettingsCollection> mSchemeProxySettings; @@ -2161,7 +2172,7 @@ nsUnixSystemProxySettings::GetMainThreadOnly(bool *aMainThreadOnly) { // dbus prevents us from being threadsafe, but this routine should not block anyhow -@@ -504,16 +507,19 @@ nsUnixSystemProxySettings::GetProxyFromG +@@ -504,16 +506,19 @@ nsUnixSystemProxySettings::GetProxyFromG nsresult nsUnixSystemProxySettings::GetProxyForURI(const nsACString & aSpec, @@ -2181,7 +2192,7 @@ if (mGConf) return GetProxyFromGConf(aScheme, aHost, aPort, aResult); -@@ -539,8 +545,34 @@ static const mozilla::Module::ContractID +@@ -539,8 +544,34 @@ static const mozilla::Module::ContractID static const mozilla::Module kUnixProxyModule = { mozilla::Module::kVersion, @@ -2681,7 +2692,7 @@ new file mode 100644 --- /dev/null +++ b/uriloader/exthandler/unix/nsCommonRegistry.cpp -@@ -0,0 +1,54 @@ +@@ -0,0 +1,53 @@ +/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +/* 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 @@ -2692,7 +2703,6 @@ +#include "nsGNOMERegistry.h" +#include "nsKDERegistry.h" +#include "nsString.h" -+#include "nsVoidArray.h" +#include "nsKDEUtils.h" + +/* static */ bool @@ -3466,7 +3476,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestParser.cpp --- a/xpcom/components/ManifestParser.cpp +++ b/xpcom/components/ManifestParser.cpp -@@ -34,16 +34,17 @@ +@@ -35,16 +35,17 @@ #include "nsIConsoleService.h" #include "nsIScriptError.h" @@ -3484,7 +3494,7 @@ #define XPTONLY_MANIFEST nullptr #define XPTONLY_XPT nullptr #endif -@@ -489,16 +490,17 @@ ParseManifest(NSLocationType aType, File +@@ -494,16 +495,17 @@ ParseManifest(NSLocationType aType, File NS_NAMED_LITERAL_STRING(kRemoteEnabled, "remoteenabled"); NS_NAMED_LITERAL_STRING(kRemoteRequired, "remoterequired"); NS_NAMED_LITERAL_STRING(kApplication, "application"); @@ -3502,7 +3512,7 @@ NS_NAMED_LITERAL_STRING(kMain, "main"); NS_NAMED_LITERAL_STRING(kContent, "content"); -@@ -549,44 +551,49 @@ ParseManifest(NSLocationType aType, File +@@ -554,44 +556,49 @@ ParseManifest(NSLocationType aType, File CopyUTF8toUTF16(s, abi); abi.Insert(char16_t('_'), 0); abi.Insert(osTarget, 0); @@ -3552,7 +3562,7 @@ process = kMain; } -@@ -681,25 +688,27 @@ ParseManifest(NSLocationType aType, File +@@ -694,25 +701,27 @@ ParseManifest(NSLocationType aType, File TriState stOsVersion = eUnspecified; TriState stOs = eUnspecified; TriState stABI = eUnspecified; @@ -3580,7 +3590,7 @@ } #if defined(MOZ_WIDGET_ANDROID) -@@ -749,16 +758,17 @@ ParseManifest(NSLocationType aType, File +@@ -762,16 +771,17 @@ ParseManifest(NSLocationType aType, File } if (!ok || @@ -3601,7 +3611,7 @@ diff --git a/xpcom/components/moz.build b/xpcom/components/moz.build --- a/xpcom/components/moz.build +++ b/xpcom/components/moz.build -@@ -48,12 +48,13 @@ FINAL_LIBRARY = 'xul' +@@ -46,12 +46,13 @@ FINAL_LIBRARY = 'xul' GENERATED_INCLUDES += ['..'] LOCAL_INCLUDES += [ '../base', @@ -3636,7 +3646,7 @@ #include "prmem.h" #include "plbase64.h" -@@ -1964,42 +1965,52 @@ nsLocalFile::SetPersistentDescriptor(con +@@ -1960,42 +1961,52 @@ nsLocalFile::SetPersistentDescriptor(con return InitWithNativePath(aPersistentDescriptor); #endif } @@ -3695,7 +3705,7 @@ return rv; } return NS_ERROR_FAILURE; -@@ -2007,16 +2018,22 @@ nsLocalFile::Reveal() +@@ -2003,16 +2014,22 @@ nsLocalFile::Reveal() return NS_ERROR_FAILURE; #endif } ++++++ mozilla-language.patch ++++++ --- /var/tmp/diff_new_pack.ihAqu3/_old 2015-08-14 14:45:51.000000000 +0200 +++ /var/tmp/diff_new_pack.ihAqu3/_new 2015-08-14 14:45:51.000000000 +0200 @@ -1,6 +1,7 @@ # HG changeset patch # User Wolfgang Rosenauer <[email protected]> # Parent 5a29924228527f8882c83cf62d470963ea1ce62e +# Parent 228ea0669fa8cc78532b71d7bdc4bad5477f246e Bug 583793 - Firefox interface language set to LANG, ignores LANGUAGE diff --git a/intl/locale/nsLocaleService.cpp b/intl/locale/nsLocaleService.cpp @@ -24,7 +25,7 @@ for( i = 0; i < LocaleListLength; i++ ) { nsresult result; -@@ -150,16 +151,21 @@ nsLocaleService::nsLocaleService(void) +@@ -158,16 +159,21 @@ nsLocaleService::nsLocaleService(void) } else { CopyASCIItoUTF16(lang, platformLocale); result = nsPosixLocale::GetXPLocale(lang, xpLocale); ++++++ mozilla-no-stdcxx-check.patch ++++++ # HG changeset patch # User Wolfgang Rosenauer <[email protected]> # Parent 7b3798afc391847b7eec89b3714b54f1bbbaa0a1 diff --git a/config/config.mk b/config/config.mk --- a/config/config.mk +++ b/config/config.mk @@ -623,34 +623,33 @@ EXPAND_LD = $(EXPAND_LIBS_EXEC) --uselis EXPAND_MKSHLIB_ARGS = --uselist ifdef SYMBOL_ORDER EXPAND_MKSHLIB_ARGS += --symbol-order $(SYMBOL_ORDER) endif EXPAND_MKSHLIB = $(EXPAND_LIBS_EXEC) $(EXPAND_MKSHLIB_ARGS) -- $(MKSHLIB) ifneq (,$(MOZ_LIBSTDCXX_TARGET_VERSION)$(MOZ_LIBSTDCXX_HOST_VERSION)) ifneq ($(OS_ARCH),Darwin) -CHECK_STDCXX = @$(TOOLCHAIN_PREFIX)objdump -p $(1) | grep -e 'GLIBCXX_3\.4\.\(9\|[1-9][0-9]\)' > /dev/null && echo 'TEST-UNEXPECTED-FAIL | check_stdcxx | We do not want these libstdc++ symbols to be used:' && $(TOOLCHAIN_PREFIX)objdump -T $(1) | grep -e 'GLIBCXX_3\.4\.\(9\|[1-9][0-9]\)' && exit 1 || true +#CHECK_STDCXX = @$(TOOLCHAIN_PREFIX)objdump -p $(1) | grep -e 'GLIBCXX_3\.4\.\(9\|[1-9][0-9]\)' > /dev/null && echo 'TEST-UNEXPECTED-FAIL | check_stdcxx | We do not want these libstdc++ symbols to be used:' && $(TOOLCHAIN_PREFIX)objdump -T $(1) | grep -e 'GLIBCXX_3\.4\.\(9\|[1-9][0-9]\)' && exit 1 || true endif endif ifeq (,$(filter $(OS_TARGET),WINNT Darwin)) CHECK_TEXTREL = @$(TOOLCHAIN_PREFIX)readelf -d $(1) | grep TEXTREL > /dev/null && echo 'TEST-UNEXPECTED-FAIL | check_textrel | We do not want text relocations in libraries and programs' || true endif ifeq ($(MOZ_WIDGET_TOOLKIT),android) # While this is very unlikely (libc being added by the compiler at the end # 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. CHECK_MOZGLUE_ORDER = @$(TOOLCHAIN_PREFIX)readelf -d $(1) | grep NEEDED | awk '{ libs[$$NF] = ++n } END { if (libs["[libmozglue.so]"] && libs["[libc.so]"] < libs["[libmozglue.so]"]) { print "libmozglue.so must be linked before libc.so"; exit 1 } }' endif define CHECK_BINARY -$(call CHECK_STDCXX,$(1)) $(call CHECK_TEXTREL,$(1)) $(call LOCAL_CHECKS,$(1)) $(call CHECK_MOZGLUE_ORDER,$(1)) endef # autoconf.mk sets OBJ_SUFFIX to an error to avoid use before including # this file OBJ_SUFFIX := $(_OBJ_SUFFIX) ++++++ mozilla-ntlm-full-path.patch ++++++ --- /var/tmp/diff_new_pack.ihAqu3/_old 2015-08-14 14:45:51.000000000 +0200 +++ /var/tmp/diff_new_pack.ihAqu3/_new 2015-08-14 14:45:51.000000000 +0200 @@ -1,12 +1,13 @@ # HG changeset patch # User Petr Cerny <[email protected]> # Parent 7308e4a7c1f769f4bbbc90870b849cadd99495a6 +# Parent 03565086f1e230cf6f0f6c01bf9a792c732de50b 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 -@@ -168,17 +168,17 @@ static uint8_t* ExtractMessage(const nsA +@@ -169,17 +169,17 @@ static uint8_t* ExtractMessage(const nsA nsresult nsAuthSambaNTLM::SpawnNTLMAuthHelper() { ++++++ mozilla-openaes-decl.patch ++++++ --- /var/tmp/diff_new_pack.ihAqu3/_old 2015-08-14 14:45:51.000000000 +0200 +++ /var/tmp/diff_new_pack.ihAqu3/_new 2015-08-14 14:45:51.000000000 +0200 @@ -1,7 +1,7 @@ # HG changeset patch # Parent 33024abb3c58dab7239e32388df58e14f99defd5 # User Wolfgang Rosenauer <[email protected]> -# Parent 12305a99d90ce098f8f11f5609571cd709b6e2de +# Parent 776cb894347a5ce8f03cd7344dca83b345e93d5f diff --git a/media/gmp-clearkey/0.1/openaes/oaes_lib.c b/media/gmp-clearkey/0.1/openaes/oaes_lib.c --- a/media/gmp-clearkey/0.1/openaes/oaes_lib.c ++++++ mozilla-preferences.patch ++++++ --- /var/tmp/diff_new_pack.ihAqu3/_old 2015-08-14 14:45:52.000000000 +0200 +++ /var/tmp/diff_new_pack.ihAqu3/_new 2015-08-14 14:45:52.000000000 +0200 @@ -6,11 +6,12 @@ # HG changeset patch # Parent 8c1bfc96b05ef1836aad6e9f2af323f63ed1b69c +# Parent 3de9f5c9ca0d23956f2580ad534ac139a63527a5 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 -@@ -1503,17 +1503,17 @@ pref("converter.html2txt.header_strategy +@@ -1770,17 +1770,17 @@ pref("converter.html2txt.always_include_ pref("intl.accept_languages", "chrome://global/locale/intl.properties"); pref("intl.menuitems.alwaysappendaccesskeys","chrome://global/locale/intl.properties"); ++++++ mozilla-repo.patch ++++++ --- /var/tmp/diff_new_pack.ihAqu3/_old 2015-08-14 14:45:52.000000000 +0200 +++ /var/tmp/diff_new_pack.ihAqu3/_new 2015-08-14 14:45:52.000000000 +0200 @@ -1,11 +1,11 @@ # HG changeset patch # Parent 80b6464bd883864fce57e8748010869af1be69e9 -# Parent 7f246bc54e416716e50efe50c0edf154b26be658 +# Parent 57bb5e3ab77acbff5414d4dbce35a38f21d39276 diff --git a/toolkit/mozapps/installer/package-name.mk b/toolkit/mozapps/installer/package-name.mk --- a/toolkit/mozapps/installer/package-name.mk +++ b/toolkit/mozapps/installer/package-name.mk -@@ -137,24 +137,24 @@ else +@@ -142,24 +142,24 @@ else BUILDID = $(shell $(PYTHON) $(MOZILLA_DIR)/config/printconfigsetting.py $(DIST)/bin/platform.ini Build BuildID) endif @@ -29,6 +29,6 @@ MOZ_SOURCESTAMP_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).txt MOZ_BUILDINFO_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).json MOZ_MOZINFO_FILE = $(DIST)/$(PKG_PATH)/$(MOZ_INFO_BASENAME).mozinfo.json + MOZ_TEST_PACKAGES_FILE = $(DIST)/$(PKG_PATH)/test_packages.json + MOZ_TEST_PACKAGES_FILE_TC = $(DIST)/$(PKG_PATH)/test_packages_tc.json - # JavaScript Shell - PKG_JSSHELL = $(DIST)/jsshell-$(MOZ_PKG_PLATFORM).zip ++++++ mozilla-shared-nss-db.patch ++++++ --- /var/tmp/diff_new_pack.ihAqu3/_old 2015-08-14 14:45:52.000000000 +0200 +++ /var/tmp/diff_new_pack.ihAqu3/_new 2015-08-14 14:45:52.000000000 +0200 @@ -7,7 +7,7 @@ diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in -@@ -8247,16 +8247,31 @@ if test "$MOZ_ENABLE_SKIA"; then +@@ -8217,16 +8217,31 @@ if test "$MOZ_ENABLE_SKIA"; then MOZ_ENABLE_SKIA_GPU=1 AC_DEFINE(USE_SKIA_GPU) AC_SUBST(MOZ_ENABLE_SKIA_GPU) @@ -42,9 +42,9 @@ diff --git a/security/manager/ssl/src/moz.build b/security/manager/ssl/src/moz.build --- a/security/manager/ssl/src/moz.build +++ b/security/manager/ssl/src/moz.build -@@ -74,16 +74,19 @@ UNIFIED_SOURCES += [ - SOURCES += [ - 'nsNSSCertificateDB.cpp', +@@ -81,16 +81,19 @@ SOURCES += [ + IPDL_SOURCES += [ + 'PPSMContentDownloader.ipdl', ] LOCAL_INCLUDES += [ @@ -87,7 +87,7 @@ #include "nsAppDirectoryServiceDefs.h" #include "nsCertVerificationThread.h" #include "nsAppDirectoryServiceDefs.h" -@@ -997,17 +1004,31 @@ nsNSSComponent::InitializeNSS() +@@ -998,17 +1005,31 @@ nsNSSComponent::InitializeNSS() if (NS_FAILED(rv)) { nsPSMInitPanic::SetPanic(); return NS_ERROR_NOT_AVAILABLE; @@ -123,7 +123,7 @@ diff --git a/toolkit/library/moz.build b/toolkit/library/moz.build --- a/toolkit/library/moz.build +++ b/toolkit/library/moz.build -@@ -207,16 +207,18 @@ if CONFIG['MOZ_B2G_CAMERA'] and CONFIG[' +@@ -197,16 +197,18 @@ if CONFIG['MOZ_B2G_CAMERA'] and CONFIG[' 'stagefright_omx', ] ++++++ mozilla-skia-be-le.patch ++++++ --- /var/tmp/diff_new_pack.ihAqu3/_old 2015-08-14 14:45:52.000000000 +0200 +++ /var/tmp/diff_new_pack.ihAqu3/_new 2015-08-14 14:45:52.000000000 +0200 @@ -1,5 +1,5 @@ # HG changeset patch -# Parent c5d7373760d7abbd34f89cb60d4a45cba2c05379 +# Parent 2cf5e1715c64a30c340872b58816c3a329bd12dc Part 2 of Bug 1136958 - gfx/layers/basic/BasicCompositor.cpp:20:56: fatal error: skia/SkCanvas.h: No such file or directory when skia is disabled ++++++ source-stamp.txt ++++++ --- /var/tmp/diff_new_pack.ihAqu3/_old 2015-08-14 14:45:52.000000000 +0200 +++ /var/tmp/diff_new_pack.ihAqu3/_new 2015-08-14 14:45:52.000000000 +0200 @@ -1,2 +1,2 @@ -REV=5a41909266e5 +REV=84e0a4087157 REPO=http://hg.mozilla.org/releases/mozilla-release ++++++ toolkit-download-folder.patch ++++++ --- /var/tmp/diff_new_pack.ihAqu3/_old 2015-08-14 14:45:52.000000000 +0200 +++ /var/tmp/diff_new_pack.ihAqu3/_new 2015-08-14 14:45:52.000000000 +0200 @@ -6,7 +6,7 @@ diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js --- a/browser/components/preferences/main.js +++ b/browser/components/preferences/main.js -@@ -408,17 +408,17 @@ var gMainPane = { +@@ -383,17 +383,17 @@ var gMainPane = { // and was available as an option in the 1.5 drop down. On XP this // was in My Documents, on OSX it was in User Docs. In 2.0, we did // away with the drop down option, although the special label was @@ -28,7 +28,7 @@ diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp --- a/toolkit/components/downloads/nsDownloadManager.cpp +++ b/toolkit/components/downloads/nsDownloadManager.cpp -@@ -1361,18 +1361,20 @@ nsDownloadManager::GetDefaultDownloadsDi +@@ -1356,18 +1356,20 @@ nsDownloadManager::GetDefaultDownloadsDi // Vista: // Downloads // XP/2K:
