commit 3393b2f3efba416f4acff6a20f7f1736f50a0cb9 Author: Arlo Breault arlolra@gmail.com Date: Wed Mar 23 08:18:26 2016 -0700
Remove WINSDK patch already in esr45 --- ...e-MOZ_FIND_WINSDK_VERSION-for-MOZ_WINS.mozpatch | 101 --------------------- projects/instantbird/config | 2 - 2 files changed, 103 deletions(-)
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 deleted file mode 100644 index fc7daf1..0000000 --- a/projects/instantbird/0001-Bug-1197281-Use-MOZ_FIND_WINSDK_VERSION-for-MOZ_WINS.mozpatch +++ /dev/null @@ -1,101 +0,0 @@ -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/config b/projects/instantbird/config index f1982e4..fa6ac16 100644 --- a/projects/instantbird/config +++ b/projects/instantbird/config @@ -111,8 +111,6 @@ input_files: enable: '[% c("var/windows") %]' - filename: 0003-Revert-Bug-1192573-Require-tablet-mode-Win10-to-show.mozpatch enable: '[% c("var/windows") %]' - - filename: 0001-Bug-1197281-Use-MOZ_FIND_WINSDK_VERSION-for-MOZ_WINS.mozpatch - enable: '[% c("var/windows") %]' - filename: Bug-9173-Change-the-default-Firefox-profile-director.mozpatch - filename: trac-16475.mozpatch - filename: OSX-package-as-tar.bz2.mozpatch