aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJozef Izso <jozef.izso@gmail.com>2019-10-03 18:42:01 +0200
committerPhil Christensen <philc@microsoft.com>2019-10-03 09:42:01 -0700
commita528ee4b856d0d73b6b837dfa7ab2e745d02b5ca (patch)
treefb351801114b1405af3c3757a1474767e5217c74
parentcd8f320b8da4abea716382293e847cb658a21211 (diff)
downloadvcpkg-a528ee4b856d0d73b6b837dfa7ab2e745d02b5ca.tar.gz
vcpkg-a528ee4b856d0d73b6b837dfa7ab2e745d02b5ca.zip
[protobuf] Update protobuf to 3.10.0 (#8439)
-rw-r--r--ports/protobuf/CONTROL2
-rw-r--r--ports/protobuf/fix-uwp.patch4
-rw-r--r--ports/protobuf/portfile.cmake4
3 files changed, 5 insertions, 5 deletions
diff --git a/ports/protobuf/CONTROL b/ports/protobuf/CONTROL
index ba4ce7d91..b0fd79627 100644
--- a/ports/protobuf/CONTROL
+++ b/ports/protobuf/CONTROL
@@ -1,5 +1,5 @@
Source: protobuf
-Version: 3.9.1
+Version: 3.10.0
Homepage: https://github.com/google/protobuf
Description: Protocol Buffers - Google's data interchange format
diff --git a/ports/protobuf/fix-uwp.patch b/ports/protobuf/fix-uwp.patch
index ba09d5913..7a993c5c0 100644
--- a/ports/protobuf/fix-uwp.patch
+++ b/ports/protobuf/fix-uwp.patch
@@ -1,8 +1,8 @@
diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
-index 3afe376..1a0b6a7 100644
+index f87b0928e..5102a10e3 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
-@@ -151,6 +151,7 @@ if (MSVC)
+@@ -190,6 +190,7 @@ if (MSVC)
/wd4506 # no definition for inline function 'function'
/wd4800 # 'type' : forcing value to bool 'true' or 'false' (performance warning)
/wd4996 # The compiler encountered a deprecated declaration.
diff --git a/ports/protobuf/portfile.cmake b/ports/protobuf/portfile.cmake
index bb6726410..0e149a3b2 100644
--- a/ports/protobuf/portfile.cmake
+++ b/ports/protobuf/portfile.cmake
@@ -3,8 +3,8 @@ include(vcpkg_common_functions)
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO protocolbuffers/protobuf
- REF v3.9.1
- SHA512 9accb56c1aadef83bf27280e15a99809a3561cbd4b39d6605dec730cc112bf4fd2e9f1ac39127b32a1b87253e712be4b4f12afe4061a8f7be76266b3f4bca314
+ REF v3.10.0
+ SHA512 0dcba6d21486fdc162f57119754b47b4a2fb605af878d5b96a32df55895321535cffb5b804566fd90ee7c36e20106d0cd4f5d9f3c652dc9c4dfca96be41a1977
HEAD_REF master
PATCHES
fix-uwp.patch