[many ports] Updates 2019.07.09 (#7217)

* [many ports] Upgrades 2019.07.11

* Re-generate patches and fix build errors.

* [manyport]Fix build errors.

* Fix avro-c and console-bridge failures, revert curl and tesseract

* fix botan failure

* Fix build errors and undo some ports upgrades.

* [aws-c-common,chipmunk,cxxopts,grpc]Fix build errors

* Fix build errors.

* [angle]Undo upgrade changes.

* [directxtk]Fix UWP build error (#7233)

* Revert leptonica since it cause tesseract failed

* Revert jsonnet

* [google-cloud-cpp] Disable parallel configure due to source directory writes

* [many ports] Undo undesired changes

* [bitsery] Fix indentation

* [avro-c][aws-c-common][graphite2] Convert line endings to minimize PR diff

* fix console-bridge and remove usockets unused patch

* update ogre patch

* [many ports] Revert unneeded changes w.r.t. master. Add missing write to console-bridge.

* [console-bridge] Fix export macro

* [avro-c] Revert upgrade; split to #7875

* [avro-c] Complete previous revert

5 files changed, 26 insertions, 24 deletions

diff --git a/ports/aws-c-common/CONTROL b/ports/aws-c-common/CONTROL
index f9e0fc9af..908c7e16a 100644
--- a/ports/aws-c-common/CONTROL
+++ b/ports/aws-c-common/CONTROL
@@ -1,3 +1,3 @@
 Source: aws-c-common

-Version: 0.3.11-1

+Version: 0.4.1
 Description: AWS common library for C

diff --git a/ports/aws-c-common/disable-error-4068.patch b/ports/aws-c-common/disable-error-4068.patch
new file mode 100644
index 000000000..60720cd67
--- /dev/null
+++ b/ports/aws-c-common/disable-error-4068.patch
@@ -0,0 +1,15 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 263d34e..8c699b7 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -122,6 +122,10 @@ if (UNIX AND NOT APPLE AND NOT ${CMAKE_SYSTEM_NAME} MATCHES FreeBSD)
+     target_compile_definitions(${CMAKE_PROJECT_NAME} PRIVATE -D_POSIX_C_SOURCE=200809L -D_XOPEN_SOURCE=500)
+ endif()
+ 
++if (WIN32)
++    add_compile_options(/wd4068)
++endif()
++
+ aws_add_sanitizers(${CMAKE_PROJECT_NAME} BLACKLIST "sanitizer-blacklist.txt")
+ target_link_libraries(${CMAKE_PROJECT_NAME} PUBLIC ${PLATFORM_LIBS})
+ 
diff --git a/ports/aws-c-common/disable-internal-crt-option.patch b/ports/aws-c-common/disable-internal-crt-option.patch
index d82a00aaa..fccb607cf 100644
--- a/ports/aws-c-common/disable-internal-crt-option.patch
+++ b/ports/aws-c-common/disable-internal-crt-option.patch
@@ -1,11 +1,12 @@
 diff --git a/cmake/AwsCFlags.cmake b/cmake/AwsCFlags.cmake
-index 5ceb11c..9d0aa12 100644
+index 0f597d7..1359b8b 100644
 --- a/cmake/AwsCFlags.cmake
 +++ b/cmake/AwsCFlags.cmake
-@@ -38,15 +38,6 @@ function(aws_set_common_properties target)
-         # Disable unknown pragma warnings
-         list(APPEND AWS_C_FLAGS /wd4068)
- 
+@@ -35,15 +35,6 @@ function(aws_set_common_properties target)
+         # /volatile:iso relaxes some implicit memory barriers that MSVC normally applies for volatile accesses
+         # Since we want to be compatible with user builds using /volatile:iso, use it for the tests.
+         list(APPEND AWS_C_FLAGS /volatile:iso)
+-        
 -        string(TOUPPER "${CMAKE_BUILD_TYPE}" _CMAKE_BUILD_TYPE)
 -        if(STATIC_CRT)
 -            string(REPLACE "/MD" "/MT" _FLAGS "${CMAKE_C_FLAGS_${_CMAKE_BUILD_TYPE}}")
@@ -14,7 +15,6 @@ index 5ceb11c..9d0aa12 100644
 -        endif()
 -        string(REPLACE " " ";" _FLAGS "${_FLAGS}")
 -        list(APPEND AWS_C_FLAGS "${_FLAGS}")
--
+ 
      else()
          list(APPEND AWS_C_FLAGS -Wall -Werror -Wstrict-prototypes)
- 
diff --git a/ports/aws-c-common/fix-dependencey-build-error.patch b/ports/aws-c-common/fix-dependencey-build-error.patch
deleted file mode 100644
index cfbf2611c..000000000
--- a/ports/aws-c-common/fix-dependencey-build-error.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/include/aws/common/byte_buf.h b/include/aws/common/byte_buf.h
-index 545b06d..c579c82 100644
---- a/include/aws/common/byte_buf.h
-+++ b/include/aws/common/byte_buf.h
-@@ -21,6 +21,8 @@
- 
- #include <string.h>
- 
-+#pragma warning(disable: 4068)
-+
- /**
-  * Represents a length-delimited binary string or buffer. If byte buffer points
-  * to constant memory or memory that should otherwise not be freed by this
diff --git a/ports/aws-c-common/portfile.cmake b/ports/aws-c-common/portfile.cmake
index 53d85abb0..eed8e1d56 100644
--- a/ports/aws-c-common/portfile.cmake
+++ b/ports/aws-c-common/portfile.cmake
@@ -3,11 +3,11 @@ include(vcpkg_common_functions)
 vcpkg_from_github(

     OUT_SOURCE_PATH SOURCE_PATH

     REPO awslabs/aws-c-common

-    REF v0.3.11

-    SHA512 da845f748aecfff61209f542f4eac8d46738af52ce980d5c8315397f859429dfd9e4bf989ddf2fbe938d1efb33dce9c531c92cbe53388b1d1082d5caa97e8750

+    REF b2e7ca47449571beaca4a507c65ac3ee39d8eefc
+    SHA512 c9dc394bf3ef8eb33d36b81bae5a2002a8fccc7d876ad9c631da818aae7d06846615791c2311e8baa6efa7fcd9d565effabfec6f01767ca0099c6fa64d58e2fa

     HEAD_REF master

     PATCHES

-        fix-dependencey-build-error.patch # This patch fixes dependency port compilation failure

+        disable-error-4068.patch # This patch fixes dependency port compilation failure

         disable-internal-crt-option.patch # Disable internal crt option because vcpkg contains crt processing flow

 )