commit 122f2ad3fc4b7c03edfe049c023ea84ea43ed9f0 Author: Arlo Breault arlolra@gmail.com Date: Wed Nov 9 09:48:13 2016 -0800
Switch to tor-browser-45.5.0esr-6.0-1 branch --- ChangeLog | 2 +- projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch | 4 ++-- projects/mozilla/0002-Trac-16475-Block-flash-too.patch | 4 ++-- ...003-Trac-20206-Avoid-the-need-to-download-the-font-Osaka.patch | 8 ++++---- ...004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch | 4 ++-- projects/mozilla/0005-OSX-package-as-tar.bz2.patch | 4 ++-- projects/mozilla/0006-Updater-fixups-for-TM.patch | 4 ++-- projects/mozilla/config | 2 +- 8 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/ChangeLog b/ChangeLog index 67f2523..9b7d4b0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,6 @@ Tor Messenger 0.3.0b1 -- * All Platforms - * Use the tor-browser-45.4.0esr-6.0-1 branch (41f1c54a) on tor-browser + * Use the tor-browser-45.5.0esr-6.0-1 branch (e5dafab8) on tor-browser * Use the THUNDERBIRD_45_4_0_RELEASE tag on comm-esr45 * Update ctypes-otr to 00e4e80a * Trac 16489: Only show "close" button on Windows diff --git a/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch b/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch index 9fca0b7..1ce4cfc 100644 --- a/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch +++ b/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch @@ -1,4 +1,4 @@ -From 1703b578adc3d9e57358e3ad2eee08922a9d93ec Mon Sep 17 00:00:00 2001 +From d05e3b60489252ad72c367af074432ab30251b3b Mon Sep 17 00:00:00 2001 From: Arlo Breault arlolra@gmail.com Date: Mon, 10 Oct 2016 10:52:52 -0700 Subject: [PATCH 1/6] Trac 19910: Prevents STARTTLS in XMPP @@ -116,5 +116,5 @@ index 568c700..1793001 100644
private: -- -2.10.1 +2.10.2
diff --git a/projects/mozilla/0002-Trac-16475-Block-flash-too.patch b/projects/mozilla/0002-Trac-16475-Block-flash-too.patch index 8f08ce2..d4cc5a8 100644 --- a/projects/mozilla/0002-Trac-16475-Block-flash-too.patch +++ b/projects/mozilla/0002-Trac-16475-Block-flash-too.patch @@ -1,4 +1,4 @@ -From e9e251b1018bec2c9cdf9e4cac86e26fda087189 Mon Sep 17 00:00:00 2001 +From 8f56d8580b3fb8a8355bc477d2353184ebf8ff31 Mon Sep 17 00:00:00 2001 From: Arlo Breault arlolra@gmail.com Date: Thu, 6 Oct 2016 20:13:35 -0700 Subject: [PATCH 2/6] Trac 16475: Block flash too @@ -29,5 +29,5 @@ index 5345ce7..1569236 100644 }
-- -2.10.1 +2.10.2
diff --git a/projects/mozilla/0003-Trac-20206-Avoid-the-need-to-download-the-font-Osaka.patch b/projects/mozilla/0003-Trac-20206-Avoid-the-need-to-download-the-font-Osaka.patch index d903ceb..667d46a 100644 --- a/projects/mozilla/0003-Trac-20206-Avoid-the-need-to-download-the-font-Osaka.patch +++ b/projects/mozilla/0003-Trac-20206-Avoid-the-need-to-download-the-font-Osaka.patch @@ -1,4 +1,4 @@ -From 2476fa68858572f0be003df27b78579a5bb68a7f Mon Sep 17 00:00:00 2001 +From 6dcf4662033b55c53401ed57e7d25d22ccf3e15b Mon Sep 17 00:00:00 2001 From: Jonathan Kew jkew@mozilla.com Date: Sun, 9 Oct 2016 09:18:37 -0700 Subject: [PATCH 3/6] Trac 20206: Avoid the need to download the font Osaka @@ -44,10 +44,10 @@ index eb7a788..5c63e69 100644 LOG_FONTLIST(("(fontlist-singleface) family name: %s, key: %s\n", NS_ConvertUTF16toUTF8(familyName).get(), diff --git a/modules/libpref/init/all.js b/modules/libpref/init/all.js -index 7078c66..a7b091d 100644 +index e855cdb..2891c80 100644 --- a/modules/libpref/init/all.js +++ b/modules/libpref/init/all.js -@@ -3576,9 +3576,9 @@ pref("font.name.monospace.x-math", "Courier"); +@@ -3577,9 +3577,9 @@ pref("font.name.monospace.x-math", "Courier"); pref("font.name.cursive.x-math", "Apple Chancery"); pref("font.name.fantasy.x-math", "Papyrus");
@@ -61,5 +61,5 @@ index 7078c66..a7b091d 100644 // optimization hint for fonts with localized names to be read in at startup, otherwise read in at lookup miss // names are canonical family names (typically English names) -- -2.10.1 +2.10.2
diff --git a/projects/mozilla/0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch b/projects/mozilla/0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch index 81a82c3..06c97ca 100644 --- a/projects/mozilla/0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch +++ b/projects/mozilla/0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch @@ -1,4 +1,4 @@ -From 504315cc3326902da82e4b1e1980327053a97500 Mon Sep 17 00:00:00 2001 +From ed613224bf375dd049edccdb6f1de8cfc5f9a149 Mon Sep 17 00:00:00 2001 From: Arlo Breault arlolra@gmail.com Date: Wed, 23 Mar 2016 19:52:07 -0700 Subject: [PATCH 4/6] Trac 18331: Update OS X toolchain to work with ESR 45 @@ -119,5 +119,5 @@ index 0e4d118..e0ad0d3 100644 /* * gcc atomic ops. These are available on several other compilers as well. -- -2.10.1 +2.10.2
diff --git a/projects/mozilla/0005-OSX-package-as-tar.bz2.patch b/projects/mozilla/0005-OSX-package-as-tar.bz2.patch index 260ab94..927e8cf 100644 --- a/projects/mozilla/0005-OSX-package-as-tar.bz2.patch +++ b/projects/mozilla/0005-OSX-package-as-tar.bz2.patch @@ -1,4 +1,4 @@ -From ab2a2be728d371e632d7816f97d399be84034b18 Mon Sep 17 00:00:00 2001 +From 283a123b62870f7f8060d6e9164082f25b67927b Mon Sep 17 00:00:00 2001 From: Nicolas Vigier boklm@torproject.org Date: Thu, 25 Jun 2015 12:18:43 +0200 Subject: [PATCH 5/6] OSX: package as tar.bz2 @@ -21,5 +21,5 @@ index 5c11ed2..0c7bf28 100644 ifeq (,$(filter-out WINNT, $(OS_ARCH))) MOZ_PKG_FORMAT = ZIP -- -2.10.1 +2.10.2
diff --git a/projects/mozilla/0006-Updater-fixups-for-TM.patch b/projects/mozilla/0006-Updater-fixups-for-TM.patch index 742f3f5..a0d7f47 100644 --- a/projects/mozilla/0006-Updater-fixups-for-TM.patch +++ b/projects/mozilla/0006-Updater-fixups-for-TM.patch @@ -1,4 +1,4 @@ -From 57faba03c751bd972776027faf84d798d2438e12 Mon Sep 17 00:00:00 2001 +From 94a4585f80a62a42f06e5433ba122e36ec60c418 Mon Sep 17 00:00:00 2001 From: Arlo Breault arlolra@gmail.com Date: Sun, 9 Oct 2016 09:34:38 -0700 Subject: [PATCH 6/6] Updater fixups for TM @@ -706,5 +706,5 @@ index c45961a..23d6fbe 100644 nsresult rv = GetAppRootDir(aExeFile, getter_AddRefs(appRootDir)); NS_ENSURE_SUCCESS(rv, rv); -- -2.10.1 +2.10.2
diff --git a/projects/mozilla/config b/projects/mozilla/config index fea12d5..ca7d2b0 100644 --- a/projects/mozilla/config +++ b/projects/mozilla/config @@ -2,7 +2,7 @@ version: '[% c("abbrev") %]' filename: 'mozilla-[% c("version") %]-[% c("var/osname") %]-[% c("var/build_id") %].tar.gz' git_url: https://git.torproject.org/tor-browser.git -git_hash: 41f1c54ad978155f964fca1100f0c2eda1bef88a +git_hash: e5dafab84b9b073bf1e510a8272c6ca35b4e396d input_files: - filename: 0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch - filename: 0002-Trac-16475-Block-flash-too.patch