[tor-commits] [tor-messenger-build/master] Update config file for the last commit

[sukhbir at torproject.org]

commit 454d3e4e8115d7cd15a7109332b3a144fe6bdb6e
Author: Sukhbir Singh <sukhbir at torproject.org>
Date:   Tue Jan 30 11:38:10 2018 -0500

    Update config file for the last commit
---
 projects/mozilla/STL_win64.patch | 24 ------------------------
 projects/mozilla/config          |  2 +-
 2 files changed, 1 insertion(+), 25 deletions(-)

diff --git a/projects/mozilla/STL_win64.patch b/projects/mozilla/STL_win64.patch
deleted file mode 100644
index e528905..0000000
--- a/projects/mozilla/STL_win64.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 8f8c1a1069d4907d3cedae578975225d8caeecaf Mon Sep 17 00:00:00 2001
-From: Nicolas Vigier <boklm at torproject.org>
-Date: Sat, 12 Aug 2017 22:00:13 +0200
-Subject: [PATCH] Bug 23231: disable STL Wrappers on Windows
-
-Workaround for:
-https://bugzilla.mozilla.org/show_bug.cgi?id=1392604
----
- old-configure.in | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/old-configure.in b/old-configure.in
-index f5a2f05..e247551 100644
---- a/old-configure.in
-+++ b/old-configure.in
-@@ -1338,7 +1338,7 @@ MOZ_CXX11
- AC_LANG_C
- 
- case "${OS_TARGET}" in
--Darwin)
-+WINNT|Darwin)
-   ;;
- *)
-   STL_FLAGS="-I${DIST}/stl_wrappers"
diff --git a/projects/mozilla/config b/projects/mozilla/config
index f3c4234..81d52d7 100644
--- a/projects/mozilla/config
+++ b/projects/mozilla/config
@@ -11,5 +11,5 @@ input_files:
   - filename: 0003-OSX-package-as-tar.bz2.patch
   - filename: 0004-Updater-fixups-for-TM.patch
   - filename: 0005-Permit-storing-exceptions-even-w-inPrivateBrowsingMo.patch
-  - filename: STL_win64.patch
+  - filename: 0006-Bug-23231-disable-STL-Wrappers-on-Windows.patch
     enable: '[% c("var/windows-x86_64") %]'