commit b97701e3c6d4f1f55d10eb47da345d24fc913158 Author: Arlo Breault arlolra@gmail.com Date: Fri Mar 25 12:59:09 2016 -0700
Use the same patch as TB for that one
* See trac 18290
* First first two patches there we already have, and the last two nss ones don't seem to trigger errors during our build. gk may investigate what's up. --- ...013-MinGW-w64-Disable-TabletMode-stuff.mozpatch | 66 ---------------------- projects/instantbird/config | 2 +- projects/instantbird/trac-18290.mozpath | 47 +++++++++++++++ 3 files changed, 48 insertions(+), 67 deletions(-)
diff --git a/projects/instantbird/0013-MinGW-w64-Disable-TabletMode-stuff.mozpatch b/projects/instantbird/0013-MinGW-w64-Disable-TabletMode-stuff.mozpatch deleted file mode 100644 index 0d27220..0000000 --- a/projects/instantbird/0013-MinGW-w64-Disable-TabletMode-stuff.mozpatch +++ /dev/null @@ -1,66 +0,0 @@ -diff --git a/widget/windows/WindowsUIUtils.cpp b/widget/windows/WindowsUIUtils.cpp ---- a/widget/windows/WindowsUIUtils.cpp -+++ b/widget/windows/WindowsUIUtils.cpp -@@ -15,16 +15,51 @@ - #include "nsIAppShellService.h" - #include "nsAppShellCID.h" - #include "nsIXULWindow.h" - #include "mozilla/Services.h" - #include "mozilla/WindowsVersion.h" - #include "nsString.h" - #include "nsIWidget.h" - -+#if defined(__MINGW64_VERSION_MAJOR) -+/* MinGW-w64 doesn't have support for this WRL stuff yet: -+ https://msdn.microsoft.com/en-us/library/hh438466(v=vs.110).aspx */ -+ -+WindowsUIUtils::WindowsUIUtils() : -+ mInTabletMode(eTabletModeUnknown) -+{ -+} -+ -+WindowsUIUtils::~WindowsUIUtils() -+{ -+} -+ -+/* -+ * Implement the nsISupports methods... -+ */ -+NS_IMPL_ISUPPORTS(WindowsUIUtils, -+ nsIWindowsUIUtils) -+ -+NS_IMETHODIMP -+WindowsUIUtils::GetInTabletMode(bool* aResult) -+{ -+ *aResult = false; -+ return NS_OK; -+} -+ -+NS_IMETHODIMP -+WindowsUIUtils::UpdateTabletModeState() -+{ -+ return NS_OK; -+} -+ -+ -+ -+#else - #include <windows.ui.viewmanagement.h> - - #pragma comment(lib, "runtimeobject.lib") - - using namespace mozilla; - using namespace ABI::Windows::UI; - using namespace ABI::Windows::UI::ViewManagement; - using namespace Microsoft::WRL; -@@ -167,8 +202,10 @@ WindowsUIUtils::UpdateTabletModeState() - } - } - } - } - - return NS_OK; - } - -+#endif /* defined(__MINGW64_VERSION_MAJOR) */ -+ diff --git a/projects/instantbird/config b/projects/instantbird/config index 2624e1e..a38dd2c 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -105,7 +105,7 @@ input_files: enable: '[% c("var/osx") %]' - filename: fix-mingw-build.patch enable: '[% c("var/windows") %]' - - filename: 0013-MinGW-w64-Disable-TabletMode-stuff.mozpatch + - filename: trac-18290.mozpatch enable: '[% c("var/windows") %]' - filename: gmploader-sandbox.mozpatch enable: '[% c("var/windows") %]' diff --git a/projects/instantbird/trac-18290.mozpath b/projects/instantbird/trac-18290.mozpath new file mode 100644 index 0000000..1766fb8 --- /dev/null +++ b/projects/instantbird/trac-18290.mozpath @@ -0,0 +1,47 @@ +From dfb3f02c452b56bd22d7cdf2086b29e118fea688 Mon Sep 17 00:00:00 2001 +From: Georg Koppen gk@torproject.org +Date: Wed, 10 Feb 2016 13:14:03 +0000 +Subject: [PATCH] Disabling view management for mingw-w64 builds + + +diff --git a/widget/windows/WindowsUIUtils.cpp b/widget/windows/WindowsUIUtils.cpp +index 85b2879..89be490 100644 +--- a/widget/windows/WindowsUIUtils.cpp ++++ b/widget/windows/WindowsUIUtils.cpp +@@ -20,6 +20,8 @@ + #include "nsString.h" + #include "nsIWidget.h" + ++/* Disable in mingw-w64 Gecko builds. */ ++#if 0 + #include <windows.ui.viewmanagement.h> + + #pragma comment(lib, "runtimeobject.lib") +@@ -85,6 +87,8 @@ public: + }; + #endif + ++#endif ++ + WindowsUIUtils::WindowsUIUtils() : + mInTabletMode(eTabletModeUnknown) + { +@@ -113,6 +117,7 @@ WindowsUIUtils::GetInTabletMode(bool* aResult) + NS_IMETHODIMP + WindowsUIUtils::UpdateTabletModeState() + { ++#if 0 + if (!IsWin10OrLater()) { + return NS_OK; + } +@@ -168,6 +173,7 @@ WindowsUIUtils::UpdateTabletModeState() + } + } + } ++#endif + + return NS_OK; + } +-- +2.7.0 +