* [zkpp] Remove vcpkg_fail_port_install.
There was no supports expression before, and there is ci.baseline.txt impact.
In support of https://github.com/microsoft/vcpkg/pull/21502
* Fix flipped sense.
There was no supports expression, and there was ci.baseline.txt impact. The remaining ci.baseline.txt line item was x86-windows, so I tried building that. It results in:
```
C:\Dev\vcpkg2\buildtrees\eathread\src\f21f15bafd-3f7f4715f1.clean\include\eathread/internal/eathread_atomic_standalone_msvc.h(201): error C3861: '_InterlockedExchange64_INLINE': identifier not found
C:\Dev\vcpkg2\buildtrees\eathread\src\f21f15bafd-3f7f4715f1.clean\include\eathread/internal/eathread_atomic_standalone_msvc.h(202): error C3861: '_InterlockedExchangeAdd64_INLINE': identifier not found
C:\Dev\vcpkg2\buildtrees\eathread\src\f21f15bafd-3f7f4715f1.clean\include\eathread/internal/eathread_atomic_standalone_msvc.h(203): error C3861: '_InterlockedExchangeAdd64_INLINE': identifier not found
C:\Dev\vcpkg2\buildtrees\eathread\src\f21f15bafd-3f7f4715f1.clean\include\eathread/internal/eathread_atomic_standalone_msvc.h(204): error C3861: '_InterlockedExchangeAdd64_INLINE': identifier not found
C:\Dev\vcpkg2\buildtrees\eathread\src\f21f15bafd-3f7f4715f1.clean\include\eathread/internal/eathread_atomic_standalone_msvc.h(205): error C3861: '_InterlockedExchangeAdd64_INLINE': identifier not found
C:\Dev\vcpkg2\buildtrees\eathread\src\f21f15bafd-3f7f4715f1.clean\include\eathread/internal/eathread_atomic_standalone_msvc.h(206): error C3861: '_InterlockedOr64_INLINE': identifier not found
C:\Dev\vcpkg2\buildtrees\eathread\src\f21f15bafd-3f7f4715f1.clean\include\eathread/internal/eathread_atomic_standalone_msvc.h(207): error C3861: '_InterlockedAnd64_INLINE': identifier not found
C:\Dev\vcpkg2\buildtrees\eathread\src\f21f15bafd-3f7f4715f1.clean\include\eathread/internal/eathread_atomic_standalone_msvc.h(208): error C3861: '_InterlockedXor64_INLINE': identifier not found
C:\Dev\vcpkg2\buildtrees\eathread\src\f21f15bafd-3f7f4715f1.clean\include\eathread/internal/eathread_atomic_standalone_msvc.h(209): error C3861: '_InterlockedExchange64_INLINE': identifier not found
C:\Dev\vcpkg2\buildtrees\eathread\src\f21f15bafd-3f7f4715f1.clean\include\eathread/internal/eathread_atomic_standalone_msvc.h(216): error C3861: '_InterlockedExchange64_INLINE': identifier not found
C:\Dev\vcpkg2\buildtrees\eathread\src\f21f15bafd-3f7f4715f1.clean\include\eathread/internal/eathread_atomic_standalone_msvc.h(217): error C3861: '_InterlockedExchangeAdd64_INLINE': identifier not found
C:\Dev\vcpkg2\buildtrees\eathread\src\f21f15bafd-3f7f4715f1.clean\include\eathread/internal/eathread_atomic_standalone_msvc.h(218): error C3861: '_InterlockedExchangeAdd64_INLINE': identifier not found
C:\Dev\vcpkg2\buildtrees\eathread\src\f21f15bafd-3f7f4715f1.clean\include\eathread/internal/eathread_atomic_standalone_msvc.h(219): error C3861: '_InterlockedExchangeAdd64_INLINE': identifier not found
C:\Dev\vcpkg2\buildtrees\eathread\src\f21f15bafd-3f7f4715f1.clean\include\eathread/internal/eathread_atomic_standalone_msvc.h(220): error C3861: '_InterlockedExchangeAdd64_INLINE': identifier not found
C:\Dev\vcpkg2\buildtrees\eathread\src\f21f15bafd-3f7f4715f1.clean\include\eathread/internal/eathread_atomic_standalone_msvc.h(221): error C3861: '_InterlockedOr64_INLINE': identifier not found
C:\Dev\vcpkg2\buildtrees\eathread\src\f21f15bafd-3f7f4715f1.clean\include\eathread/internal/eathread_atomic_standalone_msvc.h(222): error C3861: '_InterlockedAnd64_INLINE': identifier not found
C:\Dev\vcpkg2\buildtrees\eathread\src\f21f15bafd-3f7f4715f1.clean\include\eathread/internal/eathread_atomic_standalone_msvc.h(223): error C3861: '_InterlockedXor64_INLINE': identifier not found
C:\Dev\vcpkg2\buildtrees\eathread\src\f21f15bafd-3f7f4715f1.clean\include\eathread/internal/eathread_atomic_standalone_msvc.h(224): error C3861: '_InterlockedExchange64_INLINE': identifier not found
```
which is a build failure in the port, not a CI artifact, so I added that to "supports" as well.
In support of https://github.com/microsoft/vcpkg/pull/21502
* [bullet3] Remove vcpkg_fail_port_install.
The supports expression and the portfile.cmake disagreed.
Supports: !((windows | linux) & (arm | uwp))
Portfile: osx | !(arm | arm64 | uwp)
If we demorgan the supports expression we get something closer to the portfile:
!(windows | linux) | !(arm | uwp)
If we take "!(windows | linux)" to mean that the author meant "osx", and assume arm64 implies arm, we end up with:
osx | !(arm | uwp)
In support of: https://github.com/microsoft/vcpkg/pull/21502
* Also remove ci.baseline.txt entries now covered by vcpkg.json.
* unrar only support windows
* update
* update
* mdnsresponder only support windows
* --amend
* add !uwp to supports
* add !arm64 to supports
* Update ports/mdnsresponder/vcpkg.json
Co-authored-by: nicole mazzuca <83086508+strega-nil-ms@users.noreply.github.com>
* [dimcli] Add supports field instead of written in ci.baseline, disable testing
* version
* Fix build on Windows
* version
* fix build on osx
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
* [gherkin-c] Fix UNIX build, fix install path
* version
* manifest
* version
* should be a `-` not an `_`
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
The `uuid/uuid.h` header conflicts with system libraries on osx; some system headers include `<uuid/uuid.h>`, intending to get the macOS system headers.
* fixed 22434
* Clean baseline
* update version
* version
* add supports field since the upstream doesn't support uwp
* improve code
* version
* version
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
* [fluidsynth] Update to 2.2.3
* Update patch
* EOL
* Change tool as a new feature
* version
* Remove code about CMAKE_EXECUTABLE_SUFFIX to fix linux build
* version
* update to 2.2.4, cleanup baseline, add supports keyword
* version
* Fix osx build
* version
* restore FEATURE_OPTIONS
* version
* Apply suggestions
* version
* Restore add_to_path in host triplet
* version
* Preserve log files for the build of make_tables.
Co-authored-by: NancyLi1013 <lirui09@beyondsoft.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
* [llvm] update to 13.0.0
* add version
* [llvm] rework processing of the CMake packages
* update versions
* [llvm] return patch to fix config paths
* update version
* [llvm] allow to build Flang on Windows
* add version
* [llvm] temporary enable Flang by default for test
* update version
* [llvm] fix Flang installation
* update version
* [llvm] try to fix Flang build
* update version
* [llvm] remove Flang from defaults and use Perl path
* [halide] update to 13.0.0
* update versions
* [mesa] update to v21.2.5 and fix build with LLVM 13
* [llvm] use version
* update versions
* [opencv4] fix build with Halide 13
* update version
* update ci.baseline
* [halide] update usage file
* [llvm] update supports
* update versions
* [vcpkg-ci-llvm] add test port
* [vcpkg-ci-llvm] rework test port
* [vcpkg-ci-llvm] test more features
* [halide] update to v13.0.1
* update version
* [mesa] recover port version
* update versions
* [opencv4] update version
* update version
* Update opencv4.json
* [halide] update to v13.0.2 and fix usage
* update version
* Update ports/halide/portfile.cmake
Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
* update version
* enable LLVM ABI breaking checks to avoid Halide build fail
Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
* [yasm] Fix feature tools
* version
* update baseline
* fix arm build, add host dependency
* version
* Fix desc
* update baseline
* Remove arm fix patch
* version
* Fix build, apply suggestions
* version
* Add line break
* version
* Set tools as a feature
* version
* Remove remaining ci.baseline.txt entry.
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
* Modernize lodepng portfile
* Update to 8c6a9e30
* Install LICENSE as copyright
* Don't install examples
* Remove unused parameter
* Merge lodepng-c into lodepng
* Add usage
* Omit lodepng-util: not official API
* Update versions
* [gdal] Don't use lz4: not a dependency
* [libjxl] Fix link flags
* Revise install cleanup, handle .dylib
* Add extra flags for uwp
* Workaround uwp toolchain quirks
* More dependency control, jxl_extras for tools only
* Pass the version to the build
* Update versions
* Skip CI for libjxl:arm-uwp
* Install usage file
* Update versions
* Use version-date for lodepng, mark lodepng-c as deprecated, and update version database.
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
* [libdisasm] Support uwp
* version
* Add dependency vcpkg-cmake
* version
* [breakpad] drop support with uwp
* version
* use _CRT_SECURE_NO_WARNINGS instead
* version
* Revise portfile and patch
* Install pc file for windows
* Update versions
* Remove readosm failure from CI baseline
* Revise dependencies based on #include, use pkgconfig
* Revise portfile
* Update to 5.0.1
* Update versions
* Fix release-only nmake build
* Update versions
* [bux] Add new port
* Corrections according to Create Pull Request suggested questions
* SHA512
* Mark fails into .\scripts\ci.baseline.txt
* Mark fails into .\scripts\ci.baseline.txt
* No need of "port-version": 1 in vcpkg.json
* Update version database
* Update ports/bux/portfile.cmake
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
* Update ports/bux/portfile.cmake
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
* Update ports/bux/portfile.cmake
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
* Update ports/bux/vcpkg.json
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
* Update bux.json
* Update ports/bux/vcpkg.json
* update version
* Update scripts/ci.baseline.txt
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
* update bux support
* update version
* update version
* Rename bux to buck-yeh-bux
* Update version database
* [buck-yeh-bux] upgrade to v1.5.0
1. [New] `bux::C_ParaLog` is ready for a variety of parallel logging configurations, filtered or unfiltered.
2. [New] Necessary helper classes for implementation _s.t_ logger users no longer need to declare child source instances explicitly.
3. [New] Add methods to `ParaLog.h` & `SyncLog.h` to support testability.
4. [New] Add unit test cases to `ParaLog.h` & `SyncLog.h` (test_paralog & test_logger)
5. [New] Update what are found in `test/` to `test/archlinux/aur_poc/`
6. [Bug] `std::uniform_int_distribution<unsigned char>` no longer allowed.
7. [Change] `CUR_FUNC_` for Windows (MSVC)
8. [Change] `tbb` is no longer implicitly needed by C++ standard library.
9. [Change] `smoke_filtlog.cpp` verifies 2-level log filters ok.
* Missing comma in versions/b-/buck-yeh-bux.json
* buck-yeh-bux 1.6.0
* Corrections made according to NancyLi1013's requests in PR #20813
* Fix SHA key in versions/b-/buck-yeh-bux.json
* Update to buxk-yeh-bux v1.6.2
* [buck-yeh-bux-mariadb-client] The first release
* Add dependency to libmariadb
* Inccorect git-tree value in versions/b-/buck-yeh-bux-mariadb-client.json
* linux build is enabled
* [buck-yeh-bux] Upgrade to 1.6.3 to allow u64-linux
* linux build is disabled again for not recognizing C++20 header <concpts> yet
* Mark vcpkg.json to support Linux but ci.baseline.txt to fail the CI build
* Repair buck-buck-yeh-bux in version database.
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
Co-authored-by: Jonliu1993 <13720414433@163.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
* Add cmake test port for user projects
* Improve find_package test failure output
* Remove JPEG from find_package tests
* Report find_package tests to stdout
* Test more packages
* Revise package list
* Remove obsolete variable
* Move AZP markup out of loop
* Fix typo
* Isolate find_package tests
* Disable manifest mode
* Improve stdout
* Enable debug output for find_package
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
* Enable CI for libspatialite:x64-windows-static-md
* Use pkgconfig for nmake
* Use pkgconfig for autotools; fix mingw
* Install pc file for windows
* Add feature interface, make GPLv2+ features optional
* spatialite-tools need libspatialite[rttopo]
* Update versions
* Update to 3.1.15
* Modernize portfile
* Keep plugins
* Always use vcpkg zlib instead vendored copy
* Use zlib and openssl modules in pc file
* Always install pc file, drop non-relocatable mariadb_config
* UWP is not supported
* Use schannel SSL backend on windows
* Fix exported includedir and libdir
* Fixup windows pc file
* Disable extra static lib
* Disable plugins with extra dependencies
* [libmariadb] Namespace targets with unofficial::
* Update versions
* Enable CI for x86-windows: no conflict with mysql
* Re-enable lib mariadbclient via feature
* Use openssl targets to handle multi-config
* Update versions
* CR request
* Update versions
* [getdns/flint] Update to the latest version
* [getdns/flint] Update to the latest version
* [flint] Add unsupported on uwp
* Update version files
* [flint] Handle dllimport macro in header files
* [arb] Update to 2.21.0
* [arb] Update to 2.2.1 and use upstream CMakeLists.txt
* [arb] App patch
* Update versions/a-/arb.json
* hwloc try and error
* hwloc fix build.
* format manifest
* version stuff
* remove supports expression. Copy COPYING from src dir
* format manifest
* overwrite version
* update ci baseline
hpx uses _mm_pause which seems to be undefined on arm64
maybe hpx requires a supports field?
* switch to version in manifest
* version stuff
* add maintainer
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
* version stuff
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
* apply patches to make qtmultimedia work with gestreamer on windows
* version stuff
* remove libnice from ci.baseline
* move gstreamer on osx as fail to baseline
* add supports field to qtmultimedia. Qt does not officially support x86 on windows
* version stuff
* remove duplicated patch
* version stuff
* add upstream patch to fix x86-windows
* [skip actions] version stuff
* [farmhash] support windows build
* [farmhash] update baseline JSON
* [farmhash] patch from PR diff
* [farmhash] patch from all PR changes
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
* Reformat portfile
* Minimize makefiles patch
* Update to 1.0.6
* Fix uwp builds, remove skip from baseline
* Install pc file for windows
* Update versions
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
* [BitSerializer] Update to version 0.9
* [bitserializer] Update port to new version 0.44
* [bitserializer] Update deprecated VCPKG Cmake functions
* [bitserializer] Remove default features list
Co-authored-by: Pavel_Kisliak <Pavel_Kisliak@epam.com>
* REGRESSION: chartdir:x64-linux. If expected, add chartdir:x64-linux=fail to .\scripts\ci.baseline.txt.
-- Note: chartdir only supports dynamic library linkage. Building dynamic library.
-- Downloading http://www.advsofteng.net/chartdir_cpp_linux_64.tar.gz -> chartdir_cpp_linux_64-7.0.0.tar.gz...
[DEBUG] Feature flag 'binarycaching' unset
[DEBUG] Feature flag 'manifests' = off
[DEBUG] Feature flag 'compilertracking' unset
[DEBUG] Feature flag 'registries' unset
[DEBUG] Feature flag 'versions' unset
[DEBUG] popen(curl --fail -L "https://vcpkgassetcache.blob.core.windows.net/assets/e7e71b64b3a756b6df174758c392ab4c9310b4d265e521dccbd009eeefd46e021a74572e7212de5564725df20ddf189e1599e88a116b426f1256f7d34b0131aa?sp=racwl&st=2021-06-29T20:09:46Z&se=2021-10-02T04:09:46Z&spr=https&sv=2020-08-04&sr=c&sig=g3shlIpD0R923OUzfIsrTwjX0vc6OzNXGEDO3URXmYc%3D" --create-dirs --output /mnt/vcpkg-ci/downloads/chartdir_cpp_linux_64-7.0.0.tar.gz.1003174.part 2>&1)
[DEBUG] cmd_execute_and_stream_data() returned 5632 after 31162 us
[DEBUG] popen(curl --fail -L http://www.advsofteng.net/chartdir_cpp_linux_64.tar.gz --create-dirs --output /mnt/vcpkg-ci/downloads/chartdir_cpp_linux_64-7.0.0.tar.gz.1003174.part 2>&1)
[DEBUG] cmd_execute_and_stream_data() returned 0 after 8512565 us
Error: Failed to download from mirror set:
https://vcpkgassetcache.blob.core.windows.net/assets/e7e71b64b3a756b6df174758c392ab4c9310b4d265e521dccbd009eeefd46e021a74572e7212de5564725df20ddf189e1599e88a116b426f1256f7d34b0131aa?*** SECRET ***: % Total % Received % Xferd Average Speed Time Time Time Current
Dload Upload Total Spent Left Speed
0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0
0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0
curl: (22) The requested URL returned error: 403 Server failed to authenticate the request. Make sure the value of Authorization header is formed correctly including the signature.
File does not have the expected hash:
url : [ http://www.advsofteng.net/chartdir_cpp_linux_64.tar.gz ]
File path : [ /mnt/vcpkg-ci/downloads/chartdir_cpp_linux_64-7.0.0.tar.gz.1003174.part ]
Expected hash : [ e7e71b64b3a756b6df174758c392ab4c9310b4d265e521dccbd009eeefd46e021a74572e7212de5564725df20ddf189e1599e88a116b426f1256f7d34b0131aa ]
Actual hash : [ ea2e05f28dd9647fed49feaf130d8034065067463965f144b3fae4eae482579b1ecf528dc86d1b3602887d5ca0c3b1569404489b0f4cb2300b798fed940cd467 ]
Updated SHAs and added quotes. These are the changes made by upstream:
```
diff --git a/new_sha/ChartDirector/cppdemo/surfacetexture/surfacetexture.cpp b/old_sha/ChartDirector/cppdemo/surfacetexture/surfacetexture.cpp
index 79f15be..302eb78 100644
--- a/new_sha/ChartDirector/cppdemo/surfacetexture/surfacetexture.cpp
+++ b/old_sha/ChartDirector/cppdemo/surfacetexture/surfacetexture.cpp
@@ -108,7 +108,9 @@ void createChart(int chartIndex, const char *filename)
const int dataZ_size = dataX_size * dataY_size;
double dataZ[dataZ_size];
for(int yIndex = 0; yIndex < dataY_size; ++yIndex) {
+ double y = dataY[yIndex];
for(int xIndex = 0; xIndex < dataX_size; ++xIndex) {
+ double x = dataX[xIndex];
dataZ[yIndex * dataX_size + xIndex] = dataX[xIndex] * dataY[yIndex];
}
}
@@ -176,7 +178,7 @@ void createChart(int chartIndex, const char *filename)
// Use a DrawArea to load the image
DrawArea* d = new DrawArea();
d->load("maptexture.png");
- d->resize(c->getPlotRegionWidth(), c->getPlotRegionDepth());
+ d->resize(240, 210);
// Set the DrawArea as a resource
c->setResource("texture", d);
diff --git a/new_sha/ChartDirector/lib/libchartdir.so.7.0.0 b/old_sha/ChartDirector/lib/libchartdir.so.7.0.0
index b1ea97f..bfb1d4b 100644
Binary files a/new_sha/ChartDirector/lib/libchartdir.so.7.0.0 and b/old_sha/ChartDirector/lib/libchartdir.so.7.0.0 differ
diff --git a/new_sha/ChartDirector/qtdemo/helloworld/qchartviewer.cpp b/old_sha/ChartDirector/qtdemo/helloworld/qchartviewer.cpp
index 5736d60..423120f 100644
--- a/new_sha/ChartDirector/qtdemo/helloworld/qchartviewer.cpp
+++ b/old_sha/ChartDirector/qtdemo/helloworld/qchartviewer.cpp
@@ -107,9 +107,9 @@ private:
QCursor *hZoomOutCursor;
QCursor *hNoZoomCursor;
- QCursor &getZoomCursor(QCursor **cache, double scale, int flags)
+ QCursor &getZoomCursor(QCursor *cache, double scale, int flags)
{
- if (0 == *cache)
+ if (0 == cache)
{
DrawArea d;
d.setSize(32, 32, Chart::Transparent);
@@ -127,9 +127,9 @@ private:
MemBlock m = d.outPNG();
QImage img = QImage::fromData((const uchar*)m.data, m.len);
img.setDevicePixelRatio(scale);
- *cache = new QCursor(QPixmap::fromImage(img), 15, 15);
+ cache = new QCursor(QPixmap::fromImage(img), 15, 15);
}
- return **cache;
+ return *cache;
}
public:
@@ -145,15 +145,15 @@ public:
}
QCursor &getZoomInCursor(double scale)
{
- return getZoomCursor(&hZoomInCursor, scale, 3);
+ return getZoomCursor(hZoomInCursor, scale, 3);
}
QCursor &getZoomOutCursor(double scale)
{
- return getZoomCursor(&hZoomOutCursor, scale, 1);
+ return getZoomCursor(hZoomOutCursor, scale, 1);
}
QCursor &getNoZoomCursor(double scale)
{
- return getZoomCursor(&hNoZoomCursor, scale, 0);
+ return getZoomCursor(hNoZoomCursor, scale, 0);
}
} cursorManager;
diff --git a/new_sha/ChartDirector/qtdemo/qtdemo/democharts.cpp b/old_sha/ChartDirector/qtdemo/qtdemo/democharts.cpp
index a3b7962..d706853 100644
--- a/new_sha/ChartDirector/qtdemo/qtdemo/democharts.cpp
+++ b/old_sha/ChartDirector/qtdemo/qtdemo/democharts.cpp
@@ -10954,7 +10954,9 @@ void surfacetexture(QChartViewer *viewer, int chartIndex)
const int dataZ_size = dataX_size * dataY_size;
double dataZ[dataZ_size];
for(int yIndex = 0; yIndex < dataY_size; ++yIndex) {
+ double y = dataY[yIndex];
for(int xIndex = 0; xIndex < dataX_size; ++xIndex) {
+ double x = dataX[xIndex];
dataZ[yIndex * dataX_size + xIndex] = dataX[xIndex] * dataY[yIndex];
}
}
@@ -11022,7 +11024,7 @@ void surfacetexture(QChartViewer *viewer, int chartIndex)
// Use a DrawArea to load the image
DrawArea* d = new DrawArea();
d->load("@/images/maptexture.png");
- d->resize(c->getPlotRegionWidth(), c->getPlotRegionDepth());
+ d->resize(240, 210);
// Set the DrawArea as a resource
c->setResource("texture", d);
@@ -12304,6 +12306,11 @@ void treemapcolors(QChartViewer *viewer, int /* chartIndex */)
void treemaplayout(QChartViewer *viewer, int chartIndex)
{
+ // Labels for the tree map
+ const char* energy_types[] = {"Coal", "Oil", "Gas", "Nuclear", "Hydro", "Solar", "Wind",
+ "Biomass", "Geothermal", "Wave"};
+ const int energy_types_size = (int)(sizeof(energy_types)/sizeof(*energy_types));
+
// Random data for the tree map
RanSeries* r = new RanSeries(3);
DoubleArray data = r->getSeries(20, 20, 400);
@@ -14163,10 +14170,7 @@ void circularbarmeter2(QChartViewer *viewer, int chartIndex)
m->setCap(0, Chart::Transparent);
// In this example, the circular bar has 20 segments
- int segmentCount = 20;
-
- // The angular step
- double angleStep = 360.0 / segmentCount;
+ int angleStep = 360 / 20;
// The gap between segments is 4.5 degrees
double angleGap = 4.5;
@@ -14205,39 +14209,28 @@ void circularbarmeter2(QChartViewer *viewer, int chartIndex)
stepColorScale_size));
}
- //
- // Now we draw the segments of the bar meter
- //
-
- // The segment that contains the value
- int currentSegment = (int)(angle / angleStep);
-
- // Segments after the current segment is colored with the blank color
- for(int i = currentSegment + 1; i < segmentCount; ++i) {
- m->addRingSector(radius, radius - 20, i * angleStep, (i + 1) * angleStep - angleGap,
- blankColor);
+ // Draw the blank part of the circular bar
+ if (angle < 360) {
+ // Iterate the segments in the blank part of the circular bar
+ for(int startAngle = (int)(angle / angleStep) * angleStep; startAngle < 360; startAngle +=
+ angleStep) {
+ // The first segment may be partially filled
+ double partialAngle = (startAngle >= angle ? 0 : (angle - startAngle) * (1 - angleGap /
+ angleStep));
+ m->addRingSector(radius, radius - 20, startAngle + partialAngle, startAngle + angleStep
+ - angleGap, blankColor);
}
-
- // Segments before the current segment is colored with the fill color
- for(int i = 0; i < currentSegment; ++i) {
- m->addRingSector(radius, radius - 20, i * angleStep, (i + 1) * angleStep - angleGap,
- fillColor);
}
- // Segment that contains the angle will be partially filled and partially blank. We need to
- // adjust the angle to compensated for the angle gap.
- double adjustedAngle = currentSegment * angleStep + (angle - currentSegment * angleStep) * (1 -
- angleGap / angleStep);
-
- // The blank part of the segment
- if ((currentSegment + 1) * angleStep > angle) {
- m->addRingSector(radius, radius - 20, adjustedAngle, (currentSegment + 1) * angleStep -
- angleGap, blankColor);
+ // Draw the fill part of the circular bar
+ if (angle > 0) {
+ // Iterate the segments in the fill part of the circular bar
+ for(int startAngle = 0; startAngle < angle; startAngle += angleStep) {
+ // The last segment may be partially filled
+ double angleSpan = (angleStep - angleGap) * (angle >= startAngle + angleStep ? 1 : (
+ angle - startAngle) / angleStep);
+ m->addRingSector(radius, radius - 20, startAngle, startAngle + angleSpan, fillColor);
}
-
- // The filled part of the segment.
- if (angle > currentSegment * angleStep) {
- m->addRingSector(radius, radius - 20, currentSegment * angleStep, adjustedAngle, fillColor);
}
// Add a label at the center to display the value
diff --git a/new_sha/ChartDirector/qtdemo/qtdemo/financedemo.cpp b/old_sha/ChartDirector/qtdemo/qtdemo/financedemo.cpp
index 7b8c1f5..b029776 100644
--- a/new_sha/ChartDirector/qtdemo/qtdemo/financedemo.cpp
+++ b/old_sha/ChartDirector/qtdemo/qtdemo/financedemo.cpp
@@ -315,13 +315,6 @@ void FinanceDemo::onLineEditChanged()
int new_avgPeriod2 = m_MovAvg2->text().toInt();
QString tickerKey = m_TickerSymbol->text();
- if (tickerKey.isEmpty())
- {
- // Default tickerKey
- tickerKey = "ASE";
- m_TickerSymbol->setText(tickerKey);
- }
-
QString compareKey = m_CompareWith->text();
bool needReloadData = (m_tickerKey != tickerKey) || (m_compareKey != compareKey);
@@ -367,16 +360,12 @@ void FinanceDemo::loadData(const QString& ticker, const QString& compare)
if (m_compareKey != compare)
{
m_compareKey = compare;
- if (m_compareKey.isEmpty())
- m_dailyPrice.compareData.clear();
- else
- {
+
// Simulator to generate realistic random OHLC values
FinanceSimulator db2(compare.toUtf8().data(), Chart::chartTime(2010, 1, 1),
Chart::chartTime(2020, 12, 31), 86400);
m_dailyPrice.compareData = arrayToVector(db2.getCloseData());
}
- }
// In this example, we will compute the weekly and monthly prices on demand. We just
// need to clear the old data here.
diff --git a/new_sha/ChartDirector/qtdemo/qtdemo/qchartviewer.cpp b/old_sha/ChartDirector/qtdemo/qtdemo/qchartviewer.cpp
index 5736d60..423120f 100644
--- a/new_sha/ChartDirector/qtdemo/qtdemo/qchartviewer.cpp
+++ b/old_sha/ChartDirector/qtdemo/qtdemo/qchartviewer.cpp
@@ -107,9 +107,9 @@ private:
QCursor *hZoomOutCursor;
QCursor *hNoZoomCursor;
- QCursor &getZoomCursor(QCursor **cache, double scale, int flags)
+ QCursor &getZoomCursor(QCursor *cache, double scale, int flags)
{
- if (0 == *cache)
+ if (0 == cache)
{
DrawArea d;
d.setSize(32, 32, Chart::Transparent);
@@ -127,9 +127,9 @@ private:
MemBlock m = d.outPNG();
QImage img = QImage::fromData((const uchar*)m.data, m.len);
img.setDevicePixelRatio(scale);
- *cache = new QCursor(QPixmap::fromImage(img), 15, 15);
+ cache = new QCursor(QPixmap::fromImage(img), 15, 15);
}
- return **cache;
+ return *cache;
}
public:
@@ -145,15 +145,15 @@ public:
}
QCursor &getZoomInCursor(double scale)
{
- return getZoomCursor(&hZoomInCursor, scale, 3);
+ return getZoomCursor(hZoomInCursor, scale, 3);
}
QCursor &getZoomOutCursor(double scale)
{
- return getZoomCursor(&hZoomOutCursor, scale, 1);
+ return getZoomCursor(hZoomOutCursor, scale, 1);
}
QCursor &getNoZoomCursor(double scale)
{
- return getZoomCursor(&hNoZoomCursor, scale, 0);
+ return getZoomCursor(hNoZoomCursor, scale, 0);
}
} cursorManager;
```
* REGRESSION: ccfits:arm64-windows. If expected, add ccfits:arm64-windows=fail to .\scripts\ci.baseline.txt.
REGRESSION: ccfits:x64-linux. If expected, add ccfits:x64-linux=fail to .\scripts\ci.baseline.txt.
REGRESSION: ccfits:x64-osx. If expected, add ccfits:x64-osx=fail to .\scripts\ci.baseline.txt.
REGRESSION: ccfits:x64-windows-static-md. If expected, add ccfits:x64-windows-static-md=fail to .\scripts\ci.baseline.txt.
REGRESSION: ccfits:x64-windows-static. If expected, add ccfits:x64-windows-static=fail to .\scripts\ci.baseline.txt.
REGRESSION: ccfits:x64-windows. If expected, add ccfits:x64-windows=fail to .\scripts\ci.baseline.txt.
REGRESSION: ccfits:x86-windows. If expected, add ccfits:x86-windows=fail to .\scripts\ci.baseline.txt.
>[DEBUG] popen(curl --fail -L https://heasarc.gsfc.nasa.gov/fitsio/ccfits/CCfits-2.5.tar.gz --create-dirs --output /Users/bion/vcpkg/downloads/CCfits-2.5.tar.gz.15183.part 2>&1)
>[DEBUG] cmd_execute_and_stream_data() returned 5632 after 415053 us
>Error: Failed to download from mirror set:
>https://heasarc.gsfc.nasa.gov/fitsio/ccfits/CCfits-2.5.tar.gz: % Total % Received % Xferd Average Speed Time Time Time Current
> Dload Upload Total Spent Left Speed
> 0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0
>curl: (22) The requested URL returned error: 404 Not Found
Fixed link and modernized portfile.
* REGRESSION: geogram:x64-linux. If expected, add geogram:x64-linux=fail to .\scripts\ci.baseline.txt.
REGRESSION: geogram:x64-osx. If expected, add geogram:x64-osx=fail to .\scripts\ci.baseline.txt.
REGRESSION: geogram:x64-windows-static-md. If expected, add geogram:x64-windows-static-md=fail to .\scripts\ci.baseline.txt.
REGRESSION: geogram:x64-windows-static. If expected, add geogram:x64-windows-static=fail to .\scripts\ci.baseline.txt.
REGRESSION: geogram:x64-windows. If expected, add geogram:x64-windows=fail to .\scripts\ci.baseline.txt.
REGRESSION: geogram:x86-windows. If expected, add geogram:x86-windows=fail to .\scripts\ci.baseline.txt.
Upstream is gone:
https://gforge.inria.fr/frs/download.php/file/38314/geogram_1.7.5.tar.gz: % Total % Received % Xferd Average Speed Time Time Time Current
Dload Upload Total Spent Left Speed
0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0
0 0 0 0 0 0 0 0 --:--:-- --:--:-- --:--:-- 0
curl: (60) SSL: no alternative certificate subject name matches target host name 'gforge.inria.fr'
More details here: https://curl.haxx.se/docs/sslcerts.html
curl failed to verify the legitimacy of the server and therefore could not
establish a secure connection to it. To learn more about this situation and
how to fix it, please visit the web page mentioned above.
[DEBUG] /agent/_work/1/s/buildtrees/_vcpkg/src/vcpkg-tool-2021-09-10/src/vcpkg/base/downloads.cpp(626)
[DEBUG] Exiting after 583.7 ms us (582562 us)
CMake Error at scripts/cmake/vcpkg_download_distfile.cmake:83 (message):
Failed to download file with error: 1
If you use a proxy, please check your proxy setting. Possible causes are:
1. You are actually using an HTTP proxy, but setting HTTPS_PROXY variable
to `https://address:port`. This is not correct, because `https://` prefix
claims the proxy is an HTTPS proxy, while your proxy (v2ray, shadowsocksr
, etc..) is an HTTP proxy. Try setting `http://address:port` to both
HTTP_PROXY and HTTPS_PROXY instead.
2. You are using Fiddler. Currently a bug (https://github.com/microsoft/vcpkg/issues/17752)
will set HTTPS_PROXY to `https://fiddler_address:port` which lead to problem 1 above.
Workaround is open Windows 10 Settings App, and search for Proxy Configuration page,
Change `http=address:port;https=address:port` to `address`, and fill the port number.
3. You proxy's remote server is out of service.
In future vcpkg releases, if you are using Windows, you no longer need to set
HTTP(S)_PROXY environment variables. Vcpkg will simply apply Windows IE Proxy
Settings set by your proxy software. See (https://github.com/microsoft/vcpkg-tool/pull/49)
and (https://github.com/microsoft/vcpkg-tool/pull/77)
Otherwise, please submit an issue at https://github.com/Microsoft/vcpkg/issues
Call Stack (most recent call first):
scripts/cmake/vcpkg_download_distfile.cmake:274 (z_vcpkg_download_distfile_show_proxy_and_fail)
ports/geogram/portfile.cmake:4 (vcpkg_download_distfile)
scripts/ports.cmake:141 (include)
Skipped in ci.baseline.txt.
* update to 14.2.3
* remove trailing whitespace
* update HEAD_REF
* update deprecated functions
* quote paths
* update versioning
* update baseline
* update versioning
* Use version rather than version-string.
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
PASSING, REMOVE FROM FAIL LIST: libsamplerate:x64-osx (.\scripts\ci.baseline.txt)
PASSING, REMOVE FROM FAIL LIST: cppgraphqlgen:x64-osx (.\scripts\ci.baseline.txt)
PASSING, REMOVE FROM FAIL LIST: libopusenc:x64-osx (.\scripts\ci.baseline.txt)
PASSING, REMOVE FROM FAIL LIST: cartographer:x64-osx (.\scripts\ci.baseline.txt)
PASSING, REMOVE FROM FAIL LIST: clockutils:x64-osx (.\scripts\ci.baseline.txt)
PASSING, REMOVE FROM FAIL LIST: cairo:x64-osx (.\scripts\ci.baseline.txt)
PASSING, REMOVE FROM FAIL LIST: matio:x64-osx (.\scripts\ci.baseline.txt)
PASSING, REMOVE FROM FAIL LIST: coolprop:x64-osx (.\scripts\ci.baseline.txt)
These were all hidden because before the Tensorflow fix we haven't had a working MacOS CI in weeks.
REGRESSION: mfl:x64-osx. If expected, add mfl:x64-osx=fail to .\scripts\ci.baseline.txt.
This depended on cario.
REGRESSION: cppkafka:x64-osx. If expected, add cppkafka:x64-osx=fail to .\scripts\ci.baseline.txt.
This looks like a legitimate failure to detect the dependent library librdkafka
REGRESSION: forge:x64-osx. If expected, add forge:x64-osx=fail to .\scripts\ci.baseline.txt.
This looks like a legitimate failure to
REGRESSION: embree3:x64-osx. If expected, add embree3:x64-osx=fail to .\scripts\ci.baseline.txt.
Conflicts on MacOS probably for the same reason as Linux.
* [qt6] Update to 6.1.1
* version stuff
* fix empty dir
* update version
* fix casing in qtbase
* [libpq] add secure32.lib on windows
* add clang-cl fix
* version stuff
* fix flag removal by adding a space
* version stuff
* make qt6->Qt6 usage consistent since Qt6 refers to itself as Qt6 with uppercase Q
* fix libpq wrapper opensll linkage on linux
* use policy to fix dependent ports
* version stuff
* use upstream patch
* version stuff
* fix source_location with clang-cl
* version stuff
* add all new modules
* add all modules to the qt port
* push all the ports
* fix patch
* update ports
* split qt_install_submodule into smaller functions
* add qlitehtml submodule to qttools
* update a few ports before moving to beta
* update vcpkg.json and refs and fix issue with update
* fix dependencies
* remove patch
* update to 6.2
* add nodejs to vcpkg_find_acquire_program for qtwebengine
* format manifest.
* fix webengine and see if it builds.
* apply format diff
* add patch
* fix arm builds
* fix linux gcc 7.5 build error
* fix patch
* bump version in qtbase otherwise CI seems to resuse the wrong version
* fix webengine release build
* try fixing gcc 7.5 build
* revert gcc 7.5 fixes since they broke osx
* revert gcc 7.5 fixes since they broke osx
* fix qtimageformats.
* actually enable new qt6 builds.
* fix search path for nodejs.
* fix the webengine patch again.
* fix wrong binary name
* revisit all dependencies
* revisit webengine features and build settings
* more feature stuff
* remove qt6betablock and more features review for qt 6.2
* add missing qt prefix.
* format manifest
* fix ci issues
* format manifest.
* add node on osx.
* install node on linux
* fix a typo and a disable another find_package
* fix mingw build issues and switch to not using tag
* use CMAKE_HOST_WIN32 instead
* update ref
* fix core configure error
* fix mingw case.
* fix script installation
* remove qmake helper scrpt
* delete debug folder if empty
* add vcpkg-tool-nodejs
* revert changes in the pipeline scripts
* adjust qtwebengine to the changes
* format manifest and revert doc changes
* fix message and logic
* fix hashes and make host only port
* fix hash again?
* qttools add linguist feature for crossbuilds
* fix dependency
* add thread and future to concurrent feature
* add assistant as a required host feature
(somebody should tell Qt not to do that)
* fix dependency.
* [skip ci] not a host dep?!?
* [skip ci] debuging
* [skip ci] more debug messages
* [skip ci] try always redownloading
* [skip ci] fix hash und skip hash for redownloading once
* [skip ci] comment out skip sha and redownload
* add vcpkg_fixup_pkgconfig to libvpx
* qtwebengine requires qml and quick
* fix manifest format
* qtwebengine does not support static builds!
* remove unnecessary parts of the patch
* update to beta2
* add some " and a message in update mode
* [skip ci] remove old and reorder patches
* [skip ci] add qtpaths6
* [skip actions] fix webengine patch
* [skip actions] fix a few submodule refs
* [skip actions] fix qtwebengine
* [skip actions] remove qml feature from webengine in qt metaport
* qtdeclarative raise minimum cmake version
* use the tree id instead?
* [skip actions] raise minimum cmake version in qtquick3d
* fix fetching of unadvertised commit ids
* revert changes to vcpkg_from_git
* revert doc changes
* [skip actions] use the new FETCH_REF
* [skip actiosn] remove raise of minimum version to retry with new cmake version
* [skip actions] update to beta3
* revert removal of patch
* update to beta4
remove qtquickcontrols2 deps
* fix missing \
* [skip actions] fix gstreamer feature on windows
* [skip actions]
remove outdated patches
format qtmultimedia
* [skip actions] update to rc1
* [skip actions] remove patch for now
* update refs
* [skip actions] comment patch to try another patch in qtmultimedia
* x86 is not supported by qtwebengine (at least one of its internal third party deps fails due to x64 intrinsics.)
* Finalize for 6.2 release.
Open issues: QtWebengine and cross builds.
* version stuff
* fix semver in qtquickcontrols.
* version stuff
* revise qtwebengine supports expression
* update version
https://dev.azure.com/vcpkg/public/_build/results?buildId=60445
PASSING, REMOVE FROM FAIL LIST: soundtouch:x64-windows-static
Probably fixed by: https://github.com/microsoft/vcpkg/pull/19377
REGRESSION: mosquitto:x86-windows
REGRESSION: mosquitto:x64-windows
Probably broken by: https://github.com/microsoft/vcpkg/pull/20148/
```
The following EXEs were found in /bin or /debug/bin. EXEs are not valid distribution targets.
D:/packages/mosquitto_x86-windows/bin/mosquitto_ctrl.exe
The following EXEs were found in /bin or /debug/bin. EXEs are not valid distribution targets.
D:/packages/mosquitto_x86-windows/debug/bin/mosquitto_ctrl.exe
Found 2 error(s). Please correct the portfile:
C:\a\1\s\ports\mosquitto\portfile.cmake
-- Performing post-build validation done
```
The upstream build system has this:
```
option(WITH_CJSON "Build with cJSON support (required for dynamic security plugin and useful for mosquitto_sub)?" ON)
if (WITH_CJSON)
FIND_PACKAGE(cJSON)
if (CJSON_FOUND)
message(STATUS ${CJSON_FOUND})
else (CJSON_FOUND)
message(STATUS "Optional dependency cJSON not found. Some features will be disabled.")
endif(CJSON_FOUND)
endif()
```
and indeed, I repro the problem if cjson is installed first. Disable WITH_CJSON as a fix.
OSX never finishing: Hopefully fixed by https://github.com/microsoft/vcpkg/pull/20388
Looked at most recent build https://dev.azure.com/vcpkg/public/_build/results?buildId=59859
REGRESSION: dxsdk-d3dx:x86-windows
REGRESSION: dxsdk-d3dx:x64-windows
```
The following files are already installed in D:/installed/x86-windows and are in conflict with dxsdk-d3dx:x86-windows
Installed by directxsdk:x86-windows
debug/lib/d3dx10d.lib
debug/lib/d3dx11d.lib
debug/lib/d3dx9d.lib
lib/d3dx10.lib
lib/d3dx11.lib
lib/d3dx9.lib
```
Probably caused by https://github.com/microsoft/vcpkg/pull/20053/ which removed windows & !windows from the directxsdk supports field.
PASSING, REMOVE FROM FAIL LIST: cmark:x64-windows-static
Already filed https://github.com/microsoft/vcpkg/pull/20216 last week about this.
ARM: vcpkg crashed. Reported to team chat.
OSX: agent died: ##[error]We stopped hearing from agent vcpkg-eg-mac-02.
Looks to be the same outstanding tensorflow problem :(
REGRESSION: embree3:x64-linux
```
Starting package 640/1653: embree3:x64-linux
Building package embree3[avx,avx2,core,sse2,sse42]:x64-linux...
-- Downloading https://github.com/embree/embree/archive/v3.12.2.tar.gz -> embree-embree-v3.12.2.tar.gz...
-- Extracting source /mnt/vcpkg-ci/downloads/embree-embree-v3.12.2.tar.gz
-- Applying patch fix-path.patch
-- Applying patch fix-static-usage.patch
-- Applying patch cmake_policy.patch
-- Applying patch fix-targets-file-not-found.patch
-- Using source at /mnt/vcpkg-ci/buildtrees/embree3/src/v3.12.2-cbae4ce8b1.clean
-- Configuring x64-linux-dbg
-- Configuring x64-linux-rel
CMake Warning at scripts/cmake/vcpkg_configure_cmake.cmake:433 (message):
The following variables are not used in CMakeLists.txt:
EMBREE_STATIC_RUNTIME
Please recheck them and remove the unnecessary options from the
`vcpkg_configure_cmake` call.
If these options should still be passed for whatever reason, please use the
`MAYBE_UNUSED_VARIABLES` argument.
Call Stack (most recent call first):
ports/embree3/portfile.cmake:50 (vcpkg_configure_cmake)
scripts/ports.cmake:140 (include)
-- Building x64-linux-dbg
-- Building x64-linux-rel
-- Installing: /mnt/vcpkg-ci/packages/embree3_x64-linux/share/embree3/copyright
-- Performing post-build validation
```
Probably caused by https://github.com/microsoft/vcpkg/pull/20053 which removed supports:windows from embree2.
Most recent CI build: https://dev.azure.com/vcpkg/public/_build/results?buildId=59428
REGRESSION: poppler:arm64-windows. If expected, add poppler:arm64-windows=fail to .\scripts\ci.baseline.txt.
PASSING, REMOVE FROM FAIL LIST: fontconfig:arm64-windows (.\scripts\ci.baseline.txt)
poppler depends on fontconfig, so this isn't actually a regression.
PASSING, REMOVE FROM FAIL LIST: libfreenect2:x64-linux
* [bsa] new port
* [bsa] Update version file
* [bsa] Update ci baseline
* [bsa] Update version database
* [bsa] Add patch for minimum cmake version
* [bsa] Update ci baseline
* Update version database
* Try more CI
* Fix merge typo
* [bsa] Update library version
* Update versions database
* Apply suggestions from code review
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
* Update versions/b-/bsa.json
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
* Apply suggestions from code review
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
* Apply suggestions from code review
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
* Update versions database
* [bsa] Add warning instead of fail on Linux
* Update versions database
* Update ports/bsa/vcpkg.json
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
* Update version database
* Rename to rsm-bsa
* Update versions database
* Update versions/baseline.json
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
* Fix typo
* Update versions
* Update ci.baseline.txt
* Remove rsm-bsa:x64-linux=fail in ci.baseline.txt now that VMs have G++10.
* Revert "Remove rsm-bsa:x64-linux=fail in ci.baseline.txt now that VMs have G++10."
because we actually are on gcc 9.x :(
This reverts commit 781289dc26.
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
