Hello community,
here is the log from the commit of package xulrunner for openSUSE:12.1:Update:Test checked in at 2012-02-02 10:40:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.1:Update:Test/xulrunner (Old)
and /work/SRC/openSUSE:12.1:Update:Test/.xulrunner.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "xulrunner", Maintainer is "gnome-maintainers@suse.de"
Changes:
--------
--- /work/SRC/openSUSE:12.1:Update:Test/xulrunner/xulrunner.changes 2012-01-04 17:27:23.000000000 +0100
+++ /work/SRC/openSUSE:12.1:Update:Test/.xulrunner.new/xulrunner.changes 2012-02-02 10:40:55.000000000 +0100
@@ -1,0 +2,24 @@
+Mon Jan 30 09:43:21 UTC 2012 - wr@rosenauer.org
+
+- update to version 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
+- removed obsolete ppc64 patch
+- disable neon for ARM as it doesn't build correctly
+
+-------------------------------------------------------------------
Old:
----
l10n-9.0.1.tar.bz2
mozilla-ppc64.patch
xulrunner-9.0.1-source.tar.bz2
New:
----
l10n-10.0.tar.bz2
mozilla-disable-neon-option.patch
source-stamp.txt
xulrunner-10.0-source.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ xulrunner.spec ++++++
--- /var/tmp/diff_new_pack.MJxrkQ/_old 2012-02-02 10:40:57.000000000 +0100
+++ /var/tmp/diff_new_pack.MJxrkQ/_new 2012-02-02 10:40:57.000000000 +0100
@@ -1,8 +1,8 @@
#
# spec file for package xulrunner
#
-# 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
@@ -43,12 +43,12 @@
%endif
BuildRequires: mozilla-nspr-devel >= 4.8.9
BuildRequires: mozilla-nss-devel >= 3.13.1
-Version: 9.0.1
+Version: 10.0
Release: 0
-%define releasedate 2011122000
-%define version_internal 9.0.1
-%define apiversion 9
-%define uaweight 900001
+%define releasedate 2012012900
+%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
@@ -65,6 +65,7 @@
Source5: add-plugins.sh.in
Source6: create-tar.sh
Source7: baselibs.conf
+Source8: source-stamp.txt
Source9: compare-locales.tar.bz2
Patch1: toolkit-download-folder.patch
Patch2: mozilla-pkgconfig.patch
@@ -76,8 +77,8 @@
Patch12: mozilla-dump_syms-static.patch
Patch13: mozilla-sle11.patch
Patch14: mozilla-linux3.patch
-Patch15: mozilla-ppc64.patch
-Patch16: mozilla-a11y.patch
+Patch15: mozilla-a11y.patch
+Patch16: mozilla-disable-neon-option.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Requires: mozilla-js = %{version}
Requires(post): update-alternatives coreutils
@@ -283,6 +284,12 @@
ac_add_options --disable-ipc
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
@@ -434,7 +441,6 @@
%dir %{_libdir}/xulrunner-%{version_internal}/extensions/
%{_libdir}/xulrunner-%{version_internal}/chrome/icons/
%{_libdir}/xulrunner-%{version_internal}/components/
-%{_libdir}/xulrunner-%{version_internal}/hyphenation/
%{_libdir}/xulrunner-%{version_internal}/plugins/
%{_libdir}/xulrunner-%{version_internal}/*.so
%exclude %{_libdir}/xulrunner-%{version_internal}/libmozjs.so
@@ -450,7 +456,7 @@
%{_libdir}/xulrunner-%{version_internal}/xulrunner-bin
%{_libdir}/xulrunner-%{version_internal}/xulrunner-stub
%{_libdir}/xulrunner-%{version_internal}/platform.ini
-%{_libdir}/xulrunner-%{version_internal}/omni.jar
+%{_libdir}/xulrunner-%{version_internal}/omni.ja
# crashreporter files
%if %crashreporter
%{_libdir}/xulrunner-%{version_internal}/crashreporter
++++++ compare-locales.tar.bz2 ++++++
++++++ create-tar.sh ++++++
--- /var/tmp/diff_new_pack.MJxrkQ/_old 2012-02-02 10:40:57.000000000 +0100
+++ /var/tmp/diff_new_pack.MJxrkQ/_new 2012-02-02 10:40:57.000000000 +0100
@@ -2,8 +2,8 @@
CHANNEL="release"
BRANCH="releases/mozilla-$CHANNEL"
-RELEASE_TAG="FIREFOX_9_0_RELEASE"
-VERSION="9.0"
+RELEASE_TAG="FIREFOX_10_0_RELEASE"
+VERSION="10.0"
# mozilla
hg clone http://hg.mozilla.org/$BRANCH mozilla
++++++ l10n-9.0.1.tar.bz2 -> l10n-10.0.tar.bz2 ++++++
/work/SRC/openSUSE:12.1:Update:Test/xulrunner/l10n-9.0.1.tar.bz2 /work/SRC/openSUSE:12.1:Update:Test/.xulrunner.new/l10n-10.0.tar.bz2 differ: char 11, line 1
++++++ mozilla-a11y.patch ++++++
--- /var/tmp/diff_new_pack.MJxrkQ/_old 2012-02-02 10:40:57.000000000 +0100
+++ /var/tmp/diff_new_pack.MJxrkQ/_new 2012-02-02 10:40:57.000000000 +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();
+
+ } // 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
# 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-nongnome-proxies.patch ++++++
--- /var/tmp/diff_new_pack.MJxrkQ/_old 2012-02-02 10:40:57.000000000 +0100
+++ /var/tmp/diff_new_pack.MJxrkQ/_new 2012-02-02 10:40:57.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.MJxrkQ/_old 2012-02-02 10:40:57.000000000 +0100
+++ /var/tmp/diff_new_pack.MJxrkQ/_new 2012-02-02 10:40:57.000000000 +0100
@@ -1,6 +1,6 @@
# HG changeset patch
# User Petr Cerny
-# 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.MJxrkQ/_old 2012-02-02 10:40:57.000000000 +0100
+++ /var/tmp/diff_new_pack.MJxrkQ/_new 2012-02-02 10:40:57.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;
++++++ source-stamp.txt ++++++
REV=baefae4b6685
REPO=http://hg.mozilla.org/releases/mozilla-release
++++++ xulrunner-9.0.1-source.tar.bz2 -> xulrunner-10.0-source.tar.bz2 ++++++
/work/SRC/openSUSE:12.1:Update:Test/xulrunner/xulrunner-9.0.1-source.tar.bz2 /work/SRC/openSUSE:12.1:Update:Test/.xulrunner.new/xulrunner-10.0-source.tar.bz2 differ: char 11, line 1
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org
