multiple path fixes

author: Gaming4JC <g4jc@bulletmail.org> 2018-05-19 19:28:48 -0400
committer: Gaming4JC <g4jc@bulletmail.org> 2018-05-19 19:28:48 -0400
commit: 8b4ecaa1cc22198bf3491fcce619e227ed47f947 (patch)
tree: 00c079ed14c2c0653b56a4cea7fdfb52b24720a4
parent: 9523bba57fb05b2dfdc99b42f719cbb4e96139c5 (diff)
download: iceweasel-uxp-8b4ecaa1cc22198bf3491fcce619e227ed47f947.tar.gz
5 files changed, 107 insertions, 19 deletions
diff --git a/app.mozbuild b/app.mozbuild
index 6069e82..22082ca 100644
--- a/app.mozbuild
+++ b/app.mozbuild
@@ -3,7 +3,7 @@
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-include('/toolkit/toolkit.mozbuild')
+include('../../toolkit/toolkit.mozbuild')
 
 if CONFIG['MOZ_EXTENSIONS']:
     DIRS += ['/extensions']
diff --git a/base/content/mozilla.xhtml b/base/content/mozilla.xhtml
new file mode 100644
index 0000000..6471ed7
--- /dev/null
+++ b/base/content/mozilla.xhtml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
+    "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd"
+[
+  <!ENTITY % mozillaDTD SYSTEM "chrome://browser/locale/mozilla.dtd" >
+  %mozillaDTD;
+  <!ENTITY % directionDTD SYSTEM "chrome://global/locale/global.dtd" >
+  %directionDTD;
+]>
+
+<!-- ***** 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
+   - Netscape Communications Corporation.
+   - Portions created by the Initial Developer are Copyright (C) 1998
+   - the Initial Developer. All Rights Reserved.
+   -
+   - Contributor(s):
+   -   Neil Deakin <enndeakin@sympatico.ca>
+   -   Henrik Gemal <mozilla@gemal.dk>
+   -   Alexey Chernyak <alexeyc@bigfoot.com> (XHTML 1.1 conversion)
+   -   Johnathan Nightingale <johnath@mozilla.com>
+   -   Mike Beltzner <beltzner@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>&ice.title;</title>
+<style type="text/css">
+html {
+  background: #ccccff;
+  color: blue;
+  font-style: italic;
+}
+
+#moztext {
+  margin-top: 15%;
+  font-size: 1.1em;
+  font-family: serif;
+  text-align: center;
+  line-height: 1.5;
+}
+
+#from {
+  font-size: 1.95em;
+  font-family: serif;
+  text-align: right;
+}
+
+em {
+  font-size: 1.3em;
+  line-height: 0;
+}
+
+a {
+  text-decoration: none;
+  color: white;
+}
+</style>
+</head>
+<body dir="&locale.dir;">
+
+<p id="moztext">
+&ice.quote;
+</p>
+
+<p id="from">
+&ice.from;
+</p>
+
+</body>
+</html>
diff --git a/base/jar.mn b/base/jar.mn
index c582653..f2266e8 100644
--- a/base/jar.mn
+++ b/base/jar.mn
@@ -16,6 +16,7 @@ browser.jar:
         content/browser/aboutDialog.js                (content/aboutDialog.js)
         content/browser/aboutDialog.css               (content/aboutDialog.css)
         content/browser/aboutRobots.xhtml             (content/aboutRobots.xhtml)
+        content/browser/mozilla.xhtml             (content/mozilla.xhtml)
 *       content/browser/abouthome/aboutHome.xhtml     (content/abouthome/aboutHome.xhtml)
         content/browser/abouthome/aboutHome.js        (content/abouthome/aboutHome.js)
 *       content/browser/abouthome/aboutHome.css       (content/abouthome/aboutHome.css)
diff --git a/installer/package-manifest.in b/installer/package-manifest.in
index c912723..4dd9419 100644
--- a/installer/package-manifest.in
+++ b/installer/package-manifest.in
@@ -52,7 +52,7 @@
 @RESPATH@/fonts/*
 #endif
 @RESPATH@/hyphenation/*
-@RESPATH@/browser/@PREF_DIR@/firefox-l10n.js
+@RESPATH@/browser/@PREF_DIR@/iceweasel-l10n.js
 #ifdef HAVE_MAKENSISU
 @BINPATH@/uninstall/helper.exe
 #endif
@@ -578,22 +578,11 @@
 @RESPATH@/browser/modules/*
 @RESPATH@/modules/*
 
-; Safe Browsing
-@RESPATH@/components/nsURLClassifier.manifest
-@RESPATH@/components/nsUrlClassifierHashCompleter.js
-@RESPATH@/components/nsUrlClassifierListManager.js
-@RESPATH@/components/nsUrlClassifierLib.js
-@RESPATH@/components/url-classifier.xpt
-
 ; Private Browsing
 @RESPATH@/components/privatebrowsing.xpt
 @RESPATH@/components/PrivateBrowsing.manifest
 @RESPATH@/components/PrivateBrowsingTrackingProtectionWhitelist.js
 
-; Security Reports
-@RESPATH@/components/SecurityReporter.manifest
-@RESPATH@/components/SecurityReporter.js
-
 ; ANGLE GLES-on-D3D rendering library
 #ifdef MOZ_ANGLE_RENDERER
 @BINPATH@/libEGL.dll
@@ -643,7 +632,7 @@
 ; [Default Preferences]
 ; All the pref files must be part of base to prevent migration bugs
 @RESPATH@/browser/@PREF_DIR@/firefox.js
-@RESPATH@/browser/@PREF_DIR@/firefox-branding.js
+@RESPATH@/browser/@PREF_DIR@/iceweasel-branding.js
 @RESPATH@/greprefs.js
 @RESPATH@/defaults/autoconfig/prefcalls.js
 @RESPATH@/browser/defaults/permissions
diff --git a/locales/en-US/chrome/overrides/mozilla.dtd b/locales/en-US/chrome/overrides/mozilla.dtd
index 38b1542..e1f3719 100644
--- a/locales/en-US/chrome/overrides/mozilla.dtd
+++ b/locales/en-US/chrome/overrides/mozilla.dtd
@@ -2,10 +2,10 @@
    - License, v. 2.0. If a copy of the MPL was not distributed with this
    - file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
 
-<!ENTITY chronicles.title.55.2
-'The Book, 11:13'>
+<!ENTITY ice.title
+'The Book of Ice, 10:13'>
 
-<!ENTITY chronicles.quote.55.2
+<!ENTITY ice.quote
 'And thus the beast grew powerful, and <em>fire</em> and <em>thunder</em>
 swept the land.  But <em>Mammon</em> stirred in their hearts, and the beast
 <em>Foundered</em>, and its <em>Corpse</em> arose, and commanded "thou shalt
@@ -13,5 +13,5 @@ not fly in my name."  And the blazes shall <em>freeze cold</em>, and the souls
 of the followers of <em>Mammon</em> shall learn to <em>tremble</em> in the
 face of <em>ice</em> as they did before the <em>fire</em>.'>
 
-<!ENTITY chronicles.from.55.2
-'from <strong>The Book,</strong> 11:13'
+<!ENTITY ice.from
+'from <strong>The Book of Ice,</strong> 10:13'>
+\ No newline at end of file
author	Gaming4JC <g4jc@bulletmail.org>	2018-05-19 19:28:48 -0400
committer	Gaming4JC <g4jc@bulletmail.org>	2018-05-19 19:28:48 -0400
commit	8b4ecaa1cc22198bf3491fcce619e227ed47f947 (patch)
tree	00c079ed14c2c0653b56a4cea7fdfb52b24720a4
parent	9523bba57fb05b2dfdc99b42f719cbb4e96139c5 (diff)
download	iceweasel-uxp-8b4ecaa1cc22198bf3491fcce619e227ed47f947.tar.gz