commit mozilla-xulrunner192 for openSUSE:Factory
Hello community, here is the log from the commit of package mozilla-xulrunner192 for openSUSE:Factory checked in at Wed Dec 30 00:28:52 CET 2009. -------- --- mozilla-xulrunner192/mozilla-xulrunner192.changes 2009-11-11 08:19:58.000000000 +0100 +++ /mounts/work_src_done/STABLE/mozilla-xulrunner192/mozilla-xulrunner192.changes 2009-12-28 19:11:34.000000000 +0100 @@ -1,0 +2,12 @@ +Thu Dec 24 14:21:02 CET 2009 - wr@rosenauer.org + +- update to 1.9.2b5 +- removed upstreamed mozilla-abi.patch +- integrated mozilla-kde.patch +- use .autoreg file for autoregistration when needed (bnc#440872) +- enable libproxy support from 11.2 on +- renamed -gnomevfs subpackage to -gnome +- readded lockdown patches and preferences +- fix baselibs.conf + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- FIXME gconf-backend.patch.bz2 l10n-1.9.2b2.tar.bz2 mozilla-abi.patch xulrunner-source-1.9.2b2.tar.bz2 New: ---- l10n-1.9.2b5.tar.bz2 mozilla-breakpad.patch mozilla-gconf-backend.patch toolkit-lockdown.js xulrunner-source-1.9.2b5.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mozilla-xulrunner192.spec ++++++ --- /var/tmp/diff_new_pack.NkkXpp/_old 2009-12-30 00:28:25.000000000 +0100 +++ /var/tmp/diff_new_pack.NkkXpp/_new 2009-12-30 00:28:25.000000000 +0100 @@ -1,8 +1,8 @@ # -# spec file for package mozilla-xulrunner192 (Version 1.9.2b2) +# spec file for package mozilla-xulrunner192 (Version 1.9.2b5) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. -# Copyright (c) 2006-2009 Wolfgang Rosenauer +# 2006-2009 Wolfgang Rosenauer # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ Name: mozilla-xulrunner192 -BuildRequires: autoconf213 gcc-c++ libgnomeui-devel libidl-devel libnotify-devel python startup-notification-devel zip +BuildRequires: autoconf213 gcc-c++ libcurl-devel libgnomeui-devel libidl-devel libnotify-devel python startup-notification-devel zip # needed for brp-check-bytecode-version (jar, fastjar would do as well) BuildRequires: unzip %if %suse_version > 1020 @@ -34,17 +34,27 @@ %endif %if %suse_version > 1110 BuildRequires: libiw-devel -#BuildRequires: libproxy-devel +BuildRequires: libproxy-devel %else BuildRequires: wireless-tools %endif -License: GPLv2+ ; LGPLv2.1+ ; MPL 1.1 or later -Version: 1.9.2b2 +License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ +Version: 1.9.2b5 Release: 1 +%define releasedate 2009120400 +%define version_internal 1.9.2b5 +%define apiversion 1.9.2 +%define uaweight 191999 Summary: Mozilla Runtime Environment 1.9.2 Url: http://www.mozilla.org Group: Productivity/Other Provides: gecko192 +%if %suse_version >= 1110 +# this is needed to match this package with the kde4 helper package without the main package +# having a hard requirement on the kde4 package +%define kde_helper_version 6 +Provides: mozilla-kde4-version = %{kde_helper_version} +%endif %ifarch %ix86 Provides: mozilla-xulrunner192-32bit = %{version}-%{release} %endif @@ -55,26 +65,32 @@ Source4: xulrunner-openSUSE-prefs.js Source5: add-plugins.sh.in Source6: create-tar.sh +Source7: baselibs.conf +Source8: toolkit-lockdown.js Patch1: toolkit-download-folder.patch Patch2: mozilla-libproxy.patch Patch3: mozilla-pkgconfig.patch Patch4: idldir.patch -Patch7: mozilla-nongnome-proxies.patch -Patch8: mozilla-helper-app.patch -Patch10: mozilla-abi.patch -Patch12: mozilla-prefer_plugin_pref.patch -# PATCH-FEATURE-SLED FATE#302023, FATE#302024 - hfiguiere@novell.com -# --- disabled for now -Patch16: gconf-backend.patch.bz2 -Patch17: gecko-lockdown.patch -Patch18: toolkit-ui-lockdown.patch +Patch5: mozilla-nongnome-proxies.patch +Patch6: mozilla-helper-app.patch +Patch7: mozilla-prefer_plugin_pref.patch +Patch8: mozilla-shared-nss-db.patch +Patch9: mozilla-startup-notification.patch +Patch10: mozilla-kde.patch +# PATCH-FEATURE-SLED FATE#302023, FATE#302024 +Patch11: mozilla-gconf-backend.patch +Patch12: gecko-lockdown.patch +Patch13: toolkit-ui-lockdown.patch # --- -Patch22: mozilla-shared-nss-db.patch -Patch23: mozilla-kde.patch -Patch24: mozilla-startup-notification.patch +Patch14: mozilla-breakpad.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build PreReq: update-alternatives coreutils ### build configuration ### +%ifarch %ix86 +%define crashreporter 0 +%else +%define crashreporter 0 +%endif %define has_system_nspr 0 %define has_system_nss 0 %define has_system_cairo 0 @@ -86,10 +102,6 @@ %if %suse_version > 1110 %define has_system_cairo 1 %endif -%define releasedate 2009110900 -%define version_internal 1.9.2b2 -%define apiversion 1.9.2 -%define uaweight 191999 ### configuration end ### %define _use_internal_dependency_generator 0 %define __find_requires sh %{SOURCE2} @@ -103,7 +115,7 @@ BuildRequires: mozilla-nss-devel >= 3.12.3 Requires: mozilla-nss >= %(rpm -q --queryformat '%{VERSION}' mozilla-nss) %endif -Recommends: %{name}-gnomevfs +Recommends: %{name}-gnome %description XULRunner is a single installable package that can be used to bootstrap @@ -112,7 +124,7 @@ %package devel -License: GPLv2+ ; LGPLv2.1+ ; MPL 1.1 or later +License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ Summary: XULRunner/Gecko SDK 1.9.2 Group: Development/Libraries/Other %if %has_system_nspr @@ -128,7 +140,7 @@ %package translations-common -License: GPLv2+ ; LGPLv2.1+ ; MPL 1.1 or later +License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ Summary: Common translations for XULRunner 1.9.2 Group: System/Localization PreReq: %{name} = %{version} @@ -145,11 +157,11 @@ %package translations-other -License: GPLv2+ ; LGPLv2.1+ ; MPL 1.1 or later +License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ Summary: Extra translations for XULRunner 1.9.2 Group: System/Localization PreReq: %{name} = %{version} -Provides: locale(%{name}:be;bn_BD;el;et;eu;fa;fy_NL;ga_IE;gl;he;hi_IN;id;is;lt;lv;mr;or;pa_IN;rm;ro;sk;sq;ta;te;tr;uk) +Provides: locale(%{name}:af;as;be;bg;bn_BD;bn_IN;cy;el;eo;es_MX;et;eu;fa;fy_NL;ga_IE;gl;gu_IN;he;hi_IN;hr;id;is;ka;kk;kn;lt;lv;mk;ml;mr;nn_NO;oc;or;pa_IN;rm;ro;si;sk;sl;sq;sr;ta;ta_LK;te;th;tr;uk;vi) Obsoletes: %{name}-translations < %{version}-%{release} %description translations-other @@ -160,41 +172,64 @@ This package contains rarely used languages. -%package gnomevfs -License: GPLv2+ ; LGPLv2.1+ ; MPL 1.1 or later +%package gnome +License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ Summary: XULRunner components depending on gnome-vfs Group: Productivity/Other PreReq: %{name} = %{version}-%{release} -%description gnomevfs +%description gnome This subpackage contains the Necko Gnome-VFS and Gnome components which rely on the gnome-vfs subsystem to be installed. They are recommended for full desktop integration but not mandatory for small disk footprint KDE installations for example. +%if %crashreporter + +%package buildsymbols +License: GPLv2+ ; LGPLv2.1+ ; MPLv1.1+ +Summary: Breakpad buildsymbols for %{name} +Group: Development/Debug + +%description buildsymbols +This subpackage contains the Breakpad created and compatible debugging +symbols meant for upload to Mozilla's crash collector database. +%endif + %prep %setup -n mozilla -q -b 1 %patch1 -p1 -#%patch2 -p1 +%patch2 -p1 %patch3 -p1 -%patch4 -%patch7 +%patch4 -p1 +%patch5 -p1 +%patch6 -p1 +%patch7 -p1 %patch8 -p1 +%patch9 -p1 +%if %suse_version >= 1110 %patch10 -p1 +%endif +%patch11 -p1 %patch12 -p1 -# BEGIN lockdown - currently broken (see bnc#508611) -#%patch16 -p1 -#%patch17 -#%patch18 -p1 -# END lockdown -%patch22 -p1 -%patch24 -p1 +%patch13 -p1 +%patch14 -p1 %build +%if %suse_version >= 1110 +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 +%endif MOZ_APP_DIR=%{_libdir}/xulrunner-%{version_internal} export MOZ_BUILD_DATE=%{releasedate} export CFLAGS="$RPM_OPT_FLAGS -Os -fno-strict-aliasing" +%if %crashreporter +export CFLAGS="$CFLAGS -gstabs+" +%endif %ifarch ppc64 export CFLAGS="$CFLAGS -mminimal-toc" %endif @@ -237,7 +272,6 @@ ac_add_options --disable-installer ac_add_options --disable-updater ac_add_options --disable-javaxpcom -ac_add_options --disable-crashreporter ac_add_options --enable-startup-notification ac_add_options --enable-url-classifier #ac_add_options --enable-debug @@ -267,11 +301,16 @@ #ac_add_options --enable-system-sqlite #EOF #%endif -#%if %suse_version > 1110 -#cat << EOF >> $MOZCONFIG -#ac_add_options --enable-libproxy -#EOF -#%endif +%if %suse_version > 1110 +cat << EOF >> $MOZCONFIG +ac_add_options --enable-libproxy +EOF +%endif +%if ! %crashreporter +cat << EOF >> $MOZCONFIG +ac_add_options --disable-crashreporter +EOF +%endif make -f client.mk build %install @@ -294,6 +333,7 @@ #cp -rL dist/xpi-stage/simple $RPM_BUILD_ROOT/%{_libdir}/xulrunner-%{version_internal}/ # preferences cp %{SOURCE4} $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/greprefs/all-openSUSE.js +cp %{SOURCE8} $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/greprefs/lockdown.js # install add-plugins.sh sed "s:%%PROGDIR:%{_libdir}/xulrunner-%{version_internal}:g" \ %{SOURCE5} > $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/add-plugins.sh @@ -344,11 +384,21 @@ rm -f $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/LICENSE rm -f $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/README.txt rm -f $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/dictionaries/en-US* +# autoreg +touch $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/.autoreg # fdupes %if %suse_version > 1020 %fdupes $RPM_BUILD_ROOT%{_includedir}/xulrunner-%{version_internal}/ %fdupes $RPM_BUILD_ROOT%{_libdir}/xulrunner-%{version_internal}/ %endif +# create breakpad debugsymbols +%if %crashreporter +make buildsymbols +if [ -e dist/*.crashreporter-symbols.zip ]; then + mkdir -p $RPM_BUILD_ROOT%{_datadir}/mozilla/ + cp dist/*.crashreporter-symbols.zip $RPM_BUILD_ROOT%{_datadir}/mozilla/ +fi +%endif %clean rm -rf $RPM_BUILD_ROOT @@ -389,6 +439,10 @@ %{_libdir}/xulrunner-%{version_internal}/add-plugins.sh > /dev/null 2>&1 exit 0 +%post gnome +touch %{_libdir}/xulrunner-%{version_internal}/.autoreg +exit 0 + %files %defattr(-,root,root) %dir %{_libdir}/xulrunner-%{version_internal}/ @@ -410,31 +464,32 @@ %{_libdir}/xulrunner-%{version_internal}/greprefs/security-prefs.js %{_libdir}/xulrunner-%{version_internal}/greprefs/xpinstall.js %{_libdir}/xulrunner-%{version_internal}/greprefs/all-openSUSE.js +%{_libdir}/xulrunner-%{version_internal}/greprefs/lockdown.js %{_libdir}/xulrunner-%{version_internal}/icons/ %{_libdir}/xulrunner-%{version_internal}/modules/ %{_libdir}/xulrunner-%{version_internal}/plugins/ %{_libdir}/xulrunner-%{version_internal}/res/ %{_libdir}/xulrunner-%{version_internal}/*.so +%{_libdir}/xulrunner-%{version_internal}/.autoreg %{_libdir}/xulrunner-%{version_internal}/add-plugins.sh %{_libdir}/xulrunner-%{version_internal}/dependentlibs.list %{_libdir}/xulrunner-%{version_internal}/mozilla-xremote-client -%if !%has_system_nss -%{_libdir}/xulrunner-%{version_internal}/libsoftokn3.chk -%{_libdir}/xulrunner-%{version_internal}/libfreebl3.chk -%endif %{_libdir}/xulrunner-%{version_internal}/run-mozilla.sh %{_libdir}/xulrunner-%{version_internal}/xulrunner %{_libdir}/xulrunner-%{version_internal}/xulrunner-bin %{_libdir}/xulrunner-%{version_internal}/xulrunner-stub %{_libdir}/xulrunner-%{version_internal}/platform.ini -#%{_libdir}/xulrunner-%{version_internal}/javaxpcom.jar +# crashreporter files +%if %crashreporter +%{_libdir}/xulrunner-%{version_internal}/crashreporter +%{_libdir}/xulrunner-%{version_internal}/crashreporter.ini +%{_libdir}/xulrunner-%{version_internal}/Throbber-small.gif +%endif # ghosts %ghost %{_libdir}/xulrunner-%{version_internal}/global.reginfo # GRE %dir %{_sysconfdir}/gre.d/ %attr(644,root,root) %{_sysconfdir}/gre.d/* -# example -#%{_libdir}/xulrunner-%{version_internal}/simple/ # API symlink %{_libdir}/xulrunner-%{apiversion} # compat symlinks @@ -444,7 +499,6 @@ %files devel %defattr(-,root,root) -#%{_libdir}/xulrunner-%{version_internal}/MozillaInterfaces* %{_libdir}/xulrunner-%{version_internal}/xpcshell %{_libdir}/xulrunner-%{version_internal}/xpidl %{_libdir}/xulrunner-%{version_internal}/xpt_dump @@ -454,7 +508,7 @@ %attr(644,root,root) %{_libdir}/pkgconfig/* %{_includedir}/xulrunner-%{version_internal}/ -%files gnomevfs +%files gnome %defattr(-,root,root) %{_libdir}/xulrunner-%{version_internal}/components/libmozgnome.so %{_libdir}/xulrunner-%{version_internal}/components/libnkgnomevfs.so @@ -466,5 +520,11 @@ %files translations-other -f %{_tmppath}/translations.other %defattr(-,root,root) %endif +%if %crashreporter + +%files buildsymbols +%defattr(-,root,root) +%{_datadir}/mozilla/ +%endif %changelog ++++++ baselibs.conf ++++++ --- /var/tmp/diff_new_pack.NkkXpp/_old 2009-12-30 00:28:25.000000000 +0100 +++ /var/tmp/diff_new_pack.NkkXpp/_new 2009-12-30 00:28:25.000000000 +0100 @@ -1,13 +1,18 @@ -mozilla-xulrunner191 +mozilla-xulrunner192 +/usr/lib(64)?/xulrunner-.* +/etc/gre.d/.* - recommends "mozilla-xulrunner191-gnomevfs-<targettype>" + recommends "mozilla-xulrunner192-gnome-<targettype>" -mozilla-xulrunner191-translations +mozilla-xulrunner192-translations-common +/usr/lib(64)?/xulrunner-.* - prereq "mozilla-xulrunner191-<targettype> = <version>" - supplements "packageand(mozilla-xulrunner191-translations:mozilla-xulrunner191-<targettype>)" + prereq "mozilla-xulrunner192-<targettype> = <version>" + supplements "packageand(mozilla-xulrunner192-translations-common:mozilla-xulrunner192-<targettype>)" -mozilla-xulrunner191-gnomevfs +mozilla-xulrunner192-translations-other +/usr/lib(64)?/xulrunner-.* - prereq "mozilla-xulrunner191-<targettype> = <version>" + prereq "mozilla-xulrunner192-<targettype> = <version>" + supplements "packageand(mozilla-xulrunner192-translations-other:mozilla-xulrunner192-<targettype>)" + +mozilla-xulrunner192-gnome + +/usr/lib(64)?/xulrunner-.* + prereq "mozilla-xulrunner192-<targettype> = <version>" ++++++ create-tar.sh ++++++ --- /var/tmp/diff_new_pack.NkkXpp/_old 2009-12-30 00:28:25.000000000 +0100 +++ /var/tmp/diff_new_pack.NkkXpp/_new 2009-12-30 00:28:25.000000000 +0100 @@ -1,7 +1,7 @@ #!/bin/bash -RELEASE_TAG="FIREFOX_3_6b2_RELEASE" -VERSION="1.9.2b2" +RELEASE_TAG="FIREFOX_3_6b5_RELEASE" +VERSION="1.9.2b5" # mozilla hg clone http://hg.mozilla.org/releases/mozilla-1.9.2 mozilla ++++++ gecko-lockdown.patch ++++++ --- /var/tmp/diff_new_pack.NkkXpp/_old 2009-12-30 00:28:25.000000000 +0100 +++ /var/tmp/diff_new_pack.NkkXpp/_new 2009-12-30 00:28:25.000000000 +0100 @@ -1,13 +1,27 @@ -From: Robert O'Callahan -Subject: Lockdown feature for Gecko -References: +From: various contributors +Subject: lockdown hooks for Gecko - -Index: extensions/cookie/nsCookiePermission.cpp -=================================================================== ---- extensions/cookie/nsCookiePermission.cpp.orig -+++ extensions/cookie/nsCookiePermission.cpp -@@ -86,6 +86,7 @@ static const char kCookiesPrefsMigrated[ +diff --git a/extensions/cookie/nsCookiePermission.cpp b/extensions/cookie/nsCookiePermission.cpp +--- a/extensions/cookie/nsCookiePermission.cpp ++++ b/extensions/cookie/nsCookiePermission.cpp +@@ -1,10 +1,10 @@ + /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ +-/* vim:ts=2:sw=2:et: */ ++/* vim: set ts=2 sw=2 et: */ + /* ***** BEGIN LICENSE BLOCK ***** + * Version: MPL 1.1/GPL 2.0/LGPL 2.1 + * + * The contents of this file are subject to the Mozilla Public License Version + * 1.1 (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * http://www.mozilla.org/MPL/ + * +@@ -81,16 +81,17 @@ static const PRBool kDefaultPolicy = PR_ + static const char kCookiesLifetimePolicy[] = "network.cookie.lifetimePolicy"; + static const char kCookiesLifetimeDays[] = "network.cookie.lifetime.days"; + static const char kCookiesAlwaysAcceptSession[] = "network.cookie.alwaysAcceptSessionCookies"; + + static const char kCookiesPrefsMigrated[] = "network.cookie.prefsMigrated"; // obsolete pref names for migration static const char kCookiesLifetimeEnabled[] = "network.cookie.lifetime.enabled"; static const char kCookiesLifetimeBehavior[] = "network.cookie.lifetime.behavior"; @@ -15,26 +29,56 @@ static const char kCookiesAskPermission[] = "network.cookie.warnAboutCookies"; static const char kPermissionType[] = "cookie"; -@@ -125,6 +126,7 @@ nsCookiePermission::Init() + + #ifdef MOZ_MAIL_NEWS + // returns PR_TRUE if URI appears to be the URI of a mailnews protocol + // XXXbz this should be a protocol flag, not a scheme list, dammit! + static PRBool +@@ -120,16 +121,17 @@ nsCookiePermission::Init() + + // failure to access the pref service is non-fatal... + nsCOMPtr<nsIPrefBranch2> prefBranch = + do_GetService(NS_PREFSERVICE_CONTRACTID); + if (prefBranch) { prefBranch->AddObserver(kCookiesLifetimePolicy, this, PR_FALSE); prefBranch->AddObserver(kCookiesLifetimeDays, this, PR_FALSE); prefBranch->AddObserver(kCookiesAlwaysAcceptSession, this, PR_FALSE); + prefBranch->AddObserver(kCookiesHonorExceptions, this, PR_FALSE); - #ifdef MOZ_MAIL_NEWS - prefBranch->AddObserver(kCookiesDisabledForMailNews, this, PR_FALSE); - #endif -@@ -182,6 +184,10 @@ nsCookiePermission::PrefChanged(nsIPrefB + PrefChanged(prefBranch, nsnull); + + // migration code for original cookie prefs + PRBool migrated; + rv = prefBranch->GetBoolPref(kCookiesPrefsMigrated, &migrated); + if (NS_FAILED(rv) || !migrated) { + PRBool warnAboutCookies = PR_FALSE; + prefBranch->GetBoolPref(kCookiesAskPermission, &warnAboutCookies); +@@ -173,16 +175,20 @@ nsCookiePermission::PrefChanged(nsIPrefB + if (PREF_CHANGED(kCookiesLifetimeDays) && + NS_SUCCEEDED(aPrefBranch->GetIntPref(kCookiesLifetimeDays, &val))) + // save cookie lifetime in seconds instead of days + mCookiesLifetimeSec = val * 24 * 60 * 60; + + if (PREF_CHANGED(kCookiesAlwaysAcceptSession) && NS_SUCCEEDED(aPrefBranch->GetBoolPref(kCookiesAlwaysAcceptSession, &val))) mCookiesAlwaysAcceptSession = val; - ++ + if (PREF_CHANGED(kCookiesHonorExceptions) && + NS_SUCCEEDED(aPrefBranch->GetBoolPref(kCookiesHonorExceptions, &val))) + mCookiesHonorExceptions = val; -+ - #ifdef MOZ_MAIL_NEWS - if (PREF_CHANGED(kCookiesDisabledForMailNews) && - NS_SUCCEEDED(aPrefBranch->GetBoolPref(kCookiesDisabledForMailNews, &val))) -@@ -232,6 +238,11 @@ nsCookiePermission::CanAccess(nsIURI + } + + NS_IMETHODIMP + nsCookiePermission::SetAccess(nsIURI *aURI, + nsCookieAccess aAccess) + { + // + // NOTE: nsCookieAccess values conveniently match up with +@@ -202,16 +208,21 @@ nsCookiePermission::CanAccess(nsIURI + // it. + if (IsFromMailNews(aURI)) { + *aResult = ACCESS_DENY; + return NS_OK; + } #endif // MOZ_MAIL_NEWS // finally, check with permission manager... @@ -46,32 +90,56 @@ nsresult rv = mPermMgr->TestPermission(aURI, kPermissionType, (PRUint32 *) aResult); if (NS_SUCCEEDED(rv)) { switch (*aResult) { -Index: extensions/cookie/nsCookiePermission.h -=================================================================== ---- extensions/cookie/nsCookiePermission.h.orig -+++ extensions/cookie/nsCookiePermission.h -@@ -61,6 +61,7 @@ public: - #ifdef MOZ_MAIL_NEWS - , mCookiesDisabledForMailNews(PR_TRUE) - #endif + // if we have one of the publicly-available values, just return it + case nsIPermissionManager::UNKNOWN_ACTION: // ACCESS_DEFAULT + case nsIPermissionManager::ALLOW_ACTION: // ACCESS_ALLOW + case nsIPermissionManager::DENY_ACTION: // ACCESS_DENY + break; +diff --git a/extensions/cookie/nsCookiePermission.h b/extensions/cookie/nsCookiePermission.h +--- a/extensions/cookie/nsCookiePermission.h ++++ b/extensions/cookie/nsCookiePermission.h +@@ -54,30 +54,32 @@ public: + NS_DECL_ISUPPORTS + NS_DECL_NSICOOKIEPERMISSION + NS_DECL_NSIOBSERVER + + nsCookiePermission() + : mCookiesLifetimeSec(LL_MAXINT) + , mCookiesLifetimePolicy(0) // ACCEPT_NORMALLY + , mCookiesAlwaysAcceptSession(PR_FALSE) + , mCookiesHonorExceptions(PR_TRUE) {} virtual ~nsCookiePermission() {} -@@ -76,7 +77,7 @@ private: - #ifdef MOZ_MAIL_NEWS - PRPackedBool mCookiesDisabledForMailNews; - #endif -- + nsresult Init(); + void PrefChanged(nsIPrefBranch *, const char *); + + private: + PRBool InPrivateBrowsing(); + + nsCOMPtr<nsIPermissionManager> mPermMgr; + nsCOMPtr<nsIPrivateBrowsingService> mPBService; + + PRInt64 mCookiesLifetimeSec; // lifetime limit specified in seconds + PRUint8 mCookiesLifetimePolicy; // pref for how long cookies are stored + PRPackedBool mCookiesAlwaysAcceptSession; // don't prompt for session cookies + PRPackedBool mCookiesHonorExceptions; }; // {EF565D0A-AB9A-4A13-9160-0644CDFD859A} -Index: extensions/permissions/nsContentBlocker.cpp -=================================================================== ---- extensions/permissions/nsContentBlocker.cpp.orig -+++ extensions/permissions/nsContentBlocker.cpp -@@ -76,6 +76,7 @@ NS_IMPL_ISUPPORTS3(nsContentBlocker, + #define NS_COOKIEPERMISSION_CID \ + {0xEF565D0A, 0xAB9A, 0x4A13, {0x91, 0x60, 0x06, 0x44, 0xcd, 0xfd, 0x85, 0x9a }} + + #endif +diff --git a/extensions/permissions/nsContentBlocker.cpp b/extensions/permissions/nsContentBlocker.cpp +--- a/extensions/permissions/nsContentBlocker.cpp ++++ b/extensions/permissions/nsContentBlocker.cpp +@@ -71,32 +71,38 @@ static const char *kTypeString[NUMBER_OF + NS_IMPL_ISUPPORTS3(nsContentBlocker, + nsIContentPolicy, + nsIObserver, + nsSupportsWeakReference) + nsContentBlocker::nsContentBlocker() { memset(mBehaviorPref, BEHAVIOR_ACCEPT, NUMBER_OF_TYPES); @@ -79,7 +147,16 @@ } nsresult -@@ -92,6 +93,11 @@ nsContentBlocker::Init() + nsContentBlocker::Init() + { + nsresult rv; + mPermissionManager = do_GetService(NS_PERMISSIONMANAGER_CONTRACTID, &rv); + NS_ENSURE_SUCCESS(rv, rv); + + nsCOMPtr<nsIPrefService> prefService = do_GetService(NS_PREFSERVICE_CONTRACTID, &rv); + NS_ENSURE_SUCCESS(rv, rv); + + nsCOMPtr<nsIPrefBranch> prefBranch; rv = prefService->GetBranch("permissions.default.", getter_AddRefs(prefBranch)); NS_ENSURE_SUCCESS(rv, rv); @@ -91,7 +168,17 @@ // Migrate old image blocker pref nsCOMPtr<nsIPrefBranch> oldPrefBranch; oldPrefBranch = do_QueryInterface(prefService); -@@ -121,8 +127,15 @@ nsContentBlocker::Init() + PRInt32 oldPref; + rv = oldPrefBranch->GetIntPref("network.image.imageBehavior", &oldPref); + if (NS_SUCCEEDED(rv) && oldPref) { + PRInt32 newPref; + switch (oldPref) { +@@ -116,39 +122,49 @@ nsContentBlocker::Init() + + + // The branch is not a copy of the prefservice, but a new object, because + // it is a non-default branch. Adding obeservers to it will only work if + // we make sure that the object doesn't die. So, keep a reference to it. mPrefBranchInternal = do_QueryInterface(prefBranch, &rv); NS_ENSURE_SUCCESS(rv, rv); @@ -108,7 +195,8 @@ return rv; } -@@ -131,19 +144,22 @@ nsContentBlocker::Init() + + #undef LIMIT #define LIMIT(x, low, high, default) ((x) >= (low) && (x) <= (high) ? (x) : (default)) void @@ -142,7 +230,17 @@ } // nsIContentPolicy Implementation -@@ -268,11 +284,13 @@ nsContentBlocker::TestPermission(nsIURI + NS_IMETHODIMP + nsContentBlocker::ShouldLoad(PRUint32 aContentType, + nsIURI *aContentLocation, + nsIURI *aRequestingLocation, + nsISupports *aRequestingContext, +@@ -264,21 +280,23 @@ nsContentBlocker::TestPermission(nsIURI + // This default will also get used if there is an unknown value in the + // permission list, or if the permission manager returns unknown values. + *aPermission = PR_TRUE; + + // check the permission list first; if we find an entry, it overrides // default prefs. // Don't forget the aContentType ranges from 1..8, while the // array is indexed 0..7 @@ -161,7 +259,17 @@ // If there is nothing on the list, use the default. if (!permission) { -@@ -298,7 +316,7 @@ nsContentBlocker::TestPermission(nsIURI + permission = mBehaviorPref[aContentType - 1]; + *aFromPrefs = PR_TRUE; + } + + // Use the fact that the nsIPermissionManager values map to +@@ -294,17 +312,17 @@ nsContentBlocker::TestPermission(nsIURI + case BEHAVIOR_NOFOREIGN: + // Third party checking + + // Need a requesting uri for third party checks to work. + if (!aFirstURI) return NS_OK; PRBool trustedSource = PR_FALSE; @@ -170,21 +278,34 @@ NS_ENSURE_SUCCESS(rv,rv); if (!trustedSource) { rv = aFirstURI->SchemeIs("resource", &trustedSource); -@@ -363,8 +381,6 @@ nsContentBlocker::Observe(nsISupports + NS_ENSURE_SUCCESS(rv,rv); + } + if (trustedSource) + return NS_OK; + +@@ -360,12 +378,11 @@ nsContentBlocker::TestPermission(nsIURI + NS_IMETHODIMP + nsContentBlocker::Observe(nsISupports *aSubject, + const char *aTopic, + const PRUnichar *aData) { NS_ASSERTION(!strcmp(NS_PREFBRANCH_PREFCHANGE_TOPIC_ID, aTopic), "unexpected topic - we only deal with pref changes!"); -- + - if (mPrefBranchInternal) - PrefChanged(mPrefBranchInternal, NS_LossyConvertUTF16toASCII(aData).get()); + PrefChanged(NS_LossyConvertUTF16toASCII(aData).get()); return NS_OK; } -Index: extensions/permissions/nsContentBlocker.h -=================================================================== ---- extensions/permissions/nsContentBlocker.h.orig -+++ extensions/permissions/nsContentBlocker.h -@@ -66,7 +66,7 @@ public: +diff --git a/extensions/permissions/nsContentBlocker.h b/extensions/permissions/nsContentBlocker.h +--- a/extensions/permissions/nsContentBlocker.h ++++ b/extensions/permissions/nsContentBlocker.h +@@ -61,26 +61,28 @@ public: + NS_DECL_NSIOBSERVER + + nsContentBlocker(); + nsresult Init(); + private: ~nsContentBlocker() {} @@ -193,7 +314,8 @@ nsresult TestPermission(nsIURI *aCurrentURI, nsIURI *aFirstURI, PRInt32 aContentType, -@@ -75,7 +75,9 @@ private: + PRBool *aPermission, + PRBool *aFromPrefs); nsCOMPtr<nsIPermissionManager> mPermissionManager; nsCOMPtr<nsIPrefBranch2> mPrefBranchInternal; @@ -203,11 +325,20 @@ }; #define NS_CONTENTBLOCKER_CID \ -Index: modules/libpref/src/init/all.js -=================================================================== ---- modules/libpref/src/init/all.js.orig -+++ modules/libpref/src/init/all.js -@@ -798,6 +798,7 @@ pref("network.automatic-ntlm-auth.truste + { 0x4ca6b67b, 0x5cc7, 0x4e71, \ + { 0xa9, 0x8a, 0x97, 0xaf, 0x1c, 0x13, 0x48, 0x62 } } + + #define NS_CONTENTBLOCKER_CONTRACTID "@mozilla.org/permissions/contentblocker;1" + +diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js +--- a/modules/libpref/src/init/all.js ++++ b/modules/libpref/src/init/all.js +@@ -842,16 +842,17 @@ pref("network.automatic-ntlm-auth.truste + // response to a NTLM challenge. By default, this is disabled since servers + // should almost never need the LM hash, and the LM hash is what makes NTLM + // authentication less secure. See bug 250691 for further details. + // NOTE: automatic-ntlm-auth which leverages the OS-provided NTLM + // implementation will not be affected by this preference. pref("network.ntlm.send-lm-response", false); pref("permissions.default.image", 1); // 1-Accept, 2-Deny, 3-dontAcceptForeign @@ -215,67 +346,38 @@ #ifndef XP_MACOSX #ifdef XP_UNIX -@@ -825,6 +826,7 @@ pref("network.proxy.no_proxies_on", + pref("network.proxy.type", 5); + #else + pref("network.proxy.type", 0); + #endif + #else +@@ -869,16 +870,17 @@ pref("network.proxy.ssl_port", + pref("network.proxy.socks", ""); + pref("network.proxy.socks_port", 0); + pref("network.proxy.socks_version", 5); + pref("network.proxy.socks_remote_dns", false); + pref("network.proxy.no_proxies_on", "localhost, 127.0.0.1"); pref("network.proxy.failover_timeout", 1800); // 30 minutes pref("network.online", true); //online/offline pref("network.cookie.cookieBehavior", 0); // 0-Accept, 1-dontAcceptForeign, 2-dontUse +pref("network.cookie.honorExceptions", true); - pref("network.cookie.disableCookieForMailNews", true); // disable all cookies for mail pref("network.cookie.lifetimePolicy", 0); // accept normally, 1-askBeforeAccepting, 2-acceptForSession,3-acceptForNDays pref("network.cookie.alwaysAcceptSessionCookies", false); -Index: widget/src/gtk2/nsWindow.cpp -=================================================================== ---- widget/src/gtk2/nsWindow.cpp.orig -+++ widget/src/gtk2/nsWindow.cpp -@@ -81,6 +81,7 @@ - #include "nsIServiceManager.h" - #include "nsIStringBundle.h" - #include "nsGfxCIID.h" -+#include "nsIPrefService.h" - - #ifdef ACCESSIBILITY - #include "nsIAccessibilityService.h" -@@ -91,7 +92,6 @@ - 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 -@@ -3992,18 +3992,18 @@ nsWindow::NativeCreate(nsIWidget - sAccessibilityEnabled = atoi(envValue) != 0; - LOG(("Accessibility Env %s=%s\n", sAccEnv, envValue)); - } -- //check gconf-2 setting -+ //check preference 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, -+ nsCOMPtr<nsIPrefService> prefService = -+ do_GetService(NS_PREFSERVICE_CONTRACTID, &rv); -+ if (NS_SUCCEEDED(rv) && prefService) { -+ nsCOMPtr<nsIPrefBranch> prefBranch; -+ rv = prefService->GetBranch(nsnull, getter_AddRefs(prefBranch)); -+ if (NS_SUCCEEDED(rv) && prefBranch) { -+ prefBranch->GetBoolPref(sAccessibilityKey, - &sAccessibilityEnabled); -+ } - } -- + pref("network.cookie.prefsMigrated", false); + pref("network.cookie.lifetime.days", 90); + + // The PAC file to load. Ignored unless network.proxy.type is 2. + pref("network.proxy.autoconfig_url", ""); + +diff --git a/xpinstall/src/nsXPInstallManager.cpp b/xpinstall/src/nsXPInstallManager.cpp +--- a/xpinstall/src/nsXPInstallManager.cpp ++++ b/xpinstall/src/nsXPInstallManager.cpp +@@ -300,36 +300,46 @@ nsXPInstallManager::InitManagerInternal( + packageList[j++] = item->GetSafeURLString(); + packageList[j++] = item->mIconURL.get(); + packageList[j++] = item->mCertName.get(); } - } - if (sAccessibilityEnabled) { -Index: xpinstall/src/nsXPInstallManager.cpp -=================================================================== ---- xpinstall/src/nsXPInstallManager.cpp.orig -+++ xpinstall/src/nsXPInstallManager.cpp -@@ -290,6 +290,7 @@ nsXPInstallManager::InitManagerInternal( + //----------------------------------------------------- // Get permission to install //----------------------------------------------------- @@ -283,37 +385,38 @@ #ifdef ENABLE_SKIN_SIMPLE_INSTALLATION_UI if ( mChromeType == CHROME_SKIN ) -@@ -299,17 +300,26 @@ nsXPInstallManager::InitManagerInternal( + { + // We may want to enable the simple installation UI once + // bug 343037 is fixed // skins get a simpler/friendlier dialog // XXX currently not embeddable - OKtoInstall = ConfirmChromeInstall( mParentWindow, packageList ); + PRBool themesDisabled = PR_FALSE; + if (pref) -+ pref->GetBoolPref("config.lockdown.disable_themes", &themesDisabled); ++ pref->GetBoolPref("config.lockdown.disable_themes", &themesDisabled); + OKtoInstall = !themesDisabled && -+ ConfirmChromeInstall( mParentWindow, packageList ); ++ ConfirmChromeInstall( mParentWindow, packageList ); } else { #endif -- rv = dlgSvc->ConfirmInstall( mParentWindow, -- packageList, -- numStrings, -- &OKtoInstall ); -- if (NS_FAILED(rv)) -- OKtoInstall = PR_FALSE; -+ PRBool extensionsDisabled = PR_FALSE; -+ if (pref) -+ pref->GetBoolPref("config.lockdown.disable_extensions", &extensionsDisabled); -+ if (!extensionsDisabled) { -+ rv = dlgSvc->ConfirmInstall( mParentWindow, -+ packageList, -+ numStrings, -+ &OKtoInstall ); -+ if (NS_FAILED(rv)) -+ OKtoInstall = PR_FALSE; -+ } ++ PRBool extensionsDisabled = PR_FALSE; ++ if (pref) ++ pref->GetBoolPref("config.lockdown.disable_extensions", &extensionsDisabled); ++ if (!extensionsDisabled) { + rv = dlgSvc->ConfirmInstall( mParentWindow, + packageList, + numStrings, + &OKtoInstall ); + if (NS_FAILED(rv)) + OKtoInstall = PR_FALSE; ++ } #ifdef ENABLE_SKIN_SIMPLE_INSTALLATION_UI } #endif + + if (OKtoInstall) + { + //----------------------------------------------------- + // Open the progress dialog ++++++ idldir.patch ++++++ --- /var/tmp/diff_new_pack.NkkXpp/_old 2009-12-30 00:28:25.000000000 +0100 +++ /var/tmp/diff_new_pack.NkkXpp/_new 2009-12-30 00:28:25.000000000 +0100 @@ -1,6 +1,5 @@ From: Wolfgang Rosenauer <stark@suse.de> Subject: fix IDL installation dir - This is only needed to get the correct path in xulrunner-config Index: config/autoconf.mk.in @@ -9,7 +8,7 @@ retrieving revision 3.449 diff -u -r3.449 autoconf.mk.in --- config/autoconf.mk.in 16 Feb 2008 22:23:08 -0000 3.449 -+++ config/autoconf.mk.in 19 Feb 2008 14:07:13 -0000 ++++ b/config/autoconf.mk.in 19 Feb 2008 14:07:13 -0000 @@ -62,7 +62,7 @@ libdir = @libdir@ datadir = @datadir@ ++++++ l10n-1.9.2b2.tar.bz2 -> l10n-1.9.2b5.tar.bz2 ++++++ mozilla-xulrunner192/l10n-1.9.2b2.tar.bz2 /mounts/work_src_done/STABLE/mozilla-xulrunner192/l10n-1.9.2b5.tar.bz2 differ: char 11, line 1 ++++++ mozilla-breakpad.patch ++++++ From: Wolfgang Rosenauer <wr@rosenauer.org> Subject: missing declaration with newer compilers diff --git a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc --- a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc +++ b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/exception_handler.cc @@ -28,16 +28,17 @@ // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include <signal.h> #include <sys/stat.h> #include <sys/types.h> #include <unistd.h> +#include <stdio.h> #include <cassert> #include <cstdlib> #include <ctime> #include <linux/limits.h> #include "client/linux/handler/exception_handler.h" #include "common/linux/guid_creator.h" diff --git a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/minidump_generator.cc b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/minidump_generator.cc --- a/toolkit/crashreporter/google-breakpad/src/client/linux/handler/minidump_generator.cc +++ b/toolkit/crashreporter/google-breakpad/src/client/linux/handler/minidump_generator.cc @@ -36,16 +36,17 @@ #include <sys/types.h> #include <unistd.h> #include <sys/utsname.h> #include <sys/wait.h> #include <cstdlib> #include <ctime> #include <string.h> +#include <stdio.h> #include "common/linux/file_id.h" #include "client/linux/handler/linux_thread.h" #include "client/minidump_file_writer.h" #include "client/minidump_file_writer-inl.h" #include "google_breakpad/common/minidump_format.h" #include "client/linux/handler/minidump_generator.h" diff --git a/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc b/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc --- a/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc +++ b/toolkit/crashreporter/google-breakpad/src/common/linux/dump_symbols.cc @@ -26,16 +26,17 @@ // THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT // (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include <a.out.h> #include <cstdarg> #include <cstdlib> #include <cxxabi.h> +#include <stdio.h> #include <elf.h> #include <errno.h> #include <fcntl.h> #include <link.h> #include <sys/mman.h> #include <stab.h> #include <sys/stat.h> #include <sys/types.h> ++++++ mozilla-gconf-backend.patch ++++++ ++++ 3516 lines (skipped) ++++++ mozilla-helper-app.patch ++++++ --- /var/tmp/diff_new_pack.NkkXpp/_old 2009-12-30 00:28:25.000000000 +0100 +++ /var/tmp/diff_new_pack.NkkXpp/_new 2009-12-30 00:28:25.000000000 +0100 @@ -4,7 +4,6 @@ https://bugzilla.novell.com/show_bug.cgi?id=406979 https://bugzilla.mozilla.org/show_bug.cgi?id=327323 - diff --git a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp --- a/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp +++ b/uriloader/exthandler/unix/nsMIMEInfoUnix.cpp ++++++ mozilla-kde.patch ++++++ ++++ 3371 lines (skipped) ++++ between mozilla-xulrunner192/mozilla-kde.patch ++++ and /mounts/work_src_done/STABLE/mozilla-xulrunner192/mozilla-kde.patch ++++++ mozilla-libproxy.patch ++++++ --- /var/tmp/diff_new_pack.NkkXpp/_old 2009-12-30 00:28:25.000000000 +0100 +++ /var/tmp/diff_new_pack.NkkXpp/_new 2009-12-30 00:28:25.000000000 +0100 @@ -3,11 +3,10 @@ References: https://bugzilla.mozilla.org/show_bug.cgi?id=517655 - diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in --- a/config/autoconf.mk.in +++ b/config/autoconf.mk.in -@@ -523,16 +523,20 @@ FT2_CFLAGS = @FT2_CFLAGS@ +@@ -537,16 +537,20 @@ FT2_CFLAGS = @FT2_CFLAGS@ FT2_LIBS = @FT2_LIBS@ MOZ_PANGO_CFLAGS = @MOZ_PANGO_CFLAGS@ @@ -20,18 +19,18 @@ +MOZ_LIBPROXY_LIBS = @MOZ_LIBPROXY_LIBS@ +MOZ_ENABLE_LIBPROXY = @MOZ_ENABLE_LIBPROXY@ + + MOZ_LIBNOTIFY_CFLAGS = @MOZ_LIBNOTIFY_CFLAGS@ + MOZ_LIBNOTIFY_LIBS = @MOZ_LIBNOTIFY_LIBS@ + MOZ_ENABLE_LIBNOTIFY = @MOZ_ENABLE_LIBNOTIFY@ + GLIB_CFLAGS = @GLIB_CFLAGS@ GLIB_LIBS = @GLIB_LIBS@ GLIB_GMODULE_LIBS = @GLIB_GMODULE_LIBS@ LIBIDL_CFLAGS = @LIBIDL_CFLAGS@ - LIBIDL_LIBS = @LIBIDL_LIBS@ - STATIC_LIBIDL = @STATIC_LIBIDL@ - - MOZ_NATIVE_MAKEDEPEND = @SYSTEM_MAKEDEPEND@ diff --git a/config/system-headers b/config/system-headers --- a/config/system-headers +++ b/config/system-headers -@@ -1028,8 +1028,12 @@ libsn/sn-monitor.h +@@ -1007,15 +1007,19 @@ libsn/sn-monitor.h libsn/sn-util.h #endif #if MOZ_NATIVE_HUNSPELL==1 @@ -44,10 +43,17 @@ +proxy.h +#endif + + #ifdef MOZ_PLATFORM_HILDON + hildon-uri.h + hildon-mime.h + #endif + #ifdef NS_OSSO + libosso.h + #endif diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in -@@ -5179,16 +5179,39 @@ then +@@ -5280,16 +5280,39 @@ then AC_DEFINE(MOZ_ENABLE_DBUS) fi fi @@ -79,22 +85,22 @@ +AC_SUBST(MOZ_LIBPROXY_LIBS) + +dnl ======================================================== - dnl = Build Personal Security Manager + dnl = libnotify support dnl ======================================================== - MOZ_ARG_DISABLE_BOOL(crypto, - [ --disable-crypto Disable crypto support (Personal Security Manager)], - MOZ_PSM=, - MOZ_PSM=1 ) - dnl ======================================================== + if test "$MOZ_ENABLE_GTK2" + then + MOZ_ENABLE_LIBNOTIFY=1 + + MOZ_ARG_DISABLE_BOOL(libnotify, diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in --- a/toolkit/library/Makefile.in +++ b/toolkit/library/Makefile.in -@@ -242,16 +242,20 @@ EXTRA_DSO_LDOPTS += $(FT2_LIBS) +@@ -247,16 +247,20 @@ endif + ifdef MOZ_TREE_FREETYPE + EXTRA_DSO_LDOPTS += $(FT2_LIBS) endif - EXTRA_DSO_LDOPTS += $(MOZ_LOCATION_LIBS) - ifdef MOZ_ENABLE_STARTUP_NOTIFICATION EXTRA_DSO_LDOPTS += $(MOZ_STARTUP_NOTIFICATION_LIBS) endif ++++++ mozilla-nongnome-proxies.patch ++++++ --- /var/tmp/diff_new_pack.NkkXpp/_old 2009-12-30 00:28:25.000000000 +0100 +++ /var/tmp/diff_new_pack.NkkXpp/_new 2009-12-30 00:28:25.000000000 +0100 @@ -1,14 +1,13 @@ From: Wolfgang Rosenauer Subject: Do not use gconf for proxy settings if not running within Gnome - Index: toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp =================================================================== 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 -+++ toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp 17 Apr 2008 19:02:19 -0000 ++++ b/toolkit/system/unixproxy/nsUnixSystemProxySettings.cpp 17 Apr 2008 19:02:19 -0000 @@ -69,13 +69,19 @@ private: NS_IMPL_ISUPPORTS1(nsUnixSystemProxySettings, nsISystemProxySettings) ++++++ mozilla-pkgconfig.patch ++++++ --- /var/tmp/diff_new_pack.NkkXpp/_old 2009-12-30 00:28:25.000000000 +0100 +++ /var/tmp/diff_new_pack.NkkXpp/_new 2009-12-30 00:28:25.000000000 +0100 @@ -1,7 +1,6 @@ From: Wolfgang Rosenauer Subject: pkgconfig tuning - diff --git a/xulrunner/installer/Makefile.in b/xulrunner/installer/Makefile.in --- a/xulrunner/installer/Makefile.in +++ b/xulrunner/installer/Makefile.in ++++++ mozilla-prefer_plugin_pref.patch ++++++ --- /var/tmp/diff_new_pack.NkkXpp/_old 2009-12-30 00:28:25.000000000 +0100 +++ /var/tmp/diff_new_pack.NkkXpp/_new 2009-12-30 00:28:25.000000000 +0100 @@ -1,7 +1,6 @@ From: Ubuntu Subject: introduce a pref to prefer certain plugins for mime-types - diff --git a/modules/plugin/base/src/nsPluginHost.cpp b/modules/plugin/base/src/nsPluginHost.cpp --- a/modules/plugin/base/src/nsPluginHost.cpp +++ b/modules/plugin/base/src/nsPluginHost.cpp ++++++ mozilla-shared-nss-db.patch ++++++ --- /var/tmp/diff_new_pack.NkkXpp/_old 2009-12-30 00:28:25.000000000 +0100 +++ /var/tmp/diff_new_pack.NkkXpp/_new 2009-12-30 00:28:25.000000000 +0100 @@ -4,11 +4,15 @@ (can be disabled by exporting MOZ_XRE_NO_NSSHELPER=1) References: - diff --git a/config/autoconf.mk.in b/config/autoconf.mk.in --- a/config/autoconf.mk.in +++ b/config/autoconf.mk.in -@@ -535,6 +535,10 @@ LIBIDL_LIBS = @LIBIDL_LIBS@ +@@ -548,16 +548,20 @@ MOZ_ENABLE_LIBNOTIFY = @MOZ_ENABLE_LIBNO + + GLIB_CFLAGS = @GLIB_CFLAGS@ + GLIB_LIBS = @GLIB_LIBS@ + GLIB_GMODULE_LIBS = @GLIB_GMODULE_LIBS@ + LIBIDL_CFLAGS = @LIBIDL_CFLAGS@ LIBIDL_LIBS = @LIBIDL_LIBS@ STATIC_LIBIDL = @STATIC_LIBIDL@ @@ -18,16 +22,24 @@ + MOZ_NATIVE_MAKEDEPEND = @SYSTEM_MAKEDEPEND@ - # Used for LD_LIBRARY_PATH + MOZ_AUTO_DEPS = @MOZ_AUTO_DEPS@ + COMPILER_DEPEND = @COMPILER_DEPEND@ + MDDEPDIR := @MDDEPDIR@ + + MOZ_DEMANGLE_SYMBOLS = @MOZ_DEMANGLE_SYMBOLS@ + diff --git a/configure.in b/configure.in --- a/configure.in +++ b/configure.in -@@ -7613,6 +7613,21 @@ dnl ==================================== +@@ -7756,16 +7756,31 @@ AC_SUBST(MOZ_CAIRO_LIBS) + + dnl qcms + dnl ======================================================== QCMS_LIBS='$(DEPTH)/gfx/qcms/$(LIB_PREFIX)mozqcms.$(LIB_SUFFIX)' AC_SUBST(QCMS_LIBS) -+ -+dnl ======================================================== + + dnl ======================================================== +dnl Check for nss-shared-helper +dnl ======================================================== + @@ -41,13 +53,25 @@ +AC_SUBST(MOZ_ENABLE_NSSHELPER) +AC_SUBST(NSSHELPER_CFLAGS) +AC_SUBST(NSSHELPER_LIBS) - - dnl ======================================================== ++ ++dnl ======================================================== dnl disable xul + dnl ======================================================== + MOZ_ARG_DISABLE_BOOL(xul, + [ --disable-xul Disable XUL], + MOZ_XUL= ) + if test "$MOZ_XUL"; then + AC_DEFINE(MOZ_XUL) + else 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 -@@ -137,12 +137,13 @@ DEFINES += -DNSS_ENABLE_ECC +@@ -133,19 +133,20 @@ REQUIRES = nspr \ + $(NULL) + + EXTRA_DEPS = $(NSS_DEP_LIBS) + + DEFINES += -DNSS_ENABLE_ECC # Use local includes because they are inserted before INCLUDES # so that Mozilla's nss.h is used, not glibc's @@ -62,24 +86,41 @@ $(NSS_LIBS) \ $(NULL) + include $(topsrcdir)/config/rules.mk + diff --git a/security/manager/ssl/src/nsNSSComponent.cpp b/security/manager/ssl/src/nsNSSComponent.cpp --- a/security/manager/ssl/src/nsNSSComponent.cpp +++ b/security/manager/ssl/src/nsNSSComponent.cpp -@@ -43,6 +43,13 @@ +@@ -39,16 +39,23 @@ + * use your version of this file under the terms of the MPL, indicate your + * decision by deleting the provisions above and replace them with the notice + * and other provisions required by the GPL or the LGPL. If you do not delete + * the provisions above, a recipient may use your version of this file under * the terms of any one of the MPL, the GPL or the LGPL. * * ***** END LICENSE BLOCK ***** */ -+ + +#ifdef MOZ_ENABLE_NSSHELPER +#pragma GCC visibility push(default) +#include <nss-shared-helper.h> +#pragma GCC visibility pop +#include "prenv.h" +#endif - ++ #include "nsNSSComponent.h" #include "nsNSSCallbacks.h" -@@ -1602,7 +1609,21 @@ nsNSSComponent::InitializeNSS(PRBool sho + #include "nsNSSIOLayer.h" + #include "nsSSLThread.h" + #include "nsCertVerificationThread.h" + + #include "nsNetUtil.h" + #include "nsAppDirectoryServiceDefs.h" +@@ -1600,17 +1607,31 @@ nsNSSComponent::InitializeNSS(PRBool sho + // The call to ConfigureInternalPKCS11Token needs to be done before NSS is initialized, + // but affects only static data. + // If we could assume i18n will not change between profiles, one call per application + // run were sufficient. As I can't predict what happens in the future, let's repeat + // this call for every re-init of NSS. ConfigureInternalPKCS11Token(); @@ -102,10 +143,20 @@ if (init_rv != SECSuccess) { PR_LOG(gPIPNSSLog, PR_LOG_DEBUG, ("can not init NSS r/w in %s\n", profileStr.get())); + + if (supress_warning_preference) { + which_nss_problem = problem_none; + } + else { diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in --- a/toolkit/library/Makefile.in +++ b/toolkit/library/Makefile.in -@@ -194,7 +194,7 @@ endif +@@ -189,17 +189,17 @@ else + EXTRA_DSO_LDOPTS += \ + $(MOZ_COMPONENT_LIBS) \ + $(MOZ_JS_LIBS) \ + $(NULL) + endif DEFINES += -DIMPL_XREAPI @@ -114,3 +165,8 @@ ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa) CXXFLAGS += $(TK_CFLAGS) + EXTRA_DSO_LDOPTS += \ + -framework SystemConfiguration \ + -framework QuickTime \ + -framework IOKit \ + -lcrypto \ ++++++ mozilla-startup-notification.patch ++++++ --- /var/tmp/diff_new_pack.NkkXpp/_old 2009-12-30 00:28:25.000000000 +0100 +++ /var/tmp/diff_new_pack.NkkXpp/_new 2009-12-30 00:28:25.000000000 +0100 @@ -1,14 +1,14 @@ -From: Lubos Lunak <llunak@suse.cz> +From: Lubos Lunak <llunak@suse.cz>, Ginn Chen <ginn.chen@sun.com> Subject: Firefox 3.5 broken startup notification References: http://bugzilla.novell.com/show_bug.cgi?id=518603 https://bugzilla.mozilla.org/show_bug.cgi?id=416053 - +https://bugzilla.mozilla.org/show_bug.cgi?id=534845 diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp --- a/toolkit/xre/nsAppRunner.cpp +++ b/toolkit/xre/nsAppRunner.cpp -@@ -3342,23 +3342,16 @@ XRE_main(int argc, char* argv[], const n +@@ -3370,23 +3370,16 @@ XRE_main(int argc, char* argv[], const n } dirProvider.DoStartup(); @@ -32,7 +32,7 @@ cmdLine = do_CreateInstance("@mozilla.org/toolkit/command-line;1"); NS_ENSURE_TRUE(cmdLine, 1); -@@ -3376,16 +3369,23 @@ XRE_main(int argc, char* argv[], const n +@@ -3404,16 +3397,23 @@ XRE_main(int argc, char* argv[], const n NS_TIMELINE_ENTER("appStartup->CreateHiddenWindow"); rv = appStartup->CreateHiddenWindow(); @@ -56,3 +56,41 @@ if (upgraded) { rv = em->CheckForMismatches(&needsRestart); if (NS_FAILED(rv)) { +@@ -3581,30 +3581,23 @@ XRE_main(int argc, char* argv[], const n + #ifdef XP_MACOSX + if (gBinaryPath) { + static char kEnvVar[MAXPATHLEN]; + sprintf(kEnvVar, "XRE_BINARY_PATH=%s", gBinaryPath); + PR_SetEnv(kEnvVar); + } + #endif + +-// XXXkt s/MOZ_TOOLKIT_GTK2/MOZ_WIDGET_GTK2/? +-// but the hidden window has been destroyed so toolkit is NULL anyway. +-#if defined(HAVE_DESKTOP_STARTUP_ID) && defined(MOZ_TOOLKIT_GTK2) +- nsGTKToolkit* toolkit = GetGTKToolkit(); +- if (toolkit) { +- nsCAutoString currentDesktopStartupID; +- toolkit->GetDesktopStartupID(¤tDesktopStartupID); +- if (!currentDesktopStartupID.IsEmpty()) { +- nsCAutoString desktopStartupEnv; +- desktopStartupEnv.AssignLiteral("DESKTOP_STARTUP_ID="); +- desktopStartupEnv.Append(currentDesktopStartupID); +- // Leak it with extreme prejudice! +- PR_SetEnv(ToNewCString(desktopStartupEnv)); +- } ++#if defined(HAVE_DESKTOP_STARTUP_ID) && defined(MOZ_WIDGET_GTK2) ++ if (!desktopStartupID.IsEmpty()) { ++ nsCAutoString desktopStartupEnv; ++ desktopStartupEnv.AssignLiteral("DESKTOP_STARTUP_ID="); ++ desktopStartupEnv.Append(desktopStartupID); ++ // Leak it with extreme prejudice! ++ PR_SetEnv(ToNewCString(desktopStartupEnv)); + } + #endif + + #ifdef MOZ_WIDGET_GTK2 + MOZ_gdk_display_close(display); + #endif + + rv = LaunchChild(nativeApp, appInitiatedRestart); ++++++ toolkit-lockdown.js ++++++ pref("config.lockdown.showsavedpasswords", false); pref("config.lockdown.savepage", false); pref("config.lockdown.printing", false); ++++++ toolkit-ui-lockdown.patch ++++++ --- /var/tmp/diff_new_pack.NkkXpp/_old 2009-12-30 00:28:25.000000000 +0100 +++ /var/tmp/diff_new_pack.NkkXpp/_new 2009-12-30 00:28:25.000000000 +0100 @@ -1,11 +1,15 @@ -From: Robert O'Callahan -Subject: Lockdown feature for Toolkit UI -References: +From: various contributors +Subject: toolkit ui lockdown hooks diff --git a/toolkit/components/passwordmgr/content/passwordManager.js b/toolkit/components/passwordmgr/content/passwordManager.js --- a/toolkit/components/passwordmgr/content/passwordManager.js +++ b/toolkit/components/passwordmgr/content/passwordManager.js -@@ -120,8 +120,17 @@ function LoadSignons() { +@@ -119,19 +119,28 @@ function LoadSignons() { + // SignonColumnSort) assumes we want to toggle the sort + // direction but here we don't so we have to trick it + lastSignonSortAscending = !lastSignonSortAscending; + SignonColumnSort(lastSignonSortColumn); + // disable "remove all signons" button if there are no signons var element = document.getElementById("removeAllSignons"); var toggle = document.getElementById("togglePasswords"); @@ -18,12 +22,23 @@ + } if (signons.length == 0 || gSelectUserInUse) { element.setAttribute("disabled","true"); -+ toggle.setAttribute("disabled","true"); -+ } else if (viewLocked) { toggle.setAttribute("disabled","true"); ++ } else if (viewLocked) { ++ toggle.setAttribute("disabled","true"); } else { element.removeAttribute("disabled"); -@@ -167,6 +176,18 @@ function DeleteAllSignons() { + toggle.removeAttribute("disabled"); + } + + return true; + } + +@@ -166,16 +175,28 @@ function DeleteAllSignons() { + var syncNeeded = (signonsTreeView._filterSet.length != 0); + DeleteAllFromTree(signonsTree, signonsTreeView, + signonsTreeView._filterSet.length ? signonsTreeView._filterSet : signons, + deletedSignons, "removeSignon", "removeAllSignons"); + FinalizeSignonDeletions(syncNeeded); } function TogglePasswordVisible() { @@ -42,10 +57,20 @@ if (showingPasswords || ConfirmShowPasswords()) { showingPasswords = !showingPasswords; document.getElementById("togglePasswords").label = kSignonBundle.getString(showingPasswords ? "hidePasswords" : "showPasswords"); + document.getElementById("togglePasswords").accessKey = kSignonBundle.getString(showingPasswords ? "hidePasswordsAccessKey" : "showPasswordsAccessKey"); + document.getElementById("passwordCol").hidden = !showingPasswords; + _filterPasswords(); + } + diff --git a/toolkit/components/printing/content/printdialog.js b/toolkit/components/printing/content/printdialog.js --- a/toolkit/components/printing/content/printdialog.js +++ b/toolkit/components/printing/content/printdialog.js -@@ -50,6 +50,7 @@ var gWebBrowserPrint = null; +@@ -45,16 +45,17 @@ var printService = null; + var gOriginalNumCopies = 1; + + var paramBlock; + var gPrefs = null; + var gPrintSettings = null; var gWebBrowserPrint = null; var gPrintSetInterface = Components.interfaces.nsIPrintSettings; var doDebug = false; @@ -53,7 +78,17 @@ //--------------------------------------------------- function initDialog() -@@ -87,11 +88,23 @@ function initDialog() + { + dialog = new Object; + + dialog.propertiesButton = document.getElementById("properties"); + dialog.descText = document.getElementById("descText"); +@@ -82,21 +83,33 @@ function initDialog() + + dialog.printButton = document.documentElement.getButton("accept"); + + // <data> elements + dialog.printName = document.getElementById("printButton"); dialog.fpDialog = document.getElementById("fpDialog"); dialog.enabled = false; @@ -77,3 +112,8 @@ var value = element.value; if (value && value.length > 0) { value = value.replace(/[^0-9]/g,""); + if (!value) value = ""; + element.value = value; + } + if (!value || value < 1 || value > 999) + dialog.printButton.setAttribute("disabled","true"); ++++++ xulrunner-source-1.9.2b2.tar.bz2 -> xulrunner-source-1.9.2b5.tar.bz2 ++++++ mozilla-xulrunner192/xulrunner-source-1.9.2b2.tar.bz2 /mounts/work_src_done/STABLE/mozilla-xulrunner192/xulrunner-source-1.9.2b5.tar.bz2 differ: char 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root＠Hilbert.suse.de