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

- update to Firefox 29.0 (bnc#875378)

Browse Source 
- rebased patches
- removed obsolete patches
  * firefox-browser-css.patch
  * mozilla-aarch64-599882cfb998.diff
  * mozilla-aarch64-bmo-963028.patch
  * mozilla-aarch64-bmo-963029.patch
  * mozilla-aarch64-bmo-963030.patch
  * mozilla-aarch64-bmo-963031.patch
- requires NSS 3.16
- added mozilla-icu-strncat.patch to fix post build checks
- add mozilla-aarch64-599882cfb998.patch,
- Add patch for bmo#973977
- Refresh mozilla-ppc64le-xpcom.patch patch
- Adapt mozilla-ppc64le-xpcom.patch to Mozilla > 24.0 build system

OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/MozillaFirefox?expand=0&rev=378
This commit is contained in:
Wolfgang Rosenauer 2014-04-27 16:09:32 +00:00 committed by Git OBS Bridge
parent eda8b9c884
commit 9d19809515
23 changed files with 839 additions and 3237 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
MozillaFirefox.changes
View File

@ -1,3 +1,18 @@
-------------------------------------------------------------------
Sat Apr 26 12:18:07 UTC 2014 - wr@rosenauer.org
- update to Firefox 29.0 (bnc#875378)
- rebased patches
- removed obsolete patches
* firefox-browser-css.patch
* mozilla-aarch64-599882cfb998.diff
* mozilla-aarch64-bmo-963028.patch
* mozilla-aarch64-bmo-963029.patch
* mozilla-aarch64-bmo-963030.patch
* mozilla-aarch64-bmo-963031.patch
- requires NSS 3.16
- added mozilla-icu-strncat.patch to fix post build checks
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Apr 7 15:34:31 UTC 2014 - dmueller@suse.com Mon Apr 7 15:34:31 UTC 2014 - dmueller@suse.com
@ -16,23 +31,18 @@ Mon Apr 7 15:34:31 UTC 2014 - dmueller@suse.com
Mon Mar 24 16:18:44 UTC 2014 - dvaleev@suse.com Mon Mar 24 16:18:44 UTC 2014 - dvaleev@suse.com
- Add patch for bmo#973977 - Add patch for bmo#973977
- added patches:
* mozilla-ppc64-xpcom.patch * mozilla-ppc64-xpcom.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Mon Mar 24 14:29:12 UTC 2014 - dvaleev@suse.com Mon Mar 24 14:29:12 UTC 2014 - dvaleev@suse.com
- Refresh mozilla-ppc64le-xpcom.patch patch - Refresh mozilla-ppc64le-xpcom.patch patch
- modified patches:
* mozilla-ppc64le-xpcom.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Fri Mar 21 19:01:42 UTC 2014 - dvaleev@suse.com Fri Mar 21 19:01:42 UTC 2014 - dvaleev@suse.com
- Adapt mozilla-ppc64le-xpcom.patch to Mozilla > 24.0 build systm - Adapt mozilla-ppc64le-xpcom.patch to Mozilla > 24.0 build system
- modified patches:
* mozilla-ppc64le-xpcom.patch
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Mar 16 13:39:15 UTC 2014 - wr@rosenauer.org Sun Mar 16 13:39:15 UTC 2014 - wr@rosenauer.org

41
MozillaFirefox.spec
View File

@ -17,7 +17,7 @@
# #
%define major 28 %define major 29
%define mainver %major.0 %define mainver %major.0
%define update_channel release %define update_channel release
@ -37,6 +37,7 @@ BuildRequires: libcurl-devel
BuildRequires: libgnomeui-devel BuildRequires: libgnomeui-devel
BuildRequires: libidl-devel BuildRequires: libidl-devel
BuildRequires: libnotify-devel BuildRequires: libnotify-devel
BuildRequires: makeinfo
BuildRequires: python BuildRequires: python
BuildRequires: startup-notification-devel BuildRequires: startup-notification-devel
BuildRequires: unzip BuildRequires: unzip
@ -51,7 +52,7 @@ BuildRequires: libproxy-devel
BuildRequires: wireless-tools BuildRequires: wireless-tools
%endif %endif
BuildRequires: mozilla-nspr-devel >= 4.10.3 BuildRequires: mozilla-nspr-devel >= 4.10.3
BuildRequires: mozilla-nss-devel >= 3.15.5 BuildRequires: mozilla-nss-devel >= 3.16
BuildRequires: nss-shared-helper-devel BuildRequires: nss-shared-helper-devel
BuildRequires: pkgconfig(libpulse) BuildRequires: pkgconfig(libpulse)
%if %suse_version > 1210 %if %suse_version > 1210
@ -64,7 +65,7 @@ Recommends: gstreamer-0_10-plugins-ffmpeg
%endif %endif
Version: %{mainver} Version: %{mainver}
Release: 0 Release: 0
%define releasedate 2014031500 %define releasedate 2014042500
Provides: firefox = %{mainver} Provides: firefox = %{mainver}
Provides: firefox = %{version}-%{release} Provides: firefox = %{version}-%{release}
Provides: web_browser Provides: web_browser
@ -103,6 +104,7 @@ Patch7: mozilla-language.patch
Patch8: mozilla-ntlm-full-path.patch Patch8: mozilla-ntlm-full-path.patch
Patch9: mozilla-repo.patch Patch9: mozilla-repo.patch
Patch10: mozilla-sle11.patch Patch10: mozilla-sle11.patch
Patch11: mozilla-icu-strncat.patch
Patch12: mozilla-arm-disable-edsp.patch Patch12: mozilla-arm-disable-edsp.patch
Patch13: mozilla-ppc.patch Patch13: mozilla-ppc.patch
Patch14: mozilla-libproxy-compat.patch Patch14: mozilla-libproxy-compat.patch
@ -114,19 +116,13 @@ Patch19: mozilla-ppc64le-webrtc.patch
Patch20: mozilla-ppc64le-xpcom.patch Patch20: mozilla-ppc64le-xpcom.patch
Patch21: mozilla-ppc64-xpcom.patch Patch21: mozilla-ppc64-xpcom.patch
# Gecko/Toolkit AArch64 Porting # Gecko/Toolkit AArch64 Porting
Patch36: mozilla-aarch64-599882cfb998.diff Patch30: mozilla-aarch64-bmo-810631.patch
Patch37: mozilla-aarch64-bmo-810631.patch Patch31: mozilla-aarch64-bmo-962488.patch
Patch38: mozilla-aarch64-bmo-962488.patch Patch32: mozilla-aarch64-bmo-963027.patch
Patch39: mozilla-aarch64-bmo-963030.patch Patch33: mozilla-aarch64-bmo-963023.patch
Patch40: mozilla-aarch64-bmo-963027.patch Patch34: mozilla-aarch64-bmo-963024.patch
Patch41: mozilla-aarch64-bmo-963028.patch
Patch42: mozilla-aarch64-bmo-963029.patch
Patch43: mozilla-aarch64-bmo-963023.patch
Patch44: mozilla-aarch64-bmo-963024.patch
Patch45: mozilla-aarch64-bmo-963031.patch
# Firefox/browser # Firefox/browser
Patch100: firefox-browser-css.patch
Patch101: firefox-kde.patch Patch101: firefox-kde.patch
Patch102: firefox-kde-114.patch Patch102: firefox-kde-114.patch
Patch103: firefox-no-default-ualocale.patch Patch103: firefox-no-default-ualocale.patch
@ -261,6 +257,7 @@ cd $RPM_BUILD_DIR/mozilla
%if %suse_version < 1120 %if %suse_version < 1120
%patch10 -p1 %patch10 -p1
%endif %endif
%patch11 -p1
%patch12 -p1 %patch12 -p1
%patch13 -p1 %patch13 -p1
%patch14 -p1 %patch14 -p1
@ -271,19 +268,13 @@ cd $RPM_BUILD_DIR/mozilla
%patch19 -p1 %patch19 -p1
%patch20 -p1 %patch20 -p1
%patch21 -p1 %patch21 -p1
%patch36 -p1 %patch30 -p1
%patch37 -p1 %patch31 -p1
%patch38 -p1 %patch32 -p1
%patch39 -p1 %patch33 -p1
%patch40 -p1 %patch34 -p1
%patch41 -p1
%patch42 -p1
%patch43 -p1
%patch44 -p1
%patch45 -p1
# Firefox # Firefox
%patch100 -p1
%patch101 -p1 %patch101 -p1
%if %suse_version >= 1140 %if %suse_version >= 1140
%patch102 -p1 %patch102 -p1

4
compare-locales.tar.xz
View File

@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1 version https://git-lfs.github.com/spec/v1
oid sha256:e314d25e2d99f393947616e6428585a652a0540cbbbaad7eab0e2bc1719c3edb oid sha256:02d6b2c593c33691b9fbbbebd90251c27fbd8a01683aad13fd09bade08de7ece
size 28428 size 28448

4
create-tar.sh
View File

@ -2,8 +2,8 @@
CHANNEL="release" CHANNEL="release"
BRANCH="releases/mozilla-$CHANNEL" BRANCH="releases/mozilla-$CHANNEL"
RELEASE_TAG="FIREFOX_28_0_RELEASE" RELEASE_TAG="FIREFOX_29_0_RELEASE"
VERSION="28.0" VERSION="29.0"
# mozilla # mozilla
if [ -d mozilla ]; then if [ -d mozilla ]; then

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

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:49c9d4f95133071a6b062f01b6478e5c757401637223f1b4925ce50970962108
size 113703808

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

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:8657d28078baea90ddff1bab8d51a34954fb736c45a8e9bc331427dd73ba1bf1
size 120606048

42
firefox-browser-css.patch
View File

@ -1,42 +0,0 @@
From: Jakub Steiner <jimmac@novell.com>, Wolfgang Rosenauer <wr@rosenauer.org
Subject: make style compatible with dark themes
References:
https://bugzilla.novell.com/show_bug.cgi?id=503351
https://bugzilla.mozilla.org/show_bug.cgi?id=478632
wr: changed because of
https://bugzilla.novell.com/show_bug.cgi?id=561027
diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css
--- a/browser/themes/linux/browser.css
+++ b/browser/themes/linux/browser.css
@@ -980,16 +980,30 @@ toolbar[iconsize="small"] #webrtc-status
margin-top: 0;
margin-bottom: 0;
-moz-margin-start: 0;
color: GrayText;
}
%include ../shared/identity-block.inc.css
+#PopupAutoCompleteRichResult .autocomplete-richlistitem {
+ background-color: -moz-Field !important;
+}
+
+#PopupAutoCompleteRichResult .autocomplete-richlistitem[selected="true"],
+#PopupAutoCompleteRichResult .autocomplete-richlistitem[selected="true"] * {
+ color: HighlightText !important;
+ background: Highlight !important;
+}
+
+.ac-title {
+ color: -moz-Fieldtext !important;
+}
+
#page-proxy-favicon {
margin-top: 2px;
margin-bottom: 2px;
-moz-margin-start: 4px;
-moz-margin-end: 3px;
-moz-image-region: rect(0, 16px, 16px, 0);
}

808
firefox-kde.patch
View File

File diff suppressed because it is too large Load Diff

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

@ -1,18 +1,18 @@
# HG changeset patch # HG changeset patch
# User Wolfgang Rosenauer <wr@rosenauer.org> # User Wolfgang Rosenauer <wr@rosenauer.org>
# Parent 5c1cb20bb3ad68c77841909461700cbb11707708 # Parent 5ffbb37bbfc52f549620ff67ce45f218a825cf4e
Do not overwrite the locale dynamic pref from xulrunner's all.js with a wrong default value Do not overwrite the locale dynamic pref from xulrunner's all.js with a wrong default value
diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js diff --git a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
--- a/browser/app/profile/firefox.js --- a/browser/app/profile/firefox.js
+++ b/browser/app/profile/firefox.js +++ b/browser/app/profile/firefox.js
@@ -246,17 +246,17 @@ pref("lightweightThemes.update.enabled", @@ -253,17 +253,17 @@ pref("browser.uitour.pinnedTabUrl", "htt
pref("browser.uitour.enabled", false); pref("browser.uitour.url", "https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/tour/");
pref("browser.uitour.requireSecure", true);
pref("browser.uitour.themeOrigin", "https://addons.mozilla.org/%LOCALE%/firefox/themes/");
pref("browser.uitour.pinnedTabUrl", "https://support.mozilla.org/%LOCALE%/kb/pinned-tabs-keep-favorite-websites-open");
pref("browser.uitour.whitelist.add.260", "www.mozilla.org,support.mozilla.org"); pref("browser.uitour.whitelist.add.260", "www.mozilla.org,support.mozilla.org");
pref("browser.customizemode.tip0.shown", false);
pref("browser.customizemode.tip0.learnMoreUrl", "https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/customize");
pref("keyword.enabled", true); pref("keyword.enabled", true);
-pref("general.useragent.locale", "@AB_CD@"); -pref("general.useragent.locale", "@AB_CD@");

3
l10n-28.0.tar.xz
View File

@ -1,3 +0,0 @@
version https://git-lfs.github.com/spec/v1
oid sha256:4206aef3608207f00afb279ac1d7fe29cb01f66b1a6724ce11634e69fb994555
size 39457348

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

@ -0,0 +1,3 @@
version https://git-lfs.github.com/spec/v1
oid sha256:78c0a4a54fad3b44f543c0c63b02ee92cdfff4d187ea78eead271790fc996ead
size 39970532

32
mozilla-aarch64-599882cfb998.diff
View File

@ -1,32 +0,0 @@
diff --git a/js/src/assembler/wtf/Platform.h b/js/src/assembler/wtf/Platform.h
--- a/js/src/assembler/wtf/Platform.h
+++ b/js/src/assembler/wtf/Platform.h
@@ -205,16 +205,23 @@
#endif
/* WTF_CPU_S390 - S390 32-bit */
#if defined(__s390__)
#define WTF_CPU_S390 1
#define WTF_CPU_BIG_ENDIAN 1
#endif
+#if defined(__aarch64__)
+#define WTF_CPU_AARCH64 1
+#if defined(__AARCH64EB__)
+#define WTF_CPU_BIG_ENDIAN 1
+#endif
+#endif
+
/* WTF_CPU_X86 - i386 / x86 32-bit */
#if defined(__i386__) \
|| defined(i386) \
|| defined(_M_IX86) \
|| defined(_X86_) \
|| defined(__THW_INTEL)
#define WTF_CPU_X86 1
#endif

54
mozilla-aarch64-bmo-963028.patch
View File

@ -1,54 +0,0 @@
# HG changeset patch
# User Marcin Juszkiewicz <mjuszkiewicz@redhat.com>
# Date 1390512871 18000
# Node ID feaf8bd56a82749f5d0d8869b7c0a1c01e300362
# Parent 2a082f03cd1d64c8bfff9641284f2dc23617f806
Bug 963028 - AArch64 support for jemalloc. r=froydnj
diff --git a/memory/jemalloc/src/include/jemalloc/internal/jemalloc_internal.h.in b/memory/jemalloc/src/include/jemalloc/internal/jemalloc_internal.h.in
--- a/memory/jemalloc/src/include/jemalloc/internal/jemalloc_internal.h.in
+++ b/memory/jemalloc/src/include/jemalloc/internal/jemalloc_internal.h.in
@@ -283,16 +283,19 @@ static const bool config_ivsalloc =
# define LG_QUANTUM 4
# endif
# ifdef __SH4__
# define LG_QUANTUM 4
# endif
# ifdef __tile__
# define LG_QUANTUM 4
# endif
+# ifdef __aarch64__
+# define LG_QUANTUM 4
+# endif
# ifndef LG_QUANTUM
# error "No LG_QUANTUM definition for architecture; specify via CPPFLAGS"
# endif
#endif
#define QUANTUM ((size_t)(1U << LG_QUANTUM))
#define QUANTUM_MASK (QUANTUM - 1)
diff --git a/memory/mozjemalloc/jemalloc.c b/memory/mozjemalloc/jemalloc.c
--- a/memory/mozjemalloc/jemalloc.c
+++ b/memory/mozjemalloc/jemalloc.c
@@ -1097,17 +1097,17 @@ static unsigned ncpus;
/*
* VM page size. It must divide the runtime CPU page size or the code
* will abort.
* Platform specific page size conditions copied from js/public/HeapAPI.h
*/
#if (defined(SOLARIS) || defined(__FreeBSD__)) && \
(defined(__sparc) || defined(__sparcv9) || defined(__ia64))
#define pagesize_2pow ((size_t) 13)
-#elif defined(__powerpc64__)
+#elif defined(__powerpc64__) || defined(__aarch64__)
#define pagesize_2pow ((size_t) 16)
#else
#define pagesize_2pow ((size_t) 12)
#endif
#define pagesize ((size_t) 1 << pagesize_2pow)
#define pagesize_mask (pagesize - 1)
/* Various quantum-related settings. */

43
mozilla-aarch64-bmo-963029.patch
View File

@ -1,43 +0,0 @@
# HG changeset patch
# User Marcin Juszkiewicz <mjuszkiewicz@redhat.com>
# Date 1390512871 18000
# Node ID 89e06a821ad5986035de99c8bc1f9d7a99541b2a
# Parent feaf8bd56a82749f5d0d8869b7c0a1c01e300362
Bug 963029 - AArch64 support for MFBT. r=froydnj
Index: mozilla/mfbt/Endian.h
===================================================================
--- mozilla.orig/mfbt/Endian.h
+++ mozilla/mfbt/Endian.h
@@ -121,14 +121,14 @@
#elif defined(__sparc) || defined(__sparc__) || \
defined(_POWER) || defined(__hppa) || \
defined(_MIPSEB) || defined(__ARMEB__) || \
- defined(__s390__) || \
+ defined(__s390__) || defined(__AARCH64EB__) || \
(defined(__sh__) && defined(__LITTLE_ENDIAN__)) || \
(defined(__ia64) && defined(__BIG_ENDIAN__))
# define MOZ_BIG_ENDIAN 1
#elif defined(__i386) || defined(__i386__) || \
defined(__x86_64) || defined(__x86_64__) || \
defined(_MIPSEL) || defined(__ARMEL__) || \
- defined(__alpha__) || \
+ defined(__alpha__) || defined(__AARCH64EL__) || \
(defined(__sh__) && defined(__BIG_ENDIAN__)) || \
(defined(__ia64) && !defined(__BIG_ENDIAN__))
# define MOZ_LITTLE_ENDIAN 1
Index: mozilla/mfbt/tests/TestPoisonArea.cpp
===================================================================
--- mozilla.orig/mfbt/tests/TestPoisonArea.cpp
+++ mozilla/mfbt/tests/TestPoisonArea.cpp
@@ -161,6 +161,9 @@
#elif defined __s390__
#define RETURN_INSTR 0x07fe0000 /* br %r14 */
+#elif defined __aarch64__
+#define RETURN_INSTR 0xd65f03c0 /* ret */
+
#elif defined __ia64
struct ia64_instr { uint32_t i[4]; };
static const ia64_instr _return_instr =

32
mozilla-aarch64-bmo-963030.patch
View File

@ -1,32 +0,0 @@
# HG changeset patch
# User Marcin Juszkiewicz <mjuszkiewicz@redhat.com>
# Date 1391033256 18000
# Node ID 8a76622ce10d83a9dd070b968367efd8e73dc7cc
# Parent d890e603d751c465f2a0e2d2221e033b32afe4a9
Bug 963030 - AArch64 support for IPC. r=bsmedberg
diff --git a/ipc/chromium/src/build/build_config.h b/ipc/chromium/src/build/build_config.h
--- a/ipc/chromium/src/build/build_config.h
+++ b/ipc/chromium/src/build/build_config.h
@@ -97,16 +97,19 @@
#define ARCH_CPU_S390X 1
#define ARCH_CPU_64_BITS 1
#elif defined(__s390__)
#define ARCH_CPU_S390 1
#define ARCH_CPU_32_BITS 1
#elif defined(__alpha__)
#define ARCH_CPU_ALPHA 1
#define ARCH_CPU_64_BITS 1
+#elif defined(__aarch64__)
+#define ARCH_CPU_AARCH64 1
+#define ARCH_CPU_64_BITS 1
#else
#error Please add support for your architecture in build/build_config.h
#endif
// Type detection for wchar_t.
#if defined(OS_WIN)
#define WCHAR_T_IS_UTF16
#else

30
mozilla-aarch64-bmo-963031.patch
View File

@ -1,30 +0,0 @@
# HG changeset patch
# User Marcin Juszkiewicz <mjuszkiewicz@redhat.com>
# Date 1390828707 18000
# Node ID 01c406c513473eef5c98940ba8d3040c456044d8
# Parent b781647898f4a82e6cdeeb907ebbc402545698db
Bug 963031 - AArch support for Graphics. r=doublec
diff --git a/gfx/ycbcr/chromium_types.h b/gfx/ycbcr/chromium_types.h
--- a/gfx/ycbcr/chromium_types.h
+++ b/gfx/ycbcr/chromium_types.h
@@ -41,13 +41,17 @@ typedef uint32_t uint32;
#elif defined(__sparc)
#define ARCH_CPU_SPARC_FAMILY 1
#define ARCH_CPU_SPARC 1
#define ARCH_CPU_32_BITS 1
#elif defined(__sparcv9)
#define ARCH_CPU_SPARC_FAMILY 1
#define ARCH_CPU_SPARC 1
#define ARCH_CPU_64_BITS 1
+#elif defined(__aarch64__)
+#define ARCH_CPU_AARCH64_FAMILY 1
+#define ARCH_CPU_AARCH64 1
+#define ARCH_CPU_64_BITS 1
#else
#warning Please add support for your architecture in chromium_types.h
#endif
#endif // GFX_CHROMIUMTYPES_H

35
mozilla-icu-strncat.patch Normal file
View File

@ -0,0 +1,35 @@
# HG changeset patch
# Parent 29be2a4daa0f512d22bde85b97b5460839026571
# User Wolfgang Rosenauer <wr@rosenauer.org>
From: Jan Engelhardt <jengelh@inai.de>
Reference: http://bugs.icu-project.org/trac/ticket/7808
diff --git a/intl/icu/source/tools/pkgdata/pkgdata.cpp b/intl/icu/source/tools/pkgdata/pkgdata.cpp
--- a/intl/icu/source/tools/pkgdata/pkgdata.cpp
+++ b/intl/icu/source/tools/pkgdata/pkgdata.cpp
@@ -1975,22 +1975,22 @@ static void loadLists(UPKGOptions *o, UE
FILE *p = NULL;
size_t n;
static char buf[512] = "";
char cmdBuf[1024];
UErrorCode status = U_ZERO_ERROR;
const char cmd[] = "icu-config --incpkgdatafile";
/* #1 try the same path where pkgdata was called from. */
- findDirname(progname, cmdBuf, 1024, &status);
+ findDirname(progname, cmdBuf, sizeof(cmdBuf), &status);
if(U_SUCCESS(status)) {
if (cmdBuf[0] != 0) {
- uprv_strncat(cmdBuf, U_FILE_SEP_STRING, 1024);
+ uprv_strncat(cmdBuf, U_FILE_SEP_STRING, sizeof(cmdBuf)-1-strlen(cmdBuf));
}
- uprv_strncat(cmdBuf, cmd, 1024);
+ uprv_strncat(cmdBuf, cmd, sizeof(cmdBuf)-1-strlen(cmdBuf));
if(verbose) {
fprintf(stdout, "# Calling icu-config: %s\n", cmdBuf);
}
p = popen(cmdBuf, "r");
}
if(p == NULL || (n = fread(buf, 1, 511, p)) <= 0) {

59
mozilla-kde.patch
View File

@ -44,7 +44,7 @@ diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferenc
#include "prefread.h" #include "prefread.h"
#include "prefapi_private_data.h" #include "prefapi_private_data.h"
@@ -1115,16 +1116,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char @@ -1113,16 +1114,34 @@ pref_LoadPrefsInDir(nsIFile* aDir, char
static nsresult pref_LoadPrefsInDirList(const char *listId) static nsresult pref_LoadPrefsInDirList(const char *listId)
{ {
@ -62,7 +62,7 @@ diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferenc
+ +
+ if (nsKDEUtils::kdeSession()) { + if (nsKDEUtils::kdeSession()) {
+ for(int i = 0; + for(int i = 0;
+ i < NS_ARRAY_LENGTH(specialFiles); + i < MOZ_ARRAY_LENGTH(specialFiles);
+ ++i ) { + ++i ) {
+ if (*specialFiles[ i ] == '\0') { + if (*specialFiles[ i ] == '\0') {
+ specialFiles[ i ] = "kde.js"; + specialFiles[ i ] = "kde.js";
@ -79,7 +79,7 @@ diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferenc
return NS_OK; return NS_OK;
bool hasMore; bool hasMore;
@@ -1140,17 +1159,17 @@ static nsresult pref_LoadPrefsInDirList( @@ -1138,17 +1157,17 @@ static nsresult pref_LoadPrefsInDirList(
nsAutoCString leaf; nsAutoCString leaf;
path->GetNativeLeafName(leaf); path->GetNativeLeafName(leaf);
@ -89,7 +89,7 @@ diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferenc
ReadExtensionPrefs(path); ReadExtensionPrefs(path);
else else
- pref_LoadPrefsInDir(path, nullptr, 0); - pref_LoadPrefsInDir(path, nullptr, 0);
+ pref_LoadPrefsInDir(path, specialFiles, NS_ARRAY_LENGTH(specialFiles)); + pref_LoadPrefsInDir(path, specialFiles, MOZ_ARRAY_LENGTH(specialFiles));
} }
return NS_OK; return NS_OK;
} }
@ -98,7 +98,7 @@ diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferenc
{ {
nsZipItemPtr<char> manifest(jarReader, name, true); nsZipItemPtr<char> manifest(jarReader, name, true);
NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE); NS_ENSURE_TRUE(manifest.Buffer(), NS_ERROR_NOT_AVAILABLE);
@@ -1244,28 +1263,40 @@ static nsresult pref_InitInitialObjects( @@ -1242,28 +1261,40 @@ static nsresult pref_InitInitialObjects(
/* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */ /* these pref file names should not be used: we process them after all other application pref files for backwards compatibility */
static const char* specialFiles[] = { static const char* specialFiles[] = {
#if defined(XP_MACOSX) #if defined(XP_MACOSX)
@ -122,7 +122,7 @@ diff --git a/modules/libpref/src/Preferences.cpp b/modules/libpref/src/Preferenc
+ if(nsKDEUtils::kdeSession()) { // TODO what if some setup actually requires the helper? + if(nsKDEUtils::kdeSession()) { // TODO what if some setup actually requires the helper?
+ for(int i = 0; + for(int i = 0;
+ i < NS_ARRAY_LENGTH(specialFiles); + i < MOZ_ARRAY_LENGTH(specialFiles);
+ ++i ) { + ++i ) {
+ if( *specialFiles[ i ] == '\0' ) { + if( *specialFiles[ i ] == '\0' ) {
+ specialFiles[ i ] = "kde.js"; + specialFiles[ i ] = "kde.js";
@ -270,7 +270,7 @@ diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/compon
diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
--- a/toolkit/content/jar.mn --- a/toolkit/content/jar.mn
+++ b/toolkit/content/jar.mn +++ b/toolkit/content/jar.mn
@@ -53,29 +53,33 @@ toolkit.jar: @@ -55,29 +55,33 @@ toolkit.jar:
content/global/viewZoomOverlay.js (viewZoomOverlay.js) content/global/viewZoomOverlay.js (viewZoomOverlay.js)
*+ content/global/bindings/autocomplete.xml (widgets/autocomplete.xml) *+ content/global/bindings/autocomplete.xml (widgets/autocomplete.xml)
content/global/bindings/browser.xml (widgets/browser.xml) content/global/bindings/browser.xml (widgets/browser.xml)
@ -764,7 +764,7 @@ diff --git a/toolkit/content/widgets/preferences-kde.xml b/toolkit/content/widge
new file mode 100644 new file mode 100644
--- /dev/null --- /dev/null
+++ b/toolkit/content/widgets/preferences-kde.xml +++ b/toolkit/content/widgets/preferences-kde.xml
@@ -0,0 +1,1332 @@ @@ -0,0 +1,1334 @@
+<?xml version="1.0"?> +<?xml version="1.0"?>
+ +
+<!DOCTYPE bindings [ +<!DOCTYPE bindings [
@ -1358,7 +1358,6 @@ new file mode 100644
+ <xul:button dlgtype="extra1" class="dialog-button" hidden="true"/> + <xul:button dlgtype="extra1" class="dialog-button" hidden="true"/>
+ <xul:button dlgtype="cancel" class="dialog-button" icon="cancel"/> + <xul:button dlgtype="cancel" class="dialog-button" icon="cancel"/>
+ <xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/> + <xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/>
+
+#else +#else
+ pack="end"> + pack="end">
+ <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/> + <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/>
@ -1808,8 +1807,9 @@ new file mode 100644
+ <handlers> + <handlers>
+ <handler event="dialogaccept"> + <handler event="dialogaccept">
+ <![CDATA[ + <![CDATA[
+ if (!this._fireEvent("beforeaccept", this)) + if (!this._fireEvent("beforeaccept", this)){
+ return; + return false;
+ }
+ +
+ if (this.type == "child" && window.opener) { + if (this.type == "child" && window.opener) {
+ var psvc = Components.classes["@mozilla.org/preferences-service;1"] + var psvc = Components.classes["@mozilla.org/preferences-service;1"]
@ -1873,6 +1873,8 @@ new file mode 100644
+ .getService(Components.interfaces.nsIPrefService); + .getService(Components.interfaces.nsIPrefService);
+ psvc.savePrefFile(null); + psvc.savePrefFile(null);
+ } + }
+
+ return true;
+ ]]> + ]]>
+ </handler> + </handler>
+ <handler event="command"> + <handler event="command">
@ -2617,7 +2619,7 @@ diff --git a/uriloader/exthandler/Makefile.in b/uriloader/exthandler/Makefile.in
+++ b/uriloader/exthandler/Makefile.in +++ b/uriloader/exthandler/Makefile.in
@@ -19,9 +19,10 @@ endif @@ -19,9 +19,10 @@ endif
ifdef MOZ_ENABLE_DBUS ifdef MOZ_ENABLE_DBUS
LOCAL_INCLUDES += $(TK_CFLAGS) $(MOZ_DBUS_CFLAGS) OS_INCLUDES += $(TK_CFLAGS) $(MOZ_DBUS_CFLAGS)
endif endif
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk
@ -3029,7 +3031,7 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
#endif #endif
} }
nsresult nsOSHelperAppService::GetFileTokenForPath(const PRUnichar * platformAppPath, nsIFile ** aFile) nsresult nsOSHelperAppService::GetFileTokenForPath(const char16_t * platformAppPath, nsIFile ** aFile)
{ {
@@ -1263,17 +1263,17 @@ nsOSHelperAppService::GetFromExtension(c @@ -1263,17 +1263,17 @@ nsOSHelperAppService::GetFromExtension(c
mime_types_description, mime_types_description,
@ -3072,14 +3074,14 @@ diff --git a/uriloader/exthandler/unix/nsOSHelperAppService.cpp b/uriloader/exth
diff --git a/widget/gtk/Makefile.in b/widget/gtk/Makefile.in diff --git a/widget/gtk/Makefile.in b/widget/gtk/Makefile.in
--- a/widget/gtk/Makefile.in --- a/widget/gtk/Makefile.in
+++ b/widget/gtk/Makefile.in +++ b/widget/gtk/Makefile.in
@@ -4,11 +4,13 @@ @@ -3,11 +3,13 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/. # file, You can obtain one at http://mozilla.org/MPL/2.0/.
include $(topsrcdir)/config/rules.mk include $(topsrcdir)/config/rules.mk
CFLAGS += $(MOZ_STARTUP_NOTIFICATION_CFLAGS) CFLAGS += $(MOZ_STARTUP_NOTIFICATION_CFLAGS)
CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS) \ CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_STARTUP_NOTIFICATION_CFLAGS)
$(MOZ_STARTUP_NOTIFICATION_CFLAGS)
+LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre +LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
+ +
@ -3452,7 +3454,7 @@ diff --git a/xpcom/components/Makefile.in b/xpcom/components/Makefile.in
diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestParser.cpp diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestParser.cpp
--- a/xpcom/components/ManifestParser.cpp --- a/xpcom/components/ManifestParser.cpp
+++ b/xpcom/components/ManifestParser.cpp +++ b/xpcom/components/ManifestParser.cpp
@@ -30,16 +30,17 @@ @@ -31,16 +31,17 @@
#include "nsTextFormatter.h" #include "nsTextFormatter.h"
#include "nsVersionComparator.h" #include "nsVersionComparator.h"
#include "nsXPCOMCIDInternal.h" #include "nsXPCOMCIDInternal.h"
@ -3470,7 +3472,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
const char* directive; const char* directive;
int argc; int argc;
@@ -397,16 +398,17 @@ ParseManifest(NSLocationType type, FileL @@ -398,16 +399,17 @@ ParseManifest(NSLocationType type, FileL
NS_NAMED_LITERAL_STRING(kPlatform, "platform"); NS_NAMED_LITERAL_STRING(kPlatform, "platform");
NS_NAMED_LITERAL_STRING(kContentAccessible, "contentaccessible"); NS_NAMED_LITERAL_STRING(kContentAccessible, "contentaccessible");
NS_NAMED_LITERAL_STRING(kApplication, "application"); NS_NAMED_LITERAL_STRING(kApplication, "application");
@ -3488,9 +3490,9 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
NS_NAMED_LITERAL_STRING(kXPCNativeWrappers, "xpcnativewrappers"); NS_NAMED_LITERAL_STRING(kXPCNativeWrappers, "xpcnativewrappers");
nsAutoString appID; nsAutoString appID;
@@ -444,41 +446,46 @@ ParseManifest(NSLocationType type, FileL @@ -445,42 +447,47 @@ ParseManifest(NSLocationType type, FileL
CopyUTF8toUTF16(s, abi); CopyUTF8toUTF16(s, abi);
abi.Insert(PRUnichar('_'), 0); abi.Insert(char16_t('_'), 0);
abi.Insert(osTarget, 0); abi.Insert(osTarget, 0);
} }
} }
@ -3499,24 +3501,25 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
nsAutoString osVersion; nsAutoString osVersion;
+ nsAutoString desktop; + nsAutoString desktop;
#if defined(XP_WIN) #if defined(XP_WIN)
#pragma warning(push)
#pragma warning(disable:4996) // VC12+ deprecates GetVersionEx
OSVERSIONINFO info = { sizeof(OSVERSIONINFO) }; OSVERSIONINFO info = { sizeof(OSVERSIONINFO) };
if (GetVersionEx(&info)) { if (GetVersionEx(&info)) {
nsTextFormatter::ssprintf(osVersion, NS_LITERAL_STRING("%ld.%ld").get(), nsTextFormatter::ssprintf(osVersion, MOZ_UTF16("%ld.%ld"),
info.dwMajorVersion, info.dwMajorVersion,
info.dwMinorVersion); info.dwMinorVersion);
} }
+ desktop = NS_LITERAL_STRING("win"); + desktop = NS_LITERAL_STRING("win");
#pragma warning(pop)
#elif defined(MOZ_WIDGET_COCOA) #elif defined(MOZ_WIDGET_COCOA)
SInt32 majorVersion, minorVersion; SInt32 majorVersion = nsCocoaFeatures::OSXVersionMajor();
if ((Gestalt(gestaltSystemVersionMajor, &majorVersion) == noErr) && SInt32 minorVersion = nsCocoaFeatures::OSXVersionMinor();
(Gestalt(gestaltSystemVersionMinor, &minorVersion) == noErr)) {
nsTextFormatter::ssprintf(osVersion, NS_LITERAL_STRING("%ld.%ld").get(), nsTextFormatter::ssprintf(osVersion, NS_LITERAL_STRING("%ld.%ld").get(),
majorVersion, majorVersion,
minorVersion); minorVersion);
}
+ desktop = NS_LITERAL_STRING("macosx"); + desktop = NS_LITERAL_STRING("macosx");
#elif defined(MOZ_WIDGET_GTK) #elif defined(MOZ_WIDGET_GTK)
nsTextFormatter::ssprintf(osVersion, NS_LITERAL_STRING("%ld.%ld").get(), nsTextFormatter::ssprintf(osVersion, MOZ_UTF16("%ld.%ld"),
gtk_major_version, gtk_major_version,
gtk_minor_version); gtk_minor_version);
+ desktop = nsKDEUtils::kdeSession() ? NS_LITERAL_STRING("kde") : NS_LITERAL_STRING("gnome"); + desktop = nsKDEUtils::kdeSession() ? NS_LITERAL_STRING("kde") : NS_LITERAL_STRING("gnome");
@ -3535,7 +3538,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
char *token; char *token;
char *newline = buf; char *newline = buf;
@@ -560,24 +567,26 @@ ParseManifest(NSLocationType type, FileL @@ -562,24 +569,26 @@ ParseManifest(NSLocationType type, FileL
TriState stOsVersion = eUnspecified; TriState stOsVersion = eUnspecified;
TriState stOs = eUnspecified; TriState stOs = eUnspecified;
TriState stABI = eUnspecified; TriState stABI = eUnspecified;
@ -3562,7 +3565,7 @@ diff --git a/xpcom/components/ManifestParser.cpp b/xpcom/components/ManifestPars
#if defined(MOZ_WIDGET_ANDROID) #if defined(MOZ_WIDGET_ANDROID)
bool tablet = false; bool tablet = false;
if (CheckFlag(kTablet, wtoken, tablet)) { if (CheckFlag(kTablet, wtoken, tablet)) {
@@ -606,16 +615,17 @@ ParseManifest(NSLocationType type, FileL @@ -608,16 +617,17 @@ ParseManifest(NSLocationType type, FileL
} }
if (!ok || if (!ok ||

2325
mozilla-ppc64le-build.patch
View File

File diff suppressed because it is too large Load Diff

4
mozilla-ppc64le-mfbt.patch
View File

@ -1,5 +1,5 @@
# HG changeset patch # HG changeset patch
# Parent 147a75fe8f8e4a43b66f9716659e1209d7f5a950 # Parent 46508a61b834f02575c116a508aa37b66d50bd20
# User Ulrich Weigand <uweigand@de.ibm.com> # User Ulrich Weigand <uweigand@de.ibm.com>
Bug 976648 - powerpc64le-linux support - mfbt endian config Bug 976648 - powerpc64le-linux support - mfbt endian config
@ -38,7 +38,7 @@ diff --git a/mfbt/Endian.h b/mfbt/Endian.h
- defined(__ppc__) || defined(__hppa) || \ - defined(__ppc__) || defined(__hppa) || \
+ defined(_POWER) || defined(__hppa) || \ + defined(_POWER) || defined(__hppa) || \
defined(_MIPSEB) || defined(__ARMEB__) || \ defined(_MIPSEB) || defined(__ARMEB__) || \
defined(__s390__) || \ defined(__s390__) || defined(__AARCH64EB__) || \
(defined(__sh__) && defined(__LITTLE_ENDIAN__)) || \ (defined(__sh__) && defined(__LITTLE_ENDIAN__)) || \
(defined(__ia64) && defined(__BIG_ENDIAN__)) (defined(__ia64) && defined(__BIG_ENDIAN__))
# define MOZ_BIG_ENDIAN 1 # define MOZ_BIG_ENDIAN 1

55
mozilla-shared-nss-db.patch
View File

@ -7,7 +7,7 @@ References:
diff --git a/configure.in b/configure.in diff --git a/configure.in b/configure.in
--- a/configure.in --- a/configure.in
+++ b/configure.in +++ b/configure.in
@@ -8042,16 +8042,31 @@ if test "$MOZ_ENABLE_SKIA"; then @@ -8113,16 +8113,31 @@ if test "$MOZ_ENABLE_SKIA"; then
MOZ_ENABLE_SKIA_GPU=1 MOZ_ENABLE_SKIA_GPU=1
AC_DEFINE(USE_SKIA_GPU) AC_DEFINE(USE_SKIA_GPU)
AC_SUBST(MOZ_ENABLE_SKIA_GPU) AC_SUBST(MOZ_ENABLE_SKIA_GPU)
@ -73,54 +73,49 @@ diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/
+ +
#include "nsNSSComponent.h" #include "nsNSSComponent.h"
#include "CertVerifier.h" #include "ExtendedValidation.h"
#include "NSSCertDBTrustDomain.h"
#include "mozilla/Telemetry.h" #include "mozilla/Telemetry.h"
#include "nsCertVerificationThread.h" #include "nsCertVerificationThread.h"
#include "nsAppDirectoryServiceDefs.h" #include "nsAppDirectoryServiceDefs.h"
#include "nsComponentManagerUtils.h" #include "nsComponentManagerUtils.h"
#include "nsDirectoryServiceDefs.h" @@ -1117,17 +1124,31 @@ nsNSSComponent::InitializeNSS()
@@ -1207,18 +1214,35 @@ nsNSSComponent::InitializeNSS() if (NS_FAILED(rv)) {
ConfigureInternalPKCS11Token(); nsPSMInitPanic::SetPanic();
return NS_ERROR_NOT_AVAILABLE;
}
// The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs SECStatus init_rv = SECFailure;
// module by NSS_Initialize because we will load it in InstallLoadableRoots if (!profileStr.IsEmpty()) {
// later. It also allows us to work around a bug in the system NSS in // First try to initialize the NSS DB in read/write mode.
// Ubuntu 8.04, which loads any nonexistent "<configdir>/libnssckbi.so" as - SECStatus init_rv = ::mozilla::psm::InitializeNSS(profileStr.get(), false);
// "/usr/lib/nss/libnssckbi.so".
uint32_t init_flags = NSS_INIT_NOROOTINIT | NSS_INIT_OPTIMIZESPACE;
- SECStatus init_rv = ::NSS_Initialize(profileStr.get(), "", "",
- SECMOD_DB, init_flags);
+
+ SECStatus init_rv = SECFailure;
+#ifdef MOZ_ENABLE_NSSHELPER +#ifdef MOZ_ENABLE_NSSHELPER
+ if (PR_GetEnv("MOZ_XRE_NO_NSSHELPER")) { + if (PR_GetEnv("MOZ_XRE_NO_NSSHELPER")) {
+ init_rv = ::NSS_Initialize(profileStr.get(), "", "", + init_rv = ::mozilla::psm::InitializeNSS(profileStr.get(), false);
+ SECMOD_DB, init_flags);
+ } else { + } else {
+ init_rv = ::nsshelp_open_db ("Firefox", profileStr.get(), init_flags); + uint32_t flags = NSS_INIT_NOROOTINIT | NSS_INIT_OPTIMIZESPACE;
+ init_rv = ::nsshelp_open_db ("Firefox", profileStr.get(), flags);
+ +
+ if (init_rv != SECSuccess) { + if (init_rv != SECSuccess) {
+ PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("can not init NSS using nsshelp_open_db in %s\n", profileStr.get())); + PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("can not init NSS using nsshelp_open_db in %s\n", profileStr.get()));
+ init_rv = ::NSS_Initialize(profileStr.get(), "", "", + init_rv = ::mozilla::psm::InitializeNSS(profileStr.get(), false);
+ SECMOD_DB, init_flags);
+ } + }
+ } + }
+#else +#else
+ init_rv = ::NSS_Initialize(profileStr.get(), "", "", + init_rv = ::mozilla::psm::InitializeNSS(profileStr.get(), false);
+ SECMOD_DB, init_flags);
+#endif +#endif
// If that fails, attempt read-only mode.
if (init_rv != SECSuccess) { if (init_rv != SECSuccess) {
PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("can not init NSS r/w in %s\n", profileStr.get())); PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("could not init NSS r/w in %s\n", profileStr.get()));
init_rv = ::mozilla::psm::InitializeNSS(profileStr.get(), true);
// try to init r/o }
init_flags |= NSS_INIT_READONLY; if (init_rv != SECSuccess) {
init_rv = ::NSS_Initialize(profileStr.get(), "", "", PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("could not init in r/o either\n"));
SECMOD_DB, init_flags); }
diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
--- a/toolkit/library/Makefile.in --- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in +++ b/toolkit/library/Makefile.in
@@ -245,17 +245,17 @@ endif @@ -223,17 +223,17 @@ endif
ifneq (,$(filter OS2 WINNT,$(OS_ARCH))) ifneq (,$(filter OS2 WINNT,$(OS_ARCH)))
SDK_LIBRARY = $(IMPORT_LIBRARY) SDK_LIBRARY = $(IMPORT_LIBRARY)
else else

2
source-stamp.txt
View File

@ -1,2 +1,2 @@
REV=5f7c149b07ba REV=f60bc49e6bd5
REPO=http://hg.mozilla.org/releases/mozilla-release REPO=http://hg.mozilla.org/releases/mozilla-release

26
toolkit-download-folder.patch
View File

@ -6,7 +6,12 @@ https://bugzilla.novell.com/show_bug.cgi?id=501724
diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js
--- a/browser/components/preferences/main.js --- a/browser/components/preferences/main.js
+++ b/browser/components/preferences/main.js +++ b/browser/components/preferences/main.js
@@ -344,7 +344,7 @@ var gMainPane = { @@ -290,17 +290,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
// still supported for the folder if it existed. Because it was
// not exposed it was rarely used.
// With 3.0, a new desktop folder - 'Downloads' was introduced for // With 3.0, a new desktop folder - 'Downloads' was introduced for
// platforms and versions that don't support a default system downloads // platforms and versions that don't support a default system downloads
// folder. See nsDownloadManager for details. // folder. See nsDownloadManager for details.
@ -15,14 +20,24 @@ diff --git a/browser/components/preferences/main.js b/browser/components/prefere
iconUrlSpec = fph.getURLSpecFromFile(this._indexToFolder(1)); iconUrlSpec = fph.getURLSpecFromFile(this._indexToFolder(1));
} else { } else {
// 'Desktop' // 'Desktop'
downloadFolder.label = bundlePreferences.getString("desktopFolderName");
iconUrlSpec = fph.getURLSpecFromFile(this._getDownloadsFolder("Desktop"));
}
downloadFolder.image = "moz-icon://" + iconUrlSpec + "?size=16";
diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp
--- a/toolkit/components/downloads/nsDownloadManager.cpp --- a/toolkit/components/downloads/nsDownloadManager.cpp
+++ b/toolkit/components/downloads/nsDownloadManager.cpp +++ b/toolkit/components/downloads/nsDownloadManager.cpp
@@ -1269,8 +1269,10 @@ nsDownloadManager::GetDefaultDownloadsDi @@ -1365,18 +1365,20 @@ nsDownloadManager::GetDefaultDownloadsDi
// Vista:
// Downloads
// XP/2K:
// My Documents/Downloads
// Linux:
// XDG user dir spec, with a fallback to Home/Downloads // XDG user dir spec, with a fallback to Home/Downloads
nsXPIDLString folderName; nsXPIDLString folderName;
- mBundle->GetStringFromName(NS_LITERAL_STRING("downloadsFolder").get(), - mBundle->GetStringFromName(MOZ_UTF16("downloadsFolder"),
- getter_Copies(folderName)); - getter_Copies(folderName));
+ // We don't want localized "Downloads" unless XDG is used + // We don't want localized "Downloads" unless XDG is used
+ //mBundle->GetStringFromName(NS_LITERAL_STRING("downloadsFolder").get(), + //mBundle->GetStringFromName(NS_LITERAL_STRING("downloadsFolder").get(),
@ -31,3 +46,8 @@ diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/compon
#if defined (XP_MACOSX) #if defined (XP_MACOSX)
rv = dirService->Get(NS_OSX_DEFAULT_DOWNLOAD_DIR, rv = dirService->Get(NS_OSX_DEFAULT_DOWNLOAD_DIR,
NS_GET_IID(nsIFile),
getter_AddRefs(downloadDir));
NS_ENSURE_SUCCESS(rv, rv);
#elif defined(XP_WIN)
rv = dirService->Get(NS_WIN_DEFAULT_DOWNLOAD_DIR,