Fix ci baseline (#10390)

* Rebuild failed ports on ci baseline

* Remove passed port osg-qt:x64-linux from ci baseline file

* Add mirrors for qt5

14 files changed, 17 insertions, 15 deletions

diff --git a/ports/icu/CONTROL b/ports/icu/CONTROL
index 3f41ad191..9f57f9f5f 100644
--- a/ports/icu/CONTROL
+++ b/ports/icu/CONTROL
@@ -1,5 +1,5 @@
 Source: icu

-Version: 65.1-2

+Version: 65.1-3

 Homepage: http://icu-project.org/apiref/icu4c/

 Description: Mature and widely used Unicode and localization library.

 Supports: !uwp

diff --git a/ports/qt-advanced-docking-system/CONTROL b/ports/qt-advanced-docking-system/CONTROL
index a578f8643..3e22fb7cf 100644
--- a/ports/qt-advanced-docking-system/CONTROL
+++ b/ports/qt-advanced-docking-system/CONTROL
@@ -1,4 +1,4 @@
 Source: qt-advanced-docking-system

-Version: 2019-08-14

+Version: 2019-08-14-1

 Build-Depends: qt5-base, zlib, bzip2

 Description: Create customizable layouts using an advanced window docking system similar to what is found in many popular IDEs such as Visual Studio

diff --git a/ports/qt5-activeqt/CONTROL b/ports/qt5-activeqt/CONTROL
index e4aa3b5c1..e5667f7c2 100644
--- a/ports/qt5-activeqt/CONTROL
+++ b/ports/qt5-activeqt/CONTROL
@@ -1,5 +1,5 @@
 Source: qt5-activeqt

-Version: 5.12.5

+Version: 5.12.5-1

 Description: Qt5 ActiveQt Module - ActiveX components

 Build-Depends:  qt5-base

 Supports: windows
\ No newline at end of file
diff --git a/ports/qt5-base/CONTROL b/ports/qt5-base/CONTROL
index 090d35799..c3159094a 100644
--- a/ports/qt5-base/CONTROL
+++ b/ports/qt5-base/CONTROL
@@ -1,5 +1,5 @@
 Source: qt5-base
-Version: 5.12.5-10
+Version: 5.12.5-11
 Homepage: https://www.qt.io/
 Description: Qt5 Application Framework Base Module. Includes Core, GUI, Widgets, Networking, SQL, Concurrent and other essential qt components.
 Build-Depends: zlib, libjpeg-turbo, libpng, freetype, pcre2, harfbuzz, sqlite3, libpq, double-conversion, openssl, angle (!windows), egl-registry, icu (!uwp), fontconfig (!windows)
diff --git a/ports/qt5-base/cmake/qt_download_submodule.cmake b/ports/qt5-base/cmake/qt_download_submodule.cmake
index 4241b6635..8e03b00a8 100644
--- a/ports/qt5-base/cmake/qt_download_submodule.cmake
+++ b/ports/qt5-base/cmake/qt_download_submodule.cmake
@@ -15,9 +15,11 @@ function(qt_download_submodule)
 

     set(FULL_VERSION "${QT_MAJOR_MINOR_VER}.${QT_PATCH_VER}")

     set(ARCHIVE_NAME "${NAME}-everywhere-src-${FULL_VERSION}.tar.xz")

-

+    set(URLS "http://download.qt.io/official_releases/qt/${QT_MAJOR_MINOR_VER}/${FULL_VERSION}/submodules/${ARCHIVE_NAME}"

+    "http://mirrors.ocf.berkeley.edu/qt/official_releases/qt/${QT_MAJOR_MINOR_VER}/${FULL_VERSION}/submodules/${ARCHIVE_NAME}"

+    )

     vcpkg_download_distfile(ARCHIVE_FILE

-        URLS "http://download.qt.io/official_releases/qt/${QT_MAJOR_MINOR_VER}/${FULL_VERSION}/submodules/${ARCHIVE_NAME}"

+        URLS ${URLS}

         FILENAME ${ARCHIVE_NAME}

         SHA512 ${QT_HASH_${PORT}}

     )

diff --git a/ports/qt5-gamepad/CONTROL b/ports/qt5-gamepad/CONTROL
index e7b99662b..839ff9d7f 100644
--- a/ports/qt5-gamepad/CONTROL
+++ b/ports/qt5-gamepad/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-gamepad

-Version: 5.12.5-1

+Version: 5.12.5-2

 Description: Qt5 Gamepad Module - Enables Qt applications to support the use of gamepad hardware

 Build-Depends:  qt5-base, qt5-declarative

diff --git a/ports/qt5-graphicaleffects/CONTROL b/ports/qt5-graphicaleffects/CONTROL
index 111dfd7b4..934f226ba 100644
--- a/ports/qt5-graphicaleffects/CONTROL
+++ b/ports/qt5-graphicaleffects/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-graphicaleffects

-Version: 5.12.5-1

+Version: 5.12.5-2

 Description: Qt5 GraphicalEffects Module.

 Build-Depends:  qt5-base, qt5-declarative

diff --git a/ports/qt5-networkauth/CONTROL b/ports/qt5-networkauth/CONTROL
index 9115290bf..7d93e5958 100644
--- a/ports/qt5-networkauth/CONTROL
+++ b/ports/qt5-networkauth/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-networkauth

-Version: 5.12.5

+Version: 5.12.5-1

 Description: Qt5 Network Authorization Module

 Build-Depends:  qt5-base

diff --git a/ports/qt5-purchasing/CONTROL b/ports/qt5-purchasing/CONTROL
index f83c48053..6feb78113 100644
--- a/ports/qt5-purchasing/CONTROL
+++ b/ports/qt5-purchasing/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-purchasing

-Version: 5.12.5-1

+Version: 5.12.5-2

 Description: Qt5 Purchasing Module - Enables in-app purchase of products in Qt applications.

 Build-Depends:  qt5-base, qt5-declarative

diff --git a/ports/qt5-remoteobjects/CONTROL b/ports/qt5-remoteobjects/CONTROL
index def806c79..a46de496c 100644
--- a/ports/qt5-remoteobjects/CONTROL
+++ b/ports/qt5-remoteobjects/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-remoteobjects

-Version: 5.12.5-1

+Version: 5.12.5-2

 Description: Qt5 Remoteobjects module - Provides an easy to use mechanism for sharing a QObject's API (Properties/Signals/Slots) between processes or devices.

 Build-Depends:  qt5-base, qt5-declarative

diff --git a/ports/qt5-sensors/CONTROL b/ports/qt5-sensors/CONTROL
index 1c7218bec..e7068815a 100644
--- a/ports/qt5-sensors/CONTROL
+++ b/ports/qt5-sensors/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-sensors

-Version: 5.12.5-1

+Version: 5.12.5-2

 Description: Qt5 Sensors module - Provides access to sensor hardware and motion gesture recognition.

 Build-Depends:  qt5-base, qt5-declarative

diff --git a/ports/qt5-serialport/CONTROL b/ports/qt5-serialport/CONTROL
index 732f6a7da..3f8dffc8b 100644
--- a/ports/qt5-serialport/CONTROL
+++ b/ports/qt5-serialport/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-serialport

-Version: 5.12.5

+Version: 5.12.5-1

 Description: Qt5 Serial Port - provides access to hardware and virtual serial ports

 Build-Depends:  qt5-base

diff --git a/ports/qt5-tools/CONTROL b/ports/qt5-tools/CONTROL
index d77faa268..0e662daf3 100644
--- a/ports/qt5-tools/CONTROL
+++ b/ports/qt5-tools/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-tools

-Version: 5.12.5-4

+Version: 5.12.5-5

 Description: Qt5 Tools Module; Includes deployment tools and helpers, Qt Designer, Assistant, and other applications

 Build-Depends:  qt5-base, qt5-declarative, qt5-activeqt (windows)

diff --git a/ports/qt5-webchannel/CONTROL b/ports/qt5-webchannel/CONTROL
index e8adae197..91d444b2e 100644
--- a/ports/qt5-webchannel/CONTROL
+++ b/ports/qt5-webchannel/CONTROL
@@ -1,4 +1,4 @@
 Source: qt5-webchannel

-Version: 5.12.5-1

+Version: 5.12.5-2

 Description: Qt5 Web Channel module - Provides access to QObject or QML objects from HTML clients for seamless integration of Qt applications with HTML/JavaScript clients.

 Build-Depends:  qt5-base, qt5-declarative