From 62de5626aa3f1e8dedd69cfecd3e5eb18b24de54 Mon Sep 17 00:00:00 2001 From: Billy O'Neal Date: Thu, 28 Oct 2021 12:01:58 -0700 Subject: [PATCH] [miniz] Install pkgconfig files to the correct location. (#21025) --- ports/miniz/fix-pkgconfig-location.patch | 13 +++++++++++++ ports/miniz/portfile.cmake | 2 ++ ports/miniz/vcpkg.json | 1 + versions/baseline.json | 2 +- versions/m-/miniz.json | 5 +++++ 5 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 ports/miniz/fix-pkgconfig-location.patch diff --git a/ports/miniz/fix-pkgconfig-location.patch b/ports/miniz/fix-pkgconfig-location.patch new file mode 100644 index 0000000000..7bc5999b75 --- /dev/null +++ b/ports/miniz/fix-pkgconfig-location.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index f12435b..edee1f4 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -163,7 +163,7 @@ if(NOT BUILD_HEADER_ONLY) + if(INSTALL_PROJECT) + install(FILES + ${CMAKE_CURRENT_BINARY_DIR}/miniz.pc +- DESTINATION ${CMAKE_INSTALL_DATADIR}/pkgconfig) ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + endif() + endif() + diff --git a/ports/miniz/portfile.cmake b/ports/miniz/portfile.cmake index 21d7720184..acf5a7e992 100644 --- a/ports/miniz/portfile.cmake +++ b/ports/miniz/portfile.cmake @@ -4,6 +4,8 @@ vcpkg_from_github( REF 2.2.0 SHA512 0bb2b0ac627715b90ff9fd69ca8958a0bea387bd7ddf5c200daba953b98ef788092e3009842f4f123234e85570159250c8897a30c1c1f2d4dea9bca9837f6111 HEAD_REF master + PATCHES + fix-pkgconfig-location.patch ) vcpkg_cmake_configure( diff --git a/ports/miniz/vcpkg.json b/ports/miniz/vcpkg.json index 130a74fe8a..cb24f9b7f6 100644 --- a/ports/miniz/vcpkg.json +++ b/ports/miniz/vcpkg.json @@ -1,6 +1,7 @@ { "name": "miniz", "version": "2.2.0", + "port-version": 1, "description": "Single C source file zlib-replacement library", "homepage": "https://github.com/richgel999/miniz", "dependencies": [ diff --git a/versions/baseline.json b/versions/baseline.json index 00e5db587d..fcc35ca426 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -4350,7 +4350,7 @@ }, "miniz": { "baseline": "2.2.0", - "port-version": 0 + "port-version": 1 }, "minizip": { "baseline": "1.2.11", diff --git a/versions/m-/miniz.json b/versions/m-/miniz.json index b8bdf545fd..ef0f29f091 100644 --- a/versions/m-/miniz.json +++ b/versions/m-/miniz.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "49751d73421ae465b278aea471d6c8903837697c", + "version": "2.2.0", + "port-version": 1 + }, { "git-tree": "5a146337e0416425fb7a412027c755681cf88921", "version": "2.2.0",