mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-27 22:51:37 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Build results from 2020-12-27 (#15353)

Browse Source 
* [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>
This commit is contained in:
Billy O'Neal 2020-12-28 21:20:30 -08:00 committed by GitHub
parent 24290fb002
commit 580da706ed
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
27 changed files with 58 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ports/atk/CONTROL
View File

@ -1,7 +1,7 @@
Source: atk
Version: 2.24.0-5
Port-Version: 1
Port-Version: 2
Homepage: https://developer.gnome.org/atk/
Description: GNOME Accessibility Toolkit
Build-Depends: glib, gettext
Supports: !(osx|arm)
Supports: !(osx|arm)

2
ports/atk/portfile.cmake
View File

@ -3,7 +3,7 @@ vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY ONLY_DYNAMIC_CRT)
set(ATK_VERSION 2.24.0)
vcpkg_download_distfile(ARCHIVE
URLS "http://ftp.gnome.org/pub/GNOME/sources/atk/2.24/atk-${ATK_VERSION}.tar.xz"
URLS "https://ftp.gnome.org/pub/GNOME/sources/atk/2.24/atk-${ATK_VERSION}.tar.xz"
FILENAME "atk-${ATK_VERSION}.tar.xz"
SHA512 3ae0a4d5f28d5619d465135c685161f690732053bcb70a47669c951fbf389b5d2ccc5c7c73d4ee8c5a3b2df14e2f5b082e812a215f10a79b27b412d077f5e962
)

2
ports/atkmm/CONTROL
View File

@ -1,6 +1,6 @@
Source: atkmm
Version: 2.24.2
Port-Version: 4
Port-Version: 5
Homepage: https://www.gtkmm.org
Description: atkmm is the official C++ interface for the ATK accessibility toolkit library. It may be used, for instance, by user interfaces implemented with gtkmm.
Build-Depends: glib, gettext, atk, glibmm

12
ports/atkmm/portfile.cmake
View File

@ -3,7 +3,7 @@ if (VCPKG_TARGET_IS_WINDOWS)
endif()
vcpkg_download_distfile(ARCHIVE
URLS "http://ftp.gnome.org/pub/GNOME/sources/atkmm/2.24/atkmm-2.24.2.tar.xz"
URLS "https://ftp.gnome.org/pub/GNOME/sources/atkmm/2.24/atkmm-2.24.2.tar.xz"
FILENAME "atkmm-2.24.2.tar.xz"
SHA512 427714cdf3b10e3f9bc36df09c4b05608d295f5895fb1e079b9bd84afdf7bf1cfdec6794ced7f1e35bd430b76f87792df4ee63c515071a2ea6e3e51e672cdbe2
)
@ -18,7 +18,7 @@ vcpkg_extract_source_archive_ex(
if (VCPKG_TARGET_IS_WINDOWS)
file(COPY ${CMAKE_CURRENT_LIST_DIR}/msvc_recommended_pragmas.h DESTINATION ${SOURCE_PATH}/MSVC_Net2013)
set(VS_PLATFORM ${VCPKG_TARGET_ARCHITECTURE})
if(${VCPKG_TARGET_ARCHITECTURE} STREQUAL x86)
set(VS_PLATFORM "Win32")
@ -29,14 +29,14 @@ if (VCPKG_TARGET_IS_WINDOWS)
PLATFORM ${VS_PLATFORM}
USE_VCPKG_INTEGRATION
)
# Handle headers
file(COPY ${SOURCE_PATH}/MSVC_Net2013/atkmm/atkmmconfig.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
file(COPY ${SOURCE_PATH}/atk/atkmm.h DESTINATION ${CURRENT_PACKAGES_DIR}/include)
file(COPY ${SOURCE_PATH}/atk/atkmm
DESTINATION ${CURRENT_PACKAGES_DIR}/include
FILES_MATCHING PATTERN *.h)
# Handle libraries
file(COPY ${SOURCE_PATH}/MSVC_Net2013/Release/${VS_PLATFORM}/bin/atkmm.dll
DESTINATION ${CURRENT_PACKAGES_DIR}/bin)
@ -46,12 +46,12 @@ if (VCPKG_TARGET_IS_WINDOWS)
DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin)
file(COPY ${SOURCE_PATH}/MSVC_Net2013/Debug/${VS_PLATFORM}/bin/atkmm.lib
DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib)
vcpkg_copy_pdbs()
else()
set(ENV{CONFIG_SHELL} bash)
vcpkg_configure_make(SOURCE_PATH ${SOURCE_PATH} OPTIONS ${ATKMM_OPTIONS})
vcpkg_install_make()
endif()

3
ports/capnproto/CONTROL
View File

@ -1,6 +1,7 @@
Source: capnproto
Version: 0.8.0
Port-Version: 1
Description: Data interchange format and capability-based RPC system
Homepage: https://capnproto.org/
Build-Depends: zlib
Supports: !uwp
Supports: !uwp&!((arm|arm64)&windows)

5
ports/capnproto/portfile.cmake
View File

@ -1,4 +1,7 @@
vcpkg_fail_port_install(ON_TARGET "UWP")
vcpkg_fail_port_install(ON_TARGET UWP)
if(VCPKG_TARGET_IS_WINDOWS)
vcpkg_fail_port_install(ON_ARCH arm arm64)
endif()
vcpkg_check_linkage(ONLY_STATIC_LIBRARY)

3
ports/chartdir/CONTROL
View File

@ -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.

10
ports/chartdir/portfile.cmake
View File

@ -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)

2
ports/gdk-pixbuf/CONTROL
View File

@ -1,6 +1,6 @@
Source: gdk-pixbuf
Version: 2.36.9-5
Port-Version: 6
Port-Version: 7
Homepage: https://developer.gnome.org/gdk-pixbuf/
Description: Image loading library.
Build-Depends: gettext, zlib, libpng, glib

2
ports/gdk-pixbuf/portfile.cmake
View File

@ -4,7 +4,7 @@ set(GDK_PIXBUF_VERSION 2.36)
set(GDK_PIXBUF_PATCH 9)
vcpkg_download_distfile(ARCHIVE
URLS "http://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/${GDK_PIXBUF_VERSION}/gdk-pixbuf-${GDK_PIXBUF_VERSION}.${GDK_PIXBUF_PATCH}.tar.xz"
URLS "https://ftp.gnome.org/pub/GNOME/sources/gdk-pixbuf/${GDK_PIXBUF_VERSION}/gdk-pixbuf-${GDK_PIXBUF_VERSION}.${GDK_PIXBUF_PATCH}.tar.xz"
FILENAME "gdk-pixbuf-${GDK_PIXBUF_VERSION}.${GDK_PIXBUF_PATCH}.tar.xz"
SHA512 ab8f2cda4490012936b094a1321e64b85e1fa1f8d070fae135a514f87f695201b845f4192e4a02954e2767d44314c0a95d727118853528182952d15890130261
)

2
ports/glibmm/CONTROL
View File

@ -1,6 +1,6 @@
Source: glibmm
Version: 2.52.1
Port-Version: 13
Port-Version: 14
Description: This is glibmm, a C++ API for parts of glib that are useful for C++.
Homepage: https://www.gtkmm.org.
Build-Depends: zlib, pcre, libffi, gettext, libiconv, glib, libsigcpp

4
ports/glibmm/portfile.cmake
View File

@ -2,7 +2,7 @@
vcpkg_fail_port_install(ON_TARGET "UWP")
vcpkg_download_distfile(ARCHIVE
URLS "http://ftp.gnome.org/pub/GNOME/sources/glibmm/2.52/glibmm-2.52.1.tar.xz"
URLS "https://ftp.gnome.org/pub/GNOME/sources/glibmm/2.52/glibmm-2.52.1.tar.xz"
FILENAME "glibmm-2.52.1.tar.xz"
SHA512 702158762cb28972b315ab98dc00a62e532bda08b6e76dc2a2556e8cb381c2021290891887a4af2fbff5a62bab4d50581be73037dc8e0dc47d5febd6cbeb7bda
)
@ -35,4 +35,4 @@ vcpkg_fixup_pkgconfig()
# Handle copyright and readme
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
file(INSTALL ${SOURCE_PATH}/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME readme.txt)
file(INSTALL ${SOURCE_PATH}/README DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME readme.txt)

2
ports/gtkmm/CONTROL
View File

@ -1,6 +1,6 @@
Source: gtkmm
Version: 3.22.2
Port-Version: 4
Port-Version: 5
Homepage: https://www.gtkmm.org/
Description: gtkmm is the official C++ interface for the popular GUI library GTK+.
Build-Depends: glib, atk, gtk, gdk-pixbuf, pango, cairo, libepoxy, gettext, glibmm, atkmm, cairomm, pangomm

2
ports/gtkmm/portfile.cmake
View File

@ -5,7 +5,7 @@ endif()
vcpkg_check_linkage(ONLY_DYNAMIC_LIBRARY)
vcpkg_download_distfile(ARCHIVE
URLS "http://ftp.gnome.org/pub/GNOME/sources/gtkmm/3.22/gtkmm-3.22.2.tar.xz"
URLS "https://ftp.gnome.org/pub/GNOME/sources/gtkmm/3.22/gtkmm-3.22.2.tar.xz"
FILENAME "gtkmm-3.22.2.tar.xz"
SHA512 6e96b543e459481145ee0f56f31a7ad2466bd8ccdd2abf3205998aecede73d235149ca6e5ba6e8d20a4fd5345e310870d81ac2a716d4f78d1460ed685badbdc2
)

3
ports/leaf/CONTROL
View File

@ -1,3 +0,0 @@
Source: leaf
Version: 0.2.2
Description: Lightweight error augmentation framework

20
ports/leaf/portfile.cmake
View File

@ -1,19 +1 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO zajo/leaf
REF 0.2.2
SHA512 200a78e33fa919fbf996cfa5715f166e194b87776de79dec4c23d7a60b1f1e1c9db699f3d94d17b52c655e802ea63e1e6539538b180ecaafbfcf106b280b5c1f
HEAD_REF master
)
vcpkg_configure_cmake(
SOURCE_PATH ${SOURCE_PATH}
PREFER_NINJA
)
vcpkg_install_cmake()
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug)
# Handle copyright
file(INSTALL ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/leaf RENAME copyright)
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)

9
ports/leaf/vcpkg.json Normal file
View File

@ -0,0 +1,9 @@
{
"name": "leaf",
"version-string": "0.2.2",
"port-version": 1,
"description": "Deprecated boost-leaf port.",
"dependencies": [
"boost-leaf"
]
}

2
ports/libsigcpp/CONTROL
View File

@ -1,4 +1,4 @@
Source: libsigcpp
Version: 2.10-3
Port-Version: 1
Port-Version: 2
Description: Typesafe callback framework for C++

2
ports/libsigcpp/portfile.cmake
View File

@ -1,6 +1,6 @@
vcpkg_download_distfile(ARCHIVE
URLS "http://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.10/libsigc++-2.10.0.tar.xz"
URLS "https://ftp.gnome.org/pub/GNOME/sources/libsigc++/2.10/libsigc++-2.10.0.tar.xz"
FILENAME "libsigc++-2.10.0.tar.xz"
SHA512 5b96df21d6bd6ba41520c7219e77695a86aabc60b7259262c7a9f4b8475ce0e2fd8dc37bcf7c17e24e818ff28c262d682b964c83e215b51bdbe000f3f58794ae
)

2
ports/libxmlpp/CONTROL
View File

@ -1,5 +1,5 @@
Source: libxmlpp
Version: 2.40.1
Port-Version: 7
Port-Version: 8
Description: a C++ wrapper for the libxml XML parser library.
Build-Depends: libxml2, glibmm

2
ports/libxmlpp/portfile.cmake
View File

@ -3,7 +3,7 @@ vcpkg_check_linkage(ONLY_STATIC_LIBRARY)
set(LIBXMLPP_VERSION 2.40.1)
vcpkg_download_distfile(ARCHIVE
URLS "http://ftp.gnome.org/pub/GNOME/sources/libxml++/2.40/libxml++-${LIBXMLPP_VERSION}.tar.xz"
URLS "https://ftp.gnome.org/pub/GNOME/sources/libxml++/2.40/libxml++-${LIBXMLPP_VERSION}.tar.xz"
FILENAME "libxml++-${LIBXMLPP_VERSION}.tar.xz"
SHA512 a4ec2e8182d981c57bdcb8f0a203a3161f8c735ceb59fd212408b7a539d1dc826adf6717bed8f4d544ab08afd9c2fc861efe518e24bbd3a1c4b158e2ca48183a
)

4
ports/magic-get/CONTROL
View File

@ -1,4 +0,0 @@
Source: magic-get
Version: 2019-09-02-1
Homepage: https://github.com/apolukhin/magic_get
Description: This C++14 library is meant for accessing structure elements by index and providing other std::tuple like methods for user defined types without any macro or boilerplate code.

20
ports/magic-get/portfile.cmake
View File

@ -1,19 +1 @@
vcpkg_from_github(
OUT_SOURCE_PATH SOURCE_PATH
REPO apolukhin/magic_get
REF abb467c0e22a83bf75a46a9e6610370fabfc39af #Branch develop, Commits on Sep 2, 2019
SHA512 1feb5d105d13a20aec8ab2c748dbd79ecc5d2267c8c0ee7db93a3d0c6b7186ea0c475fdc14712e78502ea839788f6dfb0b359e3fedbec59d331dafe137326fa4
HEAD_REF develop
)
vcpkg_download_distfile(OCV_DOWNLOAD
URLS "https://www.boost.org/LICENSE_1_0.txt"
FILENAME "boost_license_1_0.txt"
SHA512 d6078467835dba8932314c1c1e945569a64b065474d7aced27c9a7acc391d52e9f234138ed9f1aa9cd576f25f12f557e0b733c14891d42c16ecdc4a7bd4d60b8
)
file(COPY ${SOURCE_PATH}/include DESTINATION ${CURRENT_PACKAGES_DIR})
# Handle copyright
# On Homepage README.md, License Distributed under the Boost Software License, Version 1.0. https://www.boost.org/LICENSE_1_0.txt
file(INSTALL ${OCV_DOWNLOAD} DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
set(VCPKG_POLICY_EMPTY_PACKAGE enabled)

10
ports/magic-get/vcpkg.json Normal file
View File

@ -0,0 +1,10 @@
{
"name": "magic-get",
"version-string": "2019-09-02",
"port-version": 2,
"description": "Deprecated boost-pfr port.",
"homepage": "https://github.com/apolukhin/magic_get",
"dependencies": [
"boost-pfr"
]
}

3
ports/pangomm/CONTROL
View File

@ -1,5 +1,6 @@
Source: pangomm
Version: 2.40.1-3
Version: 2.40.1
Port-Version: 4
Homepage: https://ftp.gnome.org/pub/GNOME/sources/pangomm
Description: pangomm is the official C++ interface for the Pango font layout library. See, for instance, the Pango::Layout class.
Build-Depends: glib, gettext, cairo, fontconfig, freetype, harfbuzz, pango, cairomm, glibmm

2
ports/pangomm/portfile.cmake
View File

@ -1,7 +1,7 @@
vcpkg_fail_port_install(ON_ARCH "arm" "arm64")
vcpkg_download_distfile(ARCHIVE
URLS "http://ftp.gnome.org/pub/GNOME/sources/pangomm/2.40/pangomm-2.40.1.tar.xz"
URLS "https://ftp.gnome.org/pub/GNOME/sources/pangomm/2.40/pangomm-2.40.1.tar.xz"
FILENAME "pangomm-2.40.1.tar.xz"
SHA512 bed19800b76e69cc51abeb5997bdc2f687f261ebcbe36aeee51f1fbf5010a46f4b9469033c34a912502001d9985135fd5c7f7574d3de8ba33cc5832520c6aa6f
)

12
scripts/ci.baseline.txt
View File

@ -58,14 +58,6 @@ caf:x64-uwp=fail
caffe2:x86-windows=fail
caffe2:arm64-windows=fail
cairomm:x64-linux=fail
# capnproto currently triggers an ICE
capnproto:x86-windows=fail
capnproto:x64-windows=fail
capnproto:x64-windows-static=fail
# capnproto doesn't support arm, arm64, or UWP
capnproto:arm64-windows=fail
capnproto:arm-uwp=fail
capnproto:x64-uwp=fail
c-ares:arm-uwp=fail
c-ares:x64-uwp=fail
cartographer:x64-osx=fail
@ -540,7 +532,6 @@ libdshowcapture:arm-uwp=fail
libdshowcapture:x64-linux=fail
libdshowcapture:x64-osx=fail
libdshowcapture:x64-uwp=fail
libepoxy:arm64-windows=fail
libepoxy:arm-uwp=fail
libepoxy:x64-uwp=fail
libepoxy:x64-windows-static=fail
@ -696,8 +687,6 @@ libressl:x64-uwp = skip
libressl:x64-windows = skip
libressl:x64-windows-static = skip
libressl:x86-windows = skip
libsamplerate:arm64-windows=fail
libsamplerate:arm-uwp=fail
libsamplerate:x64-osx=fail
libsoundio:arm64-windows=fail
libsoundio:arm-uwp=fail
@ -947,7 +936,6 @@ nana:x64-uwp=fail
nanodbc:arm-uwp=fail
nanodbc:x64-uwp=fail
nanodbc:x64-linux=skip
nanogui:arm64-windows=fail
nanorange:arm64-windows=fail
nanorange:arm-uwp=fail
nanorange:x64-linux=fail