[tor-commits] [tor-messenger-build/master] Cleanup mozpatches
arlo at torproject.org
arlo at torproject.org
Mon Oct 10 19:41:22 UTC 2016
commit 8b3fba82d602cb4f563d3f5f270bd0a4c7d3d7f2
Author: Arlo Breault <arlolra at gmail.com>
Date: Sun Oct 9 09:45:16 2016 -0700
Cleanup mozpatches
* Some much needed organization
* These apply to the commit in mozilla/config (8b1f07f).
---
...16-HTTP-Basic-Authentication-prompt-on.mozpatch | 6 +-
projects/instantbird/0002-Block-flash-too.mozpatch | 33 +++++
...03-s-TorBrowser-Data-TorMessenger-Data.mozpatch | 28 ++++
...n-t-attempt-to-look-up-a-single-face-f.mozpatch | 65 +++++++++
...ops-code-to-be-more-compatible-with-th.mozpatch | 123 +++++++++++++++++
.../0006-OSX-package-as-tar.bz2.mozpatch | 25 ++++
.../instantbird/0007-Remove-updater-links.mozpatch | 71 ++++++++++
.../instantbird/OSX-package-as-tar.bz2.mozpatch | 22 ---
projects/instantbird/config | 15 +-
projects/instantbird/trac-16475.mozpatch | 32 -----
projects/instantbird/trac-18331.mozpatch | 151 ---------------------
projects/instantbird/trac-20309.mozpatch | 25 ----
projects/instantbird/updater-remove-links.mozpatch | 57 --------
13 files changed, 356 insertions(+), 297 deletions(-)
diff --git a/projects/instantbird/0001-Revert-Bug-14716-HTTP-Basic-Authentication-prompt-on.mozpatch b/projects/instantbird/0001-Revert-Bug-14716-HTTP-Basic-Authentication-prompt-on.mozpatch
index bf2d69b..3203556 100644
--- a/projects/instantbird/0001-Revert-Bug-14716-HTTP-Basic-Authentication-prompt-on.mozpatch
+++ b/projects/instantbird/0001-Revert-Bug-14716-HTTP-Basic-Authentication-prompt-on.mozpatch
@@ -1,9 +1,11 @@
-From 418c4d1825a209d67f16a30c8b2ec284a613a703 Mon Sep 17 00:00:00 2001
+From ed5968f6b886ba8c606a673582ff3ecb36c3cc2a Mon Sep 17 00:00:00 2001
From: Arlo Breault <arlolra at gmail.com>
Date: Sat, 8 Oct 2016 18:11:20 -0700
-Subject: [PATCH] Revert "Bug 14716: HTTP Basic Authentication prompt only
+Subject: [PATCH 1/7] Revert "Bug 14716: HTTP Basic Authentication prompt only
displayed once"
+ * This patch was breaking Tor Messenger.
+
This reverts commit 5995aea1797320295fff1247bf4baac9ec511876.
---
toolkit/components/passwordmgr/nsLoginManager.js | 81 ++----------------------
diff --git a/projects/instantbird/0002-Block-flash-too.mozpatch b/projects/instantbird/0002-Block-flash-too.mozpatch
new file mode 100644
index 0000000..5e843e2
--- /dev/null
+++ b/projects/instantbird/0002-Block-flash-too.mozpatch
@@ -0,0 +1,33 @@
+From 07ad22078a293c7bf12e587a6d4b6569370e050b 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] Block flash too
+
+ * Builds on "Bug #3547: Block all plugins except flash."
+---
+ dom/plugins/base/nsPluginHost.cpp | 9 ---------
+ 1 file changed, 9 deletions(-)
+
+diff --git a/dom/plugins/base/nsPluginHost.cpp b/dom/plugins/base/nsPluginHost.cpp
+index 5345ce7..1569236 100644
+--- a/dom/plugins/base/nsPluginHost.cpp
++++ b/dom/plugins/base/nsPluginHost.cpp
+@@ -2081,15 +2081,6 @@ PRBool nsPluginHost::GhettoBlacklist(nsIFile *pluginFile)
+ return PR_TRUE; // fuck 'em. blacklist.
+ }
+
+- // libgnashplugin.so, libflashplayer.so, Flash Player-10.4-10.5.plugin,
+- // NPSWF32.dll, NPSWF64.dll
+- if (strstr(leafStr, "libgnashplugin") == leafStr ||
+- strstr(leafStr, "libflashplayer") == leafStr ||
+- strstr(leafStr, "Flash Player") == leafStr ||
+- strstr(leafStr, "NPSWF") == leafStr) {
+- return PR_FALSE;
+- }
+-
+ return PR_TRUE; // fuck 'em. blacklist.
+ }
+
+--
+2.10.1
+
diff --git a/projects/instantbird/0003-s-TorBrowser-Data-TorMessenger-Data.mozpatch b/projects/instantbird/0003-s-TorBrowser-Data-TorMessenger-Data.mozpatch
new file mode 100644
index 0000000..fc82b87
--- /dev/null
+++ b/projects/instantbird/0003-s-TorBrowser-Data-TorMessenger-Data.mozpatch
@@ -0,0 +1,28 @@
+From 1542f877647e82ad9f6be6965bad121fd8335c42 Mon Sep 17 00:00:00 2001
+From: Arlo Breault <arlolra at gmail.com>
+Date: Thu, 6 Oct 2016 20:20:11 -0700
+Subject: [PATCH 3/7] s/TorBrowser-Data/TorMessenger-Data/
+
+ * All that remains after the updater patches.
+
+ * See trac 20309
+---
+ xpcom/io/TorFileUtils.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/xpcom/io/TorFileUtils.cpp b/xpcom/io/TorFileUtils.cpp
+index c45961a..23d6fbe 100644
+--- a/xpcom/io/TorFileUtils.cpp
++++ b/xpcom/io/TorFileUtils.cpp
+@@ -16,7 +16,7 @@ TorBrowser_GetUserDataDir(nsIFile *aExeFile, nsIFile** aFile)
+ nsCOMPtr<nsIFile> tbDataDir;
+
+ #ifdef TOR_BROWSER_DATA_OUTSIDE_APP_DIR
+- nsAutoCString tbDataLeafName(NS_LITERAL_CSTRING("TorBrowser-Data"));
++ nsAutoCString tbDataLeafName(NS_LITERAL_CSTRING("TorMessenger-Data"));
+ nsCOMPtr<nsIFile> appRootDir;
+ nsresult rv = GetAppRootDir(aExeFile, getter_AddRefs(appRootDir));
+ NS_ENSURE_SUCCESS(rv, rv);
+--
+2.10.1
+
diff --git a/projects/instantbird/0004-Bug-1283573-Don-t-attempt-to-look-up-a-single-face-f.mozpatch b/projects/instantbird/0004-Bug-1283573-Don-t-attempt-to-look-up-a-single-face-f.mozpatch
new file mode 100644
index 0000000..b9f84f8
--- /dev/null
+++ b/projects/instantbird/0004-Bug-1283573-Don-t-attempt-to-look-up-a-single-face-f.mozpatch
@@ -0,0 +1,65 @@
+From a9cb072ad4b3e50723b182f845628b41f4987ff2 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 4/7] Bug 1283573 - Don't attempt to look up a
+ single-face-family name if the corresponding main family isn't available.
+ r=mstange
+
+---
+ gfx/thebes/gfxMacPlatformFontList.mm | 17 +++++++++++++----
+ modules/libpref/init/all.js | 6 +++---
+ 2 files changed, 16 insertions(+), 7 deletions(-)
+
+diff --git a/gfx/thebes/gfxMacPlatformFontList.mm b/gfx/thebes/gfxMacPlatformFontList.mm
+index eb7a788..5c63e69 100644
+--- a/gfx/thebes/gfxMacPlatformFontList.mm
++++ b/gfx/thebes/gfxMacPlatformFontList.mm
+@@ -735,15 +735,24 @@ gfxMacPlatformFontList::InitSingleFaceList()
+ for (uint32_t i = 0; i < numFonts; i++) {
+ LOG_FONTLIST(("(fontlist-singleface) face name: %s\n",
+ NS_ConvertUTF16toUTF8(singleFaceFonts[i]).get()));
+- if (!gfxFontUtils::IsFontFamilyNameAllowed(singleFaceFonts[i])) {
++ nsAutoString familyName(singleFaceFonts[i]);
++ auto colon = familyName.FindChar(':');
++ if (colon != kNotFound) {
++ nsAutoString key(Substring(familyName, colon + 1));
++ ToLowerCase(key);
++ if (!mFontFamilies.GetWeak(key)) {
++ continue;
++ }
++ familyName.Truncate(colon);
++ }
++ if (!gfxFontUtils::IsFontFamilyNameAllowed(familyName)) {
+ continue;
+ }
+- gfxFontEntry *fontEntry = LookupLocalFont(singleFaceFonts[i],
++ gfxFontEntry *fontEntry = LookupLocalFont(familyName,
+ 400, 0,
+ NS_FONT_STYLE_NORMAL);
+ if (fontEntry) {
+- nsAutoString familyName, key;
+- familyName = singleFaceFonts[i];
++ nsAutoString key;
+ GenerateFontListKey(familyName, key);
+ 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
+--- a/modules/libpref/init/all.js
++++ b/modules/libpref/init/all.js
+@@ -3576,9 +3576,9 @@ pref("font.name.monospace.x-math", "Courier");
+ pref("font.name.cursive.x-math", "Apple Chancery");
+ pref("font.name.fantasy.x-math", "Papyrus");
+
+-// individual font faces to be treated as independent families
+-// names are Postscript names of each face
+-pref("font.single-face-list", "Osaka-Mono");
++// Individual font faces to be treated as independent families,
++// listed as <Postscript name of face:Owning family name>
++pref("font.single-face-list", "Osaka-Mono:Osaka");
+
+ // 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
+
diff --git a/projects/instantbird/0005-Adjust-atomic-ops-code-to-be-more-compatible-with-th.mozpatch b/projects/instantbird/0005-Adjust-atomic-ops-code-to-be-more-compatible-with-th.mozpatch
new file mode 100644
index 0000000..b1cd719
--- /dev/null
+++ b/projects/instantbird/0005-Adjust-atomic-ops-code-to-be-more-compatible-with-th.mozpatch
@@ -0,0 +1,123 @@
+From 760a2780d529b6c8a569824f7bc4c288c2a6ca2d 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 5/7] Adjust atomic ops code to be more compatible with thread
+ sanitizer tools.
+
+ * This is until we port the patches for trac 18331
+
+ * See trac 20316
+---
+ intl/icu/source/common/putilimp.h | 17 +----------------
+ intl/icu/source/common/umutex.cpp | 4 ++--
+ intl/icu/source/common/umutex.h | 29 +----------------------------
+ 3 files changed, 4 insertions(+), 46 deletions(-)
+
+diff --git a/intl/icu/source/common/putilimp.h b/intl/icu/source/common/putilimp.h
+index 55ec0ae..ac083b0 100644
+--- a/intl/icu/source/common/putilimp.h
++++ b/intl/icu/source/common/putilimp.h
+@@ -1,7 +1,7 @@
+ /*
+ ******************************************************************************
+ *
+-* Copyright (C) 1997-2015, International Business Machines
++* Copyright (C) 1997-2014, International Business Machines
+ * Corporation and others. All Rights Reserved.
+ *
+ ******************************************************************************
+@@ -229,21 +229,6 @@ typedef size_t uintptr_t;
+ #endif
+
+
+-/**
+- * \def U_HAVE_CLANG_ATOMICS
+- * Defines whether Clang c11 style built-in atomics are avaialable.
+- * These are used in preference to gcc atomics when both are available.
+- */
+-#ifdef U_HAVE_CLANG_ATOMICS
+- /* Use the predefined value. */
+-#elif __has_builtin(__c11_atomic_load) && \
+- __has_builtin(__c11_atomic_store) && \
+- __has_builtin(__c11_atomic_fetch_add) && \
+- __has_builtin(__c11_atomic_fetch_sub)
+-# define U_HAVE_CLANG_ATOMICS 1
+-#else
+-# define U_HAVE_CLANG_ATOMICS 0
+-#endif
+
+ /*===========================================================================*/
+ /** @{ Programs used by ICU code */
+diff --git a/intl/icu/source/common/umutex.cpp b/intl/icu/source/common/umutex.cpp
+index 69eab79..dff0b47 100644
+--- a/intl/icu/source/common/umutex.cpp
++++ b/intl/icu/source/common/umutex.cpp
+@@ -344,8 +344,8 @@ umtx_atomic_dec(u_atomic_int32_t *p) {
+
+ U_COMMON_API int32_t U_EXPORT2
+ umtx_loadAcquire(u_atomic_int32_t &var) {
+- umtx_lock(&gIncDecMutex);
+ int32_t val = var;
++ umtx_lock(&gIncDecMutex);
+ umtx_unlock(&gIncDecMutex);
+ return val;
+ }
+@@ -353,8 +353,8 @@ umtx_loadAcquire(u_atomic_int32_t &var) {
+ U_COMMON_API void U_EXPORT2
+ umtx_storeRelease(u_atomic_int32_t &var, int32_t val) {
+ umtx_lock(&gIncDecMutex);
+- var = val;
+ umtx_unlock(&gIncDecMutex);
++ var = val;
+ }
+
+ U_NAMESPACE_END
+diff --git a/intl/icu/source/common/umutex.h b/intl/icu/source/common/umutex.h
+index 0e4d118..e0ad0d3 100644
+--- a/intl/icu/source/common/umutex.h
++++ b/intl/icu/source/common/umutex.h
+@@ -1,6 +1,6 @@
+ /*
+ **********************************************************************
+-* Copyright (C) 1997-2015, International Business Machines
++* Copyright (C) 1997-2014, International Business Machines
+ * Corporation and others. All Rights Reserved.
+ **********************************************************************
+ *
+@@ -118,33 +118,6 @@ inline int32_t umtx_atomic_dec(u_atomic_int32_t *var) {
+ U_NAMESPACE_END
+
+
+-#elif U_HAVE_CLANG_ATOMICS
+-/*
+- * Clang __c11 atomic built-ins
+- */
+-
+-U_NAMESPACE_BEGIN
+-typedef _Atomic(int32_t) u_atomic_int32_t;
+-#define ATOMIC_INT32_T_INITIALIZER(val) val
+-
+-inline int32_t umtx_loadAcquire(u_atomic_int32_t &var) {
+- return __c11_atomic_load(&var, __ATOMIC_ACQUIRE);
+-}
+-
+-inline void umtx_storeRelease(u_atomic_int32_t &var, int32_t val) {
+- return __c11_atomic_store(&var, val, __ATOMIC_RELEASE);
+-}
+-
+-inline int32_t umtx_atomic_inc(u_atomic_int32_t *var) {
+- return __c11_atomic_fetch_add(var, 1, __ATOMIC_SEQ_CST) + 1;
+-}
+-
+-inline int32_t umtx_atomic_dec(u_atomic_int32_t *var) {
+- return __c11_atomic_fetch_sub(var, 1, __ATOMIC_SEQ_CST) - 1;
+-}
+-U_NAMESPACE_END
+-
+-
+ #elif U_HAVE_GCC_ATOMICS
+ /*
+ * gcc atomic ops. These are available on several other compilers as well.
+--
+2.10.1
+
diff --git a/projects/instantbird/0006-OSX-package-as-tar.bz2.mozpatch b/projects/instantbird/0006-OSX-package-as-tar.bz2.mozpatch
new file mode 100644
index 0000000..ab8829f
--- /dev/null
+++ b/projects/instantbird/0006-OSX-package-as-tar.bz2.mozpatch
@@ -0,0 +1,25 @@
+From ffcaf55f66529997086610fd5687915737da8993 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 6/7] OSX: package as tar.bz2
+
+---
+ toolkit/mozapps/installer/upload-files.mk | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/toolkit/mozapps/installer/upload-files.mk b/toolkit/mozapps/installer/upload-files.mk
+index 5c11ed2..0c7bf28 100644
+--- a/toolkit/mozapps/installer/upload-files.mk
++++ b/toolkit/mozapps/installer/upload-files.mk
+@@ -4,7 +4,7 @@
+
+ ifndef MOZ_PKG_FORMAT
+ ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
+-MOZ_PKG_FORMAT = DMG
++MOZ_PKG_FORMAT = BZ2
+ else
+ ifeq (,$(filter-out WINNT, $(OS_ARCH)))
+ MOZ_PKG_FORMAT = ZIP
+--
+2.10.1
+
diff --git a/projects/instantbird/0007-Remove-updater-links.mozpatch b/projects/instantbird/0007-Remove-updater-links.mozpatch
new file mode 100644
index 0000000..8eb3a8e
--- /dev/null
+++ b/projects/instantbird/0007-Remove-updater-links.mozpatch
@@ -0,0 +1,71 @@
+From ab9bbbce89ff95ec72690d62c25db20b82f28cd9 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 7/7] Remove updater links
+
+---
+ toolkit/mozapps/update/content/updates.js | 2 +-
+ toolkit/mozapps/update/content/updates.xul | 13 +++++--------
+ 2 files changed, 6 insertions(+), 9 deletions(-)
+
+diff --git a/toolkit/mozapps/update/content/updates.js b/toolkit/mozapps/update/content/updates.js
+index 40e76c8..5565b9c 100644
+--- a/toolkit/mozapps/update/content/updates.js
++++ b/toolkit/mozapps/update/content/updates.js
+@@ -979,7 +979,7 @@ var gUpdatesFoundBasicPage = {
+
+ var updateMoreInfoURL = document.getElementById("updateMoreInfoURL");
+ if (update.detailsURL)
+- updateMoreInfoURL.setAttribute("url", update.detailsURL);
++ updateMoreInfoURL.setAttribute("value", update.detailsURL);
+ else
+ updateMoreInfoURL.hidden = true;
+
+diff --git a/toolkit/mozapps/update/content/updates.xul b/toolkit/mozapps/update/content/updates.xul
+index 6066802..c82bc77 100644
+--- a/toolkit/mozapps/update/content/updates.xul
++++ b/toolkit/mozapps/update/content/updates.xul
+@@ -121,8 +121,7 @@
+ <separator id="upgradeEvangelismSep" flex="1"/>
+ <vbox flex="1">
+ <hbox id="moreInfoURL">
+- <label class="text-link" id="updateMoreInfoURL"
+- value="&clickHere.label;" onclick="openUpdateURL(event);"/>
++ <textbox class="plain" flex="1" readonly="true" id="updateMoreInfoURL" />
+ </hbox>
+ </vbox>
+ </vbox>
+@@ -205,8 +204,7 @@
+ <separator/>
+ <label id="errorManual">&errorManual.label;</label>
+ <hbox>
+- <label class="text-link" id="errorLinkLabel" value=""
+- onclick="openUpdateURL(event);"/>
++ <label id="errorLinkLabel" value="" />
+ </hbox>
+ </vbox>
+ </wizardpage>
+@@ -223,8 +221,7 @@
+ <label id="genericBackgroundErrorLabel"
+ hidden="true">&genericBackgroundError.label;</label>
+ <hbox>
+- <label id="errorExtraLinkLabel" class="text-link" hidden="true"
+- value="" onclick="openUpdateURL(event);"/>
++ <label id="errorExtraLinkLabel" hidden="true" value="" />
+ </hbox>
+ </vbox>
+ </wizardpage>
+@@ -257,8 +254,8 @@
+ <hbox align="center">
+ <label>&finishedBackground.name;</label>
+ <label id="updateFinishedName" flex="1" crop="right" value=""/>
+- <label id="finishedBackgroundLink" class="text-link" disabled="true"
+- value="&details.link;" onclick="openUpdateURL(event);"/>
++ <label id="finishedBackgroundLink" hidden="true" disabled="true"
++ value="&details.link;" />
+ </hbox>
+ <spacer flex="1"/>
+ <label id="finishedBackgroundMore">&finishedBackground.more;</label>
+--
+2.10.1
+
diff --git a/projects/instantbird/OSX-package-as-tar.bz2.mozpatch b/projects/instantbird/OSX-package-as-tar.bz2.mozpatch
deleted file mode 100644
index 0e0e389..0000000
--- a/projects/instantbird/OSX-package-as-tar.bz2.mozpatch
+++ /dev/null
@@ -1,22 +0,0 @@
-From ec76d7c64ed6c08b5916d0af6d84a8faeb7e6488 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] OSX: package as tar.bz2
-
----
- toolkit/mozapps/installer/upload-files.mk | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/toolkit/mozapps/installer/upload-files.mk b/toolkit/mozapps/installer/upload-files.mk
-index b546717b9f64..70e33723c9b2 100644
---- a/toolkit/mozapps/installer/upload-files.mk
-+++ b/toolkit/mozapps/installer/upload-files.mk
-@@ -4,7 +4,7 @@
-
- ifndef MOZ_PKG_FORMAT
- ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
--MOZ_PKG_FORMAT = DMG
-+MOZ_PKG_FORMAT = BZ2
- else
- ifeq (,$(filter-out WINNT, $(OS_ARCH)))
- MOZ_PKG_FORMAT = ZIP
diff --git a/projects/instantbird/config b/projects/instantbird/config
index 1b1b424..45990ef 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -123,17 +123,16 @@ input_files:
enable: '[% c("var/osx") %]'
- filename: cert_override.txt
enable: '[% c("var/osx") %]'
- - filename: trac-18331.mozpatch
- enable: '[% c("var/osx") %]'
- filename: aboutTBUpdateLogo.png
- - filename: trac-16475.mozpatch
- - filename: trac-20309.mozpatch
- - filename: 0001-Revert-Bug-14716-HTTP-Basic-Authentication-prompt-on.mozpatch
- - filename: updater-remove-links.mozpatch
- - filename: OSX-package-as-tar.bz2.mozpatch
- enable: '[% c("var/osx") %]'
- filename: browserMountPoints.inc
enable: '[% c("var/osx") %]'
+ - filename: 0001-Revert-Bug-14716-HTTP-Basic-Authentication-prompt-on.mozpatch
+ - filename: 0002-Block-flash-too.mozpatch
+ - filename: 0003-s-TorBrowser-Data-TorMessenger-Data.mozpatch
+ - filename: 0004-Bug-1283573-Don-t-attempt-to-look-up-a-single-face-f.mozpatch
+ - filename: 0005-Adjust-atomic-ops-code-to-be-more-compatible-with-th.mozpatch
+ - filename: 0006-OSX-package-as-tar.bz2.mozpatch
+ - filename: 0007-Remove-updater-links.mozpatch
- filename: 'mozconfig-[% c("var/osname") %]'
name: mozconfig
- name: python
diff --git a/projects/instantbird/trac-16475.mozpatch b/projects/instantbird/trac-16475.mozpatch
deleted file mode 100644
index 4fa14ab..0000000
--- a/projects/instantbird/trac-16475.mozpatch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 5baab1b1e4e9c4c4c59f864ffe03265ef17f956a 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] Block flash too
-
----
- dom/plugins/base/nsPluginHost.cpp | 9 ---------
- 1 file changed, 9 deletions(-)
-
-diff --git a/dom/plugins/base/nsPluginHost.cpp b/dom/plugins/base/nsPluginHost.cpp
-index 5345ce7..1569236 100644
---- a/dom/plugins/base/nsPluginHost.cpp
-+++ b/dom/plugins/base/nsPluginHost.cpp
-@@ -2081,15 +2081,6 @@ PRBool nsPluginHost::GhettoBlacklist(nsIFile *pluginFile)
- return PR_TRUE; // fuck 'em. blacklist.
- }
-
-- // libgnashplugin.so, libflashplayer.so, Flash Player-10.4-10.5.plugin,
-- // NPSWF32.dll, NPSWF64.dll
-- if (strstr(leafStr, "libgnashplugin") == leafStr ||
-- strstr(leafStr, "libflashplayer") == leafStr ||
-- strstr(leafStr, "Flash Player") == leafStr ||
-- strstr(leafStr, "NPSWF") == leafStr) {
-- return PR_FALSE;
-- }
--
- return PR_TRUE; // fuck 'em. blacklist.
- }
-
---
-2.10.1
-
diff --git a/projects/instantbird/trac-18331.mozpatch b/projects/instantbird/trac-18331.mozpatch
deleted file mode 100644
index 90f0136..0000000
--- a/projects/instantbird/trac-18331.mozpatch
+++ /dev/null
@@ -1,151 +0,0 @@
-# HG changeset patch
-# User Arlo Breault <arlolra at gmail.com>
-# Date 1458787927 25200
-# Wed Mar 23 19:52:07 2016 -0700
-# Branch THUNDERBIRD450b3_2016032212_RELBRANCH
-# Node ID b6d62c260cb2d71eea2a13d9b0c64ccb6bd0a42e
-# Parent ded7e4b0a11f15704ecaccd5e570cc7c59f4c7a8
-Adjust atomic ops code to be more compatible with thread sanitizer tools.
-
-diff --git a/intl/icu/source/common/putilimp.h b/intl/icu/source/common/putilimp.h
---- a/intl/icu/source/common/putilimp.h
-+++ b/intl/icu/source/common/putilimp.h
-@@ -1,12 +1,12 @@
- /*
- ******************************************************************************
- *
--* Copyright (C) 1997-2015, International Business Machines
-+* Copyright (C) 1997-2014, International Business Machines
- * Corporation and others. All Rights Reserved.
- *
- ******************************************************************************
- *
- * FILE NAME : putilimp.h
- *
- * Date Name Description
- * 10/17/04 grhoten Move internal functions from putil.h to this file.
-@@ -224,31 +224,16 @@ typedef size_t uintptr_t;
- # if defined(U_HAVE_ATOMIC) && U_HAVE_ATOMIC
- # define U_HAVE_STD_ATOMICS 1
- # else
- # define U_HAVE_STD_ATOMICS 0
- # endif
- #endif
-
-
--/**
-- * \def U_HAVE_CLANG_ATOMICS
-- * Defines whether Clang c11 style built-in atomics are avaialable.
-- * These are used in preference to gcc atomics when both are available.
-- */
--#ifdef U_HAVE_CLANG_ATOMICS
-- /* Use the predefined value. */
--#elif __has_builtin(__c11_atomic_load) && \
-- __has_builtin(__c11_atomic_store) && \
-- __has_builtin(__c11_atomic_fetch_add) && \
-- __has_builtin(__c11_atomic_fetch_sub)
--# define U_HAVE_CLANG_ATOMICS 1
--#else
--# define U_HAVE_CLANG_ATOMICS 0
--#endif
-
- /*===========================================================================*/
- /** @{ Programs used by ICU code */
- /*===========================================================================*/
-
- /**
- * \def U_MAKE_IS_NMAKE
- * Defines whether the "make" program is Windows nmake.
-diff --git a/intl/icu/source/common/umutex.cpp b/intl/icu/source/common/umutex.cpp
---- a/intl/icu/source/common/umutex.cpp
-+++ b/intl/icu/source/common/umutex.cpp
-@@ -339,27 +339,27 @@ umtx_atomic_dec(u_atomic_int32_t *p) {
- umtx_lock(&gIncDecMutex);
- retVal = --(*p);
- umtx_unlock(&gIncDecMutex);
- return retVal;
- }
-
- U_COMMON_API int32_t U_EXPORT2
- umtx_loadAcquire(u_atomic_int32_t &var) {
-+ int32_t val = var;
- umtx_lock(&gIncDecMutex);
-- int32_t val = var;
- umtx_unlock(&gIncDecMutex);
- return val;
- }
-
- U_COMMON_API void U_EXPORT2
- umtx_storeRelease(u_atomic_int32_t &var, int32_t val) {
- umtx_lock(&gIncDecMutex);
-+ umtx_unlock(&gIncDecMutex);
- var = val;
-- umtx_unlock(&gIncDecMutex);
- }
-
- U_NAMESPACE_END
- #endif
-
- //--------------------------------------------------------------------------
- //
- // Deprecated functions for setting user mutexes.
-diff --git a/intl/icu/source/common/umutex.h b/intl/icu/source/common/umutex.h
---- a/intl/icu/source/common/umutex.h
-+++ b/intl/icu/source/common/umutex.h
-@@ -1,11 +1,11 @@
- /*
- **********************************************************************
--* Copyright (C) 1997-2015, International Business Machines
-+* Copyright (C) 1997-2014, International Business Machines
- * Corporation and others. All Rights Reserved.
- **********************************************************************
- *
- * File UMUTEX.H
- *
- * Modification History:
- *
- * Date Name Description
-@@ -113,43 +113,16 @@ inline int32_t umtx_atomic_inc(u_atomic_
- }
-
- inline int32_t umtx_atomic_dec(u_atomic_int32_t *var) {
- return InterlockedDecrement(var);
- }
- U_NAMESPACE_END
-
-
--#elif U_HAVE_CLANG_ATOMICS
--/*
-- * Clang __c11 atomic built-ins
-- */
--
--U_NAMESPACE_BEGIN
--typedef _Atomic(int32_t) u_atomic_int32_t;
--#define ATOMIC_INT32_T_INITIALIZER(val) val
--
--inline int32_t umtx_loadAcquire(u_atomic_int32_t &var) {
-- return __c11_atomic_load(&var, __ATOMIC_ACQUIRE);
--}
--
--inline void umtx_storeRelease(u_atomic_int32_t &var, int32_t val) {
-- return __c11_atomic_store(&var, val, __ATOMIC_RELEASE);
--}
--
--inline int32_t umtx_atomic_inc(u_atomic_int32_t *var) {
-- return __c11_atomic_fetch_add(var, 1, __ATOMIC_SEQ_CST) + 1;
--}
--
--inline int32_t umtx_atomic_dec(u_atomic_int32_t *var) {
-- return __c11_atomic_fetch_sub(var, 1, __ATOMIC_SEQ_CST) - 1;
--}
--U_NAMESPACE_END
--
--
- #elif U_HAVE_GCC_ATOMICS
- /*
- * gcc atomic ops. These are available on several other compilers as well.
- */
-
- U_NAMESPACE_BEGIN
- typedef int32_t u_atomic_int32_t;
- #define ATOMIC_INT32_T_INITIALIZER(val) val
diff --git a/projects/instantbird/trac-20309.mozpatch b/projects/instantbird/trac-20309.mozpatch
deleted file mode 100644
index 55fc453..0000000
--- a/projects/instantbird/trac-20309.mozpatch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 8cb3d859bc95b7d86152437c0983534f6db1f08c Mon Sep 17 00:00:00 2001
-From: Arlo Breault <arlolra at gmail.com>
-Date: Thu, 6 Oct 2016 20:20:11 -0700
-Subject: [PATCH] s/TorBrowser-Data/TorMessenger-Data/
-
----
- xpcom/io/TorFileUtils.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/xpcom/io/TorFileUtils.cpp b/xpcom/io/TorFileUtils.cpp
-index c45961a..23d6fbe 100644
---- a/xpcom/io/TorFileUtils.cpp
-+++ b/xpcom/io/TorFileUtils.cpp
-@@ -16,7 +16,7 @@ TorBrowser_GetUserDataDir(nsIFile *aExeFile, nsIFile** aFile)
- nsCOMPtr<nsIFile> tbDataDir;
-
- #ifdef TOR_BROWSER_DATA_OUTSIDE_APP_DIR
-- nsAutoCString tbDataLeafName(NS_LITERAL_CSTRING("TorBrowser-Data"));
-+ nsAutoCString tbDataLeafName(NS_LITERAL_CSTRING("TorMessenger-Data"));
- nsCOMPtr<nsIFile> appRootDir;
- nsresult rv = GetAppRootDir(aExeFile, getter_AddRefs(appRootDir));
- NS_ENSURE_SUCCESS(rv, rv);
---
-2.10.1
-
diff --git a/projects/instantbird/updater-remove-links.mozpatch b/projects/instantbird/updater-remove-links.mozpatch
deleted file mode 100644
index 95f20a7..0000000
--- a/projects/instantbird/updater-remove-links.mozpatch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff --git a/toolkit/mozapps/update/content/updates.js b/toolkit/mozapps/update/content/updates.js
---- a/toolkit/mozapps/update/content/updates.js
-+++ b/toolkit/mozapps/update/content/updates.js
-@@ -952,7 +952,7 @@
-
- var updateMoreInfoURL = document.getElementById("updateMoreInfoURL");
- if (update.detailsURL)
-- updateMoreInfoURL.setAttribute("url", update.detailsURL);
-+ updateMoreInfoURL.setAttribute("value", update.detailsURL);
- else
- updateMoreInfoURL.hidden = true;
-
-diff --git a/toolkit/mozapps/update/content/updates.xul b/toolkit/mozapps/update/content/updates.xul
---- a/toolkit/mozapps/update/content/updates.xul
-+++ b/toolkit/mozapps/update/content/updates.xul
-@@ -121,8 +121,7 @@
- <separator id="upgradeEvangelismSep" flex="1"/>
- <vbox flex="1">
- <hbox id="moreInfoURL">
-- <label class="text-link" id="updateMoreInfoURL"
-- value="&clickHere.label;" onclick="openUpdateURL(event);"/>
-+ <textbox class="plain" flex="1" readonly="true" id="updateMoreInfoURL" />
- </hbox>
- </vbox>
- </vbox>
-@@ -205,8 +204,7 @@
- <separator/>
- <label id="errorManual">&errorManual.label;</label>
- <hbox>
-- <label class="text-link" id="errorLinkLabel" value=""
-- onclick="openUpdateURL(event);"/>
-+ <label id="errorLinkLabel" value="" />
- </hbox>
- </vbox>
- </wizardpage>
-@@ -223,8 +221,8 @@
- <label id="genericBackgroundErrorLabel"
- hidden="true">&genericBackgroundError.label;</label>
- <hbox>
-- <label id="errorExtraLinkLabel" class="text-link" hidden="true"
-- value="" onclick="openUpdateURL(event);"/>
-+ <label id="errorExtraLinkLabel" hidden="true"
-+ value="" />
- </hbox>
- </vbox>
- </wizardpage>
-@@ -257,8 +255,8 @@
- <hbox align="center">
- <label>&finishedBackground.name;</label>
- <label id="updateFinishedName" flex="1" crop="right" value=""/>
-- <label id="finishedBackgroundLink" class="text-link" disabled="true"
-- value="&details.link;" onclick="openUpdateURL(event);"/>
-+ <label id="finishedBackgroundLink" hidden="true" disabled="true"
-+ value="&details.link;" />
- </hbox>
- <spacer flex="1"/>
- <label id="finishedBackgroundMore">&finishedBackground.more;</label>
More information about the tor-commits
mailing list