From c577ab81d79f8d9f2d68e5e6d3d8eac42bda7726 Mon Sep 17 00:00:00 2001 From: chausner <15180557+chausner@users.noreply.github.com> Date: Wed, 13 Oct 2021 23:10:44 +0200 Subject: [libsass] Update to 3.6.5 (#20628) * Update libsass to 3.6.5 * Update CI baseline * Add vcpkg_fail_port_install for UWP Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> * Update git-tree hash * Add back vcpkg_copy_pdbs * Update git-tree hash Co-authored-by: chausner Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com> --- ports/libsass/portfile.cmake | 14 ++++++-------- ports/libsass/vcpkg.json | 3 +-- versions/baseline.json | 4 ++-- versions/l-/libsass.json | 5 +++++ 4 files changed, 14 insertions(+), 12 deletions(-) diff --git a/ports/libsass/portfile.cmake b/ports/libsass/portfile.cmake index 09b228237..9195b4562 100644 --- a/ports/libsass/portfile.cmake +++ b/ports/libsass/portfile.cmake @@ -1,22 +1,20 @@ +vcpkg_fail_port_install(ON_TARGET "uwp") + vcpkg_from_github( OUT_SOURCE_PATH SOURCE_PATH REPO sass/libsass - REF 8d312a1c91bb7dd22883ebdfc829003f75a82396 # 3.6.4 - SHA512 41e532c081804c889c3e7f9169bd90d7fc944d13817d5e3a4f8c19608ebb630db2b2b0e9c61a59a2446076f4093d5ec4cb4f767aa06fa0bf0f0687094e1a2913 + REF 3.6.5 + SHA512 98CC7E12FDF74CD9E92D8D4A62B821956D3AD186FCEE9A8D77B677A621342AA161B73D9ADAD4C1849678A3BAC890443120CC8FEBE1B7429AAB374321D635B8F7 HEAD_REF master PATCHES remove_compiler_flags.patch ) vcpkg_configure_make( - SOURCE_PATH ${SOURCE_PATH} + SOURCE_PATH "${SOURCE_PATH}" AUTOCONFIG - OPTIONS - ) vcpkg_install_make(MAKEFILE GNUmakefile) vcpkg_fixup_pkgconfig() vcpkg_copy_pdbs() - -# Handle copyright -file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright) +file(INSTALL "${SOURCE_PATH}/COPYING" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright) diff --git a/ports/libsass/vcpkg.json b/ports/libsass/vcpkg.json index a67da017e..1b7f9e1ce 100644 --- a/ports/libsass/vcpkg.json +++ b/ports/libsass/vcpkg.json @@ -1,7 +1,6 @@ { "name": "libsass", - "version-string": "3.6.4", - "port-version": 1, + "version": "3.6.5", "description": "LibSass - Sass compiler written in C++", "homepage": "https://github.com/sass/libsass", "supports": "!uwp" diff --git a/versions/baseline.json b/versions/baseline.json index dcda89aac..d3a80c395 100644 --- a/versions/baseline.json +++ b/versions/baseline.json @@ -3765,8 +3765,8 @@ "port-version": 0 }, "libsass": { - "baseline": "3.6.4", - "port-version": 1 + "baseline": "3.6.5", + "port-version": 0 }, "libsbml": { "baseline": "5.19.0", diff --git a/versions/l-/libsass.json b/versions/l-/libsass.json index 40ee99dd8..1e5b38e6c 100644 --- a/versions/l-/libsass.json +++ b/versions/l-/libsass.json @@ -1,5 +1,10 @@ { "versions": [ + { + "git-tree": "f6568e763bc2718b27a5dc2d3d1db4d3cf651572", + "version": "3.6.5", + "port-version": 0 + }, { "git-tree": "124a73deb4e0b7677411ab0285b70013c26782c8", "version-string": "3.6.4", -- cgit v1.2.3