[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [torbrowser/maint-2.3] add firefox rebranding images, patch, and makefile changes
commit e3e2457216a83c25c7f6287b4feec3ae6dd63855
Author: Erinn Clark <erinn@xxxxxxxxxxxxxx>
Date: Wed Apr 25 09:33:02 2012 -0300
add firefox rebranding images, patch, and makefile changes
---
build-scripts/branding/about.png | Bin 20908 -> 0 bytes
build-scripts/branding/background.png | Bin 0 -> 32171 bytes
build-scripts/branding/default16.png | Bin 0 -> 988 bytes
build-scripts/branding/default24.png | Bin 0 -> 1918 bytes
build-scripts/branding/default256.png | Bin 0 -> 48898 bytes
build-scripts/branding/default32.png | Bin 0 -> 2775 bytes
build-scripts/branding/default48.png | Bin 0 -> 5402 bytes
build-scripts/branding/document.icns | Bin 0 -> 195435 bytes
build-scripts/branding/document.ico | Bin 0 -> 54601 bytes
.../branding/firefox-rebranding-instructions | 35 -----------
build-scripts/branding/firefox-torbrowser.diff | 60 --------------------
build-scripts/branding/firefox.icns | Bin 0 -> 242224 bytes
build-scripts/branding/firefox.ico | Bin 0 -> 75112 bytes
build-scripts/branding/mozicon128.png | Bin 0 -> 19033 bytes
build-scripts/branding/wizHeader.bmp | Bin 0 -> 34254 bytes
build-scripts/branding/wizHeaderRTL.bmp | Bin 0 -> 34254 bytes
build-scripts/branding/wizWatermark.bmp | Bin 0 -> 206038 bytes
build-scripts/linux.mk | 1 +
build-scripts/osx.mk | 1 +
build-scripts/windows.mk | 1 +
.../0013-Rebrand-Firefox-to-TorBrowser.patch | 51 +++++++++++++++++
21 files changed, 54 insertions(+), 95 deletions(-)
diff --git a/build-scripts/branding/about.png b/build-scripts/branding/about.png
deleted file mode 100644
index 305fb9e..0000000
Binary files a/build-scripts/branding/about.png and /dev/null differ
diff --git a/build-scripts/branding/background.png b/build-scripts/branding/background.png
new file mode 100644
index 0000000..7dafb9f
Binary files /dev/null and b/build-scripts/branding/background.png differ
diff --git a/build-scripts/branding/default16.png b/build-scripts/branding/default16.png
new file mode 100644
index 0000000..59e34b3
Binary files /dev/null and b/build-scripts/branding/default16.png differ
diff --git a/build-scripts/branding/default24.png b/build-scripts/branding/default24.png
new file mode 100644
index 0000000..8c0f58b
Binary files /dev/null and b/build-scripts/branding/default24.png differ
diff --git a/build-scripts/branding/default256.png b/build-scripts/branding/default256.png
new file mode 100644
index 0000000..3d440fb
Binary files /dev/null and b/build-scripts/branding/default256.png differ
diff --git a/build-scripts/branding/default32.png b/build-scripts/branding/default32.png
new file mode 100644
index 0000000..7ab63b7
Binary files /dev/null and b/build-scripts/branding/default32.png differ
diff --git a/build-scripts/branding/default48.png b/build-scripts/branding/default48.png
new file mode 100644
index 0000000..5f445ae
Binary files /dev/null and b/build-scripts/branding/default48.png differ
diff --git a/build-scripts/branding/document.icns b/build-scripts/branding/document.icns
new file mode 100644
index 0000000..476c7d6
Binary files /dev/null and b/build-scripts/branding/document.icns differ
diff --git a/build-scripts/branding/document.ico b/build-scripts/branding/document.ico
new file mode 100644
index 0000000..311340e
Binary files /dev/null and b/build-scripts/branding/document.ico differ
diff --git a/build-scripts/branding/firefox-rebranding-instructions b/build-scripts/branding/firefox-rebranding-instructions
deleted file mode 100644
index df88169..0000000
--- a/build-scripts/branding/firefox-rebranding-instructions
+++ /dev/null
@@ -1,35 +0,0 @@
-To rebrand Firefox from BonEcho into TorBrowser, a small bit of patching is
-required.
-
-First apply the renaming patch:
-
- /tmp/mozilla$ patch -p1 < ../firefox-torbrowser.diff
- patching file browser/base/content/browserconfig.properties
- patching file browser/base/content/old-homepage-default.properties
- patching file browser/locales/en-US/chrome/branding/brand.dtd
- patching file browser/locales/en-US/chrome/branding/brand.properties
- patching file configure.in
-
-Now rebuild the configuration script with autoconf:
-
- /tmp/mozilla$ autoconf2.13 configure.in
-
- [...] # Lots of Autoconf magic will fly by the terminal
-
-Ensure you have the proper .mozconfig from svn and then:
-
- /tmp/mozilla$ ./configure --with-moz-app-displayname=TorBrowser
-
-Replace the about.png with the TorBrowser version:
-
- mv about.png /tmp/mozilla/browser/base/branding/
-
-Build Firefox^H^H^H^H^H^H^H TorBrowser:
-
- make
-
-And now you'll run it and see a newly rebranded browser:
-
- ./dist/bin/run-mozilla.sh dist/bin/firefox
-
-You should have a newly branded firefox!
diff --git a/build-scripts/branding/firefox-torbrowser.diff b/build-scripts/branding/firefox-torbrowser.diff
deleted file mode 100644
index 301ba21..0000000
--- a/build-scripts/branding/firefox-torbrowser.diff
+++ /dev/null
@@ -1,60 +0,0 @@
-diff -ru mozilla/browser/base/content/browserconfig.properties mozilla-torbrowser/browser/base/content/browserconfig.properties
---- mozilla/browser/base/content/browserconfig.properties 2006-03-17 01:17:56.000000000 -0300
-+++ mozilla-torbrowser/browser/base/content/browserconfig.properties 2008-08-24 18:53:19.000000000 -0300
-@@ -1,2 +1,2 @@
- # Do NOT localize or otherwise change these values
--browser.startup.homepage=http://www.mozilla.org/projects/bonecho/
-+browser.startup.homepage=https://check.torproject.org/
-diff -ru mozilla/browser/base/content/old-homepage-default.properties mozilla-torbrowser/browser/base/content/old-homepage-default.properties
---- mozilla/browser/base/content/old-homepage-default.properties 2007-02-04 22:38:31.000000000 -0300
-+++ mozilla-torbrowser/browser/base/content/old-homepage-default.properties 2008-08-24 18:53:42.000000000 -0300
-@@ -1,2 +1,2 @@
- # Do NOT localize or otherwise change these values
--browser.startup.homepage=http://www.mozilla.org/projects/bonecho/
-+browser.startup.homepage=https://check.torproject.org/
-diff -ru mozilla/browser/locales/en-US/chrome/branding/brand.dtd mozilla-torbrowser/browser/locales/en-US/chrome/branding/brand.dtd
---- mozilla/browser/locales/en-US/chrome/branding/brand.dtd 2006-08-24 21:02:37.000000000 -0300
-+++ mozilla-torbrowser/browser/locales/en-US/chrome/branding/brand.dtd 2008-08-24 18:50:07.000000000 -0300
-@@ -1,3 +1,3 @@
--<!ENTITY brandShortName "Bon Echo">
--<!ENTITY brandFullName "Bon Echo">
-+<!ENTITY brandShortName "TorBrowser">
-+<!ENTITY brandFullName "TorBrowser">
- <!ENTITY vendorShortName "Mozilla">
-diff -ru mozilla/browser/locales/en-US/chrome/branding/brand.properties mozilla-torbrowser/browser/locales/en-US/chrome/branding/brand.properties
---- mozilla/browser/locales/en-US/chrome/branding/brand.properties 2006-03-17 01:17:56.000000000 -0300
-+++ mozilla-torbrowser/browser/locales/en-US/chrome/branding/brand.properties 2008-08-24 18:50:21.000000000 -0300
-@@ -1,3 +1,3 @@
--brandShortName=Bon Echo
--brandFullName=Bon Echo
-+brandShortName=TorBrowser
-+brandFullName=TorBrowser
- vendorShortName=Mozilla
-diff -ru mozilla/configure.in mozilla-torbrowser/configure.in
---- mozilla/configure.in 2008-03-26 16:03:05.000000000 -0300
-+++ mozilla-torbrowser/configure.in 2008-08-24 04:19:18.000000000 -0300
-@@ -4317,7 +4317,7 @@
-
- browser)
- MOZ_APP_NAME=firefox
-- MOZ_APP_DISPLAYNAME=BonEcho
-+ MOZ_APP_DISPLAYNAME=TorBrowser
- MOZ_XUL_APP=1
- MOZ_PHOENIX=1
- MOZ_SAFE_BROWSING=1
-@@ -4596,6 +4596,15 @@
-
- AC_SUBST(MOZ_BRANDING_DIRECTORY)
-
-+dnl Set this to rebrand the displayed name
-+MOZ_ARG_WITH_STRING(displayname,
-+[ --with-moz-app-displayname=displayname Set the displayed brand name.],
-+ MOZ_APP_DISPLAYNAME=$withval)
-+
-+AC_SUBST(MOZ_APP_DISPLAYNAME)
-+
-+
-+
- dnl ========================================================
- dnl = Distribution ID
- dnl ========================================================
diff --git a/build-scripts/branding/firefox.icns b/build-scripts/branding/firefox.icns
new file mode 100644
index 0000000..481914f
Binary files /dev/null and b/build-scripts/branding/firefox.icns differ
diff --git a/build-scripts/branding/firefox.ico b/build-scripts/branding/firefox.ico
new file mode 100644
index 0000000..01fb0ef
Binary files /dev/null and b/build-scripts/branding/firefox.ico differ
diff --git a/build-scripts/branding/mozicon128.png b/build-scripts/branding/mozicon128.png
new file mode 100644
index 0000000..8fc3530
Binary files /dev/null and b/build-scripts/branding/mozicon128.png differ
diff --git a/build-scripts/branding/wizHeader.bmp b/build-scripts/branding/wizHeader.bmp
new file mode 100644
index 0000000..a754d2d
Binary files /dev/null and b/build-scripts/branding/wizHeader.bmp differ
diff --git a/build-scripts/branding/wizHeaderRTL.bmp b/build-scripts/branding/wizHeaderRTL.bmp
new file mode 100644
index 0000000..c944205
Binary files /dev/null and b/build-scripts/branding/wizHeaderRTL.bmp differ
diff --git a/build-scripts/branding/wizWatermark.bmp b/build-scripts/branding/wizWatermark.bmp
new file mode 100644
index 0000000..9e523b5
Binary files /dev/null and b/build-scripts/branding/wizWatermark.bmp differ
diff --git a/build-scripts/linux.mk b/build-scripts/linux.mk
index 1a32df0..77b953f 100644
--- a/build-scripts/linux.mk
+++ b/build-scripts/linux.mk
@@ -89,6 +89,7 @@ build-pidgin:
build-firefox: config/dot_mozconfig $(FIREFOX_DIR)
cp config/dot_mozconfig $(FIREFOX_DIR)/mozconfig
+ cp branding/* $(FIREFOX_DIR)/branding
cd $(FIREFOX_DIR) && make -f client.mk build
touch $(STAMP_DIR)/build-firefox
diff --git a/build-scripts/osx.mk b/build-scripts/osx.mk
index a9c1b81..3979f37 100644
--- a/build-scripts/osx.mk
+++ b/build-scripts/osx.mk
@@ -106,6 +106,7 @@ build-tor: build-zlib build-openssl build-libevent $(TOR_DIR)
build-firefox: $(FIREFOX_DIR) config/mozconfig-osx-$(ARCH_TYPE)
cp config/mozconfig-osx-$(ARCH_TYPE) $(FIREFOX_DIR)/mozconfig
+ cp branding/* $(FIREFOX_DIR)/branding
cd $(FIREFOX_DIR) && make -f client.mk build
touch $(STAMP_DIR)/build-firefox
diff --git a/build-scripts/windows.mk b/build-scripts/windows.mk
index d690230..a41951a 100644
--- a/build-scripts/windows.mk
+++ b/build-scripts/windows.mk
@@ -107,6 +107,7 @@ build-tor: build-zlib build-openssl build-libevent $(TOR_DIR)
build-firefox: $(FIREFOX_DIR) config/dot_mozconfig $(MOZBUILD_DIR) $(MOZBUILD_DIR)/start-msvc$(MSVC_VER).bat | $(PYTHON) $(PYMAKE_DIR)
cp config/dot_mozconfig $(FIREFOX_DIR)/mozconfig
+ cp branding/* $(FIREFOX_DIR)/branding
cd $(MOZBUILD_DIR) && cmd.exe /c "start-msvc$(MSVC_VER).bat $(FIREFOX_DIR) $(PYTHON) $(PYMAKE)"
touch $(STAMP_DIR)/build-firefox
diff --git a/src/current-patches/firefox/0013-Rebrand-Firefox-to-TorBrowser.patch b/src/current-patches/firefox/0013-Rebrand-Firefox-to-TorBrowser.patch
new file mode 100644
index 0000000..1d77887
--- /dev/null
+++ b/src/current-patches/firefox/0013-Rebrand-Firefox-to-TorBrowser.patch
@@ -0,0 +1,51 @@
+From 947d85fbe7cefca8d621f615fabe8b6731569d4c Wed Aug 25 00:08:14 2012
+From: Erinn Clark <erinn@xxxxxxxxxxxxxx>
+Date: Wed, 25 Apr 2012 09:14:00 -0300
+Subject: [PATCH] Rebrand Firefox to TorBrowser
+
+This patch does some basic renaming of Firefox to TorBrowser. The rest of the
+branding is done by images and icons.
+
+---
+ browser/branding/official/configure.sh | 2 +-
+ browser/branding/official/locales/en-US/brand.dtd | 6 +++---
+ .../official/locales/en-US/brand.properties | 6 +++---
+ 3 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/browser/branding/official/configure.sh b/browser/branding/official/configure.sh
+index 4d3d297..e9b3738 100644
+--- a/browser/branding/official/configure.sh
++++ b/browser/branding/official/configure.sh
+@@ -1,2 +1,2 @@
+-MOZ_APP_DISPLAYNAME=Firefox
++MOZ_APP_DISPLAYNAME=TorBrowser
+ MOZ_UA_BUILDID=20100101
+diff --git a/browser/branding/official/locales/en-US/brand.dtd b/browser/branding/official/locales/en-US/brand.dtd
+index 142d79b..c137e04 100644
+--- a/browser/branding/official/locales/en-US/brand.dtd
++++ b/browser/branding/official/locales/en-US/brand.dtd
+@@ -1,4 +1,4 @@
+-<!ENTITY brandShortName "Firefox">
+-<!ENTITY brandFullName "Mozilla Firefox">
+-<!ENTITY vendorShortName "Mozilla">
++<!ENTITY brandShortName "TorBrowser">
++<!ENTITY brandFullName "Tor Browser">
++<!ENTITY vendorShortName "Tor Project">
+ <!ENTITY trademarkInfo.part1 "Firefox and the Firefox logos are trademarks of the Mozilla Foundation.">
+diff --git a/browser/branding/official/locales/en-US/brand.properties b/browser/branding/official/locales/en-US/brand.properties
+index 5f3ad54..62ac2fd 100644
+--- a/browser/branding/official/locales/en-US/brand.properties
++++ b/browser/branding/official/locales/en-US/brand.properties
+@@ -1,6 +1,6 @@
+-brandShortName=Firefox
+-brandFullName=Mozilla Firefox
+-vendorShortName=Mozilla
++brandShortName=TorBrowser
++brandFullName=Tor Browser
++vendorShortName=Tor Project
+
+ homePageSingleStartMain=Firefox Start, a fast home page with built-in search
+ homePageImport=Import your home page from %S
+--
+1.7.7.4
+
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits