From ba98abdd0d1df9f8d68653f8d74c8344c73059c2 Mon Sep 17 00:00:00 2001
From: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
Date: Thu, 18 Jun 2020 14:53:18 +0800
Subject: [PATCH] [vcpkg baseline] Retrigger failed ports in baseline (#11965)

* [vcpkg baseline] Retrigger flaky ports

* update the url for geographiclib

* Rebase the changes

* Remove libpq:arm64-windows=fail in baseline file
---
 ports/geographiclib/CONTROL        | 2 +-
 ports/geographiclib/portfile.cmake | 2 +-
 ports/polyclipping/CONTROL         | 2 +-
 ports/polyclipping/portfile.cmake  | 2 --
 scripts/ci.baseline.txt            | 1 -
 5 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/ports/geographiclib/CONTROL b/ports/geographiclib/CONTROL
index 479ca845318832..7705f922a3f52c 100644
--- a/ports/geographiclib/CONTROL
+++ b/ports/geographiclib/CONTROL
@@ -1,4 +1,4 @@
 Source: geographiclib
-Version: 1.47-patch1-12
+Version: 1.47-patch1-13
 Homepage: https://sourceforge.net/projects/geographiclib/
 Description: a small set of C++ classes for performing conversions between geographic, UTM, UPS, MGRS, geocentric, and local cartesian coordinates, for gravity (e.g., EGM2008), geoid height, and geomagnetic field (e.g., WMM2010) calculations, and for solving geodesic problems.
diff --git a/ports/geographiclib/portfile.cmake b/ports/geographiclib/portfile.cmake
index 11df5b8f84d48f..3b1100000a88d3 100644
--- a/ports/geographiclib/portfile.cmake
+++ b/ports/geographiclib/portfile.cmake
@@ -1,5 +1,5 @@
 vcpkg_download_distfile(ARCHIVE
-    URLS "https://jaist.dl.sourceforge.net/project/geographiclib/distrib/archive/GeographicLib-1.47-patch1.zip"
+    URLS "https://sourceforge.net/projects/geographiclib/files/distrib/archive/GeographicLib-1.47-patch1.zip"
     FILENAME "geographiclib-1.47-patch1.zip"
     SHA512 d8fdfd7ae093057ec1a4ab922457fe71a3fb9975df5b673c276d62a0e9c4f212dc63652830b9d89e3890bc96aafd335992943cf6a1bce8260acf932d1eb7abfd
 )
diff --git a/ports/polyclipping/CONTROL b/ports/polyclipping/CONTROL
index 0e97f0a32019c6..504a264845c328 100644
--- a/ports/polyclipping/CONTROL
+++ b/ports/polyclipping/CONTROL
@@ -1,3 +1,3 @@
 Source: polyclipping
-Version: 6.4.2
+Version: 6.4.2-1
 Description: The Clipper library performs clipping and offsetting for both lines and polygons. All four boolean clipping operations are supported - intersection, union, difference and exclusive-or. Polygons can be of any shape including self-intersecting polygons.
diff --git a/ports/polyclipping/portfile.cmake b/ports/polyclipping/portfile.cmake
index b1b1997cfc9a77..1b0ea71a6dc6d9 100644
--- a/ports/polyclipping/portfile.cmake
+++ b/ports/polyclipping/portfile.cmake
@@ -1,5 +1,3 @@
-include(vcpkg_common_functions)
-
 vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
 
 vcpkg_download_distfile(ARCHIVE
diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt
index b5375ab20f63dc..713cc20bbbf394 100644
--- a/scripts/ci.baseline.txt
+++ b/scripts/ci.baseline.txt
@@ -880,7 +880,6 @@ libpng-apng:x64-windows        = skip
 libpng-apng:x64-windows-static = skip
 libpng-apng:x86-windows        = skip
 libpq:arm-uwp=fail
-libpq:arm64-windows=fail
 libpq:x64-uwp=fail
 libqcow:arm-uwp=fail
 libqcow:x64-uwp=fail