Hello community, here is the log from the commit of package MozillaFirefox for openSUSE:Factory checked in at 2012-02-02 17:58:06 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/MozillaFirefox (Old) and /work/SRC/openSUSE:Factory/.MozillaFirefox.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "MozillaFirefox", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/MozillaFirefox/MozillaFirefox.changes 2011-12-25 17:36:55.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.MozillaFirefox.new/MozillaFirefox.changes 2012-02-02 17:58:08.000000000 +0100 @@ -1,0 +2,29 @@ +Mon Jan 30 09:41:59 UTC 2012 - [email protected] + +- update to Firefox 10.0 (bnc#744275) + * MFSA 2012-01/CVE-2012-0442/CVE-2012-0443 + Miscellaneous memory safety hazards + * MFSA 2012-03/CVE-2012-0445 (bmo#701071) + <iframe> element exposed across domains via name attribute + * MFSA 2012-04/CVE-2011-3659 (bmo#708198) + Child nodes from nsDOMAttribute still accessible after removal + of nodes + * MFSA 2012-05/CVE-2012-0446 (bmo#705651) + Frame scripts calling into untrusted objects bypass security + checks + * MFSA 2012-06/CVE-2012-0447 (bmo#710079) + Uninitialized memory appended when encoding icon images may + cause information disclosure + * MFSA 2012-07/CVE-2012-0444 (bmo#719612) + Potential Memory Corruption When Decoding Ogg Vorbis files + * MFSA 2012-08/CVE-2012-0449 (bmo#701806, bmo#702466) + Crash with malformed embedded XSLT stylesheets +- KDE integration has been disabled since it needs refactoring +- removed obsolete ppc64 patch + +------------------------------------------------------------------- +Sun Jan 22 12:08:07 UTC 2012 - [email protected] + +- Disable neon for arm as it doesn't build correctly + +------------------------------------------------------------------- Old: ---- firefox-9.0.1-source.tar.bz2 l10n-9.0.1.tar.bz2 mozilla-ppc64.patch New: ---- firefox-10.0-source.tar.bz2 l10n-10.0.tar.bz2 mozilla-disable-neon-option.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ MozillaFirefox.spec ++++++ --- /var/tmp/diff_new_pack.7xMinC/_old 2012-02-02 17:58:22.000000000 +0100 +++ /var/tmp/diff_new_pack.7xMinC/_new 2012-02-02 17:58:22.000000000 +0100 @@ -1,8 +1,8 @@ # # spec file for package MozillaFirefox # -# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. -# 2006-2011 Wolfgang Rosenauer +# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# 2006-2012 Wolfgang Rosenauer # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -17,7 +17,7 @@ # -%define major 9 +%define major 10 %define mainver %major.0 Name: MozillaFirefox @@ -45,9 +45,9 @@ BuildRequires: mozilla-nspr-devel >= 4.8.9 BuildRequires: mozilla-nss-devel >= 3.13.1 BuildRequires: nss-shared-helper-devel -Version: %{mainver}.1 +Version: %{mainver} Release: 0 -%define releasedate 2011122000 +%define releasedate 2012012900 Provides: web_browser Provides: firefox = %{version}-%{release} Provides: firefox = %{mainver} @@ -86,8 +86,8 @@ Patch10: mozilla-dump_syms-static.patch Patch11: mozilla-sle11.patch Patch12: mozilla-linux3.patch -Patch13: mozilla-ppc64.patch -Patch14: mozilla-a11y.patch +Patch13: mozilla-a11y.patch +Patch14: mozilla-disable-neon-option.patch # Firefox/browser Patch31: firefox-browser-css.patch Patch32: firefox-cross-desktop.patch @@ -204,7 +204,7 @@ %patch2 -p1 %patch3 -p1 %patch4 -p1 -%patch5 -p1 +#%patch5 -p1 %patch6 -p1 %patch7 -p1 %patch8 -p1 @@ -220,10 +220,10 @@ %patch31 -p1 %patch32 -p1 %if %suse_version >= 1110 -%patch33 -p1 +#%patch33 -p1 %endif %if %suse_version >= 1140 -%patch34 -p1 +#%patch34 -p1 %endif %patch38 -p1 %patch39 -p1 @@ -236,11 +236,11 @@ TIME="\"$(date -d "${modified}" "+%%R")\"" find . -regex ".*\.c\|.*\.cpp\|.*\.h" -exec sed -i "s/__DATE__/${DATE}/g;s/__TIME__/${TIME}/g" {} + # -kdehelperversion=$(cat toolkit/xre/nsKDEUtils.cpp | grep '#define KMOZILLAHELPER_VERSION' | cut -d ' ' -f 3) -if test "$kdehelperversion" != %{kde_helper_version}; then - echo fix kde helper version in the .spec file - exit 1 -fi +#kdehelperversion=$(cat toolkit/xre/nsKDEUtils.cpp | grep '#define KMOZILLAHELPER_VERSION' | cut -d ' ' -f 3) +#if test "$kdehelperversion" != %{kde_helper_version}; then +# echo fix kde helper version in the .spec file +# exit 1 +#fi source %{SOURCE5} export MOZ_SOURCE_STAMP=$REV export SOURCE_REPO=$REPO @@ -278,7 +278,7 @@ ac_add_options --disable-debug ac_add_options --enable-startup-notification #ac_add_options --enable-chrome-format=jar -ac_add_options --enable-update-channel=default +ac_add_options --enable-update-channel=release EOF %if %suse_version > 1130 cat << EOF >> $MOZCONFIG @@ -301,6 +301,12 @@ ac_add_options --disable-crashreporter EOF %endif +# Disable neon for arm as it does not build correctly +%ifarch %arm +cat << EOF >> $MOZCONFIG +ac_add_options --disable-neon +EOF +%endif make -f client.mk build %install @@ -517,7 +523,6 @@ %{progdir}/distribution/extensions/ %{progdir}/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd} %{progdir}/icons/ -%{progdir}/hyphenation/ %{progdir}/searchplugins/ %attr(755,root,root) %{progdir}/%{progname}.sh %{progdir}/firefox-bin @@ -527,7 +532,7 @@ %{progdir}/dependentlibs.list %{progdir}/*.so %{progdir}/mozilla-xremote-client -%{progdir}/omni.jar +%{progdir}/omni.ja %{progdir}/platform.ini %{progdir}/plugin-container %if %crashreporter ++++++ compare-locales.tar.bz2 ++++++ ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.7xMinC/_old 2012-02-02 17:58:22.000000000 +0100 +++ /var/tmp/diff_new_pack.7xMinC/_new 2012-02-02 17:58:22.000000000 +0100 @@ -2,8 +2,8 @@ CHANNEL="release" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_9_0_1_RELEASE" -VERSION="9.0.1" +RELEASE_TAG="FIREFOX_10_0_RELEASE" +VERSION="10.0" # mozilla hg clone http://hg.mozilla.org/$BRANCH mozilla ++++++ firefox-9.0.1-source.tar.bz2 -> firefox-10.0-source.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/MozillaFirefox/firefox-9.0.1-source.tar.bz2 /work/SRC/openSUSE:Factory/.MozillaFirefox.new/firefox-10.0-source.tar.bz2 differ: char 11, line 1 ++++++ firefox-kde.patch ++++++ --- /var/tmp/diff_new_pack.7xMinC/_old 2012-02-02 17:58:22.000000000 +0100 +++ /var/tmp/diff_new_pack.7xMinC/_new 2012-02-02 17:58:22.000000000 +0100 @@ -2,7 +2,7 @@ new file mode 100644 --- /dev/null +++ b/browser/base/content/browser-kde.xul -@@ -0,0 +1,1054 @@ +@@ -0,0 +1,1111 @@ +#filter substitution +<?xml version="1.0"?> +# -*- Mode: HTML -*- @@ -477,6 +477,7 @@ + + <toolbaritem id="unified-back-forward-button" class="chromeclass-toolbar-additional" + context="backForwardMenu" removable="true" ++ forwarddisabled="true" + title="&backForwardItem.title;"> + <toolbarbutton id="back-button" class="toolbarbutton-1" + label="&backCmd.label;" @@ -488,6 +489,13 @@ + command="Browser:ForwardOrForwardDuplicate" + onclick="checkForMiddleClick(this, event);" + tooltip="forward-button-tooltip"/> ++ <dummyobservertarget hidden="true" ++ onbroadcast="if (this.getAttribute('disabled') == 'true') ++ this.parentNode.setAttribute('forwarddisabled', 'true'); ++ else ++ this.parentNode.removeAttribute('forwarddisabled');"> ++ <observes element="Browser:ForwardOrForwardDuplicate" attribute="disabled"/> ++ </dummyobservertarget> + </toolbaritem> + + <toolbaritem id="urlbar-container" align="center" flex="400" persist="width" combined="true" @@ -963,22 +971,63 @@ + onclick="return contentAreaClick(event, false);"/> + <statuspanel id="statusbar-display" inactive="true"/> + </vbox> ++ <splitter id="devtools-side-splitter" hidden="true"/> ++ <vbox id="devtools-sidebar-box" hidden="true" ++ style="min-width: 18em; width: 22em; max-width: 42em;" persist="width"> ++ <toolbar id="devtools-sidebar-toolbar" nowindowdrag="true"/> ++ <deck id="devtools-sidebar-deck" flex="1"/> ++ </vbox> + <vbox id="browser-border-end" hidden="true" layer="true"/> + </hbox> + ++ <hbox id="full-screen-warning-container" hidden="true" fadeout="true"> ++ <hbox style="min-width: 100%;" pack="center"> <!-- Inner hbox needed due to bug 579776. --> ++ <hbox id="full-screen-warning-message"> ++ <description id="full-screen-warning-text" value="&domFullScreenWarning.label;"></description> ++ </hbox> ++ </hbox> ++ </hbox> ++ + <vbox id="browser-bottombox" layer="true"> + <toolbar id="inspector-toolbar" + nowindowdrag="true" + hidden="true"> -+ <toolbarbutton id="inspector-inspect-toolbutton" -+ label="&inspectButton.label;" -+ accesskey="&inspectButton.accesskey;" -+ class="toolbarbutton-text" -+ command="Inspector:Inspect"/> -+ <toolbarseparator /> -+ <hbox id="inspector-tools"> -+ <!-- registered tools go here --> -+ </hbox> ++ <vbox flex="1"> ++ <resizer id="inspector-top-resizer" flex="1" ++ class="inspector-resizer" ++ dir="top" disabled="true" ++ element="inspector-tree-box"/> ++ <hbox> ++#ifdef XP_MACOSX ++ <toolbarbutton id="highlighter-closebutton" ++ oncommand="InspectorUI.closeInspectorUI(false);" ++ tooltiptext="&inspectCloseButton.tooltiptext;"/> ++#endif ++ <toolbarbutton id="inspector-inspect-toolbutton" ++ label="&inspectButton.label;" ++ accesskey="&inspectButton.accesskey;" ++ command="Inspector:Inspect"/> ++ <arrowscrollbox id="inspector-breadcrumbs" ++ flex="1" orient="horizontal" ++ clicktoscroll="true"/> ++ <hbox id="inspector-tools"> ++ <toolbarbutton id="inspector-style-button" ++ label="&inspectStyleButton.label;" ++ accesskey="&inspectStyleButton.accesskey;" ++ command="Inspector:Sidebar"/> ++ <!-- registered tools go here --> ++ </hbox> ++#ifndef XP_MACOSX ++ <toolbarbutton id="highlighter-closebutton" ++ oncommand="InspectorUI.closeInspectorUI(false);" ++ tooltiptext="&inspectCloseButton.tooltiptext;"/> ++#endif ++ <resizer id="inspector-end-resizer" ++ class="inspector-resizer" ++ dir="top" disabled="true" ++ element="inspector-tree-box"/> ++ </hbox> ++ </vbox> + </toolbar> + <toolbar id="addon-bar" + toolbarname="&addonBarCmd.label;" accesskey="&addonBarCmd.accesskey;" @@ -1007,6 +1056,10 @@ + <svg:rect x="0" y="0" width="1" height="1" fill="white"/> + <svg:circle cx="-0.35" cy="0.5" r="0.58"/> + </svg:mask> ++ <svg:mask id="winstripe-urlbar-back-button-mask" maskContentUnits="userSpaceOnUse"> ++ <svg:rect x="0" y="0" width="10000" height="50" fill="white"/> ++ <svg:circle cx="-11" cy="13" r="15"/> ++ </svg:mask> + </svg:svg> +#endif +#ifdef XP_MACOSX @@ -1015,6 +1068,10 @@ + <svg:rect x="0" y="0" width="1" height="1" fill="white"/> + <svg:circle cx="-0.41" cy="0.5" r="0.65"/> + </svg:mask> ++ <svg:mask id="pinstripe-urlbar-back-button-mask" maskContentUnits="userSpaceOnUse"> ++ <svg:rect x="0" y="-5" width="10000" height="55" fill="white"/> ++ <svg:circle cx="-9" cy="11" r="15"/> ++ </svg:mask> + <svg:mask id="pinstripe-tab-ontop-left-curve-mask" maskContentUnits="userSpaceOnUse"> + <svg:circle cx="9" cy="3" r="3" fill="white"/> + <svg:rect x="9" y="0" width="3" height="3" fill="white"/> @@ -1142,7 +1199,7 @@ diff --git a/browser/components/preferences/advanced.js b/browser/components/preferences/advanced.js --- a/browser/components/preferences/advanced.js +++ b/browser/components/preferences/advanced.js -@@ -683,24 +683,42 @@ var gAdvancedPane = { +@@ -690,24 +690,42 @@ var gAdvancedPane = { var brandBundle = document.getElementById("bundleBrand"); var shellBundle = document.getElementById("bundleShell"); var brandShortName = brandBundle.getString("brandShortName"); @@ -1271,33 +1328,33 @@ +NS_IMPL_ISUPPORTS1(nsKDEShellService, nsIShellService) + +NS_IMETHODIMP -+nsKDEShellService::IsDefaultBrowser(PRBool aStartupCheck, -+ PRBool* aIsDefaultBrowser) ++nsKDEShellService::IsDefaultBrowser(bool aStartupCheck, ++ bool* aIsDefaultBrowser) + { + *aIsDefaultBrowser = PR_FALSE; + if (aStartupCheck) + mCheckedThisSession = PR_TRUE; -+ nsCStringArray command; -+ command.AppendCString( NS_LITERAL_CSTRING( "ISDEFAULTBROWSER" )); ++ nsTArray<nsCString> command; ++ command.AppendElement( NS_LITERAL_CSTRING( "ISDEFAULTBROWSER" )); + if( nsKDEUtils::command( command )) + *aIsDefaultBrowser = PR_TRUE; + return NS_OK; + } + +NS_IMETHODIMP -+nsKDEShellService::SetDefaultBrowser(PRBool aClaimAllTypes, -+ PRBool aForAllUsers) ++nsKDEShellService::SetDefaultBrowser(bool aClaimAllTypes, ++ bool aForAllUsers) + { -+ nsCStringArray command; -+ command.AppendCString( NS_LITERAL_CSTRING( "SETDEFAULTBROWSER" )); -+ command.AppendCString( aClaimAllTypes ? NS_LITERAL_CSTRING( "ALLTYPES" ) : NS_LITERAL_CSTRING( "NORMAL" )); ++ nsTArray<nsCString> command; ++ command.AppendElement( NS_LITERAL_CSTRING( "SETDEFAULTBROWSER" )); ++ command.AppendElement( aClaimAllTypes ? NS_LITERAL_CSTRING( "ALLTYPES" ) : NS_LITERAL_CSTRING( "NORMAL" )); + return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE; + } + +NS_IMETHODIMP -+nsKDEShellService::GetShouldCheckDefaultBrowser(PRBool* aResult) ++nsKDEShellService::GetShouldCheckDefaultBrowser(bool* aResult) +{ -+ // If we've already checked, the browser has been started and this is a ++ // If we've already checked, the browser has been started and this is a + // new window open, and we don't want to check again. + if (mCheckedThisSession) { + *aResult = PR_FALSE; @@ -1316,7 +1373,7 @@ +} + +NS_IMETHODIMP -+nsKDEShellService::SetShouldCheckDefaultBrowser(PRBool aShouldCheck) ++nsKDEShellService::SetShouldCheckDefaultBrowser(bool aShouldCheck) +{ + nsCOMPtr<nsIPrefBranch> prefs; + nsCOMPtr<nsIPrefService> pserve(do_GetService(NS_PREFSERVICE_CONTRACTID)); @@ -1351,11 +1408,11 @@ +NS_IMETHODIMP +nsKDEShellService::OpenApplication(PRInt32 aApplication) + { -+ nsCStringArray command; ++ nsTArray<nsCString> command; + if( aApplication == APPLICATION_MAIL ) -+ command.AppendCString( NS_LITERAL_CSTRING( "OPENMAIL" )); ++ command.AppendElement( NS_LITERAL_CSTRING( "OPENMAIL" )); + else if( aApplication == APPLICATION_NEWS ) -+ command.AppendCString( NS_LITERAL_CSTRING( "OPENNEWS" )); ++ command.AppendElement( NS_LITERAL_CSTRING( "OPENNEWS" )); + else + return NS_ERROR_NOT_IMPLEMENTED; + return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE; @@ -1364,13 +1421,13 @@ +NS_IMETHODIMP +nsKDEShellService::OpenApplicationWithURI(nsILocalFile* aApplication, const nsACString& aURI) + { -+ nsCStringArray command; -+ command.AppendCString( NS_LITERAL_CSTRING( "RUN" )); ++ nsTArray<nsCString> command; ++ command.AppendElement( NS_LITERAL_CSTRING( "RUN" )); + nsCString app; + nsresult rv = aApplication->GetNativePath( app ); + NS_ENSURE_SUCCESS( rv, rv ); -+ command.AppendCString( app ); -+ command.AppendCString( aURI ); ++ command.AppendElement( app ); ++ command.AppendElement( aURI ); + return nsKDEUtils::command( command ) ? NS_OK : NS_ERROR_FAILURE; + } + @@ -1379,14 +1436,14 @@ + { + *_retval = nsnull; + -+ nsCStringArray command; -+ command.AppendCString( NS_LITERAL_CSTRING( "GETDEFAULTFEEDREADER" )); -+ nsCStringArray output; -+ if( !nsKDEUtils::command( command, &output ) || output.Count() != 1 ) ++ nsTArray<nsCString> command; ++ command.AppendElement( NS_LITERAL_CSTRING( "GETDEFAULTFEEDREADER" )); ++ nsTArray<nsCString> output; ++ if( !nsKDEUtils::command( command, &output ) || output.Length() != 1 ) + return NS_ERROR_FAILURE; + + nsCString path; -+ path = *output[ 0 ]; ++ path = output[ 0 ]; + if (path.IsEmpty()) + return NS_ERROR_FAILURE; + @@ -1398,7 +1455,7 @@ + rv = defaultReader->InitWithNativePath(path); + NS_ENSURE_SUCCESS(rv, rv); + -+ PRBool exists; ++ bool exists; + rv = defaultReader->Exists(&exists); + NS_ENSURE_SUCCESS(rv, rv); + if (!exists) @@ -1581,7 +1638,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 -@@ -424,16 +424,17 @@ +@@ -426,16 +426,17 @@ #endif #endif ++++++ l10n-9.0.1.tar.bz2 -> l10n-10.0.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/MozillaFirefox/l10n-9.0.1.tar.bz2 /work/SRC/openSUSE:Factory/.MozillaFirefox.new/l10n-10.0.tar.bz2 differ: char 11, line 1 ++++++ mozilla-a11y.patch ++++++ --- /var/tmp/diff_new_pack.7xMinC/_old 2012-02-02 17:58:22.000000000 +0100 +++ /var/tmp/diff_new_pack.7xMinC/_new 2012-02-02 17:58:22.000000000 +0100 @@ -1,6 +1,6 @@ # HG changeset patch # User Michael Gorse <[email protected]> -# Parent d02253d1e8217008dfa26e6e2a901b6a8b75e989 +# Parent 2c115988d04c0a0a8cb75b3a597ecdb2c4c001c9 a11y only enabled from Gnome 2's GConf setting https://bugzilla.novell.com/show_bug.cgi?id=732898 https://bugzilla.mozilla.org/show_bug.cgi?id=693343 @@ -31,7 +31,7 @@ diff --git a/accessible/src/atk/nsApplicationAccessibleWrap.cpp b/accessible/src/atk/nsApplicationAccessibleWrap.cpp --- a/accessible/src/atk/nsApplicationAccessibleWrap.cpp +++ b/accessible/src/atk/nsApplicationAccessibleWrap.cpp -@@ -47,29 +47,27 @@ +@@ -47,29 +47,29 @@ #include "nsIPrefBranch.h" #include "nsIServiceManager.h" #include "nsAutoPtr.h" @@ -40,14 +40,15 @@ #include <gtk/gtk.h> #include <atk/atk.h> ++#ifdef MOZ_ENABLE_DBUS +#include <dbus/dbus.h> ++#endif + +using namespace mozilla::a11y; typedef GType (* AtkGetTypeType) (void); GType g_atk_hyperlink_impl_type = G_TYPE_INVALID; --static bool sATKChecked = false; -+static PRBool sATKChecked = PR_FALSE; + static bool sATKChecked = false; static PRLibrary *sATKLib = nsnull; static const char sATKLibName[] = "libatk-1.0.so.0"; static const char sATKHyperlinkImplGetTypeSymbol[] = @@ -65,13 +66,13 @@ static void (* gail_remove_key_event_listener) (guint remove_listener); static AtkObject * (*gail_get_root) (void); -@@ -609,36 +607,17 @@ toplevel_event_watcher(GSignalInvocation +@@ -609,36 +609,17 @@ toplevel_event_watcher(GSignalInvocation } return TRUE; } - PRBool + bool nsApplicationAccessibleWrap::Init() { - // XXX following code is copied from widget/src/gtk2/nsWindow.cpp @@ -79,7 +80,7 @@ - // see bug 390761 - - // check if accessibility enabled/disabled by environment variable -- PRBool isGnomeATEnabled = PR_FALSE; +- bool isGnomeATEnabled = false; - const char *envValue = PR_GetEnv(sAccEnv); - if (envValue) { - isGnomeATEnabled = !!atoi(envValue); @@ -103,7 +104,7 @@ else { MAI_LOG_DEBUG(("Fail to load lib: %s\n", sGail.libName)); } -@@ -877,8 +856,129 @@ LoadGtkModule(GnomeAccessibilityModule& +@@ -877,8 +858,129 @@ LoadGtkModule(GnomeAccessibilityModule& aModule.init ? aModule.shutdownName : aModule.initName, aModule.libName)); PR_UnloadLibrary(aModule.lib); @@ -117,22 +118,22 @@ +namespace a11y { + +#ifdef MOZ_ENABLE_DBUS -+static DBusPendingCall *a11yPendingCall = NULL; ++ static DBusPendingCall *a11yPendingCall = NULL; +#endif + +void +PreInit() +{ -+ static PRBool sChecked = FALSE; ++ static bool sChecked = false; + if (sChecked) + return; -+ sChecked = TRUE; ++ sChecked = true; + DBusError error; + dbus_error_init(&error); + DBusConnection* bus = dbus_bus_get(DBUS_BUS_SESSION, &error); + if (!bus) + return; -+ dbus_connection_set_exit_on_disconnect(bus, FALSE); ++ dbus_connection_set_exit_on_disconnect(bus, false); + + DBusMessage *message; + message = dbus_message_new_method_call("org.a11y.Bus", "/org/a11y/bus", @@ -155,14 +156,14 @@ + dbus_error_free(&error); +} + -+PRBool ++bool +ShouldA11yBeEnabled() +{ -+ static PRBool sChecked = PR_FALSE, sShouldEnable = PR_FALSE; ++ static bool sChecked = false, sShouldEnable = false; + if (sChecked) + return sShouldEnable; + -+ sChecked = PR_TRUE; ++ sChecked = true; + + // check if accessibility enabled/disabled by environment variable + static const char sAccEnv [] = "GNOME_ACCESSIBILITY"; @@ -172,7 +173,7 @@ + +#ifdef MOZ_ENABLE_DBUS + PreInit(); -+ PRBool dbusSuccess = PR_FALSE; ++ bool dbusSuccess = false; + DBusMessage *reply = nsnull; + if (a11yPendingCall) { + dbus_pending_call_block(a11yPendingCall); @@ -236,47 +237,44 @@ diff --git a/accessible/src/base/nsAccessibilityService.h b/accessible/src/base/nsAccessibilityService.h --- a/accessible/src/base/nsAccessibilityService.h +++ b/accessible/src/base/nsAccessibilityService.h -@@ -41,16 +41,36 @@ +@@ -46,16 +46,33 @@ - #include "nsIAccessibilityService.h" - - #include "a11yGeneric.h" - #include "nsAccDocManager.h" + #include "mozilla/a11y/FocusManager.h" #include "nsIObserver.h" -+namespace mozilla { -+namespace a11y { + namespace mozilla { + namespace a11y { + +#ifdef MOZ_ACCESSIBILITY_ATK +/** -+ * Perform initialization that should be done as soon as possible, in order -+ * to minimize startup time. -+ * XXX: this function and the next defined in nsApplicationAccessibleWrap.cpp -+ */ ++ * + * Perform initialization that should be done as soon as possible, in ++ * order ++ * + * to minimize startup time. ++ * + * XXX: this function and the next defined in ++ * nsApplicationAccessibleWrap.cpp ++ * + */ +void PreInit(); + +/** -+ * Is platform accessibility enabled. -+ * Only used on linux with atk for now. -+ */ -+PRBool ShouldA11yBeEnabled(); ++ * + * Is platform accessibility enabled. ++ * + * Only used on linux with atk for now. ++ * + */ ++bool ShouldA11yBeEnabled(); +#endif + -+} // namespace a11y -+} // namespace mozilla -+ - class nsAccessibilityService : public nsAccDocManager, - public nsIAccessibilityService, - public nsIObserver - { - public: - virtual ~nsAccessibilityService(); + /** + * Return focus manager. + */ + FocusManager* FocusMgr(); + + } // namespace a11y + } // namespace mozilla - NS_DECL_ISUPPORTS_INHERITED diff --git a/widget/src/gtk2/nsWindow.cpp b/widget/src/gtk2/nsWindow.cpp --- a/widget/src/gtk2/nsWindow.cpp +++ b/widget/src/gtk2/nsWindow.cpp -@@ -103,29 +103,20 @@ +@@ -105,29 +105,21 @@ #include "nsIStringBundle.h" #include "nsGfxCIID.h" #include "nsIObserverService.h" @@ -292,10 +290,10 @@ -#include "stdlib.h" using namespace mozilla; -- --static PRBool sAccessibilityChecked = PR_FALSE; + +-static bool sAccessibilityChecked = false; -/* static */ --PRBool nsWindow::sAccessibilityEnabled = PR_FALSE; +-bool nsWindow::sAccessibilityEnabled = false; -static const char sSysPrefService [] = "@mozilla.org/system-preference-service;1"; -static const char sAccEnv [] = "GNOME_ACCESSIBILITY"; -static const char sAccessibilityKey [] = "config.use_system_prefs.accessibility"; @@ -307,11 +305,11 @@ #include "nsIFile.h" #include "nsILocalFile.h" -@@ -1109,19 +1100,18 @@ nsWindow::Show(PRBool aState) +@@ -1111,19 +1103,18 @@ nsWindow::Show(bool aState) NativeResize(mBounds.x, mBounds.y, mBounds.width, mBounds.height, - PR_FALSE); + false); } else if (mNeedsResize) { - NativeResize(mBounds.width, mBounds.height, PR_FALSE); + NativeResize(mBounds.width, mBounds.height, false); } } @@ -328,7 +326,7 @@ } NS_IMETHODIMP -@@ -3887,16 +3877,21 @@ nsWindow::Create(nsIWidget *aPare +@@ -3885,16 +3876,21 @@ nsWindow::Create(nsIWidget *aPare nsIWidget *baseParent = aInitData && (aInitData->mWindowType == eWindowType_dialog || aInitData->mWindowType == eWindowType_toplevel || @@ -342,27 +340,27 @@ + a11y::PreInit(); +#endif + + // Ensure that the toolkit is created. + nsGTKToolkit::GetToolkit(); + // initialize all the common bits of this class - BaseCreate(baseParent, aRect, aHandleEventFunction, aContext, - aAppShell, aToolkit, aInitData); + BaseCreate(baseParent, aRect, aHandleEventFunction, aContext, aInitData); // Do we need to listen for resizes? - PRBool listenForResizes = PR_FALSE;; - if (aNativeParent || (aInitData && aInitData->mListenForResizes)) - listenForResizes = PR_TRUE; -@@ -4278,43 +4273,16 @@ nsWindow::Create(nsIWidget *aPare + bool listenForResizes = false;; +@@ -4278,43 +4274,16 @@ nsWindow::Create(nsIWidget *aPare LOG(("\tmGdkWindow %p %lx\n", (void *)mGdkWindow, gdk_x11_window_get_xid(mGdkWindow))); } // resize so that everything is set to the right dimensions if (!mIsTopLevel) - Resize(mBounds.x, mBounds.y, mBounds.width, mBounds.height, PR_FALSE); + Resize(mBounds.x, mBounds.y, mBounds.width, mBounds.height, false); -#ifdef ACCESSIBILITY - nsresult rv; - if (!sAccessibilityChecked) { -- sAccessibilityChecked = PR_TRUE; +- sAccessibilityChecked = true; - - //check if accessibility enabled/disabled by environment variable - const char *envValue = PR_GetEnv(sAccEnv); @@ -394,7 +392,7 @@ if (mDFB) mDFB->GetDisplayLayer( mDFB, DLID_PRIMARY, &mDFBLayer ); -@@ -6504,19 +6472,18 @@ nsWindow::DispatchAccessibleEvent() +@@ -6504,19 +6473,18 @@ nsWindow::DispatchAccessibleEvent() DispatchEvent(&event, status); return event.mAccessible; ++++++ mozilla-disable-neon-option.patch ++++++ # HG changeset patch # User Joop Boonen <[email protected]> # Parent be20a0ae420eb2b3584ce2c5d241e2817bac8593 Add configure option to allow disabling of neon. diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in @@ -1674,41 +1674,47 @@ if test -n "$all_flags"; then ASFLAGS="$ASFLAGS $all_flags" if test -n "$thumb_flag"; then LDFLAGS="$LDFLAGS $thumb_flag" fi fi AC_SUBST(MOZ_THUMB2) -if test "$CPU_ARCH" = "arm"; then - AC_MSG_CHECKING(for ARM SIMD support in compiler) - # We try to link so that this also fails when - # building with LTO. - AC_TRY_LINK([], - [asm("uqadd8 r1, r1, r2");], - result="yes", result="no") - AC_MSG_RESULT("$result") - if test "$result" = "yes"; then - AC_DEFINE(HAVE_ARM_SIMD) - HAVE_ARM_SIMD=1 - fi - - AC_MSG_CHECKING(for ARM NEON support in compiler) - # We try to link so that this also fails when - # building with LTO. - AC_TRY_LINK([], - [asm(".fpu neon\n vadd.i8 d0, d0, d0");], - result="yes", result="no") - AC_MSG_RESULT("$result") - if test "$result" = "yes"; then - AC_DEFINE(HAVE_ARM_NEON) - HAVE_ARM_NEON=1 - fi -fi # CPU_ARCH = arm +MOZ_ARG_DISABLE_BOOL(neon, +[ --disable-neon Disable neon extensions], + NS_DISABLE_NEON=1, + NS_DISABLE_NEON= ) +if test "$NS_DISABLE_NEON" != "1"; then + if test "$CPU_ARCH" = "arm"; then + AC_MSG_CHECKING(for ARM SIMD support in compiler) + # We try to link so that this also fails when + # building with LTO. + AC_TRY_LINK([], + [asm("uqadd8 r1, r1, r2");], + result="yes", result="no") + AC_MSG_RESULT("$result") + if test "$result" = "yes"; then + AC_DEFINE(HAVE_ARM_SIMD) + HAVE_ARM_SIMD=1 + fi + + AC_MSG_CHECKING(for ARM NEON support in compiler) + # We try to link so that this also fails when + # building with LTO. + AC_TRY_LINK([], + [asm(".fpu neon\n vadd.i8 d0, d0, d0");], + result="yes", result="no") + AC_MSG_RESULT("$result") + if test "$result" = "yes"; then + AC_DEFINE(HAVE_ARM_NEON) + HAVE_ARM_NEON=1 + fi + fi # CPU_ARCH = arm +fi AC_SUBST(HAVE_ARM_SIMD) AC_SUBST(HAVE_ARM_NEON) dnl ======================================================== dnl Android libstdc++, placed here so it can use MOZ_ARCH dnl computed above. dnl ======================================================== diff --git a/js/src/configure.in b/js/src/configure.in --- a/js/src/configure.in +++ b/js/src/configure.in @@ -1604,41 +1604,47 @@ if test -n "$all_flags"; then ASFLAGS="$ASFLAGS $all_flags" if test -n "$thumb_flag"; then LDFLAGS="$LDFLAGS $thumb_flag" fi fi AC_SUBST(MOZ_THUMB2) -if test "$CPU_ARCH" = "arm"; then - AC_MSG_CHECKING(for ARM SIMD support in compiler) - # We try to link so that this also fails when - # building with LTO. - AC_TRY_LINK([], - [asm("uqadd8 r1, r1, r2");], - result="yes", result="no") - AC_MSG_RESULT("$result") - if test "$result" = "yes"; then - AC_DEFINE(HAVE_ARM_SIMD) - HAVE_ARM_SIMD=1 - fi - - AC_MSG_CHECKING(for ARM NEON support in compiler) - # We try to link so that this also fails when - # building with LTO. - AC_TRY_LINK([], - [asm(".fpu neon\n vadd.i8 d0, d0, d0");], - result="yes", result="no") - AC_MSG_RESULT("$result") - if test "$result" = "yes"; then - AC_DEFINE(HAVE_ARM_NEON) - HAVE_ARM_NEON=1 - fi -fi # CPU_ARCH = arm +MOZ_ARG_DISABLE_BOOL(neon, +[ --disable-neon Disable neon extensions], + NS_DISABLE_NEON=1, + NS_DISABLE_NEON= ) +if test "$NS_DISABLE_NEON" != "1"; then + if test "$CPU_ARCH" = "arm"; then + AC_MSG_CHECKING(for ARM SIMD support in compiler) + # We try to link so that this also fails when + # building with LTO. + AC_TRY_LINK([], + [asm("uqadd8 r1, r1, r2");], + result="yes", result="no") + AC_MSG_RESULT("$result") + if test "$result" = "yes"; then + AC_DEFINE(HAVE_ARM_SIMD) + HAVE_ARM_SIMD=1 + fi + + AC_MSG_CHECKING(for ARM NEON support in compiler) + # We try to link so that this also fails when + # building with LTO. + AC_TRY_LINK([], + [asm(".fpu neon\n vadd.i8 d0, d0, d0");], + result="yes", result="no") + AC_MSG_RESULT("$result") + if test "$result" = "yes"; then + AC_DEFINE(HAVE_ARM_NEON) + HAVE_ARM_NEON=1 + fi + fi # CPU_ARCH = arm +fi AC_SUBST(HAVE_ARM_SIMD) AC_SUBST(HAVE_ARM_NEON) dnl ======================================================== dnl Android libstdc++, placed here so it can use MOZ_ARCH dnl computed above. dnl ======================================================== ++++++ mozilla-kde.patch ++++++ ++++ 859 lines (skipped) ++++ between /work/SRC/openSUSE:Factory/MozillaFirefox/mozilla-kde.patch ++++ and /work/SRC/openSUSE:Factory/.MozillaFirefox.new/mozilla-kde.patch ++++++ mozilla-nongnome-proxies.patch ++++++ --- /var/tmp/diff_new_pack.7xMinC/_old 2012-02-02 17:58:22.000000000 +0100 +++ /var/tmp/diff_new_pack.7xMinC/_new 2012-02-02 17:58:22.000000000 +0100 @@ -5,17 +5,19 @@ =================================================================== RCS file: /cvsroot/mozilla/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp,v retrieving revision 1.1 -diff -u -p -6 -r1.1 nsUnixSystemProxySettings.cpp ---- toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp 29 Jan 2008 15:58:41 -0000 1.1 -+++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp 17 Apr 2008 19:02:19 -0000 -@@ -69,13 +69,19 @@ private: + +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 +@@ -68,16 +68,23 @@ private: + }; NS_IMPL_ISUPPORTS1(nsUnixSystemProxySettings, nsISystemProxySettings) nsresult nsUnixSystemProxySettings::Init() { -- mGConf = do_GetService(NS_GCONFSERVICE_CONTRACTID); + mGConf = do_GetService(NS_GCONFSERVICE_CONTRACTID); + // If this is a GNOME session, load gconf and try to use its preferences. + // If gconf is not available (which would be stupid) we'll proceed as if + // this was not a GNOME session, using *_PROXY environment variables. @@ -26,6 +28,8 @@ return NS_OK; } - PRBool + bool nsUnixSystemProxySettings::IsProxyMode(const char* aMode) { + nsCAutoString mode; + return NS_SUCCEEDED(mGConf->GetString(NS_LITERAL_CSTRING("/system/proxy/mode"), mode)) && ++++++ mozilla-ntlm-full-path.patch ++++++ --- /var/tmp/diff_new_pack.7xMinC/_old 2012-02-02 17:58:22.000000000 +0100 +++ /var/tmp/diff_new_pack.7xMinC/_new 2012-02-02 17:58:22.000000000 +0100 @@ -1,6 +1,6 @@ # HG changeset patch # User Petr Cerny <[email protected]> -# Parent 971259052418fda3b7fc81da75be4557ea5d82bc +# Parent a843037ea4cee813a68dd529e7a503d1e40b81e4 Bug 634334 - call to the ntlm_auth helper fails diff --git a/extensions/auth/nsAuthSambaNTLM.cpp b/extensions/auth/nsAuthSambaNTLM.cpp @@ -23,5 +23,5 @@ nsnull }; - PRBool isOK = SpawnIOChild(args, &mChildPID, &mFromChildFD, &mToChildFD); + bool isOK = SpawnIOChild(args, &mChildPID, &mFromChildFD, &mToChildFD); if (!isOK) ++++++ mozilla-prefer_plugin_pref.patch ++++++ --- /var/tmp/diff_new_pack.7xMinC/_old 2012-02-02 17:58:22.000000000 +0100 +++ /var/tmp/diff_new_pack.7xMinC/_new 2012-02-02 17:58:22.000000000 +0100 @@ -4,8 +4,8 @@ diff --git a/dom/plugins/base/nsPluginHost.cpp b/dom/plugins/base/nsPluginHost.cpp --- a/dom/plugins/base/nsPluginHost.cpp +++ b/dom/plugins/base/nsPluginHost.cpp -@@ -1637,17 +1637,48 @@ nsPluginHost::FindPluginForType(const ch - PRBool aCheckEnabled) +@@ -1580,17 +1580,48 @@ nsPluginHost::FindPluginForType(const ch + bool aCheckEnabled) { if (!aMimeType) { return nsnull; ++++++ mozilla-shared-nss-db.patch ++++++ --- /var/tmp/diff_new_pack.7xMinC/_old 2012-02-02 17:58:22.000000000 +0100 +++ /var/tmp/diff_new_pack.7xMinC/_new 2012-02-02 17:58:22.000000000 +0100 @@ -7,7 +7,7 @@ diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in --- a/config/autoconf.mk.in +++ b/config/autoconf.mk.in -@@ -571,16 +571,20 @@ MOZ_LIBNOTIFY_LIBS = @MOZ_LIBNOTIFY_LIBS +@@ -567,16 +567,20 @@ MOZ_LIBNOTIFY_LIBS = @MOZ_LIBNOTIFY_LIBS MOZ_ENABLE_LIBNOTIFY = @MOZ_ENABLE_LIBNOTIFY@ MOZ_ALSA_LIBS = @MOZ_ALSA_LIBS@ @@ -31,7 +31,7 @@ diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in -@@ -8016,16 +8016,31 @@ AC_SUBST(QCMS_LIBS) +@@ -8093,16 +8093,31 @@ AC_SUBST(QCMS_LIBS) dnl ======================================================== dnl HarfBuzz @@ -61,12 +61,12 @@ AC_SUBST(MOZ_OTS_LIBS) dnl ======================================================== - dnl disable xul + dnl Skia dnl ======================================================== diff --git a/security/manager/ssl/src/Makefile.in b/security/manager/ssl/src/Makefile.in --- a/security/manager/ssl/src/Makefile.in +++ b/security/manager/ssl/src/Makefile.in -@@ -113,12 +113,14 @@ CSRCS += md4.c +@@ -114,12 +114,14 @@ CSRCS += md4.c EXTRA_DEPS = $(NSS_DEP_LIBS) @@ -109,7 +109,7 @@ #include "nsNetUtil.h" #include "nsAppDirectoryServiceDefs.h" -@@ -1727,18 +1734,34 @@ nsNSSComponent::InitializeNSS(PRBool sho +@@ -1725,18 +1732,34 @@ nsNSSComponent::InitializeNSS(bool showW ConfigureInternalPKCS11Token(); // The NSS_INIT_NOROOTINIT flag turns off the loading of the root certs @@ -149,8 +149,8 @@ diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in --- a/toolkit/library/Makefile.in +++ b/toolkit/library/Makefile.in -@@ -138,17 +138,17 @@ ifdef MOZ_DEBUG - EXTRA_DSO_LDOPTS += -INCREMENTAL:NO +@@ -126,17 +126,17 @@ EXTRA_DSO_LDOPTS += -INCREMENTAL:NO + endif endif endif ++++++ source-stamp.txt ++++++ --- /var/tmp/diff_new_pack.7xMinC/_old 2012-02-02 17:58:22.000000000 +0100 +++ /var/tmp/diff_new_pack.7xMinC/_new 2012-02-02 17:58:22.000000000 +0100 @@ -1,2 +1,2 @@ -REV=c4405d7a95f6 +REV=baefae4b6685 REPO=http://hg.mozilla.org/releases/mozilla-release -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
