From 3d750a2e449b246ff70e406c92b99581a31d85c1 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sun, 5 Jun 2022 09:05:48 -0400 Subject: [PATCH 1/8] yaml-cpp: update to 0.7.0. --- common/shlibs | 2 +- .../yaml-cpp/patches/fix-cmake-exports.patch | 110 ++++++++++++++++++ srcpkgs/yaml-cpp/template | 8 +- 3 files changed, 115 insertions(+), 5 deletions(-) create mode 100644 srcpkgs/yaml-cpp/patches/fix-cmake-exports.patch diff --git a/common/shlibs b/common/shlibs index 15d027bf9c20..bab37b1bb00c 100644 --- a/common/shlibs +++ b/common/shlibs @@ -2231,7 +2231,7 @@ libKF5ThreadWeaver.so.5 threadweaver-5.26.0_1 libOpenImageIO_Util.so.2.2 openimageio-2.2.13.1_1 libOpenImageIO.so.2.2 openimageio-2.2.13.1_1 libOpenColorIO.so.1 opencolorio-1.0.8_1 -libyaml-cpp.so.0.6 yaml-cpp-0.6.2_1 +libyaml-cpp.so.0.7 yaml-cpp-0.7.0_1 libpaper.so.1 libpaper-1.1.24_1 libhtsjava.so.2 httrack-3.49.2_7 libhttrack.so.2 httrack-3.49.2_7 diff --git a/srcpkgs/yaml-cpp/patches/fix-cmake-exports.patch b/srcpkgs/yaml-cpp/patches/fix-cmake-exports.patch new file mode 100644 index 000000000000..a9096eab8511 --- /dev/null +++ b/srcpkgs/yaml-cpp/patches/fix-cmake-exports.patch @@ -0,0 +1,110 @@ +From 4aad2b1666a4742743b04e765a34742512915674 Mon Sep 17 00:00:00 2001 +From: Felix Schwitzer +Date: Fri, 1 Apr 2022 05:26:47 +0200 +Subject: [PATCH] Fix CMake export files (#1077) + +After configuring the file `yaml-cpp-config.cmake.in`, the result ends up with +empty variables. (see also the discussion in #774). + +Rework this file and the call to `configure_package_config_file` according the +cmake documentation +(https://cmake.org/cmake/help/v3.22/module/CMakePackageConfigHelpers.html?highlight=configure_package_config#command:configure_package_config_file) +to overcome this issue and allow a simple `find_package` after install. + +As there was some discussion about the place where to install the +`yaml-cpp-config.cmake` file, e.g. #1055, factor out the install location into +an extra variable to make it easier changing this location in the future. + +Also untabify CMakeLists.txt in some places to align with the other code parts in this file. +--- + CMakeLists.txt | 29 ++++++++++++++++++----------- + yaml-cpp-config.cmake.in | 10 ++++++---- + 2 files changed, 24 insertions(+), 15 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 564b7c8d1..ccc1964ea 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -133,10 +133,16 @@ set_target_properties(yaml-cpp PROPERTIES + PROJECT_LABEL "yaml-cpp ${yaml-cpp-label-postfix}" + DEBUG_POSTFIX "${CMAKE_DEBUG_POSTFIX}") + ++# FIXME(felix2012): A more common place for the cmake export would be ++# `CMAKE_INSTALL_LIBDIR`, as e.g. done in ubuntu or in this project for GTest ++set(CONFIG_EXPORT_DIR "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp") ++set(EXPORT_TARGETS yaml-cpp) + configure_package_config_file( + "${PROJECT_SOURCE_DIR}/yaml-cpp-config.cmake.in" + "${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake" +- INSTALL_DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp") ++ INSTALL_DESTINATION "${CONFIG_EXPORT_DIR}" ++ PATH_VARS CMAKE_INSTALL_INCLUDEDIR CONFIG_EXPORT_DIR) ++unset(EXPORT_TARGETS) + + write_basic_package_version_file( + "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake" +@@ -145,30 +151,31 @@ write_basic_package_version_file( + configure_file(yaml-cpp.pc.in yaml-cpp.pc @ONLY) + + if (YAML_CPP_INSTALL) +- install(TARGETS yaml-cpp ++ install(TARGETS yaml-cpp + EXPORT yaml-cpp-targets + RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} + LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) +- install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/ ++ install(DIRECTORY ${PROJECT_SOURCE_DIR}/include/ + DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} +- FILES_MATCHING PATTERN "*.h") ++ FILES_MATCHING PATTERN "*.h") + install(EXPORT yaml-cpp-targets +- DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp") +- install(FILES +- "${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake" +- "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake" +- DESTINATION "${CMAKE_INSTALL_DATADIR}/cmake/yaml-cpp") ++ DESTINATION "${CONFIG_EXPORT_DIR}") ++ install(FILES ++ "${PROJECT_BINARY_DIR}/yaml-cpp-config.cmake" ++ "${PROJECT_BINARY_DIR}/yaml-cpp-config-version.cmake" ++ DESTINATION "${CONFIG_EXPORT_DIR}") + install(FILES "${PROJECT_BINARY_DIR}/yaml-cpp.pc" + DESTINATION ${CMAKE_INSTALL_DATADIR}/pkgconfig) + endif() ++unset(CONFIG_EXPORT_DIR) + + if(YAML_CPP_BUILD_TESTS) +- add_subdirectory(test) ++ add_subdirectory(test) + endif() + + if(YAML_CPP_BUILD_TOOLS) +- add_subdirectory(util) ++ add_subdirectory(util) + endif() + + if (YAML_CPP_CLANG_FORMAT_EXE) +diff --git a/yaml-cpp-config.cmake.in b/yaml-cpp-config.cmake.in +index 7b41e3f30..a7ace3dc0 100644 +--- a/yaml-cpp-config.cmake.in ++++ b/yaml-cpp-config.cmake.in +@@ -3,12 +3,14 @@ + # YAML_CPP_INCLUDE_DIR - include directory + # YAML_CPP_LIBRARIES - libraries to link against + +-# Compute paths +-get_filename_component(YAML_CPP_CMAKE_DIR "${CMAKE_CURRENT_LIST_FILE}" PATH) +-set(YAML_CPP_INCLUDE_DIR "@CONFIG_INCLUDE_DIRS@") ++@PACKAGE_INIT@ ++ ++set_and_check(YAML_CPP_INCLUDE_DIR "@PACKAGE_CMAKE_INSTALL_INCLUDEDIR@") + + # Our library dependencies (contains definitions for IMPORTED targets) +-include("${YAML_CPP_CMAKE_DIR}/yaml-cpp-targets.cmake") ++include(@PACKAGE_CONFIG_EXPORT_DIR@/yaml-cpp-targets.cmake) + + # These are IMPORTED targets created by yaml-cpp-targets.cmake + set(YAML_CPP_LIBRARIES "@EXPORT_TARGETS@") ++ ++check_required_components(@EXPORT_TARGETS@) diff --git a/srcpkgs/yaml-cpp/template b/srcpkgs/yaml-cpp/template index 4f0339ee9809..4101e07abbd7 100644 --- a/srcpkgs/yaml-cpp/template +++ b/srcpkgs/yaml-cpp/template @@ -2,7 +2,7 @@ pkgname=yaml-cpp # yaml-cpp may break ABI even without changing the soname; when # updating, test dependants to determine if revbumps are needed -version=0.6.3 +version=0.7.0 revision=1 wrksrc="${pkgname}-${pkgname}-${version}" build_style=cmake @@ -16,7 +16,7 @@ maintainer="Duncaen " license="MIT" homepage="https://github.com/jbeder/yaml-cpp" distfiles="https://github.com/jbeder/${pkgname}/archive/yaml-cpp-${version}.tar.gz" -checksum=77ea1b90b3718aa0c324207cb29418f5bced2354c2e483a9523d98c3460af1ed +checksum=43e6a9fcb146ad871515f0d0873947e5d497a1c9c60c58cb102a97b47208b7c3 post_install() { vlicense LICENSE @@ -27,8 +27,8 @@ yaml-cpp-devel_package() { short_desc+=" - Development files" pkg_install() { vmove usr/include - vmove usr/lib/pkgconfig - vmove usr/lib/cmake + vmove usr/share/pkgconfig + vmove usr/share/cmake vmove "usr/lib/*.so" } } From 2f48dca4c3b04acae30d48c114048d1ac7177a93 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sun, 5 Jun 2022 09:07:50 -0400 Subject: [PATCH 2/8] OpenXcom: rebuild for yaml-cpp --- srcpkgs/OpenXcom/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/OpenXcom/template b/srcpkgs/OpenXcom/template index f44cc1e9d916..3bffdfe26345 100644 --- a/srcpkgs/OpenXcom/template +++ b/srcpkgs/OpenXcom/template @@ -1,7 +1,7 @@ # Template file for 'OpenXcom' pkgname=OpenXcom version=1.0 -revision=4 +revision=5 build_style=gnu-configure configure_args="--disable-silent-rules --disable-werror" hostmakedepends="automake pkg-config xmlto" From f6a5e06f26d6c25b223710daecd98e6e4b59e0a6 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sun, 5 Jun 2022 09:07:50 -0400 Subject: [PATCH 3/8] facter: rebuild for yaml-cpp --- srcpkgs/facter/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/facter/template b/srcpkgs/facter/template index 41a1a9d8ba3d..93d6bfc6af51 100644 --- a/srcpkgs/facter/template +++ b/srcpkgs/facter/template @@ -1,7 +1,7 @@ # Template file for 'facter' pkgname=facter version=3.14.16 -revision=2 +revision=3 build_style=cmake configure_args="-DRUBY_CONFIG_INCLUDE_DIR=${XBPS_CROSS_BASE}/usr/include -DENABLE_CXX_WERROR=OFF -DCMAKE_INSTALL_LIBDIR=/usr/lib" From bd2f8b369299b4748e2e802633de98dd6d4ed956 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sun, 5 Jun 2022 09:07:50 -0400 Subject: [PATCH 4/8] interception-tools: rebuild for yaml-cpp --- srcpkgs/interception-tools/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/interception-tools/template b/srcpkgs/interception-tools/template index ce36d6f61e9d..592cf6d24a77 100644 --- a/srcpkgs/interception-tools/template +++ b/srcpkgs/interception-tools/template @@ -1,7 +1,7 @@ # Template file for 'interception-tools' pkgname=interception-tools version=0.6.7 -revision=1 +revision=2 wrksrc=tools-v${version} build_style=cmake hostmakedepends="pkg-config" From 3145f6f52867a37097776f168f1b2c9072a81e18 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sun, 5 Jun 2022 09:07:50 -0400 Subject: [PATCH 5/8] librime: rebuild for yaml-cpp --- srcpkgs/librime/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/librime/template b/srcpkgs/librime/template index 8a1b2b8a3e04..5f734c200bd7 100644 --- a/srcpkgs/librime/template +++ b/srcpkgs/librime/template @@ -1,7 +1,7 @@ # Template file for 'librime' pkgname=librime version=1.7.3 -revision=2 +revision=3 build_style=cmake configure_args="-DCMAKE_BUILD_TYPE=None -DENABLE_LOGGING=OFF -DBUILD_TEST=ON -DCAPNP_EXECUTABLE=/usr/bin/capnp -DCAPNPC_CXX_EXECUTABLE=/usr/bin/capnpc-c++" From 1ae3906ea49c307f6d6108f7ecb009804fad04d0 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sun, 5 Jun 2022 09:07:50 -0400 Subject: [PATCH 6/8] rstudio: rebuild for yaml-cpp --- srcpkgs/rstudio/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/rstudio/template b/srcpkgs/rstudio/template index b2c06a205eaa..7b4faea4e099 100644 --- a/srcpkgs/rstudio/template +++ b/srcpkgs/rstudio/template @@ -1,7 +1,7 @@ # Template file for 'rstudio' pkgname=rstudio version=1.4.1717 -revision=1 +revision=2 build_style=cmake configure_args="-DRSTUDIO_TARGET=Desktop -DRSTUDIO_USE_SYSTEM_BOOST=ON From b698c0140b568e3f3e779b27c23586820b4862fe Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sun, 5 Jun 2022 09:07:51 -0400 Subject: [PATCH 7/8] supercollider: rebuild for yaml-cpp --- srcpkgs/supercollider/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/supercollider/template b/srcpkgs/supercollider/template index c7a878f91c09..35f6d9dfb7c2 100644 --- a/srcpkgs/supercollider/template +++ b/srcpkgs/supercollider/template @@ -1,7 +1,7 @@ # Template file for 'supercollider' pkgname=supercollider version=3.11.1 -revision=2 +revision=3 wrksrc="SuperCollider-${version}-Source" build_style=cmake make_cmd=make From 4687d79495d046433a8815ba20cda1e98022abec Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Sun, 5 Jun 2022 09:07:51 -0400 Subject: [PATCH 8/8] thinkfan: rebuild for yaml-cpp --- srcpkgs/thinkfan/template | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/srcpkgs/thinkfan/template b/srcpkgs/thinkfan/template index 159cc28dc6ce..b71b1c43d310 100644 --- a/srcpkgs/thinkfan/template +++ b/srcpkgs/thinkfan/template @@ -1,7 +1,7 @@ # Template file for 'thinkfan' pkgname=thinkfan version=1.3.1 -revision=1 +revision=2 build_style=cmake configure_args="-DUSE_ATASMART:BOOL=ON" hostmakedepends="pkg-config"