Provisioning: Update Conan packages

* Update libjpeg-turbo to 2.0.5 * Replace MinGW 7 packages with MinGW 8 * Remove zlib packages as Qt is consistently built with -qt-zlib now
qtwebkit · Sep 11, 2020 · a70bd76 · a70bd76
1 parent 84fcc99
commit a70bd76
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 12 deletions.
diff --git a/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-10-x86/conanfiles/qtwebkit.txt
@@ -2,7 +2,7 @@
 icu/65.1@qtproject/stable
 libxml2/2.9.10@qtproject/stable
 libxslt/1.1.34@qtproject/stable
-libjpeg-turbo/2.0.3@qtproject/stable
+libjpeg-turbo/2.0.5@qtproject/stable
 
 [generators]
 cmake

diff --git a/coin/provisioning/qtci-windows-10-x86_64/11-conan.ps1 b/coin/provisioning/qtci-windows-10-x86_64/11-conan.ps1
@@ -50,20 +50,20 @@ Run-Conan-Install `
 
 Run-Conan-Install `
     -ConanfilesDir "$PSScriptRoot\conanfiles" `
-    -BuildinfoDir Mingw73-x86 `
+    -BuildinfoDir Mingw-x86 `
     -Arch x86 `
     -Compiler "gcc" `
-    -CompilerVersion 7 `
+    -CompilerVersion 8 `
     -CompilerLibcxx "libstdc++" `
     -CompilerException "dwarf2" `
     -CompilerThreads "posix"
 
 Run-Conan-Install `
     -ConanfilesDir "$PSScriptRoot\conanfiles" `
-    -BuildinfoDir Mingw73-x86_64 `
+    -BuildinfoDir Mingw-x86_64 `
     -Arch x86_64 `
     -Compiler "gcc" `
-    -CompilerVersion 7 `
+    -CompilerVersion 8 `
     -CompilerLibcxx "libstdc++" `
     -CompilerException "seh" `
     -CompilerThreads "posix"
diff --git a/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-10-x86_64/conanfiles/qtwebkit.txt
@@ -2,7 +2,7 @@
 icu/65.1@qtproject/stable
 libxml2/2.9.10@qtproject/stable
 libxslt/1.1.34@qtproject/stable
-libjpeg-turbo/2.0.3@qtproject/stable
+libjpeg-turbo/2.0.5@qtproject/stable
 
 [generators]
 cmake

diff --git a/coin/provisioning/qtci-windows-7-x86/11-conan.ps1 b/coin/provisioning/qtci-windows-7-x86/11-conan.ps1
@@ -2,10 +2,10 @@
 
 Run-Conan-Install `
     -ConanfilesDir "$PSScriptRoot\conanfiles" `
-    -BuildinfoDir Mingw73-x86 `
+    -BuildinfoDir Mingw-x86 `
     -Arch x86 `
     -Compiler "gcc" `
-    -CompilerVersion 7 `
+    -CompilerVersion 8 `
     -CompilerLibcxx "libstdc++" `
     -CompilerException "dwarf2" `
     -CompilerThreads "posix"
diff --git a/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt b/coin/provisioning/qtci-windows-7-x86/conanfiles/qtwebkit.txt
@@ -2,8 +2,7 @@
 icu/65.1@qtproject/stable
 libxml2/2.9.10@qtproject/stable
 libxslt/1.1.34@qtproject/stable
-libjpeg-turbo/2.0.3@qtproject/stable
-zlib/1.2.11@qtproject/stable
+libjpeg-turbo/2.0.5@qtproject/stable
 
 [generators]
 cmake
@@ -22,8 +21,6 @@ libxslt:shared=True
 
 libjpeg-turbo:shared=False
 
-zlib:shared=False
-
 [imports]
 bin, icudt65.dll -> ./bin
 bin, icuin65.dll -> ./bin