diff --git a/ports/protozero/fix-no-tests.patch b/ports/protozero/fix-no-tests.patch deleted file mode 100644 index 6cedbd9652..0000000000 --- a/ports/protozero/fix-no-tests.patch +++ /dev/null @@ -1,17 +0,0 @@ -From: Fabrice Fontaine -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 84e704c3c3..e99376cc13 100644 --- a/ports/protozero/portfile.cmake +++ b/ports/protozero/portfile.cmake @@ -1,22 +1,20 @@ - -vcpkg_from_github( - OUT_SOURCE_PATH SOURCE_PATH - REPO mapbox/protozero - SHA512 90bf1f487efa0ad9da2f3b887b7a6dbd849fa3687dd2126c324f902a8584722f4f7d4a2ea86f6a0e75999f7be829f6ae26cad9df1cae55d0b29a9ec24a4dbfd2 - REF v1.7.1 - HEAD_REF master - PATCHES - fix-no-tests.patch # from https://github.com/mapbox/protozero/pull/110 -) - - -vcpkg_cmake_configure( - SOURCE_PATH "${SOURCE_PATH}" - OPTIONS - -DBUILD_TESTING=OFF -) -vcpkg_cmake_install() -vcpkg_fixup_pkgconfig() - -file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug") -file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) + +vcpkg_from_github( + OUT_SOURCE_PATH SOURCE_PATH + REPO mapbox/protozero + SHA512 b5c4cef9112e03f64d53c2f15f8def28129f720f77674e8d1aac7ad663f18630bb3923495a57f94917490d27acab27f07574a6c170c9e1fb151eef702a4ffc5f + REF "v${VERSION}" + HEAD_REF master +) + + +vcpkg_cmake_configure( + SOURCE_PATH "${SOURCE_PATH}" + OPTIONS + -DBUILD_TESTING=OFF +) +vcpkg_cmake_install() +vcpkg_fixup_pkgconfig() + +file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include" "${CURRENT_PACKAGES_DIR}/debug") +file(INSTALL "${SOURCE_PATH}/LICENSE.md" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/protozero/vcpkg.json b/ports/protozero/vcpkg.json index 320b34ed8e..32e237276d 100644 --- a/ports/protozero/vcpkg.json +++ b/ports/protozero/vcpkg.json @@ -1,6 +1,6 @@ { "name": "protozero", - "version-semver": "1.7.1", + "version-semver": "1.8.0", "description": "Minimalist protocol buffer decoder and encoder in C++", "homepage": "https://github.com/mapbox/protozero", "license": "BSD-2-Clause", diff --git a/versions/baseline.json b/versions/baseline.json index 49d680ff03..176d3d7a85 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -7261,7 +7261,7 @@ "port-version": 0 }, "protozero": { - "baseline": "1.7.1", + "baseline": "1.8.0", "port-version": 0 }, "proxsuite": { diff --git a/versions/p-/protozero.json b/versions/p-/protozero.json index 867cda73c8..8f93475026 100644 --- a/versions/p-/protozero.json +++ b/versions/p-/protozero.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "d83a3c4af103b7f37529f13bf28e1d2c2579d0d9", + "version-semver": "1.8.0", + "port-version": 0 + }, { "git-tree": "f6fa6a99279f9efb98bafc45707a1bcf9ef690e4", "version-semver": "1.7.1",