* [cairo] upgrade cairo to 1.7.6 (microsoft#23848)
* [cairo] remove patch (microsoft#23848)
0001-meson-fix-macOS-build-and-add-macOS-ci.patch has been merged
into the upstream repository and is part of the 1.7.6 release.
* [cairo] use meson option to disable bfd (microsoft#23848)
Upstream has introduced an option to disable bfd. Use the option
to disable it (See microsoft#23022)
* [cairo] chase upstream cflags handling (microsoft#23848)
Upstream has put all cflags handling into the top-level meson.
Move our static compilation indicator definition to the top level,
too.
* [cairo] force-disable xcb (microsoft#23848)
This is the next update
* [cairo] format vcpkg.json (microsoft#23848)
* [cairo] update version registries (microsoft#23848)
* [cairo] add license (microsoft#23848)
* [cairo] regenerate versions registry (microsoft#23848)
Co-authored-by: Schaich <alonso.schaich@sodgeit.de>
* Apply patch: ‘sleep_for’ is not a member of ‘std::this_thread’
* Run with `./vcpkg x-add-version --all`
* update version-string
* update version
* Replace deprecated methods
* Add neccesary dependencies
Add missing license field according to original repo's license
* Run with `./vcpkg x-add-version --all`
* Bump port version
Run with `./vcpkg x-add-version --all`
* update version
* delets git-tree
* update git tree
* update vcpkg.json
* update version
Co-authored-by: Jonliu1993 <13720414433@163.com>
* add port cargs v1.0.2
* added version information
* updated version to v1.0.3
* update version
* fixed package version number
* fixed SHA for version 1.0.3
Co-authored-by: Jonliu1993 <13720414433@163.com>
* Use static runtime if capstone wants to be statically linked
This makes more sense than using the shared runtime if building a static version
* increase port-version
* Update version database
* select CRT as new feature
* don't use upercase in feature name
* format json
* run x-add-version
* remove extra space
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
* run x-add-version
* Modernize the port file.cmake
* update version
* checking feature per OS
* update versioning
* remove check for static CRT on windows so it doesn't conflict with other ports (Triton)
* update versioning
* use VCPKG_CRT_LINKAGE instead of feature for CRT
* update versioning
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
Co-authored-by: Jonliu1993 <13720414433@163.com>
* Update charls to 2.3.4
* version
* Change version-string to version
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
* version
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
Resolves https://github.com/microsoft/vcpkg/issues/22980https://github.com/microsoft/vcpkg/pull/12785 Added a set of `CMAKE_CXX_STANDARD` in this CMake config which accidentally overwrites higher versions. Upstream already has a `target_compile_options` to do this the Right Way.
This change:
* Deletes the offending attempt to set CMAKE_CXX_STANDARD. Downstream users that don't listen to the INTERFACE_COMPILE_FEATURES need to be patched locally.
* Modernizes to use vcpkg_cmake_Xxx.
* Removes attempt to fix up paths that already appears handled by `vcpkg_cmake_config_fixup`.
* Adds quotes.
* (WIP) [cgal] Update to 5.4-beta1
* Add version
* [cgal] Update to 5.4
* [cgal] add version
* [cgal] Remove version for CGAL-5.4-beta1
That is required by the CI.
* [cgal] Add "license" field
That is required by the CI.
* [cgal] Update version after last modification
* Bump GSL to 4.0.0
* Update version database
* Fix typo
* Add missing file
* Update version database
* GSL portfile properly expose Microsoft.GSL package
* Update version database
* Respond to review
* Update version database
* Update version database v2
* Update release ref
* Update version database
* Respond to review
* Update version database
* Add patch to SEAL to link to correct GSL version
* Update version database
* Update version database v2
* Bulk remove vcpkg_fail_port_install calls.
Interesting ones have been split out into separate reviews, where "interesting" means "anything more than just deleting the call to vcpkg_fail_port_install",
In support of https://github.com/microsoft/vcpkg/pull/21502
* Update version database.
* Revert google benchmark changes already submitted as https://github.com/microsoft/vcpkg/pull/22728
* Repair version database.
* [capnproto] Remove vcpkg_fail_port_install.
The portfile and vcpkg.json disagreed.
```
vcpkg.json: !uwp & !((arm | arm64) & windows)
portfile: !uwp & (!windows | !(arm | arm64))
```
If we demorgan the supports expression once they agree:
```
!uwp & (!(arm | arm64) | !windows)
```
Also, arm64 implies arm:
```
!uwp & (!arm | !windows)
```
In support of https://github.com/microsoft/vcpkg/pull/21502
* Put the supports expression into DNF as suggested by @strega-nil.
vcpkg.json and portfile.cmake disagreed.
```
vcpkg.json: !osx & !uwp & (linux | !static)
portfile.cmake: !osx & !uwp & (!windows | !(static | staticcrt))
```
Trying to get portfile.cmake to agree:
```
!osx & !uwp & (!windows | !(static | staticcrt)) given
!osx & !uwp & (!windows | (!static & !staticcrt)) demorgan
```
Considering !osx is earlier, I'm assuming Linux and !Windows are equivalent here:
```
!osx & !uwp & (linux | (!static & !staticcrt)) (above)
```
I'm assuming that portfile.cmake just never considered staticrt and linux, so I'm adding that condition.
In support of https://github.com/microsoft/vcpkg/pull/21502
* rename port co to cocoyaxi
* update version
* update port version
* update sha
* rename co to cocoyaxi
* update sha
* cleanup portfile for cocoyaxi
* update sha
* add co
* update version for co
* fix version files
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
* Update HTTP to HTTPS links where it can be done safely.
This means that the HTTP-based link gave a 200 response with identical
content to the HTTPS version of the link. For links containing
variables, we checked the interpolated (real) link.
* Bump relevant vcpkg.json versions.
* Use version-date for cello.
* update version
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Co-authored-by: Jonliu1993 <13720414433@163.com>
* Update to 5.3.1
* Add version
* Apply suggestions from the CI
* After `vcpkg format-manifest ports/cgal/vcpkg.json`
* add version
* Update versions
* Fix after suggestions from JonLiu1993
* Fix versions
* add a single config community triplet based on x64-windows
* add a failed port, otherwise mechanism does not support empty list
* add failures to baseline
* remove duplicate entry
* second round of failures added to baseline
* third round of regressions added to CI
* [ade] fix single-config builds
* [ade] update refs
* remove duplicate entries
* [unix2dos] restore eol in script file
* add even more ports now failing in singleConfig...
* [libjpeg-turbo] remove unnecessary check
* [libjpeg-turbo] fix references
* [baseline] restore check for ports that were added recently
* [libmodplug] enable single config triplets
* [tensorflow-common] enable single config triplets
* update baseline
* fix references
* remove wrong check for single config triplets
* fix references
* [ogre] fix single config builds
* [ogre] fix references
* [untested] force x64-windows-release as host triplet when testing x64-windows-release in CI
* fix
* [x264] fix for single config
* [x264] update refs
* [libffi] enable single config builds
* [libffi] update refs
* remove cli broken arguments
* [calceph] enable single-config builds
* [calceph] fix references
* [kf5config] enable single-config builds
* [kf5config] fix references
* [detours] enable single-config builds
* [detours] fix references
* [kf5*] enable single-config builds
* [kf5*] fix references
* fix
* kf5config fix reference
* trying again to force host triplet in CI
* [boost] fix for single-config builds
* [boost] update references
* fix
* [boost] update refs
* disable host triplet in ci because it's not necessary
* retrigger a build for ports previously failing
* remove host triplet in ci, not necessary anymore?
* make PR dry
* [tensorflow-common] bump version
* [tensorflow-common] fix references
* Fix version database for boost-modular-build-helper.
* fix references
* restore CRLF on some ports
* bump versions
* fix references
* bump port versions
* fix references
* boost-modular-build-helper: Reverted due to no changes.
detours, kf5config, kf5holidays, libbacktrace: Reverted due to only whitespace changes.
libffi: bumped port-version
libmodplug: reverted due to no functional changes
ogre, ogre-next: reverted due to incorrect case of "Debug" vs. "Release" already fixed in master.
And rebuilt version database.
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
* [caf] Update to 0.18.5
* Remove setting of BUILD_SHARED_LIBS already handled by vcpkg_cmake_configure.
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
* update meson to 0.60.1
* add port vcpkg-tool-meson for consistency deprecate usage of tool-meson
* [skip actions] make every port using meson depend on vcpkg-tool-meson
(except pkgconf for now.)
* fix subtle bugs in vcpkg_find_acquire_program
make the port install meson if the system does not provide it.
* make pkgconf depend on meson
* restore old vcpkg_find_acquire_program behavior for versioning
* Update ports/gstreamer/vcpkg.json
remove duplicated dependency
* remove invalid option in glib
* [skip actions] fix ci failures?
* remove invalid option in gstreamer
* try without cmake
* get more logs from meson configure.
* update glib to 2.70.1
* fix typo
* fix pc file of flac
* update meson to 0.60.2
* try the patch from the other pr.
* patch meson .....
* version stuff
* fix port version
* fix gstreamer version
* remove version
* format-manifest
* version stuff
* format manifest again
* revert version stuff
* remove outdated gtk options
* version stuff
* pango version stuff
* correct baseline lost in merge
* Fix fontconfig version db
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
* Update casclib to 2021-11-16
* Update CI baseline
* Add patch for shared Windows builds
* Update CI baseline
* Fix find_package
* Update CI baseline
Co-authored-by: chausner <chausner@users.noreply.github.com>
* [many ports] call vcpkg_fixup_pkgconfig()
The ports generate pc files, but don't call vcpkg_fixup_pkgconfig() so that there are absolute paths in the pc files
* Update port-version for armadillo and polyclipping.
* Update version database.
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
* many ports: Fix pkgconfig files location
* Use rename in botan rather than install plus delete.
* Delete the duplicate share/pkgconfig files in cppad *after* vcpkg_fixup_pkgconfig.
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
* Add cpp-jwt
* Update ports/cpp-jwt/portfile.cmake
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
* overwrite cpp-jwt version
* Update cpp-jwt which no longer requires to remove include/jwt/test
* Use version-date in cpp-jwt port
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.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 co to v2.0.2
* fix gitree in co.json
* add install-dll.patch for co
* update version
* fix CRT linkage
* update version
* minimal patch
* update version
* Update cppzmq to 4.8.1
* Update CI baseline
Co-authored-by: chausner <chausner@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
* Update cli11 to 2.1.0
* Update CI baseline
* Change version-semver to version for cli11
* Update git-tree version
Co-authored-by: chausner <chausner@users.noreply.github.com>
* [protobuf] upgrade to latest release (v3.18.0)
This requires patching OpenCV as it uses a function removed in the
latest version of protobuf (FWIW, upstream OpenCV has a similar patch).
* The arcus port also needs a patch
* The caffe2 port also needs a patch
* The brpc port also needs a patch
* initial port of calceph
* apply correct format on vcpkg.json
* add quotes in portfile
* Update version database
* add url to the documentation
* Update version database
* update vcpkg.json
* update version
* delete error version
* remove useless on operating system
* update database version
* Apply suggestions from code review
applied suggested changes about versions
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
* update port number
* update database version
* format vcpkg.json
* update version
* update portfile.cmake error
* update version
* update portfile.cmake error
* update portfile.cmake error
* fix clflags in debug mode
* update database version
* add the debug flags
* update version database
* add space to avoid single quote for cflags in Makefile.vc
* update version database
* Update version database.
Co-authored-by: Gastineau <Mickael.Gastineau@obspm.fr>
Co-authored-by: Jonliu1993 <13720414433@163.com>
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
* [cmark] update to 0.30.0
* update version
* update portfile.cmake
* update version
* add patch
* update version
* fix-uwp-APPX0703
* update version
* [cmark] update to 0.30.1
* update version
* update portfile.cmake
* update version
* update version
* Add feature tools
* version stuff
* Add feature tools and remove the old unnecessary patch
* version
* delete outdate option
* update version
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
* [cimg/libgd/libfabric] Update to latest release version
* Remove empty line
* [libgd] Update the patch
* Small changes
* [libgd] Update to version semver
* [audiofile/cgltf/libsbml] Update to the latest version
* Format manifests
* [libsbml] Update branch from stable to development
* Update versions/l-/libsbml.json
* [audiofile] Add options to vcpkg_cmake_configure
* [magnum/-plugins] Remove obsolete patches that no longer apply
Signed-off-by: Squareys <squareys@googlemail.com>
* [corrade] Make feature to flag translation consistent to fix warning
Consistent with magnum & magnum-plugins
Signed-off-by: Squareys <squareys@googlemail.com>
* Fix warning message for dlls without matching pdbs always displayed
Signed-off-by: Squareys <squareys@googlemail.com>
* Fix the baseline version
* Revert the changes in vcpkg_copy_pdbs.cmake
Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
* [cgns] update to 4.2.0
* [vtk-m] update to 1.6.0
* [vtk] Update to 9.0.1-pv5.9.1
- VTK update to match release version of ParaView
* [ParaView] Update to 5.9.1
* version stuff
* fix automatic svg linkage in static builds
* update qt5-svg
* revisit vtk
- fix build with vtk-m 1.6
- remove unused patches
- remove comments
* bump version
* remove two commented lines
* version stuff
* remove old PR version
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
* [catch2] Update to 1.13.7 and support static build
* Update version files
* Revert the new version update changes
* Update version files
* Update versions/c-/catch2.json
* Fix install path for lib and pkgconfig
* Update versions/c-/catch2.json
* update 2021-07-27
macOS -> 11.5.1, XCode -> 12.5.1
* update azure-pipelines
* update sha of macfuse
* change how macos-ci-base works
* fix build errors
* fix itpp:linux
* more fixes
* remove tab
* allow version changes in all the remove/rename-version patches
* fix libunistring for real
* robert CR
* Fix c-ares compilation under Linux with shared linkage
* Update version
* Update version file
Co-authored-by: Victor Romero <romerosanchezv@gmail.com>
* Not tested yet
* Fix SHA and version name
* reset port version to 0
* Upgrade to 5.3
* CGAL: Add FEATURES and run add-version
* update version
* [cgal] Convert to vcpkg.json
* Cancel modifications to versions/c-/cgal.json
* update version file
Co-authored-by: Jonliu1993 <13720414433@163.com>
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
Co-authored-by: Billy Robert ONeal III <bion@microsoft.com>
file(RENAME Camel lower) works fine when running vcpkg in
Windows Powershell with triplet x64-windows in NTFS fs.
file(RENAME Camel lower) does not work fine when running vcpkg in
WSL with triplet x64-linux in NTFS.
* move boost out of the toolchain
* move icu out of the toolchain
* remove CURL from the toolchain (was already unreachable?)
* remove gsl from toolchain
* remove grpc from toolchain
* version stuff
* fix indent and missing endif()
* version stuff
* Revert changes to vcpkg.cmake
* push port version
* version stuff
* - updated catch2 to version 2.13.6
- replaces catch2 CONTROL file with proper manifest
* vcpkg x-add-version catch2
* fixed the portfile to REALLY update catch2 to version 2.13.6
* vcpkg x-add-version catch2 --overwrite-version
* fixed the portfile AGAIN to REALLY REALLY update catch2 to version 2.13.6 this time
* vcpkg x-add-version catch2 --overwrite-version
* updated hash in portfile.cmake for catch2
* vcpkg x-add-version catch2 --overwrite-version
* Update version-string as version-semver
* Update versions/c-/catch2.json
Co-authored-by: NancyLi1013 <lirui09@beyondsoft.com>
* [curl] Fix android builds. Greatly simplify pkgconfig handling.
* [curl] Fix permissions on curl-config
* [curl] Fix missing assigment in replacement
* [curl] Update version
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
* Remove the CGALConfig.cmake in /lib/cgal to only keep the original stuff in /share/cgal. This will fix the missing CGAL_VERSION.
* Update CONTROL version
* update baseline version
* update comms
* update versions
* commsdsl is dynamic only
* update version
* fail on static
* update version
* use version-semver instead of version-string
* update versions
* update glib to meson
* update ci baseline
* update glib to 2.66.3
remove cmakelists
* fix some minor meson issue but meson is still a mess
* add_bin_to_path to vcpkg_install_meson
* regen docs
* try fixing/touching all glib dependent ports
* fix libsigcpp-3 version
* fix glibmm
* fix gmime
* fix libcroco
* update libnice
* fix atk build
* update harfbuzz
* fix few builds
* update libxmlpp
* fix gdk-pixbuf
* fix gts
* gts add patch
* remove old libsigcpp
* add missing comma
* fix supports logic
* fix name mismatch
* restore original ci baseline.
* fix a lot of small details.
increment controls.
* fix harfbuzz & glib
* bump port version
* update port_versions
* fix version field
* update versions
* fix glib in harfbuzz
* update port versions
* silly uppercase type
* update port-versions
* fix cairo build
* update version
* fix atk
* update atk port-verisons
* fix gts public includes
* update versions
* fix cairomm
* fix pango
* fix ignition
* update versions.
* fix gtk
* fix librsvg
* update versions
* fix atk linux
* fix libgpod
* update versions
* fix lcm
* fix librsvg
* update pango and pangomm
* update pango to meson
* more updates
* update pixman
* fix cairo
* fix cairo
* some fixes
* reorder meson a bit
* add none.txt for meson
* fix x86_x64 to x86 "cross" builds
* add tiff pkgconfig
* update gdk-pixbuf
* fix tiff and jpeg
* add graphene
* fix gdk-pixbuf
* add sassc
* update gtk
* fix cairo complete build
* add harfbuzz inlcude in pango since meson does not add it into pkgconfig.
* fix gtk build. Remaining issue fix install script.
* fix gtk build
* fix io2d
* add supports field
* fix cartographer?
* fix librsvg build
* fix gtk build
* fix cartographer
* fix sassc on linux
* fix tiff and libjpeg pc files
* fix pixman x86
* _isnanf is undefined on arm-
* merge fix for make on arm64
* fix gdk-pixbuf on arm64-windows
* pixman remove test/demos.
should fix it on osx.
* [vcpkg_install_meson] add bin to path to run code generators
* [vcpkg_configure_meson]
deactivate native compiler in cross builds
make x86 on x86_x64 a native instead of a cross build
(as long as we are not building for UWP)
* pixman reenable UWP support.
* pixman reenable arm support
* add pixman:arm-uwp=fail to baseline
* update gtkmm
* remove double whitespaces
* gtk baseline
gtk dependency on cairo x11
remove double spaces in flags
* fix linux build
* native none again
* cairo fix cairo-script.pc
* comment out patch since the cairo changes should have fixed it.
* disable wayland backend in GTK since CI is missing system packages
* silly typo in cairo pc file correction
install lzo pc on windows
* remove double spaces in _FLAGS
remove unnecessary comments
* actually disabling wayland backend
* fix glib codegen issue having the wrong path
* try to fix paths in glib codegen
* integrate changes form #12860
* add the uwp patch back in
* deactivate extra harfbuzz shapers.
* vcpkg x-add-version --all --overwrite-version
* remove patches in tesseract.
* fix version
* rerun add-version
* add libgpod:x64-linux=fail to baseline due to missing system tools/libraries
* change regex to take double - into account.
* run x-add-version
* run format-manifest
* add missing removal of multiple spaces back into the regex
* remove ws diff change
* fix gtkmm the upstream way
* remove ws to reduce diff
* make glib build on osx
* format manifest
* run x-add-version
* add pthread dependency
* update baseline due to glib compiling on osx now.
* add meson as a dep to glib
* - add glib host dependencies
- switch to manifest of touched ports
* switch to manifest.
* [libxml2] add gnuinstalldirs
* [libxml2] add missing include of GNUInstallDirs
* add version info
* add include dir to pc files ....
* update version
* add UWP as crosscompiling target
* Apply suggestions from code review
* trying to fix cairo pthread detection on osx.
* fix libmicrohttpd by adding the required system frameworks on osx
* fix poppler by not removing the CXX standard
* fix missing coretext header from harfbuzz in pano
* fix formating issues
* fix librsvg on osx
* revert version changes
* bump version
* version stuff.
* fix graphene version stuff
* fix version stuff
* removing ports from ci baseline to cause me pain
* move cairomm:x64-linux=fail
to gtkmm:x64-linx=fail
remove pangomm:x64-osx=fail
* fix typo
* revert ws changes to vcpkg_install_meson
* update port version after merge
* version stuff
* fix fluidsynth by adding vcpkg_check_features
* move cairo to ci baseline on osx
* version stuff
* fluidsynth corrections
* more version stuff
* apply code review changes
* clean version stuff.
* update version stuff
* code review cleanup
* version stuff
* formating
* update version stuff again
* remove gdi again
* version stuff
* version stuff
* version baseline
* Apply strega-nil suggestions from code review
* run x-add-version
* reset versions to upstream/master
* v8 CONTROL -> json
* reset fluidsynth to upstream/master
* first batch of version-string -> version conversion
* second and last batch of version-string -> version conversions
* update version stuff
* disable gdi feature in harfbuzz (missing user32 linkage in qt5-base)
* version stuff
* Apply suggestions from code review
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
* Apply suggestions from code review
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
* more CR stuff
* update versions
* back out provision changes so that pr can be merged.
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
* Update to CUDA 11.3 on Windows.
* Update PowerShell to 7.1.3.
* Update CUDA to 11.3 on Linux.
* "Explode" VM provisioning scripts for more consistent feedback during deploy. This resolves the deployment script often hanging with no feedback as to why.
* [libdatachannel] Fix use of deprecated result_type typedef.
Submitted upstream as https://github.com/paullouisageneau/libdatachannel/pull/413
* [libvpx] Get the libvpx outputs from the correct place.
(Perhaps VS2019 version 16.10 moved where these are placed? I've been defensive and left an attempt to find from the old location in place.)
* [chromaprint] Support implementations where lrintf is an intrinsic.
* Add provision-entire-image script.
* [cudnn] Disable download-on-the-fly due to licensing concerns.
* Add libnccl to Linux VMs.
* [wangle] Disable x64-windows due to an ICE.
* [cmake] Update cmake to 3.20.1 to avoid https://gitlab.kitware.com/cmake/cmake/-/issues/21571 race
* [libudis86] Fix passing a bogus working directory which fails on CMake 3.20.x
* [dartsim] Disable unit tests, examples, and tutorials, some of which have CMake authoring errors rejected by 3.20.1.
* Add thrust to the cuda installees.
* [tensorflow] Put .bzl in CURRENT_BUILDTREES_DIR to avoid running out of disk space in CI and to respect --clean-after-build.
* [dimcli] Skip port broken by changes in VS2019 project system.
* [upb] Disable an additional warning.
* [libhv] Fix typo DISABLE_PARALLEL => DISABLE_PARALLEL_CONFIGURE
* Update pools
Catch2 installs into share/Catch2/ and lib/cmake/Catch2.
The vcpkg_fixup_cmake_targets() function tries to move the contents from
the latter directory to share/catch2, i.e. differing in case w.r.t. the
former.
On Linux this results in both names being present. On pure Windows the
first name "wins". It breaks in a Linux Docker container where the
installation root is located on a bound directory that is on a
case-insensitive file system, such as from a host running Windows.
Fixes: #17228.
* [cudnn] add other install dir on linux
* [cudnn] add other locations for linux
* [cudnn] fix env variables
* [cudnn] fix references
* [cudnn] use also cuda module as a hint
* [cudnn] fix refs
* [cudnn] auto-download only if cuda version matches
* [cudnn] auto download also for cuda 10.2
* [cudnn] update version ref
* Update ports/cuda/vcpkg_find_cuda.cmake
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
* Update ports/cuda/vcpkg_find_cuda.cmake
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
* Update ports/cudnn/portfile.cmake
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
* apply review fixes
* fix baseline refs
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
* [celero] Updated to Celero v2.8.0
* [celero] Improving static linking support in VCPKG.
Celero issue #154 is tracking a fix.
https://github.com/DigitalInBlue/Celero/issues/154
* [celero] Updated to v2.8.1
* [celero] Updated version for VCPKG.
* [celero] Updates to better support VCPKG.
* [celero] Updated versions.
* Update celero.json
Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
* Added ClamAV port
* Patch ClamAV's cmake files instead of doing things in portfile
* Fix whitespace
* Strip down package to really only build libclamav
* Fix static build
* Fix build on Linux
* Remove libcurl linkage
* fix copy-paste mistake
* Disable static build
* update version record
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
* Restore full boost dependencies, the actual modules are too many to be listed.
* Update ports/cgal/CONTROL
Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
* Update baseline version
* Detail boost modules from grep in includes
* Fix the Build-Depends
* add boost-serialization
* Update baseline version
Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
* [continuable] add a new port
* todo: create a patch for `find_package(function2)`
* [continuable] add patch to edit cmakelists
* [continuable] add port SHA
* [continuable] minimize patch
* update port SHA
* [ceres] Mark all dependencies REQUIRED
* [suitesparse] Fix FindCXSparse.cmake
* [ceres] Add version to db
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
