forked from pool/MozillaFirefox
This commit is contained in:
OBS User unknown
Git OBS Bridge
parent
f4f7c2ec7e
commit
a17db63b6c
@ -1,3 +1,17 @@
|
||||
-------------------------------------------------------------------
|
||||
Wed Dec 17 13:13:25 EST 2008 - hfiguiere@suse.de
|
||||
|
||||
- Review and approve changes.
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Mon Dec 15 16:41:57 CET 2008 - wr@rosenauer.org
|
||||
|
||||
- security update to 1.9.0.5 (bnc#455804)
|
||||
for details
|
||||
http://www.mozilla.org/security/known-vulnerabilities/firefox30.html
|
||||
* removed aboutRights workaround again
|
||||
* added et locale
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Tue Nov 25 10:14:45 EST 2008 - hfiguiere@suse.de
|
||||
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
#
|
||||
# spec file for package MozillaFirefox (Version 3.0.4)
|
||||
# spec file for package MozillaFirefox (Version 3.0.5)
|
||||
#
|
||||
# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
|
||||
#
|
||||
@ -26,8 +26,8 @@ BuildRequires: fdupes
|
||||
License: GPL v2 or later; LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL)
|
||||
Provides: web_browser
|
||||
Provides: firefox
|
||||
Version: 3.0.4
|
||||
Release: 4
|
||||
Version: 3.0.5
|
||||
Release: 1
|
||||
Summary: Mozilla Firefox Web Browser
|
||||
Url: http://www.mozilla.org/
|
||||
Group: Productivity/Networking/Web/Browsers
|
||||
@ -44,8 +44,6 @@ Source16: firefox.1
|
||||
Source17: firefox-suse-default-prefs.js
|
||||
Patch1: firefox-libxul-sdk.patch
|
||||
Patch2: firefox-no-update.patch
|
||||
# PATCH-FIX-UPSTREAM firefox-aboutRights.patch bnc#436054 bmo#456439
|
||||
Patch3: firefox-aboutRights.patch
|
||||
Patch14: credits.patch
|
||||
Patch17: firefox-appname.patch
|
||||
# PATCH-FEATURE-SLED firefox-ui-lockdown.patch FATE#302023, FATE#302024 - hfiguiere@novell.com
|
||||
@ -61,7 +59,7 @@ Requires: %{name}-branding >= 3.0
|
||||
%define _use_internal_dependency_generator 0
|
||||
%define __find_requires sh %{SOURCE4}
|
||||
%define __find_provides %{nil}
|
||||
%define releasedate 2008103100
|
||||
%define releasedate 2008121300
|
||||
%define progname firefox
|
||||
%define progdir %{_prefix}/%_lib/%{progname}
|
||||
%if %suse_version > 1020
|
||||
@ -90,7 +88,7 @@ Authors:
|
||||
%package translations
|
||||
Summary: Translations for MozillaFirefox
|
||||
License: GPL v2 or later; LGPL v2.1 or later; MOZILLA PUBLIC LICENSE (MPL/NPL)
|
||||
Provides: locale(%{name}:af;ar;be;bg;bn_IN;ca;cs;cy;da;de;el;en_GB;eo;es_AR;es_ES;eu;fi;fr;fy_NL;ga_IE;gl;gu_IN;he;hi_IN;hu;id;is;it;ja;ka;kn;ko;ku;lt;mk;mn;mr;nb_NO;nl;nn_NO;oc;pa_IN;pl;pt_BR;pt_PT;ro;ru;si;sk;sl;sq;sr;sv_SE;te;th;tr;uk;zh_CN;zh_TW)
|
||||
Provides: locale(%{name}:af;ar;be;bg;bn_IN;ca;cs;cy;da;de;el;en_GB;eo;es_AR;es_ES;et;eu;fi;fr;fy_NL;ga_IE;gl;gu_IN;he;hi_IN;hu;id;is;it;ja;ka;kn;ko;ku;lt;mk;mn;mr;nb_NO;nl;nn_NO;oc;pa_IN;pl;pt_BR;pt_PT;ro;ru;si;sk;sl;sq;sr;sv_SE;te;th;tr;uk;zh_CN;zh_TW)
|
||||
Group: System/Localization
|
||||
PreReq: %{name} = %{version}
|
||||
Requires: mozilla-xulrunner190-translations
|
||||
@ -140,10 +138,9 @@ Authors:
|
||||
cd $RPM_BUILD_DIR/mozilla
|
||||
%patch1
|
||||
%patch2
|
||||
%patch3 -p1
|
||||
%patch14
|
||||
%patch17
|
||||
%patch20 -p0
|
||||
%patch20
|
||||
|
||||
%build
|
||||
export MOZ_BUILD_DATE=%{releasedate}
|
||||
@ -194,9 +191,6 @@ for locale in $(awk '{ print $1; }' browser/locales/shipped-locales); do
|
||||
ja-JP-mac|en-US)
|
||||
;;
|
||||
*)
|
||||
# copy aboutRights.* to every packaged locale (remove for FF 3.0.5 again!)
|
||||
cp browser/locales/en-US/chrome/browser/aboutRights.* \
|
||||
../l10n/$locale/browser/chrome/browser/
|
||||
make -C browser/locales libs-$locale
|
||||
cp dist/xpi-stage/locale-$locale/chrome/$locale.jar \
|
||||
$RPM_BUILD_ROOT/%{progdir}/chrome
|
||||
@ -345,6 +339,14 @@ fi
|
||||
%{progdir}/defaults/profile/bookmarks.html
|
||||
|
||||
%changelog
|
||||
* Wed Dec 17 2008 hfiguiere@suse.de
|
||||
- Review and approve changes.
|
||||
* Mon Dec 15 2008 wr@rosenauer.org
|
||||
- security update to 1.9.0.5 (bnc#455804)
|
||||
for details
|
||||
http://www.mozilla.org/security/known-vulnerabilities/firefox30.html
|
||||
* removed aboutRights workaround again
|
||||
* added et locale
|
||||
* Tue Nov 25 2008 hfiguiere@suse.de
|
||||
- Review and approve changes.
|
||||
* Sat Nov 22 2008 wr@rosenauer.org
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:6f0713a991dc3897f938d097da7480b6da87cec168c1a937fb7b285001eaba69
|
||||
size 36865761
|
||||
3
firefox-3.0.5-source.tar.bz2
Normal file
3
firefox-3.0.5-source.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:2ec44fe80de096cb0f93b2845c2be7f286e9fde371d73633785176dc66218153
|
||||
size 36839445
|
||||
@ -1,594 +0,0 @@
|
||||
From: upstream (Firefox 3.0.5)
|
||||
Subject: Remove EULA and show about:rights
|
||||
References:
|
||||
https://bugzilla.mozilla.org/show_bug.cgi?id=456439
|
||||
https://bugzilla.novell.com/show_bug.cgi?id=436054
|
||||
|
||||
|
||||
diff -uprN '--exclude=CVS' mozilla.orig/browser/app/profile/firefox.js mozilla/browser/app/profile/firefox.js
|
||||
--- mozilla.orig/browser/app/profile/firefox.js 2008-09-15 09:53:44.000000000 +0200
|
||||
+++ mozilla/browser/app/profile/firefox.js 2008-11-22 09:01:50.000000000 +0100
|
||||
@@ -654,20 +654,21 @@ pref("browser.safebrowsing.malware.repor
|
||||
|
||||
#endif
|
||||
|
||||
-// defaults to true on Windows and Mac, because the installer shows this
|
||||
+pref("browser.EULA.version", 3);
|
||||
+pref("browser.rights.version", 3);
|
||||
+
|
||||
+// defaults to true on Windows and Mac, because the installer shows a EULA
|
||||
#ifdef XP_MACOSX
|
||||
-pref("browser.EULA.3.accepted", true);
|
||||
+pref("browser.rights.3.shown", true);
|
||||
#elifdef XP_WIN
|
||||
-pref("browser.EULA.3.accepted", true);
|
||||
+pref("browser.rights.3.shown", true);
|
||||
#else
|
||||
-pref("browser.EULA.3.accepted", false);
|
||||
+pref("browser.rights.3.shown", false);
|
||||
#endif
|
||||
|
||||
-// if we rev the EULA again, we should bump this so users agree to the new EULA
|
||||
-pref("browser.EULA.version", 3);
|
||||
-
|
||||
#ifdef DEBUG
|
||||
-pref("browser.EULA.override", true);
|
||||
+// Don't show the about:rights notification in debug builds.
|
||||
+pref("browser.rights.override", true);
|
||||
#endif
|
||||
|
||||
pref("browser.sessionstore.enabled", true);
|
||||
diff -uprN '--exclude=CVS' mozilla.orig/browser/base/content/aboutRights.xhtml mozilla/browser/base/content/aboutRights.xhtml
|
||||
--- mozilla.orig/browser/base/content/aboutRights.xhtml 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ mozilla/browser/base/content/aboutRights.xhtml 2008-11-22 09:01:57.000000000 +0100
|
||||
@@ -0,0 +1,115 @@
|
||||
+<?xml version="1.0" encoding="UTF-8"?>
|
||||
+<!DOCTYPE html [
|
||||
+ <!ENTITY % htmlDTD PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "DTD/xhtml1-strict.dtd">
|
||||
+ %htmlDTD;
|
||||
+ <!ENTITY % brandDTD SYSTEM "chrome://branding/locale/brand.dtd">
|
||||
+ %brandDTD;
|
||||
+ <!ENTITY % securityPrefsDTD SYSTEM "chrome://browser/locale/preferences/security.dtd">
|
||||
+ %securityPrefsDTD;
|
||||
+ <!ENTITY % aboutRightsDTD SYSTEM "chrome://browser/locale/aboutRights.dtd">
|
||||
+ %aboutRightsDTD;
|
||||
+]>
|
||||
+# ***** 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/
|
||||
+#
|
||||
+# Software distributed under the License is distributed on an "AS IS" basis,
|
||||
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
+# for the specific language governing rights and limitations under the
|
||||
+# License.
|
||||
+#
|
||||
+# The Original Code is mozilla.org code.
|
||||
+#
|
||||
+# The Initial Developer of the Original Code is
|
||||
+# Gervase Markham.
|
||||
+# Portions created by the Initial Developer are Copyright (C) 2008
|
||||
+# the Initial Developer. All Rights Reserved.
|
||||
+#
|
||||
+# Contributor(s):
|
||||
+# Justin Dolske <dolske@mozilla.com>
|
||||
+#
|
||||
+# Alternatively, the contents of this file may be used under the terms of
|
||||
+# either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
+# the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
+# in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
+# of those above. If you wish to allow use of your version of this file only
|
||||
+# under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
+# 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 *****
|
||||
+
|
||||
+<html xmlns="http://www.w3.org/1999/xhtml">
|
||||
+
|
||||
+<head>
|
||||
+ <title>&rights.pagetitle;</title>
|
||||
+ <link rel="stylesheet" href="chrome://global/skin/about.css" type="text/css"/>
|
||||
+</head>
|
||||
+
|
||||
+<body id="your-rights" dir="&rights.locale-direction;">
|
||||
+<div id="aboutPageContainer" class="aboutPageWideContainer">
|
||||
+
|
||||
+<h1>&rights.intro-header;</h1>
|
||||
+
|
||||
+<p>&rights.intro;</p>
|
||||
+
|
||||
+<ul>
|
||||
+ <li>&rights.intro-point1a;<a href="http://www.mozilla.org/MPL/">&rights.intro-point1b;</a>&rights.intro-point1c;</li>
|
||||
+#ifdef OFFICIAL_BUILD
|
||||
+# Point 2 discusses Mozilla trademarks, and isn't needed when the build is unbranded.
|
||||
+# Point 3 discusses privacy policy, unbranded builds get a placeholder (for the vendor to replace)
|
||||
+# Point 4 discusses web service terms, unbranded builds gets a placeholder (for the vendor to replace)
|
||||
+ <li>&rights.intro-point2a;<a href="http://www.mozilla.org/foundation/trademarks/policy.html">&rights.intro-point2b;</a>&rights.intro-point2c;</li>
|
||||
+ <li>&rights.intro-point3a;<a href="http://www.mozilla.com/legal/privacy/">&rights.intro-point3b;</a>&rights.intro-point3c;</li>
|
||||
+ <li>&rights.intro-point4a;<a href="about:rights#webservices" onclick="showServices();">&rights.intro-point4b;</a>&rights.intro-point4c;</li>
|
||||
+#else
|
||||
+ <li>&rights.intro-point3-unbranded;</li>
|
||||
+ <li>&rights.intro-point4a-unbranded;<a href="about:rights#webservices" onclick="showServices();">&rights.intro-point4b-unbranded;</a>&rights.intro-point4c-unbranded;</li>
|
||||
+#endif
|
||||
+</ul>
|
||||
+
|
||||
+<div id="webservices-container">
|
||||
+ <a name="webservices"/>
|
||||
+ <h3>&rights.webservices-header;</h3>
|
||||
+
|
||||
+#ifdef OFFICIAL_BUILD
|
||||
+ <p>&rights.webservices-a;<code>&rights.webservices-b;</code>&rights.webservices-c-190;</p>
|
||||
+#else
|
||||
+ <p>&rights.webservices-unbranded;</p>
|
||||
+#endif
|
||||
+
|
||||
+ <ol>
|
||||
+#ifdef OFFICIAL_BUILD
|
||||
+# Terms only apply to official builds, unbranded builds get a placeholder.
|
||||
+ <li>&rights.webservices-term1;</li>
|
||||
+ <li>&rights.webservices-term2;</li>
|
||||
+ <li>&rights.webservices-term3;</li>
|
||||
+ <li><strong>&rights.webservices-term4;</strong></li>
|
||||
+ <li><strong>&rights.webservices-term5;</strong></li>
|
||||
+ <li>&rights.webservices-term6;</li>
|
||||
+ <li>&rights.webservices-term7;</li>
|
||||
+#else
|
||||
+ <li>&rights.webservices-term1-unbranded;</li>
|
||||
+#endif
|
||||
+ </ol>
|
||||
+</div>
|
||||
+
|
||||
+<script type="application/x-javascript"><![CDATA[
|
||||
+ var servicesDiv = document.getElementById("webservices-container");
|
||||
+ servicesDiv.style.display = "none";
|
||||
+
|
||||
+ function showServices() {
|
||||
+ servicesDiv.style.display = "";
|
||||
+ }
|
||||
+]]></script>
|
||||
+
|
||||
+</div>
|
||||
+</body>
|
||||
+</html>
|
||||
diff -uprN '--exclude=CVS' mozilla.orig/browser/base/jar.mn mozilla/browser/base/jar.mn
|
||||
--- mozilla.orig/browser/base/jar.mn 2008-05-12 14:06:37.000000000 +0200
|
||||
+++ mozilla/browser/base/jar.mn 2008-11-22 09:01:50.000000000 +0100
|
||||
@@ -13,6 +13,7 @@ browser.jar:
|
||||
* content/browser/aboutDialog.xul (content/aboutDialog.xul)
|
||||
* content/browser/aboutDialog.js (content/aboutDialog.js)
|
||||
content/browser/aboutDialog.css (content/aboutDialog.css)
|
||||
+* content/browser/aboutRights.xhtml (content/aboutRights.xhtml)
|
||||
* content/browser/aboutRobots.xhtml (content/aboutRobots.xhtml)
|
||||
content/browser/aboutRobots-icon.png (content/aboutRobots-icon.png)
|
||||
content/browser/aboutRobots-widget-left.png (content/aboutRobots-widget-left.png)
|
||||
diff -uprN '--exclude=CVS' mozilla.orig/browser/base/Makefile.in mozilla/browser/base/Makefile.in
|
||||
--- mozilla.orig/browser/base/Makefile.in 2008-05-12 14:06:37.000000000 +0200
|
||||
+++ mozilla/browser/base/Makefile.in 2008-11-22 09:01:50.000000000 +0100
|
||||
@@ -84,3 +84,7 @@ endif
|
||||
ifneq (,$(filter windows mac cocoa gtk2, $(MOZ_WIDGET_TOOLKIT)))
|
||||
DEFINES += -DCONTEXT_COPY_IMAGE_CONTENTS=1
|
||||
endif
|
||||
+
|
||||
+ifneq (,$(BUILD_OFFICIAL)$(MOZILLA_OFFICIAL))
|
||||
+DEFINES += -DOFFICIAL_BUILD=1
|
||||
+endif
|
||||
diff -uprN '--exclude=CVS' mozilla.orig/browser/components/aboutRights.js mozilla/browser/components/aboutRights.js
|
||||
--- mozilla.orig/browser/components/aboutRights.js 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ mozilla/browser/components/aboutRights.js 2008-11-22 09:01:50.000000000 +0100
|
||||
@@ -0,0 +1,73 @@
|
||||
+/* ***** 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/
|
||||
+ *
|
||||
+ * Software distributed under the License is distributed on an "AS IS" basis,
|
||||
+ * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
|
||||
+ * for the specific language governing rights and limitations under the
|
||||
+ * License.
|
||||
+ *
|
||||
+ * The Original Code is about:robots.
|
||||
+ *
|
||||
+ * The Initial Developer of the Original Code is Mozilla Foundation.
|
||||
+ * Portions created by the Initial Developer are Copyright (C) 2008
|
||||
+ * the Initial Developer. All Rights Reserved.
|
||||
+ *
|
||||
+ * Contributor(s):
|
||||
+ * Ryan Flint <rflint@mozilla.com>
|
||||
+ * Justin Dolske <dolske@mozilla.com>
|
||||
+ *
|
||||
+ * Alternatively, the contents of this file may be used under the terms of
|
||||
+ * either the GNU General Public License Version 2 or later (the "GPL"), or
|
||||
+ * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
|
||||
+ * in which case the provisions of the GPL or the LGPL are applicable instead
|
||||
+ * of those above. If you wish to allow use of your version of this file only
|
||||
+ * under the terms of either the GPL or the LGPL, and not to allow others to
|
||||
+ * 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 ***** */
|
||||
+const Cc = Components.classes;
|
||||
+const Ci = Components.interfaces;
|
||||
+
|
||||
+Components.utils.import("resource://gre/modules/XPCOMUtils.jsm");
|
||||
+
|
||||
+function AboutRights() {}
|
||||
+AboutRights.prototype = {
|
||||
+ classDescription: "about:rights",
|
||||
+ contractID: "@mozilla.org/network/protocol/about;1?what=rights",
|
||||
+ classID: Components.ID("{89e9da80-4c03-46a0-a357-cf77bbef98b9}"),
|
||||
+ QueryInterface: XPCOMUtils.generateQI([Ci.nsIAboutModule]),
|
||||
+
|
||||
+ getURIFlags: function(aURI) {
|
||||
+ return (Ci.nsIAboutModule.ALLOW_SCRIPT |
|
||||
+ Ci.nsIAboutModule.URI_SAFE_FOR_UNTRUSTED_CONTENT);
|
||||
+ },
|
||||
+
|
||||
+ newChannel: function(aURI) {
|
||||
+ var ios = Cc["@mozilla.org/network/io-service;1"].
|
||||
+ getService(Ci.nsIIOService);
|
||||
+
|
||||
+ var secMan = Cc["@mozilla.org/scriptsecuritymanager;1"].
|
||||
+ getService(Ci.nsIScriptSecurityManager);
|
||||
+
|
||||
+ var channel = ios.newChannel("chrome://browser/content/aboutRights.xhtml",
|
||||
+ null, null);
|
||||
+ var principal = secMan.getCodebasePrincipal(aURI);
|
||||
+
|
||||
+ channel.originalURI = aURI;
|
||||
+ channel.owner = principal;
|
||||
+
|
||||
+ return channel;
|
||||
+ }
|
||||
+};
|
||||
+
|
||||
+function NSGetModule(compMgr, fileSpec)
|
||||
+ XPCOMUtils.generateModule([AboutRights]);
|
||||
diff -uprN '--exclude=CVS' mozilla.orig/browser/components/Makefile.in mozilla/browser/components/Makefile.in
|
||||
--- mozilla.orig/browser/components/Makefile.in 2008-03-26 15:29:06.000000000 +0100
|
||||
+++ mozilla/browser/components/Makefile.in 2008-11-22 09:01:50.000000000 +0100
|
||||
@@ -53,6 +53,7 @@ XPIDLSRCS = \
|
||||
EXTRA_PP_COMPONENTS = \
|
||||
nsBrowserContentHandler.js \
|
||||
nsBrowserGlue.js \
|
||||
+ aboutRights.js \
|
||||
aboutRobots.js \
|
||||
$(NULL)
|
||||
|
||||
@@ -77,4 +78,8 @@ endif
|
||||
|
||||
DIRS += build
|
||||
|
||||
+ifneq (,$(BUILD_OFFICIAL)$(MOZILLA_OFFICIAL))
|
||||
+DEFINES += -DOFFICIAL_BUILD=1
|
||||
+endif
|
||||
+
|
||||
include $(topsrcdir)/config/rules.mk
|
||||
diff -uprN '--exclude=CVS' mozilla.orig/browser/components/nsBrowserGlue.js mozilla/browser/components/nsBrowserGlue.js
|
||||
--- mozilla.orig/browser/components/nsBrowserGlue.js 2008-11-01 00:05:05.000000000 +0100
|
||||
+++ mozilla/browser/components/nsBrowserGlue.js 2008-11-22 09:01:50.000000000 +0100
|
||||
@@ -73,6 +73,14 @@ function BrowserGlue() {
|
||||
}
|
||||
|
||||
BrowserGlue.prototype = {
|
||||
+ __prefs: null,
|
||||
+ get _prefs() {
|
||||
+ if (!this.__prefs)
|
||||
+ this.__prefs = Cc["@mozilla.org/preferences-service;1"].
|
||||
+ getService(Ci.nsIPrefBranch);
|
||||
+ return this.__prefs;
|
||||
+ },
|
||||
+
|
||||
_saveSession: false,
|
||||
|
||||
_setPrefToSaveSession: function()
|
||||
@@ -175,33 +183,6 @@ BrowserGlue.prototype = {
|
||||
// profile startup handler (contains profile initialization routines)
|
||||
_onProfileStartup: function()
|
||||
{
|
||||
- // Check to see if the EULA must be shown on startup
|
||||
-
|
||||
- var prefBranch = Cc["@mozilla.org/preferences-service;1"].
|
||||
- getService(Ci.nsIPrefBranch);
|
||||
- var mustDisplayEULA = false;
|
||||
- try {
|
||||
- mustDisplayEULA = !prefBranch.getBoolPref("browser.EULA.override");
|
||||
- } catch (e) {
|
||||
- // Pref might not exist
|
||||
- }
|
||||
-
|
||||
- // Make sure it hasn't already been accepted
|
||||
- if (mustDisplayEULA) {
|
||||
- try {
|
||||
- var EULAVersion = prefBranch.getIntPref("browser.EULA.version");
|
||||
- mustDisplayEULA = !prefBranch.getBoolPref("browser.EULA." + EULAVersion + ".accepted");
|
||||
- } catch(ex) {
|
||||
- }
|
||||
- }
|
||||
-
|
||||
- if (mustDisplayEULA) {
|
||||
- var ww2 = Cc["@mozilla.org/embedcomp/window-watcher;1"].
|
||||
- getService(Ci.nsIWindowWatcher);
|
||||
- ww2.openWindow(null, "chrome://browser/content/EULA.xul",
|
||||
- "_blank", "chrome,centerscreen,modal,resizable=yes", null);
|
||||
- }
|
||||
-
|
||||
this.Sanitizer.onStartup();
|
||||
// check if we're in safe mode
|
||||
var app = Cc["@mozilla.org/xre/app-info;1"].getService(Ci.nsIXULAppInfo).
|
||||
@@ -240,6 +221,10 @@ BrowserGlue.prototype = {
|
||||
// Browser startup complete. All initial windows have opened.
|
||||
_onBrowserStartup: function()
|
||||
{
|
||||
+ // Show about:rights notification, if needed.
|
||||
+ if (this._shouldShowRights())
|
||||
+ this._showRightsNotification();
|
||||
+
|
||||
var prefBranch = Cc["@mozilla.org/preferences-service;1"].
|
||||
getService(Ci.nsIPrefBranch);
|
||||
// If new add-ons were installed during startup open the add-ons manager.
|
||||
@@ -380,6 +365,80 @@ BrowserGlue.prototype = {
|
||||
}
|
||||
},
|
||||
|
||||
+ /*
|
||||
+ * _shouldShowRights - Determines if the user should be shown the
|
||||
+ * about:rights notification. The notification should *not* be shown if
|
||||
+ * we've already shown the current version, or if the override pref says to
|
||||
+ * never show it. The notification *should* be shown if it's never been seen
|
||||
+ * before, if a newer version is available, or if the override pref says to
|
||||
+ * always show it.
|
||||
+ */
|
||||
+ _shouldShowRights : function () {
|
||||
+ // Look for an unconditional override pref. If set, do what it says.
|
||||
+ // (true --> never show, false --> always show)
|
||||
+ try {
|
||||
+ return !this._prefs.getBoolPref("browser.rights.override");
|
||||
+ } catch (e) { }
|
||||
+ // Ditto, for the legacy EULA pref.
|
||||
+ try {
|
||||
+ return !this._prefs.getBoolPref("browser.EULA.override");
|
||||
+ } catch (e) { }
|
||||
+
|
||||
+#ifndef OFFICIAL_BUILD
|
||||
+ // Non-official builds shouldn't shouldn't show the notification.
|
||||
+ return false;
|
||||
+#endif
|
||||
+
|
||||
+ // Look to see if the user has seen the current version or not.
|
||||
+ var currentVersion = this._prefs.getIntPref("browser.rights.version");
|
||||
+ try {
|
||||
+ return !this._prefs.getBoolPref("browser.rights." + currentVersion + ".shown");
|
||||
+ } catch (e) { }
|
||||
+
|
||||
+ // Legacy: If the user accepted a EULA, we won't annoy them with the
|
||||
+ // equivalent about:rights page until the version changes.
|
||||
+ try {
|
||||
+ return !this._prefs.getBoolPref("browser.EULA." + currentVersion + ".accepted");
|
||||
+ } catch (e) { }
|
||||
+
|
||||
+ // We haven't shown the notification before, so do so now.
|
||||
+ return true;
|
||||
+ },
|
||||
+
|
||||
+ _showRightsNotification : function () {
|
||||
+ // Stick the notification onto the selected tab of the active browser window.
|
||||
+ var win = this._getMostRecentBrowserWindow();
|
||||
+ var browser = win.gBrowser; // for closure in notification bar callback
|
||||
+ var notifyBox = browser.getNotificationBox();
|
||||
+
|
||||
+ var bundleService = Cc["@mozilla.org/intl/stringbundle;1"].
|
||||
+ getService(Ci.nsIStringBundleService);
|
||||
+ var brandBundle = bundleService.createBundle("chrome://branding/locale/brand.properties");
|
||||
+ var rightsBundle = bundleService.createBundle("chrome://browser/locale/aboutRights.properties");
|
||||
+
|
||||
+ var buttonLabel = rightsBundle.GetStringFromName("buttonLabel");
|
||||
+ var buttonAccessKey = rightsBundle.GetStringFromName("buttonAccessKey");
|
||||
+ var productName = brandBundle.GetStringFromName("brandFullName");
|
||||
+ var notifyText = rightsBundle.formatStringFromName("notifyText", [productName], 1);
|
||||
+
|
||||
+ var buttons = [
|
||||
+ {
|
||||
+ label: buttonLabel,
|
||||
+ accessKey: buttonAccessKey,
|
||||
+ popup: null,
|
||||
+ callback: function(aNotificationBar, aButton) {
|
||||
+ browser.selectedTab = browser.addTab("about:rights");
|
||||
+ }
|
||||
+ }
|
||||
+ ];
|
||||
+
|
||||
+ // Set pref to indicate we've shown the notification.
|
||||
+ var currentVersion = this._prefs.getIntPref("browser.rights.version");
|
||||
+ this._prefs.setBoolPref("browser.rights." + currentVersion + ".shown", true);
|
||||
+
|
||||
+ notifyBox.appendNotification(notifyText, "about-rights", null, notifyBox.PRIORITY_INFO_LOW, buttons);
|
||||
+ },
|
||||
+
|
||||
// returns the (cached) Sanitizer constructor
|
||||
get Sanitizer()
|
||||
{
|
||||
@@ -777,6 +836,52 @@ BrowserGlue.prototype = {
|
||||
}
|
||||
},
|
||||
|
||||
+#ifdef XP_UNIX
|
||||
+#ifndef XP_MACOSX
|
||||
+#define BROKEN_WM_Z_ORDER
|
||||
+#endif
|
||||
+#endif
|
||||
+#ifdef XP_OS2
|
||||
+#define BROKEN_WM_Z_ORDER
|
||||
+#endif
|
||||
+
|
||||
+ // this returns the most recent non-popup browser window
|
||||
+ _getMostRecentBrowserWindow : function ()
|
||||
+ {
|
||||
+ var wm = Cc["@mozilla.org/appshell/window-mediator;1"].
|
||||
+ getService(Components.interfaces.nsIWindowMediator);
|
||||
+
|
||||
+#ifdef BROKEN_WM_Z_ORDER
|
||||
+ var win = wm.getMostRecentWindow("navigator:browser", true);
|
||||
+
|
||||
+ // if we're lucky, this isn't a popup, and we can just return this
|
||||
+ if (win && win.document.documentElement.getAttribute("chromehidden")) {
|
||||
+ win = null;
|
||||
+ var windowList = wm.getEnumerator("navigator:browser", true);
|
||||
+ // this is oldest to newest, so this gets a bit ugly
|
||||
+ while (windowList.hasMoreElements()) {
|
||||
+ var nextWin = windowList.getNext();
|
||||
+ if (!nextWin.document.documentElement.getAttribute("chromehidden"))
|
||||
+ win = nextWin;
|
||||
+ }
|
||||
+ }
|
||||
+#else
|
||||
+ var windowList = wm.getZOrderDOMWindowEnumerator("navigator:browser", true);
|
||||
+ if (!windowList.hasMoreElements())
|
||||
+ return null;
|
||||
+
|
||||
+ var win = windowList.getNext();
|
||||
+ while (win.document.documentElement.getAttribute("chromehidden")) {
|
||||
+ if (!windowList.hasMoreElements())
|
||||
+ return null;
|
||||
+
|
||||
+ win = windowList.getNext();
|
||||
+ }
|
||||
+#endif
|
||||
+
|
||||
+ return win;
|
||||
+ },
|
||||
+
|
||||
// for XPCOM
|
||||
classDescription: "Firefox Browser Glue Service",
|
||||
classID: Components.ID("{eab9012e-5f74-4cbc-b2b5-a590235513cc}"),
|
||||
diff -uprN '--exclude=CVS' mozilla.orig/browser/installer/unix/packages-static mozilla/browser/installer/unix/packages-static
|
||||
--- mozilla.orig/browser/installer/unix/packages-static 2008-09-15 09:53:51.000000000 +0200
|
||||
+++ mozilla/browser/installer/unix/packages-static 2008-11-22 09:01:50.000000000 +0100
|
||||
@@ -243,6 +243,7 @@ bin/components/nsContentDispatchChooser.
|
||||
bin/components/nsHandlerService.js
|
||||
bin/components/nsWebHandlerApp.js
|
||||
bin/components/libdbusservice.so
|
||||
+bin/components/aboutRights.js
|
||||
bin/components/aboutRobots.js
|
||||
bin/components/nsBadCertHandler.js
|
||||
|
||||
diff -uprN '--exclude=CVS' mozilla.orig/browser/installer/windows/packages-static mozilla/browser/installer/windows/packages-static
|
||||
--- mozilla.orig/browser/installer/windows/packages-static 2008-09-15 09:53:51.000000000 +0200
|
||||
+++ mozilla/browser/installer/windows/packages-static 2008-11-22 09:01:50.000000000 +0100
|
||||
@@ -242,6 +242,7 @@ bin\components\nsContentPrefService.js
|
||||
bin\components\nsContentDispatchChooser.js
|
||||
bin\components\nsHandlerService.js
|
||||
bin\components\nsWebHandlerApp.js
|
||||
+bin\components\aboutRights.js
|
||||
bin\components\aboutRobots.js
|
||||
bin\components\nsBadCertHandler.js
|
||||
|
||||
diff -uprN '--exclude=CVS' mozilla.orig/browser/locales/en-US/chrome/browser/aboutRights.dtd mozilla/browser/locales/en-US/chrome/browser/aboutRights.dtd
|
||||
--- mozilla.orig/browser/locales/en-US/chrome/browser/aboutRights.dtd 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ mozilla/browser/locales/en-US/chrome/browser/aboutRights.dtd 2008-11-22 09:01:57.000000000 +0100
|
||||
@@ -0,0 +1,65 @@
|
||||
+<!-- rights.locale-direction instead of the usual local.dir entity, so RTL can skip translating page. -->
|
||||
+<!ENTITY rights.locale-direction "ltr">
|
||||
+<!ENTITY rights.pagetitle "about:rights">
|
||||
+<!ENTITY rights.intro-header "About Your Rights">
|
||||
+<!ENTITY rights.intro "&brandFullName; is free and open source software, built by a community of thousands from all over the world. There are a few things you should know:">
|
||||
+
|
||||
+<!-- Note on pointa / pointb / pointc form:
|
||||
+ These points each have an embedded link in the HTML, so each point is
|
||||
+ split into chunks for text before the link, the link text, and the text
|
||||
+ after the link. If a localized grammar doesn't need the before or after
|
||||
+ chunk, it can be left blank.
|
||||
+
|
||||
+ Also note the leading/trailing whitespace in strings here, which is
|
||||
+ deliberate for formatting around the embedded links. -->
|
||||
+<!ENTITY rights.intro-point1a "&brandShortName; is made available to you under the terms of the ">
|
||||
+<!ENTITY rights.intro-point1b "Mozilla Public License">
|
||||
+<!ENTITY rights.intro-point1c ". This means you may use, copy and distribute &brandShortName; to others. You are also welcome to modify the source code of &brandShortName; as you want to meet your needs. The Mozilla Public License also gives you the right to distribute your modified versions.">
|
||||
+
|
||||
+<!ENTITY rights.intro-point2a "Mozilla does not grant you any rights to the Mozilla and Firefox trademarks or logos. Additional information on Trademarks may be found ">
|
||||
+<!ENTITY rights.intro-point2b "here">
|
||||
+<!ENTITY rights.intro-point2c ".">
|
||||
+
|
||||
+<!-- point 3 text for official branded builds -->
|
||||
+<!ENTITY rights.intro-point3a "Privacy policies for &vendorShortName;'s products may be found ">
|
||||
+<!ENTITY rights.intro-point3b "here">
|
||||
+<!ENTITY rights.intro-point3c ".">
|
||||
+
|
||||
+<!-- point 3 text for unbranded builds -->
|
||||
+<!ENTITY rights.intro-point3-unbranded "Any applicable privacy policies for this product should be listed here.">
|
||||
+
|
||||
+<!-- point 4 text for official branded builds -->
|
||||
+<!ENTITY rights.intro-point4a "&brandShortName; also offers optional web site information services, such as the SafeBrowsing service; however, we cannot guarantee they are 100% accurate or error-free. More details, including information on how to disable the services, can be found in the ">
|
||||
+<!ENTITY rights.intro-point4b "service terms">
|
||||
+<!ENTITY rights.intro-point4c ".">
|
||||
+
|
||||
+<!-- point 4 text for unbranded builds -->
|
||||
+<!ENTITY rights.intro-point4a-unbranded "If this product incorporates web services, any applicable service terms for the service(s) should be linked to the ">
|
||||
+<!ENTITY rights.intro-point4b-unbranded "Web Site Services">
|
||||
+<!ENTITY rights.intro-point4c-unbranded " section.">
|
||||
+
|
||||
+<!ENTITY rights.webservices-header "&brandFullName; Web Site Services">
|
||||
+
|
||||
+<!-- Note that this paragraph references a couple of entities from
|
||||
+ preferences/security.dtd, so that we can refer to text the user sees in
|
||||
+ the UI, without this page being forgotten every time those strings are
|
||||
+ updated. -->
|
||||
+<!-- intro paragraph for branded builds -->
|
||||
+<!ENTITY rights.webservices-a "&brandFullName; uses web site information services ("Services"), such as the SafeBrowsing service, that are available for your use with this binary version of &brandShortName; as described below. If you do not want to use the Services or the terms below are unacceptable, you may disable the SafeBrowsing service by opening the application preferences, selecting the ">
|
||||
+<!ENTITY rights.webservices-b "Security">
|
||||
+<!ENTITY rights.webservices-c-190 " section, and unchecking the options for "&tellMaybeAttackSite.label;" and "&tellMaybeForgery.label;"">
|
||||
+
|
||||
+<!-- intro paragraph for unbranded builds -->
|
||||
+<!ENTITY rights.webservices-unbranded "An overview of the web site services the product incorporates, along with instructions on how to disable them, if applicable, should be included here.">
|
||||
+
|
||||
+<!-- point 1 text for unbranded builds -->
|
||||
+<!ENTITY rights.webservices-term1-unbranded "Any applicable service terms for this product should be listed here.">
|
||||
+
|
||||
+<!-- points 1-7 text for branded builds -->
|
||||
+<!ENTITY rights.webservices-term1 "&vendorShortName; and its contributors, licensors and partners work to provide the most accurate and up-to-date phishing and malware information. However, they cannot guarantee that this information is comprehensive and error-free: some risky sites may not be identified and some safe sites may be identified in error.">
|
||||
+<!ENTITY rights.webservices-term2 "&vendorShortName; may discontinue or change the Services at its discretion.">
|
||||
+<!ENTITY rights.webservices-term3 "You are welcome to use these Services with the accompanying version of &brandShortName;, and you have all the rights necessary to do so. &vendorShortName; and its licensors reserve all other rights in the Services. These terms are not intended to limit any rights granted under open source licenses applicable to &brandShortName; and to corresponding source code versions of &brandShortName;.">
|
||||
+<!ENTITY rights.webservices-term4 "The Services are provided "as-is." &vendorShortName;, its contributors, licensors, and distributors, disclaim all warranties, whether express or implied, including without limitation, warranties that the Services are merchantable and fit for your particular purposes. You bear the entire risk as to selecting the Services for your purposes and as to the quality and performance of the Services. Some jurisdictions do not allow the exclusion or limitation of implied warranties, so this disclaimer may not apply to you.">
|
||||
+<!ENTITY rights.webservices-term5 "Except as required by law, &vendorShortName;, its contributors, licensors, and distributors will not be liable for any indirect, special, incidental, consequential, punitive, or exemplary damages arising out of or in any way relating to the use of &brandShortName; and the Services. The collective liability under these terms will not exceed $500 (five hundred dollars). Some jurisdictions do not allow the exclusion or limitation of certain damages, so this exclusion and limitation may not apply to you.">
|
||||
+<!ENTITY rights.webservices-term6 "&vendorShortName; may update these terms as necessary from time to time. These terms may not be modified or cancelled without &vendorShortName;'s written agreement.">
|
||||
+<!ENTITY rights.webservices-term7 "These terms are governed by the laws of the state of California, U.S.A., excluding its conflict of law provisions. If any portion of these terms is held to be invalid or unenforceable, the remaining portions will remain in full force and effect. In the event of a conflict between a translated version of these terms and the English language version, the English language version shall control.">
|
||||
diff -uprN '--exclude=CVS' mozilla.orig/browser/locales/en-US/chrome/browser/aboutRights.properties mozilla/browser/locales/en-US/chrome/browser/aboutRights.properties
|
||||
--- mozilla.orig/browser/locales/en-US/chrome/browser/aboutRights.properties 1970-01-01 01:00:00.000000000 +0100
|
||||
+++ mozilla/browser/locales/en-US/chrome/browser/aboutRights.properties 2008-11-22 09:01:50.000000000 +0100
|
||||
@@ -0,0 +1,3 @@
|
||||
+buttonLabel = Know your rights…
|
||||
+buttonAccessKey = K
|
||||
+notifyText = %S is free and open software from the non-profit Mozilla Foundation.
|
||||
diff -uprN '--exclude=CVS' mozilla.orig/browser/locales/jar.mn mozilla/browser/locales/jar.mn
|
||||
--- mozilla.orig/browser/locales/jar.mn 2008-09-15 09:53:51.000000000 +0200
|
||||
+++ mozilla/browser/locales/jar.mn 2008-11-22 09:01:50.000000000 +0100
|
||||
@@ -3,6 +3,8 @@
|
||||
@AB_CD@.jar:
|
||||
% locale browser @AB_CD@ %locale/browser/
|
||||
locale/browser/aboutDialog.dtd (%chrome/browser/aboutDialog.dtd)
|
||||
+ locale/browser/aboutRights.dtd (%chrome/browser/aboutRights.dtd)
|
||||
+ locale/browser/aboutRights.properties (%chrome/browser/aboutRights.properties)
|
||||
locale/browser/aboutRobots.dtd (%chrome/browser/aboutRobots.dtd)
|
||||
locale/browser/credits.dtd (%chrome/browser/credits.dtd)
|
||||
* locale/browser/browser.dtd (%chrome/browser/browser.dtd)
|
||||
diff -uprN '--exclude=CVS' mozilla.orig/other-licenses/branding/firefox/pref/firefox-branding.js mozilla/other-licenses/branding/firefox/pref/firefox-branding.js
|
||||
--- mozilla.orig/other-licenses/branding/firefox/pref/firefox-branding.js 2008-11-01 00:05:40.000000000 +0100
|
||||
+++ mozilla/other-licenses/branding/firefox/pref/firefox-branding.js 2008-11-22 09:01:50.000000000 +0100
|
||||
@@ -13,5 +13,3 @@ pref("app.releaseNotesURL", "http://%LOC
|
||||
pref("browser.search.param.yahoo-fr", "moz2");
|
||||
pref("browser.search.param.yahoo-fr-cjkt", "moz2");
|
||||
pref("browser.search.param.yahoo-f-CN", "D3_g");
|
||||
-
|
||||
-pref("browser.EULA.override", false); // Do show EULA on first start
|
||||
@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:9a3b13a5aa8d5a491dc4b12d824ea9fe92a9b4c441156cd2e012106af78da2d1
|
||||
size 29243631
|
||||
3
l10n-3.0.5.tar.bz2
Normal file
3
l10n-3.0.5.tar.bz2
Normal file
@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:f5ef3f0fbf956f26d1ffb0d9e014351e05c831f1e06653ba84b43131a70ae4f3
|
||||
size 29344087
|
||||
Loading…
Reference in New Issue
Block a user