# HG changeset patch # User Wolfgang Rosenauer # Date 1325176625 -3600 # Node ID 04fc00b85b21b7662f501cd67683956ddb5e3c38 # Parent 8891dd9439a110daaa5969668f7d9d60d3373a19 build 10.0b2 rebased mozilla-a11y.patch diff -r 8891dd9439a1 -r 04fc00b85b21 MozillaFirefox/MozillaFirefox.spec --- a/MozillaFirefox/MozillaFirefox.spec Mon Dec 26 09:20:25 2011 +0100 +++ b/MozillaFirefox/MozillaFirefox.spec Thu Dec 29 17:37:05 2011 +0100 @@ -46,7 +46,7 @@ BuildRequires: nss-shared-helper-devel Version: %{mainver} Release: 10 -%define releasedate 2011122200 +%define releasedate 2011122700 Provides: web_browser Provides: firefox = %{version}-%{release} Provides: firefox = %{mainver} @@ -212,7 +212,7 @@ %patch11 -p1 %endif %patch12 -p1 -#%patch13 -p1 +%patch13 -p1 # %patch31 -p1 %patch32 -p1 diff -r 8891dd9439a1 -r 04fc00b85b21 MozillaFirefox/create-tar.sh --- a/MozillaFirefox/create-tar.sh Mon Dec 26 09:20:25 2011 +0100 +++ b/MozillaFirefox/create-tar.sh Thu Dec 29 17:37:05 2011 +0100 @@ -2,7 +2,7 @@ CHANNEL="beta" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_10_0b1_RELEASE" +RELEASE_TAG="FIREFOX_10_0b2_RELEASE" VERSION="9.99" # mozilla diff -r 8891dd9439a1 -r 04fc00b85b21 mozilla-a11y.patch --- a/mozilla-a11y.patch Mon Dec 26 09:20:25 2011 +0100 +++ b/mozilla-a11y.patch Thu Dec 29 17:37:05 2011 +0100 @@ -1,6 +1,6 @@ # HG changeset patch # User Michael Gorse -# 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 #include ++#ifdef MOZ_ENABLE_DBUS +#include ++#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(); - NS_DECL_ISUPPORTS_INHERITED + } // namespace a11y + } // namespace mozilla + 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; diff -r 8891dd9439a1 -r 04fc00b85b21 series --- a/series Mon Dec 26 09:20:25 2011 +0100 +++ b/series Thu Dec 29 17:37:05 2011 +0100 @@ -16,7 +16,7 @@ mozilla-dump_syms-static.patch mozilla-sle11.patch mozilla-linux3.patch -#mozilla-a11y.patch +mozilla-a11y.patch # Firefox patches firefox-browser-css.patch diff -r 8891dd9439a1 -r 04fc00b85b21 xulrunner/create-tar.sh --- a/xulrunner/create-tar.sh Mon Dec 26 09:20:25 2011 +0100 +++ b/xulrunner/create-tar.sh Thu Dec 29 17:37:05 2011 +0100 @@ -1,9 +1,9 @@ #!/bin/bash -CHANNEL="release" +CHANNEL="beta" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_9_0_1_RELEASE" -VERSION="9.0.1" +RELEASE_TAG="FIREFOX_10_0b2_RELEASE" +VERSION="9.99" # mozilla hg clone http://hg.mozilla.org/$BRANCH mozilla diff -r 8891dd9439a1 -r 04fc00b85b21 xulrunner/mozilla-ppc64.patch --- a/xulrunner/mozilla-ppc64.patch Mon Dec 26 09:20:25 2011 +0100 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -../mozilla-ppc64.patch \ No newline at end of file diff -r 8891dd9439a1 -r 04fc00b85b21 xulrunner/xulrunner.spec --- a/xulrunner/xulrunner.spec Mon Dec 26 09:20:25 2011 +0100 +++ b/xulrunner/xulrunner.spec Thu Dec 29 17:37:05 2011 +0100 @@ -42,12 +42,12 @@ %endif BuildRequires: mozilla-nspr-devel >= 4.8.9 BuildRequires: mozilla-nss-devel >= 3.13.1 -Version: 9.0 +Version: 9.99 Release: 0 -%define releasedate 2011122000 -%define version_internal 9.0.1 -%define apiversion 9 -%define uaweight 900001 +%define releasedate 2011122700 +%define version_internal 10.0 +%define apiversion 10 +%define uaweight 1000000 Summary: Mozilla Runtime Environment License: MPL-1.1 or GPL-2.0+ or LGPL-2.1+ Group: Productivity/Other