From 9c0893e04db383e87617b8119659a734e6398149 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?= <47264268+JackBoosY@users.noreply.github.com> Date: Thu, 11 Jun 2020 10:13:11 +0800 Subject: [PATCH] [vcpkg baseline] Fix baseline (#11865) * [msix] Fix source hash * [librsfv] Change repo to github * [librsvg] Just re-trigger it * [libxmp-lite] Re-trigger CI test * Update ports/msix/CONTROL --- ports/librsvg/CONTROL | 3 ++- ports/librsvg/portfile.cmake | 13 ++++++------- ports/libxmp-lite/CONTROL | 2 +- ports/libxmp-lite/portfile.cmake | 2 -- ports/msix/CONTROL | 3 ++- ports/msix/portfile.cmake | 4 ++-- 6 files changed, 13 insertions(+), 14 deletions(-) diff --git a/ports/librsvg/CONTROL b/ports/librsvg/CONTROL index ec60e76f1..380186c6e 100644 --- a/ports/librsvg/CONTROL +++ b/ports/librsvg/CONTROL @@ -1,4 +1,5 @@ Source: librsvg -Version: 2.40.20-1 +Version: 2.40.20-2 +Homepage: https://gitlab.gnome.org/GNOME/librsvg Description: A small library to render Scalable Vector Graphics (SVG) Build-Depends: cairo, pango, gdk-pixbuf, libcroco \ No newline at end of file diff --git a/ports/librsvg/portfile.cmake b/ports/librsvg/portfile.cmake index c3765f0a3..4c7633066 100644 --- a/ports/librsvg/portfile.cmake +++ b/ports/librsvg/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_download_distfile(ARCHIVE URLS "https://download.gnome.org/sources/librsvg/2.40/librsvg-2.40.20.tar.xz" FILENAME "librsvg-2.40.20.tar.xz" @@ -8,7 +6,7 @@ vcpkg_download_distfile(ARCHIVE vcpkg_extract_source_archive_ex( OUT_SOURCE_PATH SOURCE_PATH - ARCHIVE ${ARCHIVE} + ARCHIVE ${ARCHIVE} ) file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH}) @@ -21,12 +19,13 @@ vcpkg_configure_cmake( vcpkg_install_cmake() +vcpkg_copy_pdbs() + vcpkg_fixup_cmake_targets(CONFIG_PATH share/unofficial-librsvg TARGET_PATH share/unofficial-librsvg) + file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include) # Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/librsvg RENAME copyright) +file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) -vcpkg_copy_pdbs() - -vcpkg_test_cmake(PACKAGE_NAME unofficial-librsvg) +#vcpkg_test_cmake(PACKAGE_NAME unofficial-librsvg) diff --git a/ports/libxmp-lite/CONTROL b/ports/libxmp-lite/CONTROL index 8ca5cbd41..6388c8e2a 100644 --- a/ports/libxmp-lite/CONTROL +++ b/ports/libxmp-lite/CONTROL @@ -1,4 +1,4 @@ Source: libxmp-lite -Version: 4.4.1-2 +Version: 4.4.1-3 Homepage: https://sourceforge.net/projects/xmp/ Description: Lightweight version of libxmp that supports MOD, S3M, XM and IT modules. diff --git a/ports/libxmp-lite/portfile.cmake b/ports/libxmp-lite/portfile.cmake index e77290095..5fdb0b699 100644 --- a/ports/libxmp-lite/portfile.cmake +++ b/ports/libxmp-lite/portfile.cmake @@ -1,5 +1,3 @@ -include(vcpkg_common_functions) - vcpkg_check_linkage(ONLY_STATIC_LIBRARY) vcpkg_download_distfile(ARCHIVE diff --git a/ports/msix/CONTROL b/ports/msix/CONTROL index fb6e632a1..2f7039e4e 100644 --- a/ports/msix/CONTROL +++ b/ports/msix/CONTROL @@ -1,5 +1,6 @@ Source: msix -Version: 1.7 +Version: 1.7-1 Build-Depends: xerces-c, zlib, openssl (!uwp&!windows), catch2 +Homepage: https://github.com/microsoft/msix-packaging Description: The MSIX Packaging SDK project is an effort to enable developers on a variety of platforms to pack and unpack packages for the purposes of distribution from either the Microsoft Store, or their own content distribution networks. The MSIX Packaging APIs that a client app would use to interact with .msix/.appx packages are a subset of those documented here. See sample/ExtractContentsSample/ExtractContentsSample.cpp for additional details. diff --git a/ports/msix/portfile.cmake b/ports/msix/portfile.cmake index 53734796f..6a1a606f8 100644 --- a/ports/msix/portfile.cmake +++ b/ports/msix/portfile.cmake @@ -2,9 +2,9 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY) vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH - REPO Microsoft/msix-packaging + REPO microsoft/msix-packaging REF ab322965d64baf1448548cbe18139e8872d686f2 # v1.7 - SHA512 d64767c84d5933bf3d1e0e62e9dc21fa13e02b8cf31776ccbe2e7066e514798d8ff758dc2b6fd64f6eabcf3deb83ef0eaa03e1a7d407307f347a045e8a75d3dd + SHA512 67f07b3f374a7493f1aa85dc5f18759daa9c3e39294f24f5d5023b5d7d9ada88b1fcf9daa497b4c2012547bab674a4b74c2236310229f29b998bf0731574a711 HEAD_REF master PATCHES install-cmake.patch