aboutsummaryrefslogtreecommitdiff
path: root/ports/chartdir
diff options
context:
space:
mode:
authorBilly O'Neal <bion@microsoft.com>2020-12-28 21:20:30 -0800
committerGitHub <noreply@github.com>2020-12-28 21:20:30 -0800
commit580da706ed3502f1b1fcd9ab70212cda548d3520 (patch)
tree1a9f877da54d068d617e8f694d302187900df58a /ports/chartdir
parent24290fb0020006e5d1276eb1dcf7498086c7c85e (diff)
downloadvcpkg-580da706ed3502f1b1fcd9ab70212cda548d3520.tar.gz
vcpkg-580da706ed3502f1b1fcd9ab70212cda548d3520.zip
Build results from 2020-12-27 (#15353)
* [capnproto] Remove from baseline. PASSING, REMOVE FROM FAIL LIST: capnproto:x64-windows (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: capnproto:x64-windows-static (.\scripts\ci.baseline.txt) PASSING, REMOVE FROM FAIL LIST: capnproto:x86-windows (.\scripts\ci.baseline.txt) These were fixed by the update to VS2019 version 16.8. Other capnproto skips moved into "supports" because: capnp.lib(serialize-packed.c++.obj) : error LNK2019: unresolved external symbol __popcnt referenced in function "int __cdecl kj::popCount(unsigned int)" (?popCount@kj@@YAHI@Z) i.e. the port wants popcnt to exist and it doesn't, so this isn't an artifact of our CI. * Remove "passing: remove from fail list" entries. * [atk, atkmm, gdk-pixbuf, glibmm, gtkmm, libsigcpp, libxmlpp, pangomm] Acquire using HTTPS. * [chardir] Update osx download. * [leaf] Remove leaf in favor of boost-leaf. ``` Starting package 759/1414: leaf:x86-windows Building package leaf[core]:x86-windows... -- Downloading https://github.com/zajo/leaf/archive/0.2.2.tar.gz... -- Extracting source D:/downloads/zajo-leaf-0.2.2.tar.gz -- Using source at D:/buildtrees/leaf/src/0.2.2-26417cde9d.clean -- Configuring x86-windows -- Building x86-windows-dbg -- Building x86-windows-rel -- Installing: D:/packages/leaf_x86-windows/share/leaf/copyright -- Performing post-build validation -- Performing post-build validation done Uploaded binaries to 1 HTTP remotes. Building package leaf[core]:x86-windows... done Installing package leaf[core]:x86-windows... The following files are already installed in D:/installed/x86-windows and are in conflict with leaf:x86-windows Installed by boost-leaf:x86-windows include/boost/leaf/capture.hpp include/boost/leaf/common.hpp include/boost/leaf/context.hpp include/boost/leaf/detail/all.hpp include/boost/leaf/detail/demangle.hpp include/boost/leaf/detail/function_traits.hpp include/boost/leaf/detail/mp11.hpp include/boost/leaf/detail/optional.hpp include/boost/leaf/detail/print.hpp include/boost/leaf/error.hpp include/boost/leaf/exception.hpp include/boost/leaf/result.hpp Elapsed time for package leaf:x86-windows: 2.931 s ``` Caused by the update to Boost 1.75.0. Because this port is touching include/boost, I'm interpreting that as "the author intends users to use it as a Boost library", and have deleted this port in favor of the Boost version. * [magic-get] Remove magic-get in favor of boost-pfr. * Update ports/chartdir/portfile.cmake Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com> * Restore versions. * format-manifest Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com>
Diffstat (limited to 'ports/chartdir')
-rw-r--r--ports/chartdir/CONTROL3
-rw-r--r--ports/chartdir/portfile.cmake10
2 files changed, 7 insertions, 6 deletions
diff --git a/ports/chartdir/CONTROL b/ports/chartdir/CONTROL
index 75ed7d6a8..d373e3862 100644
--- a/ports/chartdir/CONTROL
+++ b/ports/chartdir/CONTROL
@@ -1,4 +1,5 @@
Source: chartdir
-Version: 6.3.1-1
+Version: 6.3.1
+Port-Version: 2
Homepage: https://www.advsofteng.com/
Description: ChartDirector is a powerful chart component for creating professional looking charts for web and windows applications.
diff --git a/ports/chartdir/portfile.cmake b/ports/chartdir/portfile.cmake
index 284af5688..8234e9286 100644
--- a/ports/chartdir/portfile.cmake
+++ b/ports/chartdir/portfile.cmake
@@ -28,15 +28,15 @@ elseif(VCPKG_TARGET_IS_WINDOWS)
file(COPY "${LIBDIR}/chartdir60.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
file(COPY "${LIBDIR}/chartdir60.dll" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
file(COPY "${LIBDIR}/chartdir60.lib" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
-
+
set(CHARTDIR_LIB "chartdir60.lib")
elseif(VCPKG_TARGET_IS_OSX)
vcpkg_download_distfile(ARCHIVE_FILE
URLS "https://www.advsofteng.net/chartdir_cpp_mac.tar.gz"
- FILENAME "chartdir_cpp_mac-6.3.1.tar.gz"
- SHA512 d7364b42ed7c5dd2f89ed8692ed0df1ec952216ba24f8afa8e039641f3296f23c9ff6391e3e0dcd3bfdb9e6898c21a8281aa2803fbee33c7197c1df271a0edf7
+ FILENAME "chartdir_cpp_mac-6.3.1.51483c1975.tar.gz"
+ SHA512 51483c197518203a24f652a4bfd9af1f933f8c59f3d7286e13c612cf09c5b850b4d1e9daa506379218797b5bb79bbc571b9e90b0fbb0f3ef4a3f455dd0de3848
)
vcpkg_extract_source_archive_ex(
@@ -47,7 +47,7 @@ elseif(VCPKG_TARGET_IS_OSX)
file(COPY "${SOURCE_PATH}/lib/libchartdir.6.dylib" DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
file(COPY "${SOURCE_PATH}/lib/libchartdir.6.dylib" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
-
+
set(CHARTDIR_LIB "libchartdir.6.dylib")
elseif(VCPKG_TARGET_IS_LINUX)
@@ -78,7 +78,7 @@ elseif(VCPKG_TARGET_IS_LINUX)
file(COPY "${SOURCE_PATH}/lib/libchartdir.so.6.0.3" DESTINATION ${CURRENT_PACKAGES_DIR}/lib)
file(COPY "${SOURCE_PATH}/lib/libchartdir.so.6.0.3" DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
-
+
set(CHARTDIR_LIB "libchartdir.so.6.0.3")
file(COPY ${SOURCE_PATH}/lib/fonts DESTINATION ${CURRENT_PACKAGES_DIR}/share/chartdir)