From 069d315a34638a639833747a75beed97ad583373 Mon Sep 17 00:00:00 2001
From: JackBoosY <yuzaiyang@beyondsoft.com>
Date: Tue, 9 Jun 2020 19:27:54 -0700
Subject: [PATCH 1/5] [msix] Fix source hash

---
 ports/msix/CONTROL        | 3 ++-
 ports/msix/portfile.cmake | 4 ++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ports/msix/CONTROL b/ports/msix/CONTROL
index fb6e632a1d09a0..0be6d3335805e1 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 53734796f0f337..6a1a606f816b85 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

From bda3c45fc4e6b605b2e9e7c3c0ee7df0d42f7b3b Mon Sep 17 00:00:00 2001
From: JackBoosY <yuzaiyang@beyondsoft.com>
Date: Tue, 9 Jun 2020 19:34:16 -0700
Subject: [PATCH 2/5] [librsfv] Change repo to github

---
 ports/librsvg/CONTROL        |  3 ++-
 ports/librsvg/portfile.cmake | 24 ++++++++++--------------
 2 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/ports/librsvg/CONTROL b/ports/librsvg/CONTROL
index ec60e76f1aa844..380186c6eccec0 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 c3765f0a3d4394..93cdb7a7c9b058 100644
--- a/ports/librsvg/portfile.cmake
+++ b/ports/librsvg/portfile.cmake
@@ -1,14 +1,9 @@
-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"
-    SHA512 cdd8224deb4c3786e29f48ed02c32ed9dff5cb15aba574a5ef845801ad3669cfcc3eedb9d359c22213dc7a29de24c363248825adad5877c40abf73b3688ff12f
-)
-
-vcpkg_extract_source_archive_ex(
+vcpkg_from_github(
     OUT_SOURCE_PATH SOURCE_PATH
-    ARCHIVE ${ARCHIVE} 
+    REPO GNOME/librsvg
+    REF  2cbb0f7bf56666187993bd7ba688bf82d0c9a5c7 #2.40.20
+    SHA512 776558fdd911f0cc9e8d467bf8e00a1930d2e51bb8ccd5f36f95955fefecab65faf575a80fdaacfe83fd32808f8b9c2e0323b16823e0431300df7bc0c1dfde12
+    HEAD_REF master
 )
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})
@@ -21,12 +16,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)
-
-vcpkg_copy_pdbs()
+file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
 
-vcpkg_test_cmake(PACKAGE_NAME unofficial-librsvg)
+#vcpkg_test_cmake(PACKAGE_NAME unofficial-librsvg)

From c97598679d5f551bc08533480ae085002a7d09b0 Mon Sep 17 00:00:00 2001
From: JackBoosY <yuzaiyang@beyondsoft.com>
Date: Tue, 9 Jun 2020 20:07:19 -0700
Subject: [PATCH 3/5] [librsvg] Just re-trigger it

---
 ports/librsvg/portfile.cmake | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/ports/librsvg/portfile.cmake b/ports/librsvg/portfile.cmake
index 93cdb7a7c9b058..4c7633066b6c8e 100644
--- a/ports/librsvg/portfile.cmake
+++ b/ports/librsvg/portfile.cmake
@@ -1,9 +1,12 @@
-vcpkg_from_github(
+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"
+    SHA512 cdd8224deb4c3786e29f48ed02c32ed9dff5cb15aba574a5ef845801ad3669cfcc3eedb9d359c22213dc7a29de24c363248825adad5877c40abf73b3688ff12f
+)
+
+vcpkg_extract_source_archive_ex(
     OUT_SOURCE_PATH SOURCE_PATH
-    REPO GNOME/librsvg
-    REF  2cbb0f7bf56666187993bd7ba688bf82d0c9a5c7 #2.40.20
-    SHA512 776558fdd911f0cc9e8d467bf8e00a1930d2e51bb8ccd5f36f95955fefecab65faf575a80fdaacfe83fd32808f8b9c2e0323b16823e0431300df7bc0c1dfde12
-    HEAD_REF master
+    ARCHIVE ${ARCHIVE}
 )
 
 file(COPY ${CMAKE_CURRENT_LIST_DIR}/CMakeLists.txt DESTINATION ${SOURCE_PATH})

From 90c14babf0e0a4a321abb4aaf48b86ce05599c41 Mon Sep 17 00:00:00 2001
From: JackBoosY <yuzaiyang@beyondsoft.com>
Date: Tue, 9 Jun 2020 20:17:20 -0700
Subject: [PATCH 4/5] [libxmp-lite] Re-trigger CI test

---
 ports/libxmp-lite/CONTROL        | 2 +-
 ports/libxmp-lite/portfile.cmake | 2 --
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/ports/libxmp-lite/CONTROL b/ports/libxmp-lite/CONTROL
index 8ca5cbd41f33e5..6388c8e2ac84fe 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 e77290095e6743..5fdb0b699098a7 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

From 207b7b2af45765aadaaae0277f698bde2c3e0297 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jack=C2=B7Boos=C2=B7Yu?=
 <47264268+JackBoosY@users.noreply.github.com>
Date: Wed, 10 Jun 2020 13:22:29 +0800
Subject: [PATCH 5/5] Update ports/msix/CONTROL

---
 ports/msix/CONTROL | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ports/msix/CONTROL b/ports/msix/CONTROL
index 0be6d3335805e1..2f7039e4eaf919 100644
--- a/ports/msix/CONTROL
+++ b/ports/msix/CONTROL
@@ -1,6 +1,6 @@
 Source: msix
-Version: 1.7-1
+Version: 1.7-1
 Build-Depends: xerces-c, zlib, openssl (!uwp&!windows), catch2
-Homepage: https://github.com/Microsoft/msix-packaging
+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.