WIP: [C++] Bump Protobuf to v33.5

Author: wgtmac

cmake_modules/ThirdpartyToolchain.cmake

@@ -26,7 +26,7 @@ set(LZ4_VERSION "1.10.0")
 set(SNAPPY_VERSION "1.2.2")
 set(ZLIB_VERSION "1.3.1")
 set(GTEST_VERSION "1.17.0")
-set(PROTOBUF_VERSION "3.21.12")
+set(PROTOBUF_VERSION "33.5")
 set(ZSTD_VERSION "1.5.7")
 set(SPARSEHASH_VERSION "2.11.1")
 
@@ -209,7 +209,6 @@ else ()
 
     fetchcontent_declare(Protobuf
       URL "https://github.com/google/protobuf/archive/v${PROTOBUF_VERSION}.tar.gz"
-      SOURCE_SUBDIR "cmake"
       FIND_PACKAGE_ARGS
       NAMES Protobuf
       CONFIG
@@ -245,7 +244,14 @@ else ()
 
       if(INSTALL_VENDORED_LIBS)
         set_target_properties(libprotobuf PROPERTIES OUTPUT_NAME "orc_vendored_protobuf")
-        install(TARGETS libprotobuf
+        set(_PROTOBUF_INSTALL_TARGETS libprotobuf)
+        if(TARGET utf8_range)
+          list(APPEND _PROTOBUF_INSTALL_TARGETS utf8_range)
+        endif()
+        if(TARGET utf8_validity)
+          list(APPEND _PROTOBUF_INSTALL_TARGETS utf8_validity)
+        endif()
+        install(TARGETS ${_PROTOBUF_INSTALL_TARGETS}
                 EXPORT orc_targets
                 RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
                 ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"

subprojects/protobuf.wrap

@@ -16,15 +16,13 @@
 # under the License.
 
 [wrap-file]
-directory = protobuf-3.21.12
-source_url = https://github.com/protocolbuffers/protobuf/archive/refs/tags/v3.21.12.tar.gz
-source_filename = protobuf-3.21.12.tar.gz
-source_hash = 930c2c3b5ecc6c9c12615cf5ad93f1cd6e12d0aba862b572e076259970ac3a53
+directory = protobuf-33.5
+source_url = https://github.com/protocolbuffers/protobuf/archive/refs/tags/v33.5.tar.gz
+source_filename = protobuf-33.5.tar.gz
+source_hash = 440848dffa209beb8a04e41cc352762e44f8e91342b2a43aab6af9b30713c2f6
 patch_filename = protobuf_3.21.12-5_patch.zip
 patch_url = https://wrapdb.mesonbuild.com/v2/protobuf_3.21.12-5/get_patch
 patch_hash = 8ae4d39ca9748a6edf7e028e15f5c7499b1c6ce687454a5709711d47cfd4e293
-source_fallback_url = https://github.com/mesonbuild/wrapdb/releases/download/protobuf_3.21.12-5/protobuf-3.21.12.tar.gz
-wrapdb_version = 3.21.12-5
 
 [provide]
 protobuf = protobuf_dep