Hello community, here is the log from the commit of package xulrunner for openSUSE:Factory checked in at 2011-12-25 17:43:13 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/xulrunner (Old) and /work/SRC/openSUSE:Factory/.xulrunner.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xulrunner", Maintainer is "gnome-maintain...@suse.de" Changes: -------- --- /work/SRC/openSUSE:Factory/xulrunner/xulrunner.changes 2011-11-14 13:51:08.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.xulrunner.new/xulrunner.changes 2011-12-25 17:43:28.000000000 +0100 @@ -1,0 +2,22 @@ +Fri Dec 23 17:02:01 UTC 2011 - w...@rosenauer.org + +- update to Firefox 9.0.1 + * (strongparent) parentNode of element gets lost (bmo#335998) + +------------------------------------------------------------------- +Sun Dec 18 09:28:02 UTC 2011 - w...@rosenauer.org + +- update to release 9.0 (bnc#737533) + * MFSA 2011-53/CVE-2011-3660 + Miscellaneous memory safety hazards (rv:9.0) + * MFSA 2011-54/CVE-2011-3661 (bmo#691299) + Potentially exploitable crash in the YARR regular expression + library + * MFSA 2011-55/CVE-2011-3658 (bmo#708186) + nsSVGValue out-of-bounds access + * MFSA 2011-56/CVE-2011-3663 (bmo#704482) + Key detection without JavaScript via SVG animation + * MFSA 2011-58/VE-2011-3665 (bmo#701259) + Crash scaling <video> to extreme sizes + +------------------------------------------------------------------- Old: ---- l10n-8.0.tar.bz2 xulrunner-8.0-source.tar.bz2 New: ---- l10n-9.0.1.tar.bz2 mozilla-a11y.patch xulrunner-9.0.1-source.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xulrunner.spec ++++++ --- /var/tmp/diff_new_pack.jfoiCx/_old 2011-12-25 17:43:34.000000000 +0100 +++ /var/tmp/diff_new_pack.jfoiCx/_new 2011-12-25 17:43:34.000000000 +0100 @@ -16,29 +16,43 @@ # Please submit bugfixes or comments via http://bugs.opensuse.org/ # -# norootforbuild - Name: xulrunner -BuildRequires: Mesa-devel autoconf213 dbus-1-glib-devel fdupes gcc-c++ hunspell-devel libcurl-devel libgnomeui-devel libidl-devel libnotify-devel nss-shared-helper-devel pkg-config python startup-notification-devel unzip yasm zip +BuildRequires: Mesa-devel +BuildRequires: autoconf213 +BuildRequires: dbus-1-glib-devel +BuildRequires: fdupes +BuildRequires: gcc-c++ +BuildRequires: hunspell-devel +BuildRequires: libcurl-devel +BuildRequires: libgnomeui-devel +BuildRequires: libidl-devel +BuildRequires: libnotify-devel +BuildRequires: nss-shared-helper-devel +BuildRequires: pkg-config +BuildRequires: python +BuildRequires: startup-notification-devel +BuildRequires: unzip +BuildRequires: yasm +BuildRequires: zip %if %suse_version > 1110 BuildRequires: libiw-devel BuildRequires: libproxy-devel %else BuildRequires: wireless-tools %endif -BuildRequires: mozilla-nspr-devel >= 4.8.8 -BuildRequires: mozilla-nss-devel >= 3.12.10 -License: MPL-1.1 or GPL-2.0+ or LGPL-2.1+ -Version: 8.0 -Release: 1 -%define releasedate 2011110500 -%define version_internal 8.0 -%define apiversion 8 -%define uaweight 800000 +BuildRequires: mozilla-nspr-devel >= 4.8.9 +BuildRequires: mozilla-nss-devel >= 3.13.1 +Version: 9.0.1 +Release: 0 +%define releasedate 2011122000 +%define version_internal 9.0.1 +%define apiversion 9 +%define uaweight 900001 Summary: Mozilla Runtime Environment -Url: http://www.mozilla.org/ +License: MPL-1.1 or GPL-2.0+ or LGPL-2.1+ Group: Productivity/Other +Url: http://www.mozilla.org/ Provides: gecko %ifarch %ix86 Provides: xulrunner-32bit = %{version}-%{release} @@ -63,6 +77,7 @@ Patch13: mozilla-sle11.patch Patch14: mozilla-linux3.patch Patch15: mozilla-ppc64.patch +Patch16: mozilla-a11y.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build Requires: mozilla-js = %{version} Requires(post): update-alternatives coreutils @@ -98,7 +113,6 @@ %package -n mozilla-js -License: MPL-1.1 or GPL-2.0+ or LGPL-2.1+ Summary: Mozilla JS engine Group: Productivity/Other @@ -110,7 +124,6 @@ %package devel -License: MPL-1.1 or GPL-2.0+ or LGPL-2.1+ Summary: XULRunner/Gecko SDK Group: Development/Libraries/Other %if %has_system_nspr @@ -127,7 +140,6 @@ %if %localize %package translations-common -License: MPL-1.1 or GPL-2.0+ or LGPL-2.1+ Summary: Common translations for XULRunner Group: System/Localization Requires: %{name} = %{version} @@ -144,7 +156,6 @@ %package translations-other -License: MPL-1.1 or GPL-2.0+ or LGPL-2.1+ Summary: Extra translations for XULRunner Group: System/Localization Requires: %{name} = %{version} @@ -162,7 +173,6 @@ %if %crashreporter %package buildsymbols -License: MPL-1.1 or GPL-2.0+ or LGPL-2.1+ Summary: Breakpad buildsymbols for %{name} Group: Development/Debug @@ -186,6 +196,7 @@ %endif %patch14 -p1 %patch15 -p1 +%patch16 -p1 %build # no need to add build time to binaries @@ -280,7 +291,7 @@ cp %{SOURCE4} dist/bin/defaults/pref/all-openSUSE.js %makeinstall STRIP=/bin/true # xpt.py is not executable -chmod a+x $RPM_BUILD_ROOT%{_libdir}/xulrunner-devel-%{version_internal}/sdk/bin/xpt.py +chmod a+x $RPM_BUILD_ROOT%{_libdir}/xulrunner-devel-%{version_internal}/sdk/bin/*.py # remove some executable permissions find $RPM_BUILD_ROOT%{_includedir}/xulrunner-%{version_internal} \ -type f -perm -111 -exec chmod a-x {} \; @@ -451,8 +462,8 @@ %if %suse_version >= 1120 %ghost %{_bindir}/xulrunner %endif -# API symlink -%{_libdir}/xulrunner-%{apiversion} +# API symlink (already in mozilla-js) +#%{_libdir}/xulrunner-%{apiversion} # compat symlinks %if 0%{?ga_version:1} %ghost %{_libdir}/xulrunner-%{ga_version} @@ -467,7 +478,6 @@ %files devel %defattr(-,root,root) %{_libdir}/xulrunner-%{version_internal}/xpcshell -%{_libdir}/xulrunner-%{version_internal}/xpidl %{_libdir}/xulrunner-devel-%{version_internal}/ # FIXME symlink dynamic libs below sdk/lib %attr(644,root,root) %{_libdir}/pkgconfig/* ++++++ compare-locales.tar.bz2 ++++++ ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.jfoiCx/_old 2011-12-25 17:43:34.000000000 +0100 +++ /var/tmp/diff_new_pack.jfoiCx/_new 2011-12-25 17:43:34.000000000 +0100 @@ -2,8 +2,8 @@ CHANNEL="release" BRANCH="releases/mozilla-$CHANNEL" -RELEASE_TAG="FIREFOX_8_0_RELEASE" -VERSION="8.0" +RELEASE_TAG="FIREFOX_9_0_RELEASE" +VERSION="9.0" # mozilla hg clone http://hg.mozilla.org/$BRANCH mozilla ++++++ l10n-8.0.tar.bz2 -> l10n-9.0.1.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/xulrunner/l10n-8.0.tar.bz2 /work/SRC/openSUSE:Factory/.xulrunner.new/l10n-9.0.1.tar.bz2 differ: char 11, line 1 ++++++ mozilla-a11y.patch ++++++ # HG changeset patch # User Michael Gorse <mgo...@suse.com> # Parent d02253d1e8217008dfa26e6e2a901b6a8b75e989 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 diff --git a/accessible/src/atk/Makefile.in b/accessible/src/atk/Makefile.in --- a/accessible/src/atk/Makefile.in +++ b/accessible/src/atk/Makefile.in @@ -87,15 +87,19 @@ EXPORTS = \ # we want to force the creation of a static lib. FORCE_STATIC_LIB = 1 include $(topsrcdir)/config/rules.mk CFLAGS += $(MOZ_GTK2_CFLAGS) CXXFLAGS += $(MOZ_GTK2_CFLAGS) +ifdef MOZ_ENABLE_DBUS +CXXFLAGS += $(MOZ_DBUS_CFLAGS) +endif + LOCAL_INCLUDES += \ -I$(srcdir) \ -I$(srcdir)/../base \ -I$(srcdir)/../html \ -I$(srcdir)/../xul \ -I$(topsrcdir)/other-licenses/atk-1.0 \ $(NULL) 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 @@ #include "nsIPrefBranch.h" #include "nsIServiceManager.h" #include "nsAutoPtr.h" #include "nsAccessibilityService.h" #include "AtkSocketAccessible.h" #include <gtk/gtk.h> #include <atk/atk.h> +#include <dbus/dbus.h> + +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 PRLibrary *sATKLib = nsnull; static const char sATKLibName[] = "libatk-1.0.so.0"; static const char sATKHyperlinkImplGetTypeSymbol[] = "atk_hyperlink_impl_get_type"; -static const char sAccEnv [] = "GNOME_ACCESSIBILITY"; -static const char sSysPrefService [] = - "@mozilla.org/system-preference-service;1"; -static const char sAccessibilityKey [] = - "config.use_system_prefs.accessibility"; /* gail function pointer */ static guint (* gail_add_global_event_listener) (GSignalEmissionHook listener, const gchar *event_type); static void (* gail_remove_global_event_listener) (guint remove_listener); static void (* gail_remove_key_event_listener) (guint remove_listener); static AtkObject * (*gail_get_root) (void); @@ -609,36 +607,17 @@ toplevel_event_watcher(GSignalInvocation } return TRUE; } PRBool nsApplicationAccessibleWrap::Init() { - // XXX following code is copied from widget/src/gtk2/nsWindow.cpp - // we should put it to somewhere that can be used from both modules - // see bug 390761 - - // check if accessibility enabled/disabled by environment variable - PRBool isGnomeATEnabled = PR_FALSE; - const char *envValue = PR_GetEnv(sAccEnv); - if (envValue) { - isGnomeATEnabled = !!atoi(envValue); - } else { - //check gconf-2 setting - nsresult rv; - nsCOMPtr<nsIPrefBranch> sysPrefService = - do_GetService(sSysPrefService, &rv); - if (NS_SUCCEEDED(rv) && sysPrefService) { - sysPrefService->GetBoolPref(sAccessibilityKey, &isGnomeATEnabled); - } - } - - if (isGnomeATEnabled) { + if (ShouldA11yBeEnabled()) { // load and initialize gail library nsresult rv = LoadGtkModule(sGail); if (NS_SUCCEEDED(rv)) { (*sGail.init)(); } else { MAI_LOG_DEBUG(("Fail to load lib: %s\n", sGail.libName)); } @@ -877,8 +856,129 @@ LoadGtkModule(GnomeAccessibilityModule& aModule.init ? aModule.shutdownName : aModule.initName, aModule.libName)); PR_UnloadLibrary(aModule.lib); aModule.lib = NULL; return NS_ERROR_FAILURE; } return NS_OK; } + +namespace mozilla { +namespace a11y { + +#ifdef MOZ_ENABLE_DBUS +static DBusPendingCall *a11yPendingCall = NULL; +#endif + +void +PreInit() +{ + static PRBool sChecked = FALSE; + if (sChecked) + return; + 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); + + DBusMessage *message; + message = dbus_message_new_method_call("org.a11y.Bus", "/org/a11y/bus", + "org.freedesktop.DBus.Properties", + "Get"); + if (!message) + goto dbus_done; + + static const char* iface = "org.a11y.Status"; + static const char* member = "IsEnabled"; + dbus_message_append_args(message, DBUS_TYPE_STRING, &iface, + DBUS_TYPE_STRING, &member, DBUS_TYPE_INVALID); + dbus_connection_send_with_reply(bus, message, &a11yPendingCall, 1000); + +dbus_done: + if (message) + dbus_message_unref(message); + if (bus) + dbus_connection_unref(bus); + dbus_error_free(&error); +} + +PRBool +ShouldA11yBeEnabled() +{ + static PRBool sChecked = PR_FALSE, sShouldEnable = PR_FALSE; + if (sChecked) + return sShouldEnable; + + sChecked = PR_TRUE; + + // check if accessibility enabled/disabled by environment variable + static const char sAccEnv [] = "GNOME_ACCESSIBILITY"; + const char* envValue = PR_GetEnv(sAccEnv); + if (envValue) + return sShouldEnable = !!atoi(envValue); + +#ifdef MOZ_ENABLE_DBUS + PreInit(); + PRBool dbusSuccess = PR_FALSE; + DBusMessage *reply = nsnull; + if (a11yPendingCall) { + dbus_pending_call_block(a11yPendingCall); + reply = dbus_pending_call_steal_reply(a11yPendingCall); + dbus_pending_call_unref(a11yPendingCall); + a11yPendingCall = nsnull; + } + if (!reply || + dbus_message_get_type(reply) != DBUS_MESSAGE_TYPE_METHOD_RETURN || + strcmp(dbus_message_get_signature (reply), "v")) + goto dbus_done; + + DBusMessageIter iter, iter_variant, iter_struct; + dbus_bool_t dResult; + dbus_message_iter_init(reply, &iter); + dbus_message_iter_recurse (&iter, &iter_variant); + switch (dbus_message_iter_get_arg_type(&iter_variant)) { + case DBUS_TYPE_STRUCT: + // at-spi2-core 2.2.0-2.2.1 had a bug where it returned a struct + dbus_message_iter_recurse(&iter_variant, &iter_struct); + if (dbus_message_iter_get_arg_type(&iter_struct) == DBUS_TYPE_BOOLEAN) { + dbus_message_iter_get_basic(&iter_struct, &dResult); + sShouldEnable = dResult; + dbusSuccess = true; + } + + break; + case DBUS_TYPE_BOOLEAN: + dbus_message_iter_get_basic(&iter_variant, &dResult); + sShouldEnable = dResult; + dbusSuccess = true; + break; + default: + break; + } + + dbus_done: + if (reply) + dbus_message_unref(reply); + + if (dbusSuccess) + return sShouldEnable; +#endif + + //check gconf-2 setting + nsresult rv = NS_OK; + static const char sSysPrefService [] = + "@mozilla.org/system-preference-service;1"; + static const char sAccessibilityKey [] = + "config.use_system_prefs.accessibility"; + nsCOMPtr<nsIPrefBranch> sysPrefService = + do_GetService(sSysPrefService, &rv); + if (NS_SUCCEEDED(rv) && sysPrefService) + sysPrefService->GetBoolPref(sAccessibilityKey, &sShouldEnable); + + return sShouldEnable; +} +} // namespace a11y +} // namespace mozilla + 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 @@ #include "nsIAccessibilityService.h" #include "a11yGeneric.h" #include "nsAccDocManager.h" #include "nsIObserver.h" +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 + */ +void PreInit(); + +/** + * Is platform accessibility enabled. + * Only used on linux with atk for now. + */ +PRBool ShouldA11yBeEnabled(); +#endif + +} // namespace a11y +} // namespace mozilla + class nsAccessibilityService : public nsAccDocManager, public nsIAccessibilityService, public nsIObserver { public: virtual ~nsAccessibilityService(); 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 @@ #include "nsIStringBundle.h" #include "nsGfxCIID.h" #include "nsIObserverService.h" #include "nsIdleService.h" #include "nsIPropertyBag2.h" #ifdef ACCESSIBILITY -#include "nsIAccessibilityService.h" +#include "nsAccessibilityService.h" #include "nsIAccessibleDocument.h" -#include "prenv.h" -#include "stdlib.h" using namespace mozilla; - -static PRBool sAccessibilityChecked = PR_FALSE; -/* static */ -PRBool nsWindow::sAccessibilityEnabled = PR_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"; #endif /* For SetIcon */ #include "nsAppDirectoryServiceDefs.h" #include "nsXPIDLString.h" #include "nsIFile.h" #include "nsILocalFile.h" @@ -1109,19 +1100,18 @@ nsWindow::Show(PRBool aState) NativeResize(mBounds.x, mBounds.y, mBounds.width, mBounds.height, PR_FALSE); } else if (mNeedsResize) { NativeResize(mBounds.width, mBounds.height, PR_FALSE); } } #ifdef ACCESSIBILITY - if (aState && sAccessibilityEnabled) { + if (aState && a11y::ShouldA11yBeEnabled()) CreateRootAccessible(); - } #endif NativeShow(aState); return NS_OK; } NS_IMETHODIMP @@ -3887,16 +3877,21 @@ nsWindow::Create(nsIWidget *aPare nsIWidget *baseParent = aInitData && (aInitData->mWindowType == eWindowType_dialog || aInitData->mWindowType == eWindowType_toplevel || aInitData->mWindowType == eWindowType_invisible) ? nsnull : aParent; NS_ASSERTION(!mWindowGroup, "already have window group (leaking it)"); +#ifdef ACCESSIBILITY + // Send a DBus message to check whether a11y is enabled + a11y::PreInit(); +#endif + // initialize all the common bits of this class BaseCreate(baseParent, aRect, aHandleEventFunction, aContext, aAppShell, aToolkit, 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 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); -#ifdef ACCESSIBILITY - nsresult rv; - if (!sAccessibilityChecked) { - sAccessibilityChecked = PR_TRUE; - - //check if accessibility enabled/disabled by environment variable - const char *envValue = PR_GetEnv(sAccEnv); - if (envValue) { - sAccessibilityEnabled = atoi(envValue) != 0; - LOG(("Accessibility Env %s=%s\n", sAccEnv, envValue)); - } - //check gconf-2 setting - else { - nsCOMPtr<nsIPrefBranch> sysPrefService = - do_GetService(sSysPrefService, &rv); - if (NS_SUCCEEDED(rv) && sysPrefService) { - - // do the work to get gconf setting. - // will be done soon later. - sysPrefService->GetBoolPref(sAccessibilityKey, - &sAccessibilityEnabled); - } - - } - } -#endif - #ifdef MOZ_DFB if (!mDFB) { DirectFBCreate( &mDFB ); D_ASSUME( mDFB != NULL ); if (mDFB) mDFB->GetDisplayLayer( mDFB, DLID_PRIMARY, &mDFBLayer ); @@ -6504,19 +6472,18 @@ nsWindow::DispatchAccessibleEvent() DispatchEvent(&event, status); return event.mAccessible; } void nsWindow::DispatchEventToRootAccessible(PRUint32 aEventType) { - if (!sAccessibilityEnabled) { + if (!a11y::ShouldA11yBeEnabled()) return; - } nsCOMPtr<nsIAccessibilityService> accService = do_GetService("@mozilla.org/accessibilityService;1"); if (!accService) { return; } // Get the root document accessible and fire event to it. ++++++ mozilla-pkgconfig.patch ++++++ --- /var/tmp/diff_new_pack.jfoiCx/_old 2011-12-25 17:43:34.000000000 +0100 +++ /var/tmp/diff_new_pack.jfoiCx/_new 2011-12-25 17:43:34.000000000 +0100 @@ -14,17 +14,17 @@ # Add pkg-config files to the install:: target +# the apilibdir always ends with 1.9 as every patch update will provide a link -+apilibdir = $(dir $(installdir))xulrunner-8 ++apilibdir = $(dir $(installdir))xulrunner-9 + pkg_config_files = \ libxul.pc \ libxul-embedding.pc \ mozilla-js.pc \ mozilla-plugin.pc \ - mozilla-gtkmozembed.pc \ - mozilla-gtkmozembed-embedding.pc \ $(NULL) -@@ -105,16 +108,17 @@ pkg_config_files += mozilla-nss.pc + + ifdef MOZ_NATIVE_NSPR +@@ -103,16 +106,17 @@ pkg_config_files += mozilla-nss.pc endif %.pc: $(srcdir)/%.pc.in $(GLOBAL_DEPS) @@ -73,32 +73,6 @@ Version: %MOZILLA_VERSION% Requires: %NSPR_NAME% >= %NSPR_VERSION% Libs: -L${sdkdir}/lib %MOZ_XUL_LINK% -diff --git a/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in b/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in ---- a/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in -+++ b/xulrunner/installer/mozilla-gtkmozembed-embedding.pc.in -@@ -1,8 +1,9 @@ - prefix=%prefix% - sdkdir=%sdkdir% -+libdir=%libdir% - includedir=%includedir% - - Name: mozilla-gtkembedmoz - Description: Static version-independent Mozilla Embedding Widget for Gtk+ - Version: %MOZILLA_VERSION% - Requires: libxul-embedding = %MOZILLA_VERSION% -diff --git a/xulrunner/installer/mozilla-gtkmozembed.pc.in b/xulrunner/installer/mozilla-gtkmozembed.pc.in ---- a/xulrunner/installer/mozilla-gtkmozembed.pc.in -+++ b/xulrunner/installer/mozilla-gtkmozembed.pc.in -@@ -1,8 +1,9 @@ - prefix=%prefix% - sdkdir=%sdkdir% -+libdir=%libdir% - includedir=%includedir% - - Name: mozilla-gtkembedmoz - Description: Mozilla Embedding Widget for Gtk+ - Version: %MOZILLA_VERSION% - Requires: libxul = %MOZILLA_VERSION% diff --git a/xulrunner/installer/mozilla-js.pc.in b/xulrunner/installer/mozilla-js.pc.in --- a/xulrunner/installer/mozilla-js.pc.in +++ b/xulrunner/installer/mozilla-js.pc.in ++++++ mozilla-ppc64.patch ++++++ --- /var/tmp/diff_new_pack.jfoiCx/_old 2011-12-25 17:43:34.000000000 +0100 +++ /var/tmp/diff_new_pack.jfoiCx/_new 2011-12-25 17:43:34.000000000 +0100 @@ -1,5 +1,5 @@ # HG changeset patch -# Parent 87e43d08cce58b76e1910946c36c6465bb4c74e6 +# Parent 928a29c4a79c9041d6b9f68e24de8f5aab15cc5d From: upstream Subject: Fix PPC64 build https://bugzilla.mozilla.org/show_bug.cgi?id=670719 @@ -8,7 +8,7 @@ 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 -@@ -52,16 +52,19 @@ +@@ -54,16 +54,19 @@ #define ARCH_CPU_X86_FAMILY 1 #define ARCH_CPU_X86 1 #define ARCH_CPU_32_BITS 1 @@ -23,53 +23,8 @@ #elif defined(__ppc__) || defined(__powerpc__) #define ARCH_CPU_PPC 1 #define ARCH_CPU_32_BITS 1 + #elif defined(__sparc64__) + #define ARCH_CPU_SPARC 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. -diff --git a/js/src/Makefile.in b/js/src/Makefile.in ---- a/js/src/Makefile.in -+++ b/js/src/Makefile.in -@@ -433,16 +433,18 @@ CPPSRCS += \ - YarrPattern.cpp \ - YarrSyntaxChecker.cpp \ - $(NULL) - else - - ############################################### - # BEGIN include sources for the Nitro assembler - # -+ENABLE_YARR_JIT = 1 -+ - VPATH += $(srcdir)/assembler \ - $(srcdir)/assembler/wtf \ - $(srcdir)/assembler/jit \ - $(srcdir)/assembler/assembler \ - $(srcdir)/methodjit \ - $(srcdir)/yarr \ - $(NONE) - -@@ -1076,17 +1078,21 @@ endif - - ############################################### - # BEGIN kludges for the Nitro assembler - # - - # Needed to "configure" it correctly. Unfortunately these - # flags wind up being applied to all code in js/src, not just - # the code in js/src/assembler. --CXXFLAGS += -DUSE_SYSTEM_MALLOC=1 -DENABLE_ASSEMBLER=1 -DENABLE_JIT=1 -+CXXFLAGS += -DUSE_SYSTEM_MALLOC=1 -DENABLE_ASSEMBLER=1 -+ -+ifneq (,$(ENABLE_YARR_JIT)$(ENABLE_TRACEJIT)$(ENABLE_METHODJIT)) -+CXXFLAGS += -DENABLE_JIT=1 -+endif - - INCLUDES += -I$(srcdir)/assembler -I$(srcdir)/yarr - - ifdef ENABLE_METHODJIT - # Build a standalone test program that exercises the assembler - # sources a bit. - TESTMAIN_OBJS = \ - Assertions.$(OBJ_SUFFIX) \ ++++++ xulrunner-8.0-source.tar.bz2 -> xulrunner-9.0.1-source.tar.bz2 ++++++ /work/SRC/openSUSE:Factory/xulrunner/xulrunner-8.0-source.tar.bz2 /work/SRC/openSUSE:Factory/.xulrunner.new/xulrunner-9.0.1-source.tar.bz2 differ: char 11, line 1 -- To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org For additional commands, e-mail: opensuse-commit+h...@opensuse.org
