From 73e8e5bcdc3d3d833500881a18f9997467589502 Mon Sep 17 00:00:00 2001 From: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com> Date: Tue, 16 Jun 2020 00:36:58 -0700 Subject: [PATCH 1/4] [vcpkg baseline] Retrigger flaky ports --- ports/geographiclib/CONTROL | 2 +- ports/gperf/CONTROL | 2 +- ports/libpq/CONTROL | 2 +- ports/nettle/CONTROL | 2 +- ports/ocilib/CONTROL | 2 +- ports/polyclipping/CONTROL | 2 +- ports/polyclipping/portfile.cmake | 2 -- ports/quickfix/CONTROL | 2 +- ports/qwt/CONTROL | 2 +- 9 files changed, 8 insertions(+), 10 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/gperf/CONTROL b/ports/gperf/CONTROL index 34d19df809617c..fa99032111a355 100644 --- a/ports/gperf/CONTROL +++ b/ports/gperf/CONTROL @@ -1,4 +1,4 @@ Source: gperf -Version: 3.1-1 +Version: 3.1-2 Description: GNU perfect hash function generator Homepage: https://www.gnu.org/software/gperf/ diff --git a/ports/libpq/CONTROL b/ports/libpq/CONTROL index b4e4abcfe1cbc6..59154b657f9809 100644 --- a/ports/libpq/CONTROL +++ b/ports/libpq/CONTROL @@ -1,5 +1,5 @@ Source: libpq -Version: 12.2-2 +Version: 12.2-3 Build-Depends: libpq[bonjour] (osx) Supports: !uwp Homepage: https://www.postgresql.org/ diff --git a/ports/nettle/CONTROL b/ports/nettle/CONTROL index e73b0df663cb18..c6e3e37353b7cc 100644 --- a/ports/nettle/CONTROL +++ b/ports/nettle/CONTROL @@ -1,5 +1,5 @@ Source: nettle -Version: 3.5.1-1 +Version: 3.5.1-2 Homepage: https://git.lysator.liu.se/nettle/nettle Description: Nettle is a low-level cryptographic library that is designed to fit easily in more or less any context: In crypto toolkits for object-oriented languages (C++, Python, Pike, ...), in applications like LSH or GNUPG, or even in kernel space. Build-Depends: gmp, vs-yasm (windows) \ No newline at end of file diff --git a/ports/ocilib/CONTROL b/ports/ocilib/CONTROL index c5d4fbb3742c95..a79d07889c2098 100644 --- a/ports/ocilib/CONTROL +++ b/ports/ocilib/CONTROL @@ -1,5 +1,5 @@ Source: ocilib -Version: 4.6.4-1 +Version: 4.6.4-2 Homepage: https://vrogier.github.io/ocilib/ Description: OCILIB is an open source and cross platform Oracle Driver that delivers efficient access to Oracle databases. Supports: !(arm|uwp) \ No newline at end of file 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/ports/quickfix/CONTROL b/ports/quickfix/CONTROL index 5a3fe30c21a073..690170a68292f3 100644 --- a/ports/quickfix/CONTROL +++ b/ports/quickfix/CONTROL @@ -1,5 +1,5 @@ Source: quickfix -Version: 1.15.1-4 +Version: 1.15.1-5 Build-Depends: openssl Homepage: https://github.com/quickfix/quickfix Description: QuickFIX is a free and open source implementation of the FIX protocol. diff --git a/ports/qwt/CONTROL b/ports/qwt/CONTROL index ba9f5bec1daabf..54c1c88bbf5485 100644 --- a/ports/qwt/CONTROL +++ b/ports/qwt/CONTROL @@ -1,5 +1,5 @@ Source: qwt -Version: 6.1.3-11 +Version: 6.1.3-12 Homepage: https://sourceforge.net/projects/qwt Description: Qt widgets library for technical applications Build-Depends: qt5-base, qt5-svg, qt5-tools From 0c44bfa6533b33437a1fa003930d0d7a2765f5d4 Mon Sep 17 00:00:00 2001 From: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com> Date: Tue, 16 Jun 2020 01:08:49 -0700 Subject: [PATCH 2/4] update the url for geographiclib --- ports/geographiclib/portfile.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 ) From 224026effdbef9deff4f0458546122704405c388 Mon Sep 17 00:00:00 2001 From: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com> Date: Wed, 17 Jun 2020 23:08:44 -0700 Subject: [PATCH 3/4] Rebase the changes --- ports/gperf/CONTROL | 2 +- ports/libpq/CONTROL | 2 +- ports/nettle/CONTROL | 2 +- ports/ocilib/CONTROL | 2 +- ports/quickfix/CONTROL | 2 +- ports/qwt/CONTROL | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ports/gperf/CONTROL b/ports/gperf/CONTROL index fa99032111a355..34d19df809617c 100644 --- a/ports/gperf/CONTROL +++ b/ports/gperf/CONTROL @@ -1,4 +1,4 @@ Source: gperf -Version: 3.1-2 +Version: 3.1-1 Description: GNU perfect hash function generator Homepage: https://www.gnu.org/software/gperf/ diff --git a/ports/libpq/CONTROL b/ports/libpq/CONTROL index 59154b657f9809..b4e4abcfe1cbc6 100644 --- a/ports/libpq/CONTROL +++ b/ports/libpq/CONTROL @@ -1,5 +1,5 @@ Source: libpq -Version: 12.2-3 +Version: 12.2-2 Build-Depends: libpq[bonjour] (osx) Supports: !uwp Homepage: https://www.postgresql.org/ diff --git a/ports/nettle/CONTROL b/ports/nettle/CONTROL index c6e3e37353b7cc..e73b0df663cb18 100644 --- a/ports/nettle/CONTROL +++ b/ports/nettle/CONTROL @@ -1,5 +1,5 @@ Source: nettle -Version: 3.5.1-2 +Version: 3.5.1-1 Homepage: https://git.lysator.liu.se/nettle/nettle Description: Nettle is a low-level cryptographic library that is designed to fit easily in more or less any context: In crypto toolkits for object-oriented languages (C++, Python, Pike, ...), in applications like LSH or GNUPG, or even in kernel space. Build-Depends: gmp, vs-yasm (windows) \ No newline at end of file diff --git a/ports/ocilib/CONTROL b/ports/ocilib/CONTROL index a79d07889c2098..c5d4fbb3742c95 100644 --- a/ports/ocilib/CONTROL +++ b/ports/ocilib/CONTROL @@ -1,5 +1,5 @@ Source: ocilib -Version: 4.6.4-2 +Version: 4.6.4-1 Homepage: https://vrogier.github.io/ocilib/ Description: OCILIB is an open source and cross platform Oracle Driver that delivers efficient access to Oracle databases. Supports: !(arm|uwp) \ No newline at end of file diff --git a/ports/quickfix/CONTROL b/ports/quickfix/CONTROL index 690170a68292f3..5a3fe30c21a073 100644 --- a/ports/quickfix/CONTROL +++ b/ports/quickfix/CONTROL @@ -1,5 +1,5 @@ Source: quickfix -Version: 1.15.1-5 +Version: 1.15.1-4 Build-Depends: openssl Homepage: https://github.com/quickfix/quickfix Description: QuickFIX is a free and open source implementation of the FIX protocol. diff --git a/ports/qwt/CONTROL b/ports/qwt/CONTROL index 54c1c88bbf5485..ba9f5bec1daabf 100644 --- a/ports/qwt/CONTROL +++ b/ports/qwt/CONTROL @@ -1,5 +1,5 @@ Source: qwt -Version: 6.1.3-12 +Version: 6.1.3-11 Homepage: https://sourceforge.net/projects/qwt Description: Qt widgets library for technical applications Build-Depends: qt5-base, qt5-svg, qt5-tools From 0e053451b304d97885dd566138159218f6579ada Mon Sep 17 00:00:00 2001 From: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com> Date: Wed, 17 Jun 2020 23:19:03 -0700 Subject: [PATCH 4/4] Remove libpq:arm64-windows=fail in baseline file --- scripts/ci.baseline.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/scripts/ci.baseline.txt b/scripts/ci.baseline.txt index edc4e9b48c81fb..bf8593347a7037 100644 --- a/scripts/ci.baseline.txt +++ b/scripts/ci.baseline.txt @@ -881,7 +881,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