[prev in list] [next in list] [prev in thread] [next in thread]
List: opensuse-commit
Subject: commit MozillaFirefox for openSUSE:Factory
From: root () hilbert ! suse ! de (h_root)
Date: 2014-04-30 13:09:51
Message-ID: 20140430130951.12308AE05A () hilbert ! suse ! de
[Download RAW message or body]
Hello community,
here is the log from the commit of package MozillaFirefox for openSUSE:Factory \
checked in at 2014-04-30 15:09:39 \
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2014-04-14 \
09:25:09.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.MozillaFirefox.new/MozillaFirefox.changes 2014-04-30 \
15:09:40.000000000 +0200 @@ -1,0 +2,40 @@
+Sat Apr 26 12:18:07 UTC 2014 - wr@rosenauer.org
+
+- update to Firefox 29.0 (bnc#875378)
+ * MFSA 2014-34/CVE-2014-1518/CVE-2014-1519
+ Miscellaneous memory safety hazards
+ * MFSA 2014-36/CVE-2014-1522 (bmo#995289)
+ Web Audio memory corruption issues
+ * MFSA 2014-37/CVE-2014-1523 (bmo#969226)
+ Out of bounds read while decoding JPG images
+ * MFSA 2014-38/CVE-2014-1524 (bmo#989183)
+ Buffer overflow when using non-XBL object as XBL
+ * MFSA 2014-39/CVE-2014-1525 (bmo#989210)
+ Use-after-free in the Text Track Manager for HTML video
+ * MFSA 2014-41/CVE-2014-1528 (bmo#963962)
+ Out-of-bounds write in Cairo
+ * MFSA 2014-42/CVE-2014-1529 (bmo#987003)
+ Privilege escalation through Web Notification API
+ * MFSA 2014-43/CVE-2014-1530 (bmo#895557)
+ Cross-site scripting (XSS) using history navigations
+ * MFSA 2014-44/CVE-2014-1531 (bmo#987140)
+ Use-after-free in imgLoader while resizing images
+ * MFSA 2014-45/CVE-2014-1492 (bmo#903885)
+ Incorrect IDNA domain name matching for wildcard certificates
+ (fixed by NSS 3.16)
+ * MFSA 2014-46/CVE-2014-1532 (bmo#966006)
+ Use-after-free in nsHostResolver
+ * MFSA 2014-47/CVE-2014-1526 (bmo#988106)
+ Debugger can bypass XrayWrappers with JavaScript
+- 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
+
+-------------------------------------------------------------------
@@ -19,2 +58,0 @@
-
-- added patches:
@@ -21,0 +60 @@
+
@@ -27,2 +65,0 @@
-- modified patches:
- * mozilla-ppc64le-xpcom.patch
@@ -32 +69 @@
-- Adapt mozilla-ppc64le-xpcom.patch to Mozilla > 24.0 build systm
+- Adapt mozilla-ppc64le-xpcom.patch to Mozilla > 24.0 build system
@@ -34,2 +70,0 @@
-- modified patches:
- * mozilla-ppc64le-xpcom.patch
Old:
----
firefox-28.0-source.tar.xz
firefox-browser-css.patch
l10n-28.0.tar.xz
mozilla-aarch64-599882cfb998.diff
mozilla-aarch64-bmo-963028.patch
mozilla-aarch64-bmo-963029.patch
mozilla-aarch64-bmo-963030.patch
mozilla-aarch64-bmo-963031.patch
New:
----
firefox-29.0-source.tar.xz
l10n-29.0.tar.xz
mozilla-icu-strncat.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ MozillaFirefox.spec ++++++
--- /var/tmp/diff_new_pack.7Cmjgl/_old 2014-04-30 15:09:50.000000000 +0200
+++ /var/tmp/diff_new_pack.7Cmjgl/_new 2014-04-30 15:09:50.000000000 +0200
@@ -17,7 +17,7 @@
#
-%define major 28
+%define major 29
%define mainver %major.0
%define update_channel release
@@ -37,6 +37,7 @@
BuildRequires: libgnomeui-devel
BuildRequires: libidl-devel
BuildRequires: libnotify-devel
+BuildRequires: makeinfo
BuildRequires: python
BuildRequires: startup-notification-devel
BuildRequires: unzip
@@ -51,7 +52,7 @@
BuildRequires: wireless-tools
%endif
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: pkgconfig(libpulse)
%if %suse_version > 1210
@@ -64,7 +65,7 @@
%endif
Version: %{mainver}
Release: 0
-%define releasedate 2014031500
+%define releasedate 2014042500
Provides: firefox = %{mainver}
Provides: firefox = %{version}-%{release}
Provides: web_browser
@@ -103,6 +104,7 @@
Patch8: mozilla-ntlm-full-path.patch
Patch9: mozilla-repo.patch
Patch10: mozilla-sle11.patch
+Patch11: mozilla-icu-strncat.patch
Patch12: mozilla-arm-disable-edsp.patch
Patch13: mozilla-ppc.patch
Patch14: mozilla-libproxy-compat.patch
@@ -114,19 +116,13 @@
Patch20: mozilla-ppc64le-xpcom.patch
Patch21: mozilla-ppc64-xpcom.patch
# Gecko/Toolkit AArch64 Porting
-Patch36: mozilla-aarch64-599882cfb998.diff
-Patch37: mozilla-aarch64-bmo-810631.patch
-Patch38: mozilla-aarch64-bmo-962488.patch
-Patch39: mozilla-aarch64-bmo-963030.patch
-Patch40: mozilla-aarch64-bmo-963027.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
+Patch30: mozilla-aarch64-bmo-810631.patch
+Patch31: mozilla-aarch64-bmo-962488.patch
+Patch32: mozilla-aarch64-bmo-963027.patch
+Patch33: mozilla-aarch64-bmo-963023.patch
+Patch34: mozilla-aarch64-bmo-963024.patch
# Firefox/browser
-Patch100: firefox-browser-css.patch
Patch101: firefox-kde.patch
Patch102: firefox-kde-114.patch
Patch103: firefox-no-default-ualocale.patch
@@ -202,7 +198,7 @@
%package translations-other
Summary: Extra translations for Firefox
Group: System/Localization
-Provides: locale(%{name}:ach;af;ak;as;ast;be;bg;bn_BD;bn_IN;br;bs;csb;cy;en_ZA; \
eo;es_MX;et;eu;fa;ff;fy_NL;ga_IE;gd;gl;gu_IN;he;hi_IN;hr;hy_AM;id;is;kk;km;kn;ku;lg;li \
j;lt;lv;mai;mk;ml;mr;nn_NO;nso;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;ta;ta_LK;te;th;tr;uk;vi;zu)
+Provides: locale(%{name}:ach;af;an;as;ast;be;bg;bn_BD;bn_IN;br;bs;csb;cy;en_ZA \
;eo;es_MX;et;eu;fa;ff;fy_NL;ga_IE;gd;gl;gu_IN;he;hi_IN;hr;hy_AM;id;is;kk;km;kn;ku;lij; \
lt;lv;mai;mk;ml;mr;ms;nn_NO;or;pa_IN;rm;ro;si;sk;sl;son;sq;sr;ta;te;th;tr;uk;vi;xh;zu)
Requires: %{name} = %{version}
Obsoletes: %{name}-translations < %{version}-%{release}
@@ -261,6 +257,7 @@
%if %suse_version < 1120
%patch10 -p1
%endif
+%patch11 -p1
%patch12 -p1
%patch13 -p1
%patch14 -p1
@@ -271,19 +268,13 @@
%patch19 -p1
%patch20 -p1
%patch21 -p1
-%patch36 -p1
-%patch37 -p1
-%patch38 -p1
-%patch39 -p1
-%patch40 -p1
-%patch41 -p1
-%patch42 -p1
-%patch43 -p1
-%patch44 -p1
-%patch45 -p1
+%patch30 -p1
+%patch31 -p1
+%patch32 -p1
+%patch33 -p1
+%patch34 -p1
# Firefox
-%patch100 -p1
%patch101 -p1
%if %suse_version >= 1140
%patch102 -p1
++++++ compare-locales.tar.xz ++++++
++++++ create-tar.sh ++++++
--- /var/tmp/diff_new_pack.7Cmjgl/_old 2014-04-30 15:09:50.000000000 +0200
+++ /var/tmp/diff_new_pack.7Cmjgl/_new 2014-04-30 15:09:50.000000000 +0200
@@ -2,8 +2,8 @@
CHANNEL="release"
BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_28_0_RELEASE"
-VERSION="28.0"
+RELEASE_TAG="FIREFOX_29_0_RELEASE"
+VERSION="29.0"
# mozilla
if [ -d mozilla ]; then
++++++ firefox-28.0-source.tar.xz -> firefox-29.0-source.tar.xz ++++++
/work/SRC/openSUSE:Factory/MozillaFirefox/firefox-28.0-source.tar.xz \
/work/SRC/openSUSE:Factory/.MozillaFirefox.new/firefox-29.0-source.tar.xz differ: \
char 25, line 1
++++++ firefox-kde.patch ++++++
++++ 1444 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/MozillaFirefox/firefox-kde.patch
++++ and /work/SRC/openSUSE:Factory/.MozillaFirefox.new/firefox-kde.patch
++++++ firefox-no-default-ualocale.patch ++++++
--- /var/tmp/diff_new_pack.7Cmjgl/_old 2014-04-30 15:09:50.000000000 +0200
+++ /var/tmp/diff_new_pack.7Cmjgl/_new 2014-04-30 15:09:50.000000000 +0200
@@ -1,18 +1,18 @@
# HG changeset patch
# 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
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
-@@ -246,17 +246,17 @@ pref("lightweightThemes.update.enabled",
- pref("browser.uitour.enabled", false);
- 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"); \
+@@ -253,17 +253,17 @@ pref("browser.uitour.pinnedTabUrl", "htt + \
pref("browser.uitour.url", \
"https://www.mozilla.org/%LOCALE%/firefox/%VERSION%/tour/"); \
pref("browser.uitour.whitelist.add.260", "www.mozilla.org,support.mozilla.org");
+ pref("browser.customizemode.tip0.shown", false);
+ pref("browser.customizemode.tip0.learnMoreUrl", \
"https://support.mozilla.org/1/firefox/%VERSION%/%OS%/%LOCALE%/customize"); +
pref("keyword.enabled", true);
-pref("general.useragent.locale", "@AB_CD@");
++++++ l10n-28.0.tar.xz -> l10n-29.0.tar.xz ++++++
/work/SRC/openSUSE:Factory/MozillaFirefox/l10n-28.0.tar.xz \
/work/SRC/openSUSE:Factory/.MozillaFirefox.new/l10n-29.0.tar.xz differ: char 26, line \
1
++++++ mozilla-icu-strncat.patch ++++++
# 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) {
++++++ mozilla-kde.patch ++++++
--- /var/tmp/diff_new_pack.7Cmjgl/_old 2014-04-30 15:09:50.000000000 +0200
+++ /var/tmp/diff_new_pack.7Cmjgl/_new 2014-04-30 15:09:50.000000000 +0200
@@ -44,7 +44,7 @@
#include "prefread.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)
{
@@ -62,7 +62,7 @@
+
+ if (nsKDEUtils::kdeSession()) {
+ for(int i = 0;
-+ i < NS_ARRAY_LENGTH(specialFiles);
++ i < MOZ_ARRAY_LENGTH(specialFiles);
+ ++i ) {
+ if (*specialFiles[ i ] == '\0') {
+ specialFiles[ i ] = "kde.js";
@@ -79,7 +79,7 @@
return NS_OK;
bool hasMore;
-@@ -1140,17 +1159,17 @@ static nsresult pref_LoadPrefsInDirList(
+@@ -1138,17 +1157,17 @@ static nsresult pref_LoadPrefsInDirList(
nsAutoCString leaf;
path->GetNativeLeafName(leaf);
@@ -89,7 +89,7 @@
ReadExtensionPrefs(path);
else
- pref_LoadPrefsInDir(path, nullptr, 0);
-+ pref_LoadPrefsInDir(path, specialFiles, NS_ARRAY_LENGTH(specialFiles));
++ pref_LoadPrefsInDir(path, specialFiles, MOZ_ARRAY_LENGTH(specialFiles));
}
return NS_OK;
}
@@ -98,7 +98,7 @@
{
nsZipItemPtr<char> manifest(jarReader, name, true);
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 */ static const char* \
specialFiles[] = { #if defined(XP_MACOSX)
@@ -122,7 +122,7 @@
+ if(nsKDEUtils::kdeSession()) { // TODO what if some setup actually requires the \
helper? + for(int i = 0;
-+ i < NS_ARRAY_LENGTH(specialFiles);
++ i < MOZ_ARRAY_LENGTH(specialFiles);
+ ++i ) {
+ if( *specialFiles[ i ] == '\0' ) {
+ specialFiles[ i ] = "kde.js";
@@ -270,7 +270,7 @@
diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
--- a/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/bindings/autocomplete.xml (widgets/autocomplete.xml)
content/global/bindings/browser.xml (widgets/browser.xml)
@@ -764,7 +764,7 @@
new file mode 100644
--- /dev/null
+++ b/toolkit/content/widgets/preferences-kde.xml
-@@ -0,0 +1,1332 @@
+@@ -0,0 +1,1334 @@
+<?xml version="1.0"?>
+
+<!DOCTYPE bindings [
@@ -1350,15 +1350,14 @@
+ <xul:button dlgtype="cancel" class="dialog-button" icon="cancel"/>
+ <xul:button dlgtype="accept" class="dialog-button" icon="accept"/>
+#elif XP_UNIX
-+ pack="end">
-+ <xul:button dlgtype="help" class="dialog-button" hidden="true" \
icon="help"/>
-+ <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/>
-+ <xul:spacer anonid="spacer" flex="1"/>
-+ <xul:button dlgtype="accept" class="dialog-button" icon="accept"/>
-+ <xul:button dlgtype="extra1" class="dialog-button" hidden="true"/>
-+ <xul:button dlgtype="cancel" class="dialog-button" icon="cancel"/>
-+ <xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/>
-+
++ pack="end">
++ <xul:button dlgtype="help" class="dialog-button" hidden="true" icon="help"/>
++ <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/>
++ <xul:spacer anonid="spacer" flex="1"/>
++ <xul:button dlgtype="accept" class="dialog-button" icon="accept"/>
++ <xul:button dlgtype="extra1" class="dialog-button" hidden="true"/>
++ <xul:button dlgtype="cancel" class="dialog-button" icon="cancel"/>
++ <xul:button dlgtype="disclosure" class="dialog-button" hidden="true"/>
+#else
+ pack="end">
+ <xul:button dlgtype="extra2" class="dialog-button" hidden="true"/>
@@ -1808,9 +1807,10 @@
+ <handlers>
+ <handler event="dialogaccept">
+ <![CDATA[
-+ if (!this._fireEvent("beforeaccept", this))
-+ return;
-+
++ if (!this._fireEvent("beforeaccept", this)){
++ return false;
++ }
++
+ if (this.type == "child" && window.opener) {
+ var psvc = Components.classes["@mozilla.org/preferences-service;1"]
+ .getService(Components.interfaces.nsIPrefBranch);
@@ -1873,6 +1873,8 @@
+ .getService(Components.interfaces.nsIPrefService);
+ psvc.savePrefFile(null);
+ }
++
++ return true;
+ ]]>
+ </handler>
+ <handler event="command">
@@ -2617,7 +2619,7 @@
+++ b/uriloader/exthandler/Makefile.in
@@ -19,9 +19,10 @@ endif
ifdef MOZ_ENABLE_DBUS
- LOCAL_INCLUDES += $(TK_CFLAGS) $(MOZ_DBUS_CFLAGS)
+ OS_INCLUDES += $(TK_CFLAGS) $(MOZ_DBUS_CFLAGS)
endif
include $(topsrcdir)/config/rules.mk
@@ -3029,7 +3031,7 @@
#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
mime_types_description,
@@ -3072,14 +3074,14 @@
diff --git a/widget/gtk/Makefile.in b/widget/gtk/Makefile.in
--- a/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/.
include $(topsrcdir)/config/rules.mk
CFLAGS += $(MOZ_STARTUP_NOTIFICATION_CFLAGS)
- CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_PIXMAN_CFLAGS) \
- $(MOZ_STARTUP_NOTIFICATION_CFLAGS)
+ CXXFLAGS += $(MOZ_CAIRO_CFLAGS) $(MOZ_STARTUP_NOTIFICATION_CFLAGS)
+LOCAL_INCLUDES += -I$(topsrcdir)/toolkit/xre
+
@@ -3452,7 +3454,7 @@
diff --git a/xpcom/components/ManifestParser.cpp \
b/xpcom/components/ManifestParser.cpp
--- a/xpcom/components/ManifestParser.cpp
+++ b/xpcom/components/ManifestParser.cpp
-@@ -30,16 +30,17 @@
+@@ -31,16 +31,17 @@
#include "nsTextFormatter.h"
#include "nsVersionComparator.h"
#include "nsXPCOMCIDInternal.h"
@@ -3470,7 +3472,7 @@
const char* directive;
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(kContentAccessible, "contentaccessible");
NS_NAMED_LITERAL_STRING(kApplication, "application");
@@ -3488,9 +3490,9 @@
NS_NAMED_LITERAL_STRING(kXPCNativeWrappers, "xpcnativewrappers");
nsAutoString appID;
-@@ -444,41 +446,46 @@ ParseManifest(NSLocationType type, FileL
+@@ -445,42 +447,47 @@ ParseManifest(NSLocationType type, FileL
CopyUTF8toUTF16(s, abi);
- abi.Insert(PRUnichar('_'), 0);
+ abi.Insert(char16_t('_'), 0);
abi.Insert(osTarget, 0);
}
}
@@ -3499,24 +3501,25 @@
nsAutoString osVersion;
+ nsAutoString desktop;
#if defined(XP_WIN)
+ #pragma warning(push)
+ #pragma warning(disable:4996) // VC12+ deprecates GetVersionEx
OSVERSIONINFO info = { sizeof(OSVERSIONINFO) };
if (GetVersionEx(&info)) {
- nsTextFormatter::ssprintf(osVersion, NS_LITERAL_STRING("%ld.%ld").get(),
+ nsTextFormatter::ssprintf(osVersion, MOZ_UTF16("%ld.%ld"),
info.dwMajorVersion,
info.dwMinorVersion);
}
+ desktop = NS_LITERAL_STRING("win");
+ #pragma warning(pop)
#elif defined(MOZ_WIDGET_COCOA)
- SInt32 majorVersion, minorVersion;
- if ((Gestalt(gestaltSystemVersionMajor, &majorVersion) == noErr) &&
- (Gestalt(gestaltSystemVersionMinor, &minorVersion) == noErr)) {
- nsTextFormatter::ssprintf(osVersion, NS_LITERAL_STRING("%ld.%ld").get(),
- majorVersion,
- minorVersion);
- }
+ SInt32 majorVersion = nsCocoaFeatures::OSXVersionMajor();
+ SInt32 minorVersion = nsCocoaFeatures::OSXVersionMinor();
+ nsTextFormatter::ssprintf(osVersion, NS_LITERAL_STRING("%ld.%ld").get(),
+ majorVersion,
+ minorVersion);
+ desktop = NS_LITERAL_STRING("macosx");
#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_minor_version);
+ desktop = nsKDEUtils::kdeSession() ? NS_LITERAL_STRING("kde") : \
NS_LITERAL_STRING("gnome"); @@ -3535,7 +3538,7 @@
char *token;
char *newline = buf;
-@@ -560,24 +567,26 @@ ParseManifest(NSLocationType type, FileL
+@@ -562,24 +569,26 @@ ParseManifest(NSLocationType type, FileL
TriState stOsVersion = eUnspecified;
TriState stOs = eUnspecified;
TriState stABI = eUnspecified;
@@ -3562,7 +3565,7 @@
#if defined(MOZ_WIDGET_ANDROID)
bool tablet = false;
if (CheckFlag(kTablet, wtoken, tablet)) {
-@@ -606,16 +615,17 @@ ParseManifest(NSLocationType type, FileL
+@@ -608,16 +617,17 @@ ParseManifest(NSLocationType type, FileL
}
if (!ok ||
++++++ mozilla-ppc64le-build.patch ++++++
++++ 2554 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/MozillaFirefox/mozilla-ppc64le-build.patch
++++ and /work/SRC/openSUSE:Factory/.MozillaFirefox.new/mozilla-ppc64le-build.patch
++++++ mozilla-ppc64le-mfbt.patch ++++++
--- /var/tmp/diff_new_pack.7Cmjgl/_old 2014-04-30 15:09:50.000000000 +0200
+++ /var/tmp/diff_new_pack.7Cmjgl/_new 2014-04-30 15:09:50.000000000 +0200
@@ -1,5 +1,5 @@
# HG changeset patch
-# Parent 147a75fe8f8e4a43b66f9716659e1209d7f5a950
+# Parent 46508a61b834f02575c116a508aa37b66d50bd20
# User Ulrich Weigand <uweigand@de.ibm.com>
Bug 976648 - powerpc64le-linux support - mfbt endian config
@@ -38,7 +38,7 @@
- defined(__ppc__) || defined(__hppa) || \
+ 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
++++++ mozilla-shared-nss-db.patch ++++++
--- /var/tmp/diff_new_pack.7Cmjgl/_old 2014-04-30 15:09:50.000000000 +0200
+++ /var/tmp/diff_new_pack.7Cmjgl/_new 2014-04-30 15:09:50.000000000 +0200
@@ -7,7 +7,7 @@
diff --git a/configure.in b/configure.in
--- a/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
AC_DEFINE(USE_SKIA_GPU)
AC_SUBST(MOZ_ENABLE_SKIA_GPU)
@@ -73,54 +73,49 @@
+
#include "nsNSSComponent.h"
- #include "CertVerifier.h"
+ #include "ExtendedValidation.h"
+ #include "NSSCertDBTrustDomain.h"
#include "mozilla/Telemetry.h"
#include "nsCertVerificationThread.h"
#include "nsAppDirectoryServiceDefs.h"
#include "nsComponentManagerUtils.h"
- #include "nsDirectoryServiceDefs.h"
-@@ -1207,18 +1214,35 @@ nsNSSComponent::InitializeNSS()
- ConfigureInternalPKCS11Token();
-
- // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs
- // module by NSS_Initialize because we will load it in InstallLoadableRoots
- // later. It also allows us to work around a bug in the system NSS in
- // Ubuntu 8.04, which loads any nonexistent "<configdir>/libnssckbi.so" as
- // "/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;
+@@ -1117,17 +1124,31 @@ nsNSSComponent::InitializeNSS()
+ if (NS_FAILED(rv)) {
+ nsPSMInitPanic::SetPanic();
+ return NS_ERROR_NOT_AVAILABLE;
+ }
+
+ SECStatus init_rv = SECFailure;
+ if (!profileStr.IsEmpty()) {
+ // First try to initialize the NSS DB in read/write mode.
+- SECStatus init_rv = ::mozilla::psm::InitializeNSS(profileStr.get(), false);
+#ifdef MOZ_ENABLE_NSSHELPER
+ if (PR_GetEnv("MOZ_XRE_NO_NSSHELPER")) {
-+ init_rv = ::NSS_Initialize(profileStr.get(), "", "",
-+ SECMOD_DB, init_flags);
++ init_rv = ::mozilla::psm::InitializeNSS(profileStr.get(), false);
+ } 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) {
+ 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(), "", "",
-+ SECMOD_DB, init_flags);
++ init_rv = ::mozilla::psm::InitializeNSS(profileStr.get(), false);
+ }
+ }
+#else
-+ init_rv = ::NSS_Initialize(profileStr.get(), "", "",
-+ SECMOD_DB, init_flags);
++ init_rv = ::mozilla::psm::InitializeNSS(profileStr.get(), false);
+#endif
-
+ // If that fails, attempt read-only mode.
if (init_rv != SECSuccess) {
- PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("can not init NSS r/w in %s\n", \
profileStr.get()));
-
- // try to init r/o
- init_flags |= NSS_INIT_READONLY;
- init_rv = ::NSS_Initialize(profileStr.get(), "", "",
- SECMOD_DB, init_flags);
+ 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); + }
+ if (init_rv != SECSuccess) {
+ PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("could not init in r/o either\n"));
+ }
diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
--- a/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)))
SDK_LIBRARY = $(IMPORT_LIBRARY)
else
++++++ source-stamp.txt ++++++
--- /var/tmp/diff_new_pack.7Cmjgl/_old 2014-04-30 15:09:51.000000000 +0200
+++ /var/tmp/diff_new_pack.7Cmjgl/_new 2014-04-30 15:09:51.000000000 +0200
@@ -1,2 +1,2 @@
-REV=5f7c149b07ba
+REV=f60bc49e6bd5
REPO=http://hg.mozilla.org/releases/mozilla-release
++++++ toolkit-download-folder.patch ++++++
--- /var/tmp/diff_new_pack.7Cmjgl/_old 2014-04-30 15:09:51.000000000 +0200
+++ /var/tmp/diff_new_pack.7Cmjgl/_new 2014-04-30 15:09:51.000000000 +0200
@@ -6,7 +6,12 @@
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
-@@ -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
// platforms and versions that don't support a default system downloads
// folder. See nsDownloadManager for details.
@@ -15,14 +20,24 @@
iconUrlSpec = fph.getURLSpecFromFile(this._indexToFolder(1));
} else {
// '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
--- a/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
nsXPIDLString folderName;
-- mBundle->GetStringFromName(NS_LITERAL_STRING("downloadsFolder").get(),
+- mBundle->GetStringFromName(MOZ_UTF16("downloadsFolder"),
- getter_Copies(folderName));
+ // We don't want localized "Downloads" unless XDG is used
+ //mBundle->GetStringFromName(NS_LITERAL_STRING("downloadsFolder").get(),
@@ -31,3 +46,8 @@
#if defined (XP_MACOSX)
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,
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic