diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-11-17 04:54:15 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-11-17 04:54:15 +0000 |
commit | 04a96556dc0036655ac429edf598cc48febe294b (patch) | |
tree | 6577b5fabfcb1cee8eac4db1da2a0df03e5406a8 /dev-cpp/sdbus-c++ | |
parent | b7a94956953b9eb949dbf7a2b05fff47558c99a8 (diff) |
gentoo auto-resync : 17:11:2023 - 04:54:15
Diffstat (limited to 'dev-cpp/sdbus-c++')
-rw-r--r-- | dev-cpp/sdbus-c++/Manifest | 11 | ||||
-rw-r--r-- | dev-cpp/sdbus-c++/files/sdbus-c++-1.4.0-gcc-14.patch | 25 | ||||
-rw-r--r-- | dev-cpp/sdbus-c++/files/sdbus-c++-pc-reqs.patch | 29 | ||||
-rw-r--r-- | dev-cpp/sdbus-c++/files/sdbus-c++-static-libsystemd.patch | 10 | ||||
-rw-r--r-- | dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r6.ebuild | 148 | ||||
-rw-r--r-- | dev-cpp/sdbus-c++/sdbus-c++-1.4.0.ebuild (renamed from dev-cpp/sdbus-c++/sdbus-c++-1.3.0.ebuild) | 4 |
6 files changed, 32 insertions, 195 deletions
diff --git a/dev-cpp/sdbus-c++/Manifest b/dev-cpp/sdbus-c++/Manifest index 1fe33e69a3b5..a25ac4e64e22 100644 --- a/dev-cpp/sdbus-c++/Manifest +++ b/dev-cpp/sdbus-c++/Manifest @@ -1,9 +1,4 @@ -AUX sdbus-c++-pc-reqs.patch 1106 BLAKE2B 8f2cbb5d8f91b736cc3d15997e236dc452dd80ed9cc8c28c2b42a624b98f1f55fd986424291a37e9c8eba74c7bbeb9a6071231f875246706b5bcc617b10d227a SHA512 d27efa14fe841be0d6e0c7ca179a44aea560894eb5fb951deb31c63b8d65e223aa387d854dbc68209075bacb25cf5f40dea38715d62ced510fbef8284f67efe2 -AUX sdbus-c++-static-libsystemd.patch 417 BLAKE2B ec6120631ad48d70820c1070a47a224c837c838e0ff24c031b02fb4b9ef900da7b3a2c0b0e696066665a9004b9fcb68851c6971a220b2446da03dbbf42138ac5 SHA512 e42a080f580597aa7c3cddb71f6e6368addfe4a36b08b2944baf111dd70029c3d0d79868dabeaf78b91836c2a84939163ce10c3ffe4b36e53424be06c1fe1a0e -DIST sdbus-c++-0.9.0.tar.gz 198979 BLAKE2B 31cda7ce97aad05f93a015ca0f8bd93aa095f6abb6bc513343767c7221d2aeacc96ee2b6a1b0ecf50850f17506fc97aa3a9fead0332687d57bdbddf806502826 SHA512 8695d3efac5654cb28998cdd69c16f251654b2c95e0dc2a2f5a4b01b24dae7b04e1a1f2e9bc9fb96b99f099dd4a130ca980cb672f74829565fd0d48162a581c5 -DIST sdbus-c++-1.3.0.tar.gz 217150 BLAKE2B aa9a902cdff6a6f2268cfe04b45105ab08ee4b3a257db10af63f8224a9932e28c5f755879c866274722a2087a59c0a22dc0616ac5d696229daeaa965a156e220 SHA512 8f4cb9ae88b1ec0db0bcc27e131fcb9ad8a8bc88e39721b3b73f63e057bae4cd36619894e25114ccddb1a8e6c21db2f80adcabb3263ff5d8b34b72af7563afe2 -DIST systemd-musl-patches-253.3.tar.gz 28384 BLAKE2B 2736a4ddc36b2ce087c08c57c0b995db2dcf6f82a4ae6f20b07609657bc5ea1e4a12ec78da1576b364e03260577b4f9fc85fae8c0f7497eca564c6fb857e06d8 SHA512 4b556975f25393cbeb5df495267c68edf14bef0f8baae20955151c900f200d1402b54630cab7dd3a69bbb82bef3f7464869222e2022c60faa2311444fa87ec80 -DIST systemd-stable-253.7.tar.gz 12111722 BLAKE2B 2007653c264d615fbef52cd91d173597f175ba05c1b961c6035d51c1a28ff663151a72d858115536c316a2644d880dfe94e6d00809bf3a2abe3e2f5532df565b SHA512 6935508f511930d6e980a7f0a3319295acbbc482cbce4f8f407af399259fe04b095dabd470f8825d84328a7d0f39efe6d5926022c1bdf18ec7fffe43b2586aa1 -EBUILD sdbus-c++-0.9.0-r6.ebuild 3685 BLAKE2B d3d1eaa418d6c8d9dbeedd2033885a3d3b2984cc1654d0a7c3240106af9f7f188453a1282bd771393516ef7ec7c2285762fccf34e31ea4fcb0722f4a57da7da8 SHA512 00efb828f2f728f984102677fa33af19929fff25e5559fc9c44cdf775fe82fdf3d85c8c37cb52a70ad6d19ac85bd03c365f0a1b8a27c6e366fcb3dd6946587a4 -EBUILD sdbus-c++-1.3.0.ebuild 1765 BLAKE2B 2b3a96e688b2f67defc722a81cd5222e1b9c827b9961f38845b29fa3e9fc879f09679d8df51e025478dad61385cec1df485b4b85a84cf317e76d9c19dd08b324 SHA512 c59b9ad88143ed4bccb971d8dcb87a1656a0cf2df22004ff3268886556e5bc368be3ccb38053887a62ea441de47df01d5f1ad8a836e7b66dde0b6ec15c295359 +AUX sdbus-c++-1.4.0-gcc-14.patch 735 BLAKE2B 206126f96f28f52a17d18bb134b34a5b3c99c657883bf79f0884d27771793733773cb337a05fc86ef689aec5c8eeb2a074de046062846243aec352a1f137e689 SHA512 d70a06274a0f218830d2787cc76f1bcd2df4605e8fec9030a7083590b51f6d0f00d8c97156d363534182c0de8a08f4f982b88ef732675dca80f5860977075e39 +DIST sdbus-c++-1.4.0.tar.gz 224529 BLAKE2B a82656f3d1b98bbf4f7f83c708e507168105a2c2341df3983f782c2590b9e0e1811fb594065c248d8d93a3b4ca31ca99c141f0ecbab050d7358f78a499ceede2 SHA512 8b13dc57f15de482f59edfff7cdd4e2b4e2e659b9cdff9f946783bb0bf1ec735f789675dd19ebe7d38a06358fe77dcfabdc2a387660af00f2c0f3962de214d76 +EBUILD sdbus-c++-1.4.0.ebuild 1811 BLAKE2B 8b39394f6d5e1d8d2562c11a64abbd597d32d046b04a82998fcd45be46000f7aa10b4b0a7e547bffaf3ab5cd78e5b14866457dc26207e081d8d7859d9dc305b5 SHA512 1b844513982dce57b105a5c507d2cc39fa9313699553d217cf4bd63c9fc9a7d9dd47d4a3d6ae70abbac54f7d916a6a95119b8edf00176027103f5fd72cf4345f MISC metadata.xml 506 BLAKE2B 9782068264c44c006c345fa1ffc32eb47e4f526dc0cc371f2ae2cf0d480bccf065aa1cea17ceec02b40269fb029d6473b5dc531546571e558d2a78184f029bed SHA512 347b6ae706fc9878a356e8fa35026ff693989ccb4ea702ff4727e9d256863d2225718be0d40591895970018d5161163b42fb3423594a083794025fb9f73f5167 diff --git a/dev-cpp/sdbus-c++/files/sdbus-c++-1.4.0-gcc-14.patch b/dev-cpp/sdbus-c++/files/sdbus-c++-1.4.0-gcc-14.patch new file mode 100644 index 000000000000..2b2671e3ea12 --- /dev/null +++ b/dev-cpp/sdbus-c++/files/sdbus-c++-1.4.0-gcc-14.patch @@ -0,0 +1,25 @@ +From 066785da67f0d7e2fa5f45c0fb25c333679be061 Mon Sep 17 00:00:00 2001 +From: Alfred Wingate <parona@protonmail.com> +Date: Thu, 16 Nov 2023 18:52:48 +0200 +Subject: [PATCH] fix: Add header for gcc-14 that isn't included by default + anymore + +* https://gcc.gnu.org/gcc-14/porting_to.html + +Signed-off-by: Alfred Wingate <parona@protonmail.com> +--- + include/sdbus-c++/Message.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/include/sdbus-c++/Message.h b/include/sdbus-c++/Message.h +index 915a071b..9c85c019 100644 +--- a/include/sdbus-c++/Message.h ++++ b/include/sdbus-c++/Message.h +@@ -42,6 +42,7 @@ + #include <cassert> + #include <functional> + #include <sys/types.h> ++#include <algorithm> + + // Forward declarations + namespace sdbus { diff --git a/dev-cpp/sdbus-c++/files/sdbus-c++-pc-reqs.patch b/dev-cpp/sdbus-c++/files/sdbus-c++-pc-reqs.patch deleted file mode 100644 index 9730bda5bc65..000000000000 --- a/dev-cpp/sdbus-c++/files/sdbus-c++-pc-reqs.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 0733b41..fd613be 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -210,6 +210,11 @@ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/cmake/sdbus-c++-config.cmake - DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/sdbus-c++ - COMPONENT dev) - -+if(BUILD_LIBSYSTEMD OR pkgcfg_lib_Systemd_systemd MATCHES "\.a$") -+ set(PKGCONFIG_REQS "") -+else() -+ set(PKGCONFIG_REQS "libsystemd") -+endif() - configure_file(pkgconfig/sdbus-c++.pc.in pkgconfig/sdbus-c++.pc @ONLY) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/sdbus-c++.pc - DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig COMPONENT dev) -diff --git a/pkgconfig/sdbus-c++.pc.in b/pkgconfig/sdbus-c++.pc.in -index 21e0f0b..a6d6ec9 100644 ---- a/pkgconfig/sdbus-c++.pc.in -+++ b/pkgconfig/sdbus-c++.pc.in -@@ -5,7 +5,7 @@ includedir=@CMAKE_INSTALL_FULL_INCLUDEDIR@ - - Name: @PROJECT_NAME@ - Description: C++ library on top of sd-bus, a systemd D-Bus library --Requires: libsystemd -+Requires: @PKGCONFIG_REQS@ - Version: @SDBUSCPP_VERSION@ - Libs: -L${libdir} -l@PROJECT_NAME@ - Cflags: -I${includedir} diff --git a/dev-cpp/sdbus-c++/files/sdbus-c++-static-libsystemd.patch b/dev-cpp/sdbus-c++/files/sdbus-c++-static-libsystemd.patch deleted file mode 100644 index d6f018fda175..000000000000 --- a/dev-cpp/sdbus-c++/files/sdbus-c++-static-libsystemd.patch +++ /dev/null @@ -1,10 +0,0 @@ -systemd does not include pkg-config dependencies for static linking. - -diff -Naur a/src/libsystemd/libsystemd.pc.in b/src/libsystemd/libsystemd.pc.in ---- a/src/libsystemd/libsystemd.pc.in 2022-01-18 11:35:43.000000000 +0000 -+++ b/src/libsystemd/libsystemd.pc.in 2022-03-05 21:24:47.139338880 +0000 -@@ -18,3 +18,4 @@ - Version: {{PROJECT_VERSION}} - Libs: -L${libdir} -lsystemd - Cflags: -I${includedir} -+Requires: libcap diff --git a/dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r6.ebuild b/dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r6.ebuild deleted file mode 100644 index 9e5abbf648df..000000000000 --- a/dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r6.ebuild +++ /dev/null @@ -1,148 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..12} ) -inherit python-any-r1 meson cmake flag-o-matic - -SDP="systemd-stable-253.7" -MUSL_PATCHSET="systemd-musl-patches-253.3" - -DESCRIPTION="High-level C++ D-Bus library" -HOMEPAGE="https://github.com/Kistler-Group/sdbus-cpp" -SRC_URI="https://github.com/Kistler-Group/sdbus-cpp/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz - !systemd? ( - https://github.com/systemd/${SDP%-*}/archive/v${SDP##*-}/${SDP}.tar.gz - elibc_musl? ( - https://dev.gentoo.org/~floppym/distfiles/${MUSL_PATCHSET}.tar.gz - https://dev.gentoo.org/~gyakovlev/distfiles/${MUSL_PATCHSET}.tar.gz - https://dev.gentoo.org/~soap/distfiles/${MUSL_PATCHSET}.tar.gz - ) - )" -LICENSE="LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1" # Nothing to do with Qt but exception text is exactly the same. -SLOT="0/0" -KEYWORDS="~amd64" -IUSE="doc systemd test tools" -RESTRICT="!test? ( test )" - -RDEPEND=" - !systemd? ( sys-libs/libcap ) - systemd? ( >=sys-apps/systemd-236:= ) - tools? ( dev-libs/expat ) -" - -# util-linux is needed for libmount when building libsystemd, but sdbus-c++ -# doesn't need it when subsequently linking libsystemd statically. - -DEPEND=" - ${RDEPEND} - !systemd? ( sys-apps/util-linux ) - test? ( >=dev-cpp/gtest-1.10.0 ) -" - -BDEPEND=" - virtual/pkgconfig - doc? ( app-doc/doxygen[dot] ) - !systemd? ( - ${PYTHON_DEPS} - $(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]') - ) -" - -python_check_deps() { - python_has_version -b "dev-python/jinja[${PYTHON_USEDEP}]" -} - -S="${WORKDIR}/sdbus-cpp-${PV}" -SDS="${WORKDIR}/${SDP}" -SDB="${WORKDIR}/systemd-build" - -PATCHES=( - "${FILESDIR}"/${PN}-pc-reqs.patch -) - -pkg_setup() { - use systemd || python-any-r1_pkg_setup -} - -src_prepare() { - if ! use systemd; then - pushd "${SDS}" || die - use elibc_musl && eapply "${WORKDIR}/${MUSL_PATCHSET}" - eapply "${FILESDIR}"/${PN}-static-libsystemd.patch - popd || die - fi - - cmake_src_prepare -} - -src_configure() { - if ! use systemd; then - # Avoid redefinition of struct ethhdr. - use elibc_musl && append-cppflags -D__UAPI_DEF_ETHHDR=0 - - EMESON_SOURCE=${SDS} \ - BUILD_DIR=${SDB} \ - meson_src_configure \ - --prefix "${WORKDIR}" \ - --includedir "${SDP}/src" \ - -Drootlibdir="${SDB}" \ - -Dselinux=false \ - -Dstatic-libsystemd=pic \ - -Dgshadow=false \ - -Dsmack=false \ - -Dutmp=false - - # systemd doesn't generate the needed pkg-config file during configure. - BUILD_DIR=${SDB} \ - meson_src_compile libsystemd.pc - - # Need this present otherwise CMake generates the wrong linker args. - touch "${SDB}"/libsystemd.a || die - fi - - local mycmakeargs=( - -DBUILD_CODE_GEN=$(usex tools) - -DBUILD_DOC=yes - -DBUILD_DOXYGEN_DOC=$(usex doc) - -DBUILD_LIBSYSTEMD=no - -DBUILD_TESTS=$(usex test) - ) - - PKG_CONFIG_PATH=${SDB}/src/libsystemd:${PKG_CONFIG_PATH} \ - cmake_src_configure -} - -src_compile() { - if ! use systemd; then - BUILD_DIR=${SDB} \ - meson_src_compile version.h systemd:static_library - fi - - cmake_src_compile all $(usev doc) -} - -src_test() { - if ! cmp -s {"${S}"/tests/integrationtests/files,/etc/dbus-1/system.d}/org.sdbuscpp.integrationtests.conf; then - ewarn "Not running the tests as a D-Bus configuration file has not been" - ewarn "installed yet or has changed since. The tests can be run after" - ewarn "the package has been merged." - return - elif [[ ! -S /run/dbus/system_bus_socket ]]; then - ewarn "Not running the tests as the system-wide D-Bus daemon is unavailable." - return - fi - - cmake_src_test -} - -src_install() { - cmake_src_install - rm -v "${ED}"/usr/share/doc/${PF}/COPYING || die - - if use test; then - # Delete installed test binaries. - rm -rv "${ED}"/opt || die - fi -} diff --git a/dev-cpp/sdbus-c++/sdbus-c++-1.3.0.ebuild b/dev-cpp/sdbus-c++/sdbus-c++-1.4.0.ebuild index 9ea9f723b88a..1a01fb800da2 100644 --- a/dev-cpp/sdbus-c++/sdbus-c++-1.3.0.ebuild +++ b/dev-cpp/sdbus-c++/sdbus-c++-1.4.0.ebuild @@ -33,6 +33,10 @@ BDEPEND=" S="${WORKDIR}/sdbus-cpp-${PV}" +PATCHES=( + "${FILESDIR}"/${P}-gcc-14.patch +) + src_configure() { local mycmakeargs=( -DBUILD_CODE_GEN=$(usex tools) |