[tor-commits] [tor-messenger-build/master] Revert "Add the fixup for trac 20204"
arlo at torproject.org
arlo at torproject.org
Wed Oct 26 19:15:41 UTC 2016
commit f6a024dfd18f8a49e40e46df161e739fdb43ba24
Author: Arlo Breault <arlolra at gmail.com>
Date: Wed Oct 26 12:10:48 2016 -0700
Revert "Add the fixup for trac 20204"
* And bump tor-browser to 41f1c54a, now that this patch is upstream.
This reverts commit 83d3a565273eb7ddd8dc9cdf5ca1423d2960d9cc.
---
...0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch | 2 +-
.../mozilla/0002-Trac-16475-Block-flash-too.patch | 2 +-
...Avoid-the-need-to-download-the-font-Osaka.patch | 2 +-
...Update-OS-X-toolchain-to-work-with-ESR-45.patch | 2 +-
projects/mozilla/0005-OSX-package-as-tar.bz2.patch | 2 +-
projects/mozilla/0006-Updater-fixups-for-TM.patch | 2 +-
...070710-Add-mozilla-ViewRegion-which-assem.patch | 28 ----------------------
projects/mozilla/config | 3 +--
8 files changed, 7 insertions(+), 36 deletions(-)
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 684e6cf..9fca0b7 100644
--- a/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch
+++ b/projects/mozilla/0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch
@@ -1,7 +1,7 @@
From 1703b578adc3d9e57358e3ad2eee08922a9d93ec Mon Sep 17 00:00:00 2001
From: Arlo Breault <arlolra at gmail.com>
Date: Mon, 10 Oct 2016 10:52:52 -0700
-Subject: [PATCH 1/7] Trac 19910: Prevents STARTTLS in XMPP
+Subject: [PATCH 1/6] Trac 19910: Prevents STARTTLS in XMPP
* Revert "Bug #3875: Use Optimistic Data SOCKS variant."
diff --git a/projects/mozilla/0002-Trac-16475-Block-flash-too.patch b/projects/mozilla/0002-Trac-16475-Block-flash-too.patch
index 906cb49..8f08ce2 100644
--- a/projects/mozilla/0002-Trac-16475-Block-flash-too.patch
+++ b/projects/mozilla/0002-Trac-16475-Block-flash-too.patch
@@ -1,7 +1,7 @@
From e9e251b1018bec2c9cdf9e4cac86e26fda087189 Mon Sep 17 00:00:00 2001
From: Arlo Breault <arlolra at gmail.com>
Date: Thu, 6 Oct 2016 20:13:35 -0700
-Subject: [PATCH 2/7] Trac 16475: Block flash too
+Subject: [PATCH 2/6] Trac 16475: Block flash too
* Builds on "Bug #3547: Block all plugins except flash."
---
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 3c42635..d903ceb 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,7 +1,7 @@
From 2476fa68858572f0be003df27b78579a5bb68a7f Mon Sep 17 00:00:00 2001
From: Jonathan Kew <jkew at mozilla.com>
Date: Sun, 9 Oct 2016 09:18:37 -0700
-Subject: [PATCH 3/7] Trac 20206: Avoid the need to download the font Osaka
+Subject: [PATCH 3/6] Trac 20206: Avoid the need to download the font Osaka
* Bug 1283573 - Don't attempt to look up a single-face-family name if
the corresponding main family isn't available. r=mstange
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 9ee103f..81a82c3 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,7 +1,7 @@
From 504315cc3326902da82e4b1e1980327053a97500 Mon Sep 17 00:00:00 2001
From: Arlo Breault <arlolra at gmail.com>
Date: Wed, 23 Mar 2016 19:52:07 -0700
-Subject: [PATCH 4/7] Trac 18331: Update OS X toolchain to work with ESR 45
+Subject: [PATCH 4/6] Trac 18331: Update OS X toolchain to work with ESR 45
* We're reverting the patch, "Adjust atomic ops code to be more
compatible with thread sanitizer tools."
diff --git a/projects/mozilla/0005-OSX-package-as-tar.bz2.patch b/projects/mozilla/0005-OSX-package-as-tar.bz2.patch
index c134bc3..260ab94 100644
--- a/projects/mozilla/0005-OSX-package-as-tar.bz2.patch
+++ b/projects/mozilla/0005-OSX-package-as-tar.bz2.patch
@@ -1,7 +1,7 @@
From ab2a2be728d371e632d7816f97d399be84034b18 Mon Sep 17 00:00:00 2001
From: Nicolas Vigier <boklm at torproject.org>
Date: Thu, 25 Jun 2015 12:18:43 +0200
-Subject: [PATCH 5/7] OSX: package as tar.bz2
+Subject: [PATCH 5/6] OSX: package as tar.bz2
---
toolkit/mozapps/installer/upload-files.mk | 2 +-
diff --git a/projects/mozilla/0006-Updater-fixups-for-TM.patch b/projects/mozilla/0006-Updater-fixups-for-TM.patch
index a0118a7..742f3f5 100644
--- a/projects/mozilla/0006-Updater-fixups-for-TM.patch
+++ b/projects/mozilla/0006-Updater-fixups-for-TM.patch
@@ -1,7 +1,7 @@
From 57faba03c751bd972776027faf84d798d2438e12 Mon Sep 17 00:00:00 2001
From: Arlo Breault <arlolra at gmail.com>
Date: Sun, 9 Oct 2016 09:34:38 -0700
-Subject: [PATCH 6/7] Updater fixups for TM
+Subject: [PATCH 6/6] Updater fixups for TM
* Remove updater links
diff --git a/projects/mozilla/0007-fixup-Bug-1070710-Add-mozilla-ViewRegion-which-assem.patch b/projects/mozilla/0007-fixup-Bug-1070710-Add-mozilla-ViewRegion-which-assem.patch
deleted file mode 100644
index 15f58e6..0000000
--- a/projects/mozilla/0007-fixup-Bug-1070710-Add-mozilla-ViewRegion-which-assem.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 56a75be530e26bf19f730957d10e46b6c6ccf609 Mon Sep 17 00:00:00 2001
-From: Kathy Brade <brade at pearlcrescent.com>
-Date: Tue, 25 Oct 2016 23:01:20 -0400
-Subject: [PATCH 7/7] fixup! Bug 1070710 - Add mozilla::ViewRegion which
- assembles a LayoutDeviceIntRegion as NSViews. r=spohl
-
-OSX: Fix a problem where clicking and dragging in the content area of a
-window would sometimes cause the window to move. This is a fixup for an
-error introduced while backporting a Mozilla patch for Tor bug 20204.
----
- widget/cocoa/ViewRegion.mm | 1 -
- 1 file changed, 1 deletion(-)
-
-diff --git a/widget/cocoa/ViewRegion.mm b/widget/cocoa/ViewRegion.mm
-index 3459849..ee31889 100644
---- a/widget/cocoa/ViewRegion.mm
-+++ b/widget/cocoa/ViewRegion.mm
-@@ -56,7 +56,6 @@ ViewRegion::UpdateRegion(const LayoutDeviceIntRegion& aRegion,
- }
- [view setNeedsDisplay:YES];
- mViews.AppendElement(view);
-- iter.Next();
- } else {
- // Our new region is made of fewer rects than the old region, so we can
- // remove this view. We only have a weak reference to it, so removing it
---
-2.10.1
-
diff --git a/projects/mozilla/config b/projects/mozilla/config
index 1d22708..fea12d5 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: 8b1f07f31cd04fb157bf99a9e2e600b4422f277f
+git_hash: 41f1c54ad978155f964fca1100f0c2eda1bef88a
input_files:
- filename: 0001-Trac-19910-Prevents-STARTTLS-in-XMPP.patch
- filename: 0002-Trac-16475-Block-flash-too.patch
@@ -10,4 +10,3 @@ input_files:
- filename: 0004-Trac-18331-Update-OS-X-toolchain-to-work-with-ESR-45.patch
- filename: 0005-OSX-package-as-tar.bz2.patch
- filename: 0006-Updater-fixups-for-TM.patch
- - filename: 0007-fixup-Bug-1070710-Add-mozilla-ViewRegion-which-assem.patch
More information about the tor-commits
mailing list