From 03de4e9edcd30b9ec6c11cb0ff83c022a31be712 Mon Sep 17 00:00:00 2001
From: autoantwort <41973254+autoantwort@users.noreply.github.com>
Date: Tue, 19 Apr 2022 17:17:40 +0200
Subject: [PATCH] [protozero] update to 1.7.1 (#24231)

---
 ports/protozero/fix-builderror.patch | 13 -------------
 ports/protozero/fix-no-tests.patch   | 17 +++++++++++++++++
 ports/protozero/portfile.cmake       |  9 +++++----
 ports/protozero/vcpkg.json           |  4 ++--
 scripts/ci.baseline.txt              |  2 --
 versions/baseline.json               |  4 ++--
 versions/p-/protozero.json           |  5 +++++
 7 files changed, 31 insertions(+), 23 deletions(-)
 delete mode 100644 ports/protozero/fix-builderror.patch
 create mode 100644 ports/protozero/fix-no-tests.patch

diff --git a/ports/protozero/fix-builderror.patch b/ports/protozero/fix-builderror.patch
deleted file mode 100644
index 74ae398004..0000000000
--- a/ports/protozero/fix-builderror.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index f9702d6..bd41cbe 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -29,7 +29,7 @@ if(MSVC)
-     add_definitions(/W3)
-     add_definitions(-D_CRT_SECURE_NO_WARNINGS -D_SCL_SECURE_NO_WARNINGS)
- else()
--    add_definitions(-std=c++11 -Wall -Wextra -pedantic -Wsign-compare -Wunused-parameter -Wno-float-equal -Wno-covered-switch-default)
-+    add_definitions(-std=c++17 -Wall -Wextra -pedantic -Wsign-compare -Wunused-parameter -Wno-float-equal -Wno-covered-switch-default)
-     if(WERROR)
-         add_definitions(-Werror)
-     endif()
diff --git a/ports/protozero/fix-no-tests.patch b/ports/protozero/fix-no-tests.patch
new file mode 100644
index 0000000000..6cedbd9652
--- /dev/null
+++ b/ports/protozero/fix-no-tests.patch
@@ -0,0 +1,17 @@
+From: Fabrice Fontaine <fontaine.fabrice@gmail.com>
+Date: Wed, 16 Feb 2022 00:11:38 +0100
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index b975d490..df2ca15f 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -52,7 +52,9 @@ endif()
+ #
+ #-----------------------------------------------------------------------------
+ 
+-find_package(Protobuf)
++if(BUILD_TESTING)
++    find_package(Protobuf)
++endif()
+ 
+ 
+ #-----------------------------------------------------------------------------
diff --git a/ports/protozero/portfile.cmake b/ports/protozero/portfile.cmake
index abfe4956b4..84e704c3c3 100644
--- a/ports/protozero/portfile.cmake
+++ b/ports/protozero/portfile.cmake
@@ -2,15 +2,16 @@
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO mapbox/protozero
-    SHA512 d09a34865c535264c52f9c605ccb6f453c357f5e3a7b0dc72b097de288eabc6985a5b81ddbe79c47d0af2d8f74e33bd380fefce47acb15d8d51d5c151d71786b
-    REF v1.7.0
+    SHA512 90bf1f487efa0ad9da2f3b887b7a6dbd849fa3687dd2126c324f902a8584722f4f7d4a2ea86f6a0e75999f7be829f6ae26cad9df1cae55d0b29a9ec24a4dbfd2
+    REF v1.7.1
     HEAD_REF master
-    PATCHES fix-builderror.patch
+    PATCHES
+        fix-no-tests.patch  # from https://github.com/mapbox/protozero/pull/110
 )
 
 
 vcpkg_cmake_configure(
-    SOURCE_PATH ${SOURCE_PATH}
+    SOURCE_PATH "${SOURCE_PATH}"
     OPTIONS
         -DBUILD_TESTING=OFF
 )
diff --git a/ports/protozero/vcpkg.json b/ports/protozero/vcpkg.json
index 3d4ba85b9a..320b34ed8e 100644
--- a/ports/protozero/vcpkg.json
+++ b/ports/protozero/vcpkg.json
@@ -1,10 +1,10 @@
 {
   "name": "protozero",
-  "version-semver": "1.7.0",
-  "port-version": 1,
+  "version-semver": "1.7.1",
   "description": "Minimalist protocol buffer decoder and encoder in C++",
   "homepage": "https://github.com/mapbox/protozero",
   "license": "BSD-2-Clause",
+  "supports": "!uwp",
   "dependencies": [
     "protobuf",
     {
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index b3c08b0291..31497efefa 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -1356,8 +1356,6 @@ ctp:x64-windows=skip
 ctp:x64-windows-static=skip
 ctp:x64-windows-static-md=skip
 ctp:x86-windows=skip
-protozero:arm-uwp=fail
-protozero:x64-uwp=fail
 
 # clapack is replaced by lapack-reference on the platforms lapack-reference supports
 clapack:x64-linux=skip
diff --git a/versions/baseline.json b/versions/baseline.json
index 8eb3001012..82b08a2f12 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -5577,8 +5577,8 @@
       "port-version": 1
     },
     "protozero": {
-      "baseline": "1.7.0",
-      "port-version": 1
+      "baseline": "1.7.1",
+      "port-version": 0
     },
     "proxygen": {
       "baseline": "2022.03.21.00",
diff --git a/versions/p-/protozero.json b/versions/p-/protozero.json
index 55c02b1a1f..867cda73c8 100644
--- a/versions/p-/protozero.json
+++ b/versions/p-/protozero.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "f6fa6a99279f9efb98bafc45707a1bcf9ef690e4",
+      "version-semver": "1.7.1",
+      "port-version": 0
+    },
     {
       "git-tree": "e617bcd5ceeebd89da7229c7daeecacf7581d767",
       "version-semver": "1.7.0",