Updated firefox for v22

helpers/DATA/firefox/branding/Makefile.in

@@ -1,98 +1,74 @@
-# ***** BEGIN LICENSE BLOCK *****
+# This Source Code Form is subject to the terms of the Mozilla Public
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+# 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/.
-# The contents of this file are subject to the Trisquel 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 Trisquel Foundation.
-# Portions created by the Initial Developer are Copyright (C) 2009
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#   Justin Dolske <dolske@mozilla.com> (original author)
-#
-# 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 *****
 
-DEPTH = ../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
-
+include $(topsrcdir)/config/config.mk
-DIRS = \
-	content \
-	locales \
-	$(NULL)
 
 PREF_JS_EXPORTS = $(srcdir)/pref/abrowser-branding.js
 
-include $(topsrcdir)/config/rules.mk
+# On Windows only do this step for browser, skip for metro.
-
+ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows browser)
-WINDOWS_BRANDING_FILES = \
+BRANDING_FILES := \
 	abrowser.ico \
 	document.ico \
 	branding.nsi \
+	appname.bmp \
+	bgintro.bmp \
+	bgplain.bmp \
+	clock.bmp \
+	particles.bmp \
+	pencil.bmp \
+	pencil-rtl.bmp \
 	wizHeader.bmp \
 	wizHeaderRTL.bmp \
 	wizWatermark.bmp \
+	newwindow.ico \
+	newtab.ico \
+	pbmode.ico \
 	$(NULL)
-
-ifdef MOZ_SPLASHSCREEN
-WINDOWS_BRANDING_FILES += splash.bmp
 endif
 
-OSX_BRANDING_FILES = \
+ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
+BRANDING_FILES := \
 	background.png \
 	abrowser.icns \
 	disk.icns \
 	document.icns \
 	dsstore \
 	$(NULL)
+endif
 
-LINUX_BRANDING_FILES = \
+ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
+BRANDING_FILES := \
 	default16.png \
-	default22.png \
-	default24.png \
 	default32.png \
 	default48.png \
-	default128.png \
-	default256.png \
-	document.png \
 	mozicon128.png \
 	$(NULL)
+endif
 
+ifeq ($(OS_ARCH),OS2)
+BRANDING_FILES := \
+	abrowser-os2.ico \
+	document-os2.ico \
+	$(NULL)
+endif
 
-export::
+BRANDING_DEST := $(DIST)/branding
-	$(NSINSTALL) -D $(DIST)/branding
+BRANDING_TARGET := export
-ifeq ($(MOZ_WIDGET_TOOLKIT),windows)
+INSTALL_TARGETS += BRANDING
-	cp $(addprefix $(srcdir)/, $(WINDOWS_BRANDING_FILES)) $(DIST)/branding/
+
-endif
+ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro)
-ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
+VISUALMANIFEST := VisualElementsManifest.xml
-	cp $(addprefix $(srcdir)/, $(OSX_BRANDING_FILES)) $(DIST)/branding/
+VISUALMANIFEST_FLAGS := -Fsubstitution -DMOZ_APP_DISPLAYNAME=${MOZ_APP_DISPLAYNAME}
-endif
+VISUALMANIFEST_PATH := $(DIST)/bin
-ifeq ($(MOZ_WIDGET_TOOLKIT),gtk2)
+PP_TARGETS += VISUALMANIFEST
-	cp $(addprefix $(srcdir)/, $(LINUX_BRANDING_FILES)) $(DIST)/branding/
-	$(NSINSTALL) -D $(DIST)/install
 endif
+
+include $(topsrcdir)/config/rules.mk

helpers/DATA/firefox/branding/VisualElementsManifest.xml

@@ -0,0 +1,16 @@
+<Application
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <VisualElements
+      DisplayName="@MOZ_APP_DISPLAYNAME@"
+      Logo="tileresources\VisualElements_logo.png"
+      SmallLogo="tileresources\VisualElements_smalllogo.png"
+      ForegroundText="light"
+      BackgroundColor="#001226">
+    <DefaultTile
+        ShortName="@MOZ_APP_DISPLAYNAME@"
+        ShowName="allLogos"
+            />
+    <SplashScreen
+        Image="tileresources\VisualElements_splashscreen.png" />
+  </VisualElements>
+</Application>

helpers/DATA/firefox/branding/branding.nsi

@@ -1,42 +1,8 @@
-# ***** BEGIN LICENSE BLOCK *****
+# This Source Code Form is subject to the terms of the Mozilla Public
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+# 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/.
-# The contents of this file are subject to the Trisquel 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 the Trisquel Installer code.
-#
-# The Initial Developer of the Original Code is Trisquel Foundation
-# Portions created by the Initial Developer are Copyright (C) 2006
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#  Robert Strong <robert.bugzilla@gmail.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 *****
 
 # NSIS branding defines for unofficial builds.
-# The official release build branding.nsi is located in other-license/branding/abrowser/
-# The nightly build branding.nsi is located in browser/installer/windows/nsis/
 
 # BrandFullNameInternal is used for some registry and file system values
 # instead of BrandFullName and typically should not be modified.
@@ -44,3 +10,34 @@
 !define CompanyName           "Trisquel"
 !define URLInfoAbout          "http://trisquel.info/browser"
 !define URLUpdateInfo         "http://trisquel.info/wiki"
+
+!define URLStubDownload "http://trisquel.info/browser"
+!define URLManualDownload "http://trisquel.info/browser"
+!define Channel "unofficial"
+
+# The installer's certificate name and issuer expected by the stub installer
+!define CertNameDownload   "Mozilla Corporation"
+!define CertIssuerDownload "Thawte Code Signing CA - G2"
+
+# Dialog units are used so the UI displays correctly with the system's DPI
+# settings.
+# The dialog units for the bitmap's dimensions should match exactly with the
+# bitmap's width and height in pixels.
+!define APPNAME_BMP_WIDTH_DU 159u
+!define APPNAME_BMP_HEIGHT_DU 26u
+!define INTRO_BLURB_WIDTH_DU "230u"
+!define INTRO_BLURB_EDGE_DU "198u"
+!define INTRO_BLURB_LTR_TOP_DU "16u"
+!define INTRO_BLURB_RTL_TOP_DU "11u"
+
+# UI Colors that can be customized for each channel
+!define FOOTER_CONTROL_TEXT_COLOR_NORMAL 0x000000
+!define FOOTER_CONTROL_TEXT_COLOR_FADED 0x999999
+!define FOOTER_BKGRD_COLOR 0xFFFFFF
+!define INTRO_BLURB_TEXT_COLOR 0xFFFFFF
+!define OPTIONS_TEXT_COLOR_NORMAL 0xFFFFFF
+!define OPTIONS_TEXT_COLOR_FADED 0xA1AAB3
+!define OPTIONS_BKGRD_COLOR 0x0F1B26
+!define INSTALL_BLURB_TEXT_COLOR 0xFFFFFF
+!define INSTALL_PROGRESS_TEXT_COLOR_NORMAL 0xFFFFFF
+!define INSTALL_PROGRESS_TEXT_COLOR_FADED 0xA1AAB3

helpers/DATA/firefox/branding/configure.sh

@@ -1 +1,5 @@
-MOZ_APP_DISPLAYNAME=Abrowser
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+
+MOZ_APP_DISPLAYNAME=MozillaDeveloperPreview

helpers/DATA/firefox/branding/content/Makefile.in

@@ -1,11 +1,22 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+
 # Branding Makefile
 #  - jars chrome artwork
 
-DEPTH = ../../../..
+DEPTH = @DEPTH@
 topsrcdir = @top_srcdir@
 srcdir = @srcdir@
 VPATH = @srcdir@
 
 include $(DEPTH)/config/autoconf.mk
 
+# resources needed for the metro tile interface
+ifeq ($(MOZ_WIDGET_TOOLKIT) $(DIST_SUBDIR),windows metro)
+TILE_FILES := $(wildcard $(srcdir)/VisualElements*)
+TILE_DEST := $(DIST)/bin/tileresources
+INSTALL_TARGETS += TILE
+endif
+
 include $(topsrcdir)/config/rules.mk

helpers/DATA/firefox/branding/content/aboutDialog.css

@@ -1,3 +1,7 @@
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * 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/. */
+
 #aboutDialogContainer {
   background-image: url("chrome://branding/content/about-background.png");
   background-repeat: no-repeat;

helpers/DATA/firefox/branding/content/jar.mn

@@ -1,3 +1,7 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+
 browser.jar:
 % content branding %content/branding/ contentaccessible=yes
   content/branding/about.png                     (about.png)
@@ -6,6 +10,6 @@ browser.jar:
   content/branding/about-wordmark.png            (about-wordmark.png)
   content/branding/icon48.png                    (icon48.png)
   content/branding/icon64.png                    (icon64.png)
-  content/branding/icon128.png                   (../mozicon128.png)
   content/branding/icon16.png                    (../default16.png)
+  content/branding/icon32.png                    (../default32.png)
   content/branding/aboutDialog.css               (aboutDialog.css)

helpers/DATA/firefox/branding/content/moz.build

@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+

helpers/DATA/firefox/branding/locales/Makefile.in

@@ -1,44 +1,12 @@
-# ***** BEGIN LICENSE BLOCK *****
+# This Source Code Form is subject to the terms of the Mozilla Public
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
+# 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/.
-# The contents of this file are subject to the Trisquel 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 the Trisquel Browser code.
-#
-# The Initial Developer of the Original Code is
-# Benjamin Smedberg <benjamin@smedbergs.us>
-# Portions created by the Initial Developer are Copyright (C) 2004
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# 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 *****
 
-DEPTH          = ../../../..
+DEPTH          = @DEPTH@
 topsrcdir      = @top_srcdir@
 srcdir         = @srcdir@
 VPATH          = @srcdir@
-relativesrcdir = browser/branding/unofficial/locales
+relativesrcdir = @relativesrcdir@
 
 include $(DEPTH)/config/autoconf.mk
 

helpers/DATA/firefox/branding/locales/browserconfig.properties

@@ -1,2 +1,6 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+
 # Do NOT localize or otherwise change these values
 browser.startup.homepage=http://trisquel.info

helpers/DATA/firefox/branding/locales/en-US/brand.dtd

@@ -1,3 +1,7 @@
+<!-- This Source Code Form is subject to the terms of the Mozilla Public
+   - 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  brandShortName        "Abrowser">
 <!ENTITY  brandFullName         "Abrowser">
 <!ENTITY  vendorShortName       "Trisquel">

helpers/DATA/firefox/branding/locales/en-US/brand.properties

@@ -1,3 +1,7 @@
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+
 brandShortName=Abrowser
 brandFullName=Abrowser
 vendorShortName=Trisquel

helpers/DATA/firefox/branding/locales/jar.mn

@@ -1,8 +1,12 @@
 #filter substitution
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+
 
 @AB_CD@.jar:
 % locale branding @AB_CD@ %locale/branding/
 # Unofficial branding only exists in en-US
   locale/branding/brand.dtd        (en-US/brand.dtd)
-* locale/branding/brand.properties (en-US/brand.properties)
+  locale/branding/brand.properties (en-US/brand.properties)
-* locale/branding/browserconfig.properties (browserconfig.properties)
+  locale/branding/browserconfig.properties (browserconfig.properties)

helpers/DATA/firefox/branding/locales/moz.build

@@ -0,0 +1,5 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+

helpers/DATA/firefox/branding/moz.build

@@ -0,0 +1,7 @@
+# vim: set filetype=python:
+# This Source Code Form is subject to the terms of the Mozilla Public
+# 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/.
+
+DIRS += ['content', 'locales']
+

helpers/DATA/firefox/branding/pref/abrowser-branding.js

@@ -13,3 +13,12 @@ pref("app.update.url.manual", "http://trisquel.info/browser");
 // supplied in the "An update is available" page of the update wizard.
 pref("app.update.url.details", "http://trisquel.info/browser");
 
+// Release notes and vendor URLs
+pref("app.releaseNotesURL", "http://trisquel.info/browser");
+pref("app.vendorURL", "http://trisquel.info/browser/");
+
+// Search codes belong only in builds with official branding
+pref("browser.search.param.yahoo-fr", "");
+pref("browser.search.param.yahoo-fr-cjkt", ""); // now unused
+pref("browser.search.param.yahoo-fr-ja", "");
+pref("browser.search.param.yahoo-f-CN", "");

helpers/make-firefox

@@ -38,7 +38,7 @@ sed "s/Provides.*/Provides: firefox-locale-@LANGCODE@/" -i debian/control.langpa
 sed '/Package: firefox/,/It can be safely removed/d' -i debian/control.in
 
 # Remove Ubuntu bookmarks
-sed -i /ubuntu-bookmarks/d debian/patches/series.in
+sed -i /ubuntu-bookmarks/d debian/patches/series
 rm debian/patches/ubuntu-bookmarks*
 
 #Unbrand url codes for google and amazon
@@ -105,7 +105,7 @@ sed 's/ubuntu_version/trisquel_version/; s/Ubuntu 10.10/Trisquel 4.0/; s/1010/40
 sed '/Package: @MOZ_PKG_NAME@-dev/,/Description:/ s/Provides:/Provides:firefox-dev, /' debian/control.in -i
 
 # Redirect feedback menu
-sed s:input.mozilla.com/feedback:trisquel.info/contact: -i browser/base/content/utilityOverlay.js
+sed s:input.mozilla.com/feedback:trisquel.info/contact: b2g/app/b2g.js -i
 
 # Make abrowser-locale-$lang provide firefox-locale-$lang
 #sed 's/Package:\(.*\)/Package:\1\nProvides: firefox-locale-@LANGCODE@/g' debian/control.langpacks* -i