mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-11-09 06:37:10 -08:00
dev-cpp/sdbus-c++: Drop old 1.4.0-r1 and 2.0.0
Signed-off-by: James Le Cuirot <chewi@gentoo.org>
This commit is contained in:
James Le Cuirot
@@ -1,3 +1 @@
|
||||
DIST sdbus-c++-1.4.0.tar.gz 224529 BLAKE2B a82656f3d1b98bbf4f7f83c708e507168105a2c2341df3983f782c2590b9e0e1811fb594065c248d8d93a3b4ca31ca99c141f0ecbab050d7358f78a499ceede2 SHA512 8b13dc57f15de482f59edfff7cdd4e2b4e2e659b9cdff9f946783bb0bf1ec735f789675dd19ebe7d38a06358fe77dcfabdc2a387660af00f2c0f3962de214d76
|
||||
DIST sdbus-c++-2.0.0.tar.gz 243202 BLAKE2B 946a7d87b882ae44843864311fc93ddf010a4f3fe3d341fb5d3f05890f2693d341082007db94f57eee06bf60e3f3a1adc35e63bbf057883b4a6d0b466791def0 SHA512 638453d2ea0d5ba556eacda59ca114896bf275d227b33b525259bf69dac3d766df6586046e6ea83a8c1afe9fb0701f4d358819ed9300bab598e775a0a2880917
|
||||
DIST sdbus-c++-2.1.0.tar.gz 251656 BLAKE2B 47a8cc2a5416ca9d06134e5faf797b91ae3a8f18d103523cb727567f34df15018ce0f17c37e0a811cba82188c446cc21d59646fba8163002f5b3d3ee0edf3b8a SHA512 4247d49f0d5231e2768c0c96fa9c266bbcc340292c9c3d748f9c37ff992b82301faea798300f916e9a5c992d77adfe56186866c91a4c7d4157750ff09ba5a047
|
||||
|
||||
@@ -1,94 +0,0 @@
|
||||
https://github.com/Kistler-Group/sdbus-cpp/commit/fb9e4ae37152648a67814458d3ff673b1d3ca089
|
||||
https://github.com/Kistler-Group/sdbus-cpp/pull/378
|
||||
https://bugs.gentoo.org/917678
|
||||
https://bugs.gentoo.org/922490
|
||||
|
||||
From 674d370470a62c670bf457896561cc36668c04c6 Mon Sep 17 00:00:00 2001
|
||||
From: FuchtelJockel <25532271+FuchtelJockel@users.noreply.github.com>
|
||||
Date: Mon, 20 Nov 2023 14:41:59 +0100
|
||||
Subject: [PATCH] fix: correctly add libsystemd dependency to pkgconfig (#378)
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
* fix: correctly add libsystemd dependency to pkgconfig
|
||||
|
||||
* refactor: solve sd-bus dependencies uniformly
|
||||
|
||||
---------
|
||||
|
||||
Co-authored-by: Stanislav Angelovič <stanislav.angelovic@protonmail.com>
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -12,7 +12,8 @@ include(GNUInstallDirs) # Installation directories for `install` command and pkg
|
||||
# PERFORMING CHECKS & PREPARING THE DEPENDENCIES
|
||||
#-------------------------------
|
||||
|
||||
-set(LIBSYSTEMD "systemd")
|
||||
+set(LIBSYSTEMD_IMPL "systemd")
|
||||
+set(LIBSYSTEMD_LIB "libsystemd")
|
||||
|
||||
option(BUILD_LIBSYSTEMD "Build libsystemd static library and incorporate it into libsdbus-c++" OFF)
|
||||
|
||||
@@ -23,13 +24,15 @@ if(NOT BUILD_LIBSYSTEMD)
|
||||
message(WARNING "libsystemd not found, checking for libelogind instead")
|
||||
pkg_check_modules(Systemd IMPORTED_TARGET GLOBAL libelogind>=236)
|
||||
if(TARGET PkgConfig::Systemd)
|
||||
- set(LIBSYSTEMD "elogind")
|
||||
+ set(LIBSYSTEMD_IMPL "elogind")
|
||||
+ set(LIBSYSTEMD_LIB "libelogind")
|
||||
string(REPLACE "." ";" VERSION_LIST ${Systemd_VERSION})
|
||||
list(GET VERSION_LIST 0 Systemd_VERSION)
|
||||
else()
|
||||
message(WARNING "libelogind not found, checking for basu instead")
|
||||
pkg_check_modules(Systemd IMPORTED_TARGET GLOBAL basu)
|
||||
- set(LIBSYSTEMD "basu")
|
||||
+ set(LIBSYSTEMD_IMPL "basu")
|
||||
+ set(LIBSYSTEMD_LIB "basu")
|
||||
# https://git.sr.ht/~emersion/basu/commit/d4d185d29a26
|
||||
set(Systemd_VERSION "240")
|
||||
endif()
|
||||
@@ -125,8 +128,8 @@ add_library(sdbus-c++-objlib OBJECT ${SDBUSCPP_SRCS})
|
||||
target_compile_definitions(sdbus-c++-objlib PRIVATE
|
||||
BUILD_LIB=1
|
||||
LIBSYSTEMD_VERSION=${LIBSYSTEMD_VERSION}
|
||||
- SDBUS_${LIBSYSTEMD}
|
||||
- SDBUS_HEADER=<${LIBSYSTEMD}/sd-bus.h>)
|
||||
+ SDBUS_${LIBSYSTEMD_IMPL}
|
||||
+ SDBUS_HEADER=<${LIBSYSTEMD_IMPL}/sd-bus.h>)
|
||||
target_include_directories(sdbus-c++-objlib PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/include>
|
||||
$<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>)
|
||||
if(BUILD_SHARED_LIBS)
|
||||
@@ -236,6 +239,7 @@ if(BUILD_SHARED_LIBS AND (BUILD_LIBSYSTEMD OR Systemd_LINK_LIBRARIES MATCHES "/l
|
||||
else()
|
||||
set(PKGCONFIG_REQS "")
|
||||
endif()
|
||||
+set(PKGCONFIG_DEPS ${LIBSYSTEMD_LIB})
|
||||
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)
|
||||
--- 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@PKGCONFIG_REQS@: @LIBSYSTEMD@
|
||||
+Requires@PKGCONFIG_REQS@: @PKGCONFIG_DEPS@
|
||||
Version: @SDBUSCPP_VERSION@
|
||||
Libs: -L${libdir} -l@PROJECT_NAME@
|
||||
Cflags: -I${includedir}
|
||||
--- a/tests/CMakeLists.txt
|
||||
+++ b/tests/CMakeLists.txt
|
||||
@@ -106,7 +106,7 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR})
|
||||
add_executable(sdbus-c++-unit-tests ${UNITTESTS_SRCS})
|
||||
target_compile_definitions(sdbus-c++-unit-tests PRIVATE
|
||||
LIBSYSTEMD_VERSION=${LIBSYSTEMD_VERSION}
|
||||
- SDBUS_HEADER=<${LIBSYSTEMD}/sd-bus.h>)
|
||||
+ SDBUS_HEADER=<${LIBSYSTEMD_IMPL}/sd-bus.h>)
|
||||
target_link_libraries(sdbus-c++-unit-tests sdbus-c++-objlib GTest::gmock)
|
||||
|
||||
add_executable(sdbus-c++-integration-tests ${INTEGRATIONTESTS_SRCS})
|
||||
--
|
||||
2.43.0
|
||||
|
||||
@@ -1,25 +0,0 @@
|
||||
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 {
|
||||
@@ -1,79 +0,0 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit meson cmake
|
||||
|
||||
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"
|
||||
LICENSE="LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1" # Nothing to do with Qt but exception text is exactly the same.
|
||||
SLOT="0/1"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE="doc +elogind systemd test tools"
|
||||
REQUIRED_USE="?? ( elogind systemd )"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
RDEPEND="
|
||||
elogind? ( >=sys-auth/elogind-236 )
|
||||
systemd? ( >=sys-apps/systemd-236:= )
|
||||
!elogind? ( !systemd? ( >=sys-libs/basu-0.2.1 ) )
|
||||
tools? ( dev-libs/expat )
|
||||
"
|
||||
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
test? ( >=dev-cpp/gtest-1.10.0 )
|
||||
"
|
||||
|
||||
BDEPEND="
|
||||
virtual/pkgconfig
|
||||
doc? ( app-text/doxygen[dot] )
|
||||
"
|
||||
|
||||
S="${WORKDIR}/sdbus-cpp-${PV}"
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${P}-gcc-14.patch
|
||||
"${FILESDIR}"/${P}-fix-pkgconfig.patch
|
||||
)
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DBUILD_CODE_GEN=$(usex tools)
|
||||
-DBUILD_DOC=yes
|
||||
-DBUILD_DOXYGEN_DOC=$(usex doc)
|
||||
-DBUILD_LIBSYSTEMD=no
|
||||
-DBUILD_TESTS=$(usex test)
|
||||
)
|
||||
cmake_src_configure
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
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
|
||||
}
|
||||
@@ -1,77 +0,0 @@
|
||||
# Copyright 1999-2024 Gentoo Authors
|
||||
# Distributed under the terms of the GNU General Public License v2
|
||||
|
||||
EAPI=8
|
||||
|
||||
inherit meson cmake
|
||||
|
||||
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"
|
||||
S="${WORKDIR}/sdbus-cpp-${PV}"
|
||||
|
||||
LICENSE="LGPL-2.1+ Nokia-Qt-LGPL-Exception-1.1" # Nothing to do with Qt but exception text is exactly the same.
|
||||
SLOT="0/2"
|
||||
KEYWORDS="~amd64"
|
||||
IUSE="doc +elogind systemd test tools"
|
||||
REQUIRED_USE="?? ( elogind systemd )"
|
||||
RESTRICT="!test? ( test )"
|
||||
|
||||
RDEPEND="
|
||||
elogind? ( >=sys-auth/elogind-252 )
|
||||
systemd? ( >=sys-apps/systemd-252:= )
|
||||
!elogind? ( !systemd? ( >=sys-libs/basu-0.2.1 ) )
|
||||
tools? ( dev-libs/expat )
|
||||
"
|
||||
|
||||
DEPEND="
|
||||
${RDEPEND}
|
||||
test? ( >=dev-cpp/gtest-1.14.0 )
|
||||
"
|
||||
|
||||
BDEPEND="
|
||||
virtual/pkgconfig
|
||||
doc? ( app-text/doxygen[dot] )
|
||||
"
|
||||
|
||||
src_configure() {
|
||||
local mycmakeargs=(
|
||||
-DBUILD_DOXYGEN_DOC=$(usex doc)
|
||||
-DSDBUSCPP_BUILD_CODEGEN=$(usex tools)
|
||||
-DSDBUSCPP_BUILD_DOCS=yes
|
||||
-DSDBUSCPP_BUILD_DOXYGEN_DOCS=$(usex doc)
|
||||
-DSDBUSCPP_BUILD_LIBSYSTEMD=no
|
||||
-DSDBUSCPP_BUILD_TESTS=$(usex test)
|
||||
)
|
||||
cmake_src_configure
|
||||
}
|
||||
|
||||
src_compile() {
|
||||
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
|
||||
|
||||
# Can't use cmake_src_test with dbus-run-session. Don't bother with all the
|
||||
# extra arguments because there's only two tests.
|
||||
dbus-run-session ctest --test-dir "${BUILD_DIR}" || die
|
||||
}
|
||||
|
||||
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}"/usr/tests || die
|
||||
fi
|
||||
}
|
||||
Reference in New Issue
Block a user