From 1e5d7782ddc92b3b056c1383422cd086eae2162f Mon Sep 17 00:00:00 2001 From: Tim Biermann Date: Fri, 11 Aug 2023 06:42:51 +0200 Subject: [PATCH] yaml-cpp: dropped --- yaml-cpp/.footprint | 57 ---------------------- yaml-cpp/.signature | 7 --- yaml-cpp/Pkgfile | 46 ----------------- yaml-cpp/patch-yaml-cpp-config.cmake.in | 17 ------- yaml-cpp/yaml-cpp-0.6.3-abi-breakage.patch | 57 ---------------------- 5 files changed, 184 deletions(-) delete mode 100644 yaml-cpp/.footprint delete mode 100644 yaml-cpp/.signature delete mode 100644 yaml-cpp/Pkgfile delete mode 100644 yaml-cpp/patch-yaml-cpp-config.cmake.in delete mode 100644 yaml-cpp/yaml-cpp-0.6.3-abi-breakage.patch diff --git a/yaml-cpp/.footprint b/yaml-cpp/.footprint deleted file mode 100644 index f88e34d4d..000000000 --- a/yaml-cpp/.footprint +++ /dev/null @@ -1,57 +0,0 @@ -drwxr-xr-x root/root usr/ -drwxr-xr-x root/root usr/include/ -drwxr-xr-x root/root usr/include/yaml-cpp/ --rw-r--r-- root/root usr/include/yaml-cpp/anchor.h --rw-r--r-- root/root usr/include/yaml-cpp/binary.h -drwxr-xr-x root/root usr/include/yaml-cpp/contrib/ --rw-r--r-- root/root usr/include/yaml-cpp/contrib/anchordict.h --rw-r--r-- root/root usr/include/yaml-cpp/contrib/graphbuilder.h --rw-r--r-- root/root usr/include/yaml-cpp/depthguard.h --rw-r--r-- root/root usr/include/yaml-cpp/dll.h --rw-r--r-- root/root usr/include/yaml-cpp/emitfromevents.h --rw-r--r-- root/root usr/include/yaml-cpp/emitter.h --rw-r--r-- root/root usr/include/yaml-cpp/emitterdef.h --rw-r--r-- root/root usr/include/yaml-cpp/emittermanip.h --rw-r--r-- root/root usr/include/yaml-cpp/emitterstyle.h --rw-r--r-- root/root usr/include/yaml-cpp/eventhandler.h --rw-r--r-- root/root usr/include/yaml-cpp/exceptions.h --rw-r--r-- root/root usr/include/yaml-cpp/mark.h -drwxr-xr-x root/root usr/include/yaml-cpp/node/ --rw-r--r-- root/root usr/include/yaml-cpp/node/convert.h -drwxr-xr-x root/root usr/include/yaml-cpp/node/detail/ --rw-r--r-- root/root usr/include/yaml-cpp/node/detail/impl.h --rw-r--r-- root/root usr/include/yaml-cpp/node/detail/iterator.h --rw-r--r-- root/root usr/include/yaml-cpp/node/detail/iterator_fwd.h --rw-r--r-- root/root usr/include/yaml-cpp/node/detail/memory.h --rw-r--r-- root/root usr/include/yaml-cpp/node/detail/node.h --rw-r--r-- root/root usr/include/yaml-cpp/node/detail/node_data.h --rw-r--r-- root/root usr/include/yaml-cpp/node/detail/node_iterator.h --rw-r--r-- root/root usr/include/yaml-cpp/node/detail/node_ref.h --rw-r--r-- root/root usr/include/yaml-cpp/node/emit.h --rw-r--r-- root/root usr/include/yaml-cpp/node/impl.h --rw-r--r-- root/root usr/include/yaml-cpp/node/iterator.h --rw-r--r-- root/root usr/include/yaml-cpp/node/node.h --rw-r--r-- root/root usr/include/yaml-cpp/node/parse.h --rw-r--r-- root/root usr/include/yaml-cpp/node/ptr.h --rw-r--r-- root/root usr/include/yaml-cpp/node/type.h --rw-r--r-- root/root usr/include/yaml-cpp/noexcept.h --rw-r--r-- root/root usr/include/yaml-cpp/null.h --rw-r--r-- root/root usr/include/yaml-cpp/ostream_wrapper.h --rw-r--r-- root/root usr/include/yaml-cpp/parser.h --rw-r--r-- root/root usr/include/yaml-cpp/stlemitter.h --rw-r--r-- root/root usr/include/yaml-cpp/traits.h --rw-r--r-- root/root usr/include/yaml-cpp/yaml.h -drwxr-xr-x root/root usr/lib/ --rw-r--r-- root/root usr/lib/libyaml-cpp.a -lrwxrwxrwx root/root usr/lib/libyaml-cpp.so -> libyaml-cpp.so.0.7 -lrwxrwxrwx root/root usr/lib/libyaml-cpp.so.0.7 -> libyaml-cpp.so.0.7.0 --rwxr-xr-x root/root usr/lib/libyaml-cpp.so.0.7.0 -drwxr-xr-x root/root usr/share/ -drwxr-xr-x root/root usr/share/cmake/ -drwxr-xr-x root/root usr/share/cmake/yaml-cpp/ --rw-r--r-- root/root usr/share/cmake/yaml-cpp/yaml-cpp-config-version.cmake --rw-r--r-- root/root usr/share/cmake/yaml-cpp/yaml-cpp-config.cmake --rw-r--r-- root/root usr/share/cmake/yaml-cpp/yaml-cpp-targets-release.cmake --rw-r--r-- root/root usr/share/cmake/yaml-cpp/yaml-cpp-targets.cmake -drwxr-xr-x root/root usr/share/pkgconfig/ --rw-r--r-- root/root usr/share/pkgconfig/yaml-cpp.pc diff --git a/yaml-cpp/.signature b/yaml-cpp/.signature deleted file mode 100644 index 3964627ef..000000000 --- a/yaml-cpp/.signature +++ /dev/null @@ -1,7 +0,0 @@ -untrusted comment: verify with /etc/ports/contrib.pub -RWSagIOpLGJF36jVpd1GxMmDyQs1xkEvZPpv8nhoK1gZY54D3knB+ZAZ9iziGKb05j9aAAT+IpGThV9UA1CyXZ1p2sGp+Gc+5Ag= -SHA256 (Pkgfile) = 3b22774596b509d167302caca62c4ce10013a8b796b07ebf78941a98c82c1b7d -SHA256 (.footprint) = e70cd5a156ba726ca9fc021061892ec75b080ccfd701662966b47c1b91cd875f -SHA256 (yaml-cpp-0.7.0.tar.gz) = 43e6a9fcb146ad871515f0d0873947e5d497a1c9c60c58cb102a97b47208b7c3 -SHA256 (yaml-cpp-0.6.3-abi-breakage.patch) = 613a94953bee42e48d2a357348c9a36a57a455c7ebc2f99999c7ecc150c2d61d -SHA256 (patch-yaml-cpp-config.cmake.in) = ec9a629417494d425994ccb8822c8a9d09719c5d5becefd5b97292c8c7ac3ddd diff --git a/yaml-cpp/Pkgfile b/yaml-cpp/Pkgfile deleted file mode 100644 index 004907066..000000000 --- a/yaml-cpp/Pkgfile +++ /dev/null @@ -1,46 +0,0 @@ -# Description: YAML parser and emitter in C++, written around the YAML 1.2 spec -# URL: https://github.com/jbeder/yaml-cpp -# Maintainer: Tim Biermann, tbier at posteo dot de -# Depends on: cmake -# Optional: ninja - -name=yaml-cpp -version=0.7.0 -release=1 -source=(https://github.com/jbeder/yaml-cpp/archive/yaml-cpp-$version/$name-$version.tar.gz - yaml-cpp-0.6.3-abi-breakage.patch patch-yaml-cpp-config.cmake.in) - - -build() { - patch -Np1 -d $name-$name-$version -i $SRC/yaml-cpp-0.6.3-abi-breakage.patch - sed -e 's|%%PREFIX%%|/usr|' -i $SRC/patch-yaml-cpp-config.cmake.in - patch -Np0 -d $name-$name-$version -i $SRC/patch-yaml-cpp-config.cmake.in - - prt-get isinst ninja && PKGMK_YAMLCPP+=' -G Ninja' - - cmake -S $name-$name-$version -B build $PKGMK_YAMLCPP \ - -D CMAKE_INSTALL_PREFIX=/usr \ - -D CMAKE_INSTALL_LIBDIR=lib \ - -D CMAKE_BUILD_TYPE=Release \ - -D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \ - -D BUILD_SHARED_LIBS=ON \ - -D YAML_BUILD_SHARED_LIBS=ON \ - -D YAML_CPP_BUILD_TESTS=OFF \ - -D YAML_CPP_BUILD_TOOLS=OFF \ - -Wno-dev - cmake --build build - DESTDIR=$PKG cmake --install build - - cmake -S $name-$name-$version -B build-static $PKGMK_YAMLCPP \ - -D CMAKE_INSTALL_PREFIX=/usr \ - -D CMAKE_INSTALL_LIBDIR=lib \ - -D CMAKE_BUILD_TYPE=Release \ - -D CMAKE_CXX_FLAGS_RELEASE="$CXXFLAGS" \ - -D BUILD_SHARED_LIBS=OFF \ - -D YAML_BUILD_SHARED_LIBS=OFF \ - -D YAML_CPP_BUILD_TESTS=OFF \ - -D YAML_CPP_BUILD_TOOLS=OFF \ - -Wno-dev - cmake --build build-static - DESTDIR=$PKG cmake --install build-static -} diff --git a/yaml-cpp/patch-yaml-cpp-config.cmake.in b/yaml-cpp/patch-yaml-cpp-config.cmake.in deleted file mode 100644 index 4b85175be..000000000 --- a/yaml-cpp/patch-yaml-cpp-config.cmake.in +++ /dev/null @@ -1,17 +0,0 @@ ---- yaml-cpp-config.cmake.in.orig 2021-07-10 15:53:22 UTC -+++ yaml-cpp-config.cmake.in -@@ -3,12 +3,5 @@ - # 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@") -- --# Our library dependencies (contains definitions for IMPORTED targets) --include("${YAML_CPP_CMAKE_DIR}/yaml-cpp-targets.cmake") -- --# These are IMPORTED targets created by yaml-cpp-targets.cmake --set(YAML_CPP_LIBRARIES "@EXPORT_TARGETS@") -+set(YAML_CPP_INCLUDE_DIR "%%PREFIX%%/include") -+set(YAML_CPP_LIBRARIES "yaml-cpp") diff --git a/yaml-cpp/yaml-cpp-0.6.3-abi-breakage.patch b/yaml-cpp/yaml-cpp-0.6.3-abi-breakage.patch deleted file mode 100644 index d9160856c..000000000 --- a/yaml-cpp/yaml-cpp-0.6.3-abi-breakage.patch +++ /dev/null @@ -1,57 +0,0 @@ -commit f5f288c7622d3547c29a8355b8ccda0155483b79 -Author: Till Hofmann -Date: Sun Nov 17 22:43:20 2019 +0100 - - Revert "fix up static, so works as DLL (#559)" - - This reverts commit 774f25800e6f19f4b927023c85d1389af322da5e. - -diff --git a/include/yaml-cpp/node/detail/node_data.h b/include/yaml-cpp/node/detail/node_data.h -index 82fb79a..50bcd74 100644 ---- a/include/yaml-cpp/node/detail/node_data.h -+++ b/include/yaml-cpp/node/detail/node_data.h -@@ -81,7 +81,7 @@ class YAML_CPP_API node_data { - shared_memory_holder pMemory); - - public: -- static const std::string& empty_scalar(); -+ static std::string empty_scalar; - - private: - void compute_seq_size() const; -diff --git a/include/yaml-cpp/node/impl.h b/include/yaml-cpp/node/impl.h -index 7a3deac..b363f86 100644 ---- a/include/yaml-cpp/node/impl.h -+++ b/include/yaml-cpp/node/impl.h -@@ -166,13 +166,13 @@ inline T Node::as(const S& fallback) const { - inline const std::string& Node::Scalar() const { - if (!m_isValid) - throw InvalidNode(m_invalidKey); -- return m_pNode ? m_pNode->scalar() : detail::node_data::empty_scalar(); -+ return m_pNode ? m_pNode->scalar() : detail::node_data::empty_scalar; - } - - inline const std::string& Node::Tag() const { - if (!m_isValid) - throw InvalidNode(m_invalidKey); -- return m_pNode ? m_pNode->tag() : detail::node_data::empty_scalar(); -+ return m_pNode ? m_pNode->tag() : detail::node_data::empty_scalar; - } - - inline void Node::SetTag(const std::string& tag) { -diff --git a/src/node_data.cpp b/src/node_data.cpp -index 6cfedfc..eba1ae4 100644 ---- a/src/node_data.cpp -+++ b/src/node_data.cpp -@@ -13,10 +13,7 @@ - namespace YAML { - namespace detail { - --const std::string& node_data::empty_scalar() { -- static const std::string svalue; -- return svalue; --} -+std::string node_data::empty_scalar; - - node_data::node_data() - : m_isDefined(false),