From 7339aea6f57e85a37ff14e887c5bc040c6f0ac41 Mon Sep 17 00:00:00 2001
From: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
Date: Wed, 23 Sep 2020 06:36:04 +0800
Subject: [Many ports] Update to the latest version or commit (#13560)

* [Many ports] Update to the latest version or commit

* [libplist] Update version
[libsync] Update patch format

* Update as review suggestions

* [libplist] Revert changes
---
 ports/liblinear/CMakeLists.txt |  4 ++--
 ports/liblinear/CONTROL        |  4 +++-
 ports/liblinear/portfile.cmake | 15 +++++++++------
 3 files changed, 14 insertions(+), 9 deletions(-)

(limited to 'ports/liblinear')

diff --git a/ports/liblinear/CMakeLists.txt b/ports/liblinear/CMakeLists.txt
index 6e6928a91..093b0f4ea 100644
--- a/ports/liblinear/CMakeLists.txt
+++ b/ports/liblinear/CMakeLists.txt
@@ -12,7 +12,7 @@ add_library(blas OBJECT
 
 add_library(liblinear
     linear.cpp
-    tron.cpp
+    newton.cpp
     $<TARGET_OBJECTS:blas>
 )
 target_include_directories(liblinear PRIVATE .)
@@ -42,6 +42,6 @@ endif()
 
 if(NOT DISABLE_INSTALL_HEADERS)
     install(
-        FILES linear.h tron.h
+        FILES linear.h newton.h
         DESTINATION include/liblinear)
 endif()
\ No newline at end of file
diff --git a/ports/liblinear/CONTROL b/ports/liblinear/CONTROL
index 71e01deab..03a915a14 100644
--- a/ports/liblinear/CONTROL
+++ b/ports/liblinear/CONTROL
@@ -1,3 +1,5 @@
 Source: liblinear
-Version: 230
+Version: 241
+Homepage: https://github.com/cjlin1/liblinear
 Description: A Library for Large Linear Classification
+Supports: !uwp
diff --git a/ports/liblinear/portfile.cmake b/ports/liblinear/portfile.cmake
index 2c71b869a..4a9b4b6a0 100644
--- a/ports/liblinear/portfile.cmake
+++ b/ports/liblinear/portfile.cmake
@@ -1,10 +1,10 @@
-include(vcpkg_common_functions)
+vcpkg_fail_port_install(ON_TARGET "uwp")
 
 vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
     REPO cjlin1/liblinear
-    REF v230
-    SHA512 c8acdd9f5cfcf7ef1ff9b9fac658ff51ac4677801fdb9ce6a210ccca7fb136a7957d0edaf45e83269c1928de1926de0200d669cd94e09371c06821d42ba539bc
+    REF 2381122d05bbb1e4ee24b522298dd548f0ec0d24 #v241
+    SHA512 ee784b6325681b3d9e3dc0b59f4a703d87be35fb898cc16df93e4a814a959d530736a8451be4f0f2c856769d81e3f5acbcd6f0f8677425e700597e3502f9f36d
     HEAD_REF master
 )
 
@@ -20,7 +20,10 @@ vcpkg_configure_cmake(
 
 vcpkg_install_cmake()
 vcpkg_copy_pdbs()
-vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/liblinear)
 
-file(INSTALL ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/liblinear RENAME copyright)
-file(INSTALL ${SOURCE_PATH}/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/liblinear)
+if(NOT DISABLE_INSTALL_TOOLS)
+    vcpkg_copy_tool_dependencies(${CURRENT_PACKAGES_DIR}/tools/liblinear)
+endif()
+
+file(INSTALL ${SOURCE_PATH}/COPYRIGHT DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
+file(INSTALL ${SOURCE_PATH}/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT})
-- 
cgit v1.2.3