Merge remote-tracking branch 'origin/master' into HEADupdate-geos-381

4 files changed, 31 insertions, 19 deletions

diff --git a/ports/upb/CONTROL b/ports/upb/CONTROL
index 4ca52fa03..a24ac31ab 100644
--- a/ports/upb/CONTROL
+++ b/ports/upb/CONTROL
@@ -1,4 +1,4 @@
 Source: upb
-Version: 2019-10-21-2
+Version: 2020-08-19
 Homepage: https://github.com/protocolbuffers/upb/
 Description: μpb (often written 'upb') is a small protobuf implementation written in C.
diff --git a/ports/upb/add-cmake-install.patch b/ports/upb/add-cmake-install.patch
index ece6b8db4..cdda03407 100644
--- a/ports/upb/add-cmake-install.patch
+++ b/ports/upb/add-cmake-install.patch
@@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt

-index 836c5ff..6eb8bb5 100644

+index 4dd6454..eda6a72 100644

 --- a/CMakeLists.txt

 +++ b/CMakeLists.txt

 @@ -8,7 +8,7 @@ else()

@@ -11,27 +11,25 @@ index 836c5ff..6eb8bb5 100644
  cmake_policy(SET CMP0048 NEW)

  

  project(upb)

-@@ -59,7 +59,7 @@ elseif(UNIX)

- endif()

+@@ -62,6 +62,7 @@ enable_testing()

  

- enable_testing()

--

+ add_library(port

+   upb/port.c)

 +add_library(descriptor_upbproto INTERFACE)

  add_library(upb

    upb/decode.c

    upb/encode.c

-@@ -136,12 +136,35 @@ target_link_libraries(upb_cc_bindings INTERFACE

-   descriptor_upbproto

+@@ -154,6 +155,7 @@ target_link_libraries(upb_cc_bindings INTERFACE

    handlers

+   port

    upb)

--add_library(upb_test

 +if(ENABLE_TESTING)

-+add_executable(upb_test

+ add_library(upb_test

    tests/testmain.cc

    tests/test_util.h

-   tests/upb_test.h)

- target_link_libraries(upb_test

+@@ -162,5 +164,28 @@ target_link_libraries(upb_test

    handlers

+   port

    upb)

 +endif()

  

@@ -41,8 +39,9 @@ index 836c5ff..6eb8bb5 100644
 +  DESTINATION include

 +  FILES_MATCHING

 +  PATTERN "*.h"

++  PATTERN "*.hpp"

 +  PATTERN "*.inc"

-+  PATTERN "*.int.h" EXCLUDE

++  PATTERN "*.int.h"

 +)

 +target_include_directories(upb PUBLIC $<INSTALL_INTERFACE:include>)

 +install(TARGETS

@@ -50,10 +49,10 @@ index 836c5ff..6eb8bb5 100644
 +  upb_cc_bindings

 +  upb_json

 +  upb_pb

++  port

 +  table

 +  descriptor_upbproto

 +  handlers

-+  legacy_msg_reflection

 +  reflection

 +  EXPORT upb-config

 +)

diff --git a/ports/upb/fix-uwp.patch b/ports/upb/fix-uwp.patch
index 91c45b416..bbc8e257a 100644
--- a/ports/upb/fix-uwp.patch
+++ b/ports/upb/fix-uwp.patch
@@ -1,5 +1,5 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 577000a..759e35b 100644
+index eda6a72..386966f 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
 @@ -58,6 +58,10 @@ elseif(UNIX)
@@ -11,5 +11,18 @@ index 577000a..759e35b 100644
 +endif()
 +
  enable_testing()
- add_library(descriptor_upbproto INTERFACE)
- add_library(upb
+ 
+ add_library(port
+diff --git a/upb/json_decode.c b/upb/json_decode.c
+index 953d238..5185ffd 100644
+--- a/upb/json_decode.c
++++ b/upb/json_decode.c
+@@ -1138,7 +1138,7 @@ static void jsondec_struct(jsondec *d, upb_msg *msg, const upb_msgdef *m) {
+ static void jsondec_wellknownvalue(jsondec *d, upb_msg *msg,
+                                    const upb_msgdef *m) {
+   upb_msgval val;
+-  const upb_fielddef *f;
++  const upb_fielddef *f = NULL;
+   upb_msg *submsg;
+ 
+   switch (jsondec_peek(d)) {
diff --git a/ports/upb/portfile.cmake b/ports/upb/portfile.cmake
index 9d475670e..fdb59441f 100644
--- a/ports/upb/portfile.cmake
+++ b/ports/upb/portfile.cmake
@@ -3,8 +3,8 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO protocolbuffers/upb
-    REF  9effcbcb27f0a665f9f345030188c0b291e32482
-    SHA512 416ff26ec21181d53be23e94203205072152ab3a8e4b3b28d16263a601995fd2d2f8afe5d8cfbecdac8543249482287b9fe6129314f7c9a7880660f5508bb85e
+    REF  7338facddb8ce405fe7a0a52a6061a1e7c823279
+    SHA512 a2ece65612ca7c3cdc7b79994aa488623e5ce4227988611ab60724fae5dc7ba9311363bf5c73f6c74910a6b91392e0a231c28f0b2f4c8cc2c4d4328ed33bc265
     HEAD_REF master
     PATCHES
         add-cmake-install.patch