[tor-messenger-build/master] Use the FIREFOX_42_0_RELEASE tag on mozilla-release - tor-commits

16 Nov 2015

commit 317efc107ad7e5d9fb110799737b767a04c8d847
Author: Nicolas Vigier boklm@torproject.org
Date:   Thu Nov 12 15:00:25 2015 +0100
Use the FIREFOX_42_0_RELEASE tag on mozilla-release
* Rebase Bug-9173-Change-the-default-Firefox-profile-director.mozpatch
    * Update mingw-w64 to fix the Windows build
    * Add 0001-Bug-1197281-Use-MOZ_FIND_WINSDK_VERSION-for-MOZ_WINS.mozpatch
    * Remove patches already merged in firefox 42.0
---
 ChangeLog                                          |    1 +
 ...efinition-of-MFVideoFormat_VP80-with-m.mozpatch |   28 ------
 ...e-MOZ_FIND_WINSDK_VERSION-for-MOZ_WINS.mozpatch |  101 ++++++++++++++++++++
 ...move-a-dead-iOS-related-conditional-fr.mozpatch |   31 ------
 ...e-the-default-Firefox-profile-director.mozpatch |   65 +++++++------
 ...31-do-not-mark-static-inline-functions.mozpatch |   29 ------
 projects/instantbird/config                        |   14 +--
 projects/mingw-w64/config                          |    2 +-
 projects/mozilla/config                            |    2 +-
 9 files changed, 146 insertions(+), 127 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index cfa58ab..d8c16df 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,7 @@ Tor Messenger 0.1.0b4 --
    * ctypes-otr
      * Bug 17539: Pass username when interpolating resent string
      * Bug 15179: Add an OTR Preferences item to the Tools menu
+   * Use the FIREFOX_42_0_RELEASE tag on mozilla-release
  * Mac
    * Bug 16476: Themes preference is positioned incorrectly
    * Bug 17456: Hang in preferences menu
diff --git a/projects/instantbird/0001-Avoid-double-definition-of-MFVideoFormat_VP80-with-m.mozpatch b/projects/instantbird/0001-Avoid-double-definition-of-MFVideoFormat_VP80-with-m.mozpatch
deleted file mode 100644
index 1e094ac..0000000
--- a/projects/instantbird/0001-Avoid-double-definition-of-MFVideoFormat_VP80-with-m.mozpatch
+++ /dev/null
@@ -1,28 +0,0 @@
-From dd5b8134fd85507d68ed79f9efbb3afc87ee9d7e Mon Sep 17 00:00:00 2001
-From: Nicolas Vigier boklm@torproject.org
-Date: Wed, 30 Sep 2015 14:35:36 +0200
-Subject: [PATCH] Avoid double definition of MFVideoFormat_VP80 with mingw-w64
-
----
- dom/media/platforms/wmf/WMFVideoMFTManager.cpp | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/dom/media/platforms/wmf/WMFVideoMFTManager.cpp b/dom/media/platforms/wmf/WMFVideoMFTManager.cpp
---- a/dom/media/platforms/wmf/WMFVideoMFTManager.cpp
-+++ b/dom/media/platforms/wmf/WMFVideoMFTManager.cpp
-@@ -30,6 +30,7 @@
- using mozilla::layers::LayerManager;
- using mozilla::layers::LayersBackend;
- 
-+#if 0
- const GUID MFVideoFormat_VP80 =
- {
-   0x30385056,
-@@ -45,6 +46,7 @@
-   0x0010,
-   {0x80, 0x00, 0x00, 0xaa, 0x00, 0x38, 0x9b, 0x71}
- };
-+#endif
- 
- const CLSID CLSID_WebmMfVp8Dec =
- {
diff --git a/projects/instantbird/0001-Bug-1197281-Use-MOZ_FIND_WINSDK_VERSION-for-MOZ_WINS.mozpatch b/projects/instantbird/0001-Bug-1197281-Use-MOZ_FIND_WINSDK_VERSION-for-MOZ_WINS.mozpatch
new file mode 100644
index 0000000..fc7daf1
--- /dev/null
+++ b/projects/instantbird/0001-Bug-1197281-Use-MOZ_FIND_WINSDK_VERSION-for-MOZ_WINS.mozpatch
@@ -0,0 +1,101 @@
+From 12146218bf250e6b7f2e15ebe1685d3da9cdd99a Mon Sep 17 00:00:00 2001
+From: Jacek Caban jacek@codeweavers.com
+Date: Wed, 7 Oct 2015 12:26:40 +0200
+Subject: [PATCH] Bug 1197281 - Use MOZ_FIND_WINSDK_VERSION for
+ MOZ_WINSDK_MAXVER on mingw. r=glandium
+
+---
+ configure.in        | 11 ++++-------
+ js/src/configure.in | 11 ++++-------
+ 2 files changed, 8 insertions(+), 14 deletions(-)
+
+diff --git a/configure.in b/configure.in
+index dc0192193ce8..3c7ee5afcf57 100644
+--- a/configure.in
++++ b/configure.in
+@@ -505,6 +505,9 @@ EOF
+   fi
+ fi
+ 
++AC_PROG_CPP
++AC_PROG_CXXCPP
++
+ dnl ========================================================
+ dnl Special win32 checks
+ dnl ========================================================
+@@ -730,8 +733,6 @@ See https://developer.mozilla.org/en/Windows_Build_Prerequisites.])
+         fi
+         CFLAGS="$CFLAGS -D_HAS_EXCEPTIONS=0"
+         CXXFLAGS="$CXXFLAGS -D_HAS_EXCEPTIONS=0"
+-
+-        MOZ_FIND_WINSDK_VERSION
+     else
+         # Check w32api version
+         _W32API_MAJOR_VERSION=`echo $W32API_VERSION | $AWK -F. '{ print $1 }'`
+@@ -783,10 +784,9 @@ See https://developer.mozilla.org/en/Windows_Build_Prerequisites.])
+         # strsafe.h on mingw uses macros for function deprecation that pollutes namespace
+         # causing problems with local implementations with the same name.
+         AC_DEFINE(STRSAFE_NO_DEPRECATE)
+-
+-        MOZ_WINSDK_MAXVER=0x06030000
+     fi # !GNU_CC
+ 
++    MOZ_FIND_WINSDK_VERSION
+     AC_DEFINE_UNQUOTED(WINVER,0x$WINVER)
+     AC_DEFINE_UNQUOTED(_WIN32_WINNT,0x$WINVER)
+     # Require OS features provided by IE 6.0 SP2 (XP SP2)
+@@ -810,9 +810,6 @@ See https://developer.mozilla.org/en/Windows_Build_Prerequisites.])
+     ;;
+ esac
+ 
+-AC_PROG_CPP
+-AC_PROG_CXXCPP
+-
+ if test -n "$_WIN32_MSVC"; then
+     SKIP_PATH_CHECKS=1
+     SKIP_COMPILER_CHECKS=1
+diff --git a/js/src/configure.in b/js/src/configure.in
+index 7cc41469aa36..e0c546876201 100644
+--- a/js/src/configure.in
++++ b/js/src/configure.in
+@@ -303,6 +303,9 @@ MOZ_TOOL_VARIABLES
+ 
+ MOZ_CHECK_COMPILER_WRAPPER
+ 
++AC_PROG_CPP
++AC_PROG_CXXCPP
++
+ dnl Special win32 checks
+ dnl ========================================================
+ 
+@@ -432,8 +435,6 @@ case "$target" in
+ 
+         CFLAGS="$CFLAGS -D_HAS_EXCEPTIONS=0"
+         CXXFLAGS="$CXXFLAGS -D_HAS_EXCEPTIONS=0"
+-
+-        MOZ_FIND_WINSDK_VERSION
+     else
+         # Check w32api version
+         _W32API_MAJOR_VERSION=`echo $W32API_VERSION | $AWK -F. '{ print $1 }'`
+@@ -469,10 +470,9 @@ case "$target" in
+         then
+             AC_MSG_ERROR([windres version $WINDRES_VERSION or higher is required to build.])
+         fi
+-
+-        MOZ_WINSDK_MAXVER=0x06030000
+     fi # !GNU_CC
+ 
++    MOZ_FIND_WINSDK_VERSION
+     AC_DEFINE_UNQUOTED(WINVER,0x$WINVER)
+     AC_DEFINE_UNQUOTED(_WIN32_WINNT,0x$WINVER)
+     # Require OS features provided by IE 6.0 SP2 (XP SP2)
+@@ -494,9 +494,6 @@ case "$target" in
+     ;;
+ esac
+ 
+-AC_PROG_CPP
+-AC_PROG_CXXCPP
+-
+ if test -n "$_WIN32_MSVC"; then
+     SKIP_PATH_CHECKS=1
+     SKIP_COMPILER_CHECKS=1
diff --git a/projects/instantbird/0001-bug-1183129-Remove-a-dead-iOS-related-conditional-fr.mozpatch b/projects/instantbird/0001-bug-1183129-Remove-a-dead-iOS-related-conditional-fr.mozpatch
deleted file mode 100644
index 895626e..0000000
--- a/projects/instantbird/0001-bug-1183129-Remove-a-dead-iOS-related-conditional-fr.mozpatch
+++ /dev/null
@@ -1,31 +0,0 @@
-From ee0ef02a1fa4e473201bfbdcee8cea9cf5bd3357 Mon Sep 17 00:00:00 2001
-From: Ted Mielczarek ted@mielczarek.org
-Date: Mon, 13 Jul 2015 07:20:30 -0400
-Subject: [PATCH] bug 1183129 - Remove a dead iOS-related conditional from
- configure.in. r=glandium
-
---HG--
-extra : rebase_source : 59f06d0f9e6734dc005e5458a05da062367d71cb
----
- configure.in | 5 +----
- 1 file changed, 1 insertion(+), 4 deletions(-)
-
-diff --git a/configure.in b/configure.in
-index f76c761739d2..7f38650138c8 100644
---- a/configure.in
-+++ b/configure.in
-@@ -4345,10 +4345,7 @@ cairo-cocoa)
-     CXXFLAGS="$CXXFLAGS $TK_CFLAGS"
-     MOZ_USER_DIR="Mozilla"
-     MOZ_FS_LAYOUT=bundle
--    # skip event loop instrumentation on UIKit for now
--    if test "$MOZ_WIDGET_TOOLKIT" == "cocoa"; then
--      MOZ_INSTRUMENT_EVENT_LOOP=1
--    fi
-+    MOZ_INSTRUMENT_EVENT_LOOP=1
-     ;;
- 
- cairo-uikit)
--- 
-2.1.0
-
diff --git a/projects/instantbird/Bug-9173-Change-the-default-Firefox-profile-director.mozpatch b/projects/instantbird/Bug-9173-Change-the-default-Firefox-profile-director.mozpatch
index abdf109..a3ca392 100644
--- a/projects/instantbird/Bug-9173-Change-the-default-Firefox-profile-director.mozpatch
+++ b/projects/instantbird/Bug-9173-Change-the-default-Firefox-profile-director.mozpatch
@@ -25,7 +25,7 @@ index 7d09374ba773..417ebee773ba 100644
  #include "mozilla/Services.h"
  #include "mozilla/Omnijar.h"
  #include "mozilla/Preferences.h"
-@@ -197,9 +198,6 @@
+@@ -200,9 +201,6 @@ nsXREDirProvider::GetUserProfilesRootDir(nsIFile** aResult,
                                       aProfileName, aAppName, aVendorName);
if (NS_SUCCEEDED(rv)) {
@@ -35,7 +35,7 @@ index 7d09374ba773..417ebee773ba 100644
      // We must create the profile directory here if it does not exist.
      nsresult tmp = EnsureDirectoryExists(file);
      if (NS_FAILED(tmp)) {
-@@ -222,9 +220,6 @@
+@@ -225,9 +223,6 @@ nsXREDirProvider::GetUserProfilesLocalDir(nsIFile** aResult,
                                       aProfileName, aAppName, aVendorName);
if (NS_SUCCEEDED(rv)) {
@@ -45,7 +45,7 @@ index 7d09374ba773..417ebee773ba 100644
      // We must create the profile directory here if it does not exist.
      nsresult tmp = EnsureDirectoryExists(file);
      if (NS_FAILED(tmp)) {
-@@ -1219,82 +1214,44 @@
+@@ -1222,90 +1217,45 @@ nsresult
  nsXREDirProvider::GetUserDataDirectoryHome(nsIFile** aFile, bool aLocal)
  {
    // Copied from nsAppFileLocationProvider (more or less)
@@ -84,44 +84,42 @@ index 7d09374ba773..417ebee773ba 100644
 +    rv = localDir->GetNativeLeafName(removedName);
 +    NS_ENSURE_SUCCESS(rv, rv);
 +    bool didRemove = !removedName.Equals(".");
+ 
+-  rv = dirFileMac->InitWithFSRef(&fsRef);
+-  NS_ENSURE_SUCCESS(rv, rv);
 +    // Remove a directory component.
 +    nsCOMPtr<nsIFile> parentDir;
 +    rv = localDir->GetParent(getter_AddRefs(parentDir));
 +    NS_ENSURE_SUCCESS(rv, rv);
 +    localDir = parentDir;
-+
-+    if (didRemove)
-+      --levelsToRemove;
-+  }
-
--  rv = dirFileMac->InitWithFSRef(&fsRef);
-+  if (!localDir)
-+    return NS_ERROR_FAILURE;
-+
-+  rv = localDir->AppendRelativeNativePath(NS_LITERAL_CSTRING("TorMessenger"
-+                                     XPCOM_FILE_PATH_SEPARATOR "Data"
-+                                     XPCOM_FILE_PATH_SEPARATOR "Browser"));
-   NS_ENSURE_SUCCESS(rv, rv);
-  localDir = do_QueryInterface(dirFileMac, &rv);
+-#elif defined(XP_IOS)
+-  nsAutoCString userDir;
+-  if (GetUIKitDirectory(aLocal, userDir)) {
+-    rv = NS_NewNativeLocalFile(userDir, true, getter_AddRefs(localDir));
+-  } else {
+-    rv = NS_ERROR_FAILURE;
+-  }
+-  NS_ENSURE_SUCCESS(rv, rv);
 -#elif defined(XP_WIN)
 -  nsString path;
-   if (aLocal) {
+-  if (aLocal) {
 -    rv = GetShellFolderPath(CSIDL_LOCAL_APPDATA, path);
 -    if (NS_FAILED(rv))
 -      rv = GetRegWindowsAppDataFolder(aLocal, path);
-+    rv = localDir->AppendNative(NS_LITERAL_CSTRING("Caches"));
-+    NS_ENSURE_SUCCESS(rv, rv);
-   }
+-  }
 -  if (!aLocal || NS_FAILED(rv)) {
 -    rv = GetShellFolderPath(CSIDL_APPDATA, path);
 -    if (NS_FAILED(rv)) {
 -      if (!aLocal)
 -        rv = GetRegWindowsAppDataFolder(aLocal, path);
 -    }
--  }
++    if (didRemove)
++      --levelsToRemove;
+   }
 -  NS_ENSURE_SUCCESS(rv, rv);
--
+ 
 -  rv = NS_NewLocalFile(path, true, getter_AddRefs(localDir));
 -#elif defined(MOZ_WIDGET_GONK)
 -  rv = NS_NewNativeLocalFile(NS_LITERAL_CSTRING("/data/b2g"), true,
@@ -129,13 +127,18 @@ index 7d09374ba773..417ebee773ba 100644
 -#elif defined(XP_UNIX)
 -  const char* homeDir = getenv("HOME");
 -  if (!homeDir || !*homeDir)
--    return NS_ERROR_FAILURE;
--
++  if (!localDir)
+     return NS_ERROR_FAILURE;
+ 
 -#ifdef ANDROID /* We want (ProfD == ProfLD) on Android. */
 -  aLocal = false;
 -#endif
--
--  if (aLocal) {
++  rv = localDir->AppendRelativeNativePath(NS_LITERAL_CSTRING("TorMessenger"
++                                     XPCOM_FILE_PATH_SEPARATOR "Data"
++                                     XPCOM_FILE_PATH_SEPARATOR "Browser"));
++  NS_ENSURE_SUCCESS(rv, rv);
+ 
+   if (aLocal) {
 -    // If $XDG_CACHE_HOME is defined use it, otherwise use $HOME/.cache.
 -    const char* cacheHome = getenv("XDG_CACHE_HOME");
 -    if (cacheHome && *cacheHome) {
@@ -150,14 +153,16 @@ index 7d09374ba773..417ebee773ba 100644
 -  } else {
 -    rv = NS_NewNativeLocalFile(nsDependentCString(homeDir), true,
 -                               getter_AddRefs(localDir));
--  }
++    rv = localDir->AppendNative(NS_LITERAL_CSTRING("Caches"));
++    NS_ENSURE_SUCCESS(rv, rv);
+   }
 -#else
 -#error "Don't know how to get product dir on your platform"
 -#endif
NS_IF_ADDREF(*aFile = localDir);
    return rv;
-@@ -1507,48 +1464,25 @@
+@@ -1518,48 +1468,25 @@ nsXREDirProvider::AppendProfilePath(nsIFile* aFile,
    }
nsAutoCString profile;
@@ -209,7 +214,7 @@ index 7d09374ba773..417ebee773ba 100644
#elif defined(ANDROID)
    // The directory used for storing profiles
-@@ -1560,12 +1494,6 @@
+@@ -1571,12 +1498,6 @@ nsXREDirProvider::AppendProfilePath(nsIFile* aFile,
    rv = aFile->AppendNative(nsDependentCString("mozilla"));
    NS_ENSURE_SUCCESS(rv, rv);
  #elif defined(XP_UNIX)
@@ -222,7 +227,7 @@ index 7d09374ba773..417ebee773ba 100644
    if (!profile.IsEmpty()) {
      // Skip any leading path characters
      const char* profileStart = profile.get();
-@@ -1574,31 +1502,17 @@
+@@ -1585,31 +1506,17 @@ nsXREDirProvider::AppendProfilePath(nsIFile* aFile,
// On the off chance that someone wanted their folder to be hidden don't
      // let it become ".."
diff --git a/projects/instantbird/bug-1176731-do-not-mark-static-inline-functions.mozpatch b/projects/instantbird/bug-1176731-do-not-mark-static-inline-functions.mozpatch
deleted file mode 100644
index 7580ea0..0000000
--- a/projects/instantbird/bug-1176731-do-not-mark-static-inline-functions.mozpatch
+++ /dev/null
@@ -1,29 +0,0 @@
-From: Jacek Caban jacek@codeweavers.com
-Don't maek static inline functions as MFBT_API in TimeStamp.h.
-
-
-diff --git a/mozglue/misc/TimeStamp.h b/mozglue/misc/TimeStamp.h
-index 8f043d4..c2c9cf9 100644
---- a/mozglue/misc/TimeStamp.h
-+++ b/mozglue/misc/TimeStamp.h
-@@ -421,18 +421,18 @@ public:
-    * Now() is trying to ensure the best possible precision on each platform,
-    * at least one millisecond.
-    *
-    * NowLoRes() has been introduced to workaround performance problems of
-    * QueryPerformanceCounter on the Windows platform.  NowLoRes() is giving
-    * lower precision, usually 15.6 ms, but with very good performance benefit.
-    * Use it for measurements of longer times, like >200ms timeouts.
-    */
--  static MFBT_API TimeStamp Now() { return Now(true); }
--  static MFBT_API TimeStamp NowLoRes() { return Now(false); }
-+  static TimeStamp Now() { return Now(true); }
-+  static TimeStamp NowLoRes() { return Now(false); }
- 
-   /**
-    * Return a timestamp representing the time when the current process was
-    * created which will be comparable with other timestamps taken with this
-    * class. If the actual process creation time is detected to be inconsistent
-    * the @a aIsInconsistent parameter will be set to true, the returned
-    * timestamp however will still be valid though inaccurate.
-    *
diff --git a/projects/instantbird/config b/projects/instantbird/config
index d2ffb5d..638339d 100644
--- a/projects/instantbird/config
+++ b/projects/instantbird/config
@@ -108,24 +108,24 @@ input_files:
     enable: '[% c("var/osx") %]'
   - filename: fix-mingw-build.patch
     enable: '[% c("var/windows") %]'
-  - filename: bug-1176731-do-not-mark-static-inline-functions.mozpatch
-    enable: '[% c("var/windows") %]'
   - filename: gmploader-sandbox.mozpatch
     enable: '[% c("var/windows") %]'
+  - filename: 0001-Revert-no-bug-fix-case-of-nsIDocShell.h-in-WindowsUI.mozpatch
+    enable: '[% c("var/windows") %]'
   - filename: 0002-Revert-Bug-1170522-expose-whether-or-not-we-re-in-ta.mozpatch
     enable: '[% c("var/windows") %]'
+  - filename: 0003-Revert-Bug-1192573-Require-tablet-mode-Win10-to-show.mozpatch
+    enable: '[% c("var/windows") %]'
   - filename: bug-1197282-include-atomic-in-videodecoder.mozpatch
     enable: '[% c("var/windows") %]'
-  - filename: 0001-Avoid-double-definition-of-MFVideoFormat_VP80-with-m.mozpatch
+  - filename: 0001-Bug-1192248-Fixed-WinIMEHandler.cpp-cross-compilatio.mozpatch
+    enable: '[% c("var/windows") %]'
+  - filename: 0001-Bug-1197281-Use-MOZ_FIND_WINSDK_VERSION-for-MOZ_WINS.mozpatch
     enable: '[% c("var/windows") %]'
-    # When 1197281 is fixed, this should not be needed anymore:
-    # https://bugzilla.mozilla.org/show_bug.cgi?id=1197281
   - filename: Bug-9173-Change-the-default-Firefox-profile-director.mozpatch
   - filename: block-plugins.mozpatch
   - filename: OSX-package-as-tar.bz2.mozpatch
     enable: '[% c("var/osx") %]'
-  - filename: 0001-bug-1183129-Remove-a-dead-iOS-related-conditional-fr.mozpatch
-    enable: '[% c("var/osx") %]'
   - filename: 'mozconfig-[% c("var/osname") %]'
     name: mozconfig
   - name: python
diff --git a/projects/mingw-w64/config b/projects/mingw-w64/config
index 85c9b7f..c080a13 100644
--- a/projects/mingw-w64/config
+++ b/projects/mingw-w64/config
@@ -1,7 +1,7 @@
 # vim: filetype=yaml sw=2
 filename: '[% project %]-[% c("version") %]-[% c("var/build_id") %].tar.gz'
 git_url: http://git.code.sf.net/p/mingw-w64/mingw-w64
-git_hash: 548b1984042a1dd66cae95ad8c0003b5e5494a68
+git_hash: 917249082fd711f6a3e13515d1f6ffd4474d4f9c
 version: '[% c("abbrev") %]'
 remote_docker: 1
 var:
diff --git a/projects/mozilla/config b/projects/mozilla/config
index 4b98c6d..2e813b5 100644
--- a/projects/mozilla/config
+++ b/projects/mozilla/config
@@ -1,7 +1,7 @@
 # vim: filetype=yaml sw=2
 version: '[% c("abbrev") %]'
 hg_url: https://hg.mozilla.org/releases/mozilla-release/
-hg_hash: THUNDERBIRD_41_0b1_RELEASE
+hg_hash: FIREFOX_42_0_RELEASE
 src: |
   #!/bin/sh
   set -e

    