From 038ded3b5a86e0ecc9e03d5f0f88d5c36a6a7807 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Fri, 5 May 2023 13:21:43 +0200
Subject: [PATCH] Bump local Protocol Buffers version to 22.4. Remove patch
 applied upstream

---
 CMakeLists.txt                    |  2 +-
 cmake/Modules/BuildProtobuf.cmake | 23 +----------------------
 src/tests/data/protobuf22.patch   | 12 ------------
 3 files changed, 2 insertions(+), 35 deletions(-)
 delete mode 100644 src/tests/data/protobuf22.patch

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 024d573a4..2a4beeb9b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -337,7 +337,7 @@ set(GNSSSDR_ARMADILLO_LOCAL_VERSION "12.2.x")
 set(GNSSSDR_GFLAGS_LOCAL_VERSION "2.2.2")
 set(GNSSSDR_GLOG_LOCAL_VERSION "0.6.0")
 set(GNSSSDR_MATIO_LOCAL_VERSION "1.5.23")
-set(GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION "22.2")
+set(GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION "22.4")
 set(GNSSSDR_PUGIXML_LOCAL_VERSION "1.13")
 set(GNSSSDR_GTEST_LOCAL_VERSION "1.13.0")
 set(GNSSSDR_GNSS_SIM_LOCAL_VERSION "master")
diff --git a/cmake/Modules/BuildProtobuf.cmake b/cmake/Modules/BuildProtobuf.cmake
index ca8ea19c7..5b7a995eb 100644
--- a/cmake/Modules/BuildProtobuf.cmake
+++ b/cmake/Modules/BuildProtobuf.cmake
@@ -9,13 +9,11 @@
 # abseil-cpp >= 20230117 libraries (see https://github.com/abseil/abseil-cpp)
 # already installed. Zlib is used if found.
 #
-# Note: requires the patch command if using GCC >= 13 or Clang >= 16
-#
 # Creates protobuf::libprotobuf and protobuf::protoc imported targets.
 
 
 if(NOT GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION)
-    set(GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION "22.2")
+    set(GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION "22.4")
 endif()
 
 if(NOT GNSSSDR_BINARY_DIR)
@@ -57,25 +55,6 @@ list(APPEND UTF8_LIBRARIES
     ${GNSSSDR_BINARY_DIR}/protobuf-${GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION}/${CMAKE_INSTALL_LIBDIR}/${CMAKE_STATIC_LIBRARY_PREFIX}utf8_range${CMAKE_STATIC_LIBRARY_SUFFIX}
 )
 
-# Fix for GCC 13 and Clang 16
-if(((CMAKE_CXX_COMPILER_ID STREQUAL "GNU") AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "13")) OR
-  ((CMAKE_CXX_COMPILER_ID STREQUAL "Clang") AND (CMAKE_CXX_COMPILER_VERSION VERSION_GREATER_EQUAL "16")))
-    find_program(Patch_EXECUTABLE NAME patch PATHS ENV PATH)
-    if(NOT Patch_EXECUTABLE)
-        message(FATAL_ERROR "The patch command is not found. It is required to build Protocol Buffers. Please check your OS documentation and install the patch command.")
-    endif()
-    set(PROTOBUF_PATCH_COMMAND
-        cd ${GNSSSDR_BINARY_DIR}/thirdparty/protobuf/protobuf-${GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION}/src/google/protobuf/ &&
-        ${Patch_EXECUTABLE} ${GNSSSDR_BINARY_DIR}/thirdparty/protobuf/protobuf-${GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION}/src/google/protobuf/port.h < ${GNSSSDR_SOURCE_DIR}/src/tests/data/protobuf22.patch
-    )
-    # Patch only once
-    if(EXISTS ${GNSSSDR_BINARY_DIR}/thirdparty/protobuf/protobuf-${GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION}/src/google/protobuf/port.h)
-        set(PROTOBUF_PATCH_COMMAND "")
-    endif()
-else()
-    set(PROTOBUF_PATCH_COMMAND "")
-endif()
-
 ExternalProject_Add(protobuf-${GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION}
     PREFIX ${GNSSSDR_BINARY_DIR}/protobuf-${GNSSSDR_PROTOCOLBUFFERS_LOCAL_VERSION}
     GIT_REPOSITORY https://github.com/protocolbuffers/protobuf
diff --git a/src/tests/data/protobuf22.patch b/src/tests/data/protobuf22.patch
deleted file mode 100644
index ac7dd27df..000000000
--- a/src/tests/data/protobuf22.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-SPDX-License-Identifier: GPL-3.0-or-later
-SPDX-FileCopyrightText: 2023 Carles Fernandez-Prades <carles.fernandez@cttc.es>
---- port.h	2023-03-31 11:40:38.000000000 +0100
-+++ port.h	2023-03-31 11:56:49.000000000 +0100
-@@ -38,6 +38,7 @@
- 
- #include <cassert>
- #include <cstddef>
-+#include <cstdint>
- #include <new>
- #include <string>
- #include <type_traits>
\ No newline at end of file