[gentoo-commits] repo/gentoo:master commit in: dev-cpp/sdbus-c++/files/, dev-cpp/sdbus-c++/
commit: af4fdba984fe0b5fe9384fed31fcf87a40f7e539 Author: Alfred Wingate protonmail com> AuthorDate: Fri Jan 19 12:43:40 2024 + Commit: James Le Cuirot gentoo org> CommitDate: Tue Jan 30 23:20:52 2024 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af4fdba9 dev-cpp/sdbus-c++: fix pkgconfig file Closes: https://bugs.gentoo.org/922490 Bug: https://bugs.gentoo.org/917678 Signed-off-by: Alfred Wingate protonmail.com> Closes: https://github.com/gentoo/gentoo/pull/34898 Signed-off-by: James Le Cuirot gentoo.org> .../files/sdbus-c++-1.4.0-fix-pkgconfig.patch | 94 ++ ...-c++-1.4.0.ebuild => sdbus-c++-1.4.0-r1.ebuild} | 1 + 2 files changed, 95 insertions(+) diff --git a/dev-cpp/sdbus-c++/files/sdbus-c++-1.4.0-fix-pkgconfig.patch b/dev-cpp/sdbus-c++/files/sdbus-c++-1.4.0-fix-pkgconfig.patch new file mode 100644 index ..d9022bdcfe99 --- /dev/null +++ b/dev-cpp/sdbus-c++/files/sdbus-c++-1.4.0-fix-pkgconfig.patch @@ -0,0 +1,94 @@ +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+fuchteljoc...@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č +--- 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 $ + $) + 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 + diff --git a/dev-cpp/sdbus-c++/sdbus-c++-1.4.0.ebuild
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/sdbus-c++/files/, dev-cpp/sdbus-c++/
commit: bd2f66aa4cbf947420bbfe4a6f0067fb0489ac22 Author: James Le Cuirot gentoo org> AuthorDate: Thu Nov 16 22:57:23 2023 + Commit: James Le Cuirot gentoo org> CommitDate: Thu Nov 16 22:57:23 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bd2f66aa dev-cpp/sdbus-c++: Bump to 1.4.0, fix GCC 14, drop old Thanks to Alfred Wingate for the patch. Closes: https://bugs.gentoo.org/917157 Signed-off-by: James Le Cuirot gentoo.org> dev-cpp/sdbus-c++/Manifest | 5 +- .../sdbus-c++/files/sdbus-c++-1.4.0-gcc-14.patch | 25 dev-cpp/sdbus-c++/files/sdbus-c++-pc-reqs.patch| 29 .../files/sdbus-c++-static-libsystemd.patch| 10 -- dev-cpp/sdbus-c++/sdbus-c++-0.9.0-r6.ebuild| 148 - ...bus-c++-1.3.0.ebuild => sdbus-c++-1.4.0.ebuild} | 4 + 6 files changed, 30 insertions(+), 191 deletions(-) diff --git a/dev-cpp/sdbus-c++/Manifest b/dev-cpp/sdbus-c++/Manifest index 4cfcbb920a4e..3a391a21c399 100644 --- a/dev-cpp/sdbus-c++/Manifest +++ b/dev-cpp/sdbus-c++/Manifest @@ -1,4 +1 @@ -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 +DIST sdbus-c++-1.4.0.tar.gz 224529 BLAKE2B a82656f3d1b98bbf4f7f83c708e507168105a2c2341df3983f782c2590b9e0e1811fb594065c248d8d93a3b4ca31ca99c141f0ecbab050d7358f78a499ceede2 SHA512 8b13dc57f15de482f59edfff7cdd4e2b4e2e659b9cdff9f946783bb0bf1ec735f789675dd19ebe7d38a06358fe77dcfabdc2a387660af00f2c0f3962de214d76 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 ..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 +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 +--- + 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 + #include + #include ++#include + + // 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.. --- 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:
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/sdbus-c++/files/, dev-cpp/sdbus-c++/
commit: 17210d6df606eae8555385843976e233aab33ac1 Author: James Le Cuirot gentoo org> AuthorDate: Sat Sep 2 08:30:38 2023 + Commit: James Le Cuirot gentoo org> CommitDate: Sat Sep 2 09:01:09 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17210d6d dev-cpp/sdbus-c++: Bump to 1.3.0, drop old 1.2.0-r1 It now works with elogind! Signed-off-by: James Le Cuirot gentoo.org> dev-cpp/sdbus-c++/Manifest | 2 +- ...fix-integration-tests-for-libsystemd-v251.patch | 39 -- dev-cpp/sdbus-c++/sdbus-c++-1.2.0-r1.ebuild| 149 - dev-cpp/sdbus-c++/sdbus-c++-1.3.0.ebuild | 73 ++ 4 files changed, 74 insertions(+), 189 deletions(-) diff --git a/dev-cpp/sdbus-c++/Manifest b/dev-cpp/sdbus-c++/Manifest index dc68d12bda1f..dce128efad4d 100644 --- a/dev-cpp/sdbus-c++/Manifest +++ b/dev-cpp/sdbus-c++/Manifest @@ -1,4 +1,4 @@ DIST sdbus-c++-0.9.0.tar.gz 198979 BLAKE2B 31cda7ce97aad05f93a015ca0f8bd93aa095f6abb6bc513343767c7221d2aeacc96ee2b6a1b0ecf50850f17506fc97aa3a9fead0332687d57bdbddf806502826 SHA512 8695d3efac5654cb28998cdd69c16f251654b2c95e0dc2a2f5a4b01b24dae7b04e1a1f2e9bc9fb96b99f099dd4a130ca980cb672f74829565fd0d48162a581c5 -DIST sdbus-c++-1.2.0.tar.gz 205798 BLAKE2B da040acb49f5294665b09df97c171eac38f7c6ce5e86093b45b896c4b216afc9b45870395404ffb8e7c32ac8b98f6c795fb528691b344587545e5ae27d4423d6 SHA512 dab2c4d9a5ea6d626672a5a6ee6f3490c60c6fdd160769801a4d6b4cf3df4983fad57ff0230132a5d637ec78a55993200ce217fa89461016e101865cc2777d7d +DIST sdbus-c++-1.3.0.tar.gz 217150 BLAKE2B aa9a902cdff6a6f2268cfe04b45105ab08ee4b3a257db10af63f8224a9932e28c5f755879c866274722a2087a59c0a22dc0616ac5d696229daeaa965a156e220 SHA512 8f4cb9ae88b1ec0db0bcc27e131fcb9ad8a8bc88e39721b3b73f63e057bae4cd36619894e25114ccddb1a8e6c21db2f80adcabb3263ff5d8b34b72af7563afe2 DIST systemd-musl-patches-252.4.tar.gz 25053 BLAKE2B 1d75f85ea0c48c788e9199e2d919bac90edce16a9788a349332cf308c32fb9510ac2883f8e09f21e7f37fbac2e557dc39cdf44dcd7a986587c40dedd2d1b5df5 SHA512 1dc8e220eae1869eb4bb50f9c701392542b053099cf9b6bde13f12a2d26fa29984819a8b4ce1b6c57e38a71f86324469a87cf9e22abe0f6d67ac3e84c6b9a3ba DIST systemd-stable-252.6.tar.gz 11823064 BLAKE2B 0c260685c929b5271efba13d6ba84bc99211ead7d080b5e9b0d68428fe46a8a8a556b140787dd21f7b19e1454a78f15bf407038b3dc02a4d3db2336f3d881255 SHA512 948cb3f7c6a4bbc2bcc3ebe4f36afac304c9d694dadac7e363bbdb79f111eb5d69fd501433ba6719d79d833206a019cb40a37b16a92c8d22acbdd9736cdbdd37 diff --git a/dev-cpp/sdbus-c++/files/0001-fix-integration-tests-for-libsystemd-v251.patch b/dev-cpp/sdbus-c++/files/0001-fix-integration-tests-for-libsystemd-v251.patch deleted file mode 100644 index 93767dc94be7.. --- a/dev-cpp/sdbus-c++/files/0001-fix-integration-tests-for-libsystemd-v251.patch +++ /dev/null @@ -1,39 +0,0 @@ -From c812d03bc726aafc90f996073bfc327bb0ae230d Mon Sep 17 00:00:00 2001 -From: Stanislav Angelovic -Date: Mon, 2 Jan 2023 15:05:57 +0100 -Subject: [PATCH] fix: integration tests for libsystemd v251 - -diff --git a/tests/integrationtests/DBusStandardInterfacesTests.cpp b/tests/integrationtests/DBusStandardInterfacesTests.cpp -index a291be3..6381587 100644 a/tests/integrationtests/DBusStandardInterfacesTests.cpp -+++ b/tests/integrationtests/DBusStandardInterfacesTests.cpp -@@ -201,7 +201,13 @@ TEST_F(SdbusTestObject, EmitsInterfacesAddedSignalForAllObjectInterfaces) - , const std::map>& interfacesAndProperties ) - { - EXPECT_THAT(objectPath, Eq(OBJECT_PATH)); -+#if LIBSYSTEMD_VERSION<=250 - EXPECT_THAT(interfacesAndProperties, SizeIs(5)); // INTERFACE_NAME + 4 standard interfaces -+#else -+// Since systemd v251, ObjectManager standard interface is not listed among the interfaces -+// if the object does not have object manager functionality explicitly enabled. -+EXPECT_THAT(interfacesAndProperties, SizeIs(4)); // INTERFACE_NAME + 3 standard interfaces -+#endif - #if LIBSYSTEMD_VERSION<=244 - // Up to sd-bus v244, all properties are added to the list, i.e. `state', `action', and `blocking' in this case. - EXPECT_THAT(interfacesAndProperties.at(INTERFACE_NAME), SizeIs(3)); -@@ -248,7 +254,13 @@ TEST_F(SdbusTestObject, EmitsInterfacesRemovedSignalForAllObjectInterfaces) - , const std::vector& interfaces ) - { - EXPECT_THAT(objectPath, Eq(OBJECT_PATH)); -+#if LIBSYSTEMD_VERSION<=250 - ASSERT_THAT(interfaces, SizeIs(5)); // INTERFACE_NAME + 4 standard interfaces -+#else -+// Since systemd v251, ObjectManager standard interface is not listed among the interfaces -+// if the object does not have object manager functionality explicitly enabled. -+ASSERT_THAT(interfaces, SizeIs(4)); // INTERFACE_NAME + 3 standard interfaces -+#endif - signalReceived = true; - }; - --- -2.39.1 diff --git
[gentoo-commits] repo/gentoo:master commit in: dev-cpp/sdbus-c++/files/, dev-cpp/sdbus-c++/
commit: 1423841eb6ef3c5fa2363cc38e04665ef4e06fe9 Author: James Le Cuirot gentoo org> AuthorDate: Sun Mar 20 10:38:31 2022 + Commit: James Le Cuirot gentoo org> CommitDate: Sun Mar 20 10:38:31 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1423841e dev-cpp/sdbus-c++: New package Including older 0.9.0 version for msalsdk-dbusclient. Signed-off-by: James Le Cuirot gentoo.org> dev-cpp/sdbus-c++/Manifest | 3 + dev-cpp/sdbus-c++/files/sdbus-c++-gtest-1.11.patch | 58 ++ .../files/sdbus-c++-static-libsystemd.patch| 10 ++ dev-cpp/sdbus-c++/metadata.xml | 12 +++ dev-cpp/sdbus-c++/sdbus-c++-0.9.0.ebuild | 115 dev-cpp/sdbus-c++/sdbus-c++-1.1.0.ebuild | 119 + 6 files changed, 317 insertions(+) diff --git a/dev-cpp/sdbus-c++/Manifest b/dev-cpp/sdbus-c++/Manifest new file mode 100644 index ..fd0c4fb8f9c5 --- /dev/null +++ b/dev-cpp/sdbus-c++/Manifest @@ -0,0 +1,3 @@ +DIST sdbus-c++-0.9.0.tar.gz 198979 BLAKE2B 31cda7ce97aad05f93a015ca0f8bd93aa095f6abb6bc513343767c7221d2aeacc96ee2b6a1b0ecf50850f17506fc97aa3a9fead0332687d57bdbddf806502826 SHA512 8695d3efac5654cb28998cdd69c16f251654b2c95e0dc2a2f5a4b01b24dae7b04e1a1f2e9bc9fb96b99f099dd4a130ca980cb672f74829565fd0d48162a581c5 +DIST sdbus-c++-1.1.0.tar.gz 201532 BLAKE2B 3dac74cb7fc6717db9d25463ddfb9122db54edcd3bc9d1e71d18c132ede1efaf12b514f335c3978f51277afff7e6ab5533cfd02241759f7e3d24cede8aa29c6d SHA512 ba6230c0d1019875d92a92f793278c528a01692dc70e7acee8bb289af5dae65c1ad7b1c139f859cb7a960c7b48501178bfdf755163c2bc4d3766e67f3aa9b883 +DIST systemd-stable-250.4.tar.gz 11132786 BLAKE2B 8fdfe1bad76e572dc1be0955f3d1c4080f2beb81a2f9670f80827899f5406ab8ed8675400c2f5e8ccef44cf1bceff42ceae12a42e1b67d46c0deb523e6495f25 SHA512 307ed0920da660b6c45d909fea66864fb98db8b2f6905d629fb2012fc4bf64dd25fd61168c22bf4098200be541be9b0e815fbde98806a99c85cb33d49d8b63d0 diff --git a/dev-cpp/sdbus-c++/files/sdbus-c++-gtest-1.11.patch b/dev-cpp/sdbus-c++/files/sdbus-c++-gtest-1.11.patch new file mode 100644 index ..e6d3622ee11f --- /dev/null +++ b/dev-cpp/sdbus-c++/files/sdbus-c++-gtest-1.11.patch @@ -0,0 +1,58 @@ +From 7f437a6e06d2ec3abd3e2fd1101ab6aab386bc44 Mon Sep 17 00:00:00 2001 +From: Stanislav Angelovic +Date: Thu, 27 Jan 2022 13:38:19 +0100 +Subject: [PATCH] fix(tests): printer for std::chrono in googletest v1.11.0 + +--- + tests/CMakeLists.txt | 2 +- + tests/integrationtests/Defs.h | 22 ++ + 2 files changed, 11 insertions(+), 13 deletions(-) + +diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt +index fbf198c..ec42e55 100644 +--- a/tests/CMakeLists.txt b/tests/CMakeLists.txt +@@ -19,7 +19,7 @@ if (NOT TARGET GTest::gmock) + if (NOT TARGET GTest::gmock) + include(FetchContent) + +-message("Fetching googletest...") ++message("Fetching googletest v${GOOGLETEST_VERSION}...") + FetchContent_Declare(googletest + GIT_REPOSITORY ${GOOGLETEST_GIT_REPO} + GIT_TAGrelease-${GOOGLETEST_VERSION} +diff --git a/tests/integrationtests/Defs.h b/tests/integrationtests/Defs.h +index 2f129a4..2bfc7c9 100644 +--- a/tests/integrationtests/Defs.h b/tests/integrationtests/Defs.h +@@ -56,20 +56,18 @@ const bool DEFAULT_BLOCKING_VALUE{true}; + + constexpr const double DOUBLE_VALUE{3.24L}; + +-/** Duration stream operator for human readable gtest value output. +- * +- * Note that the conversion to double is lossy if the input type has 64 or more bits. +- * This is ok for our integration tests because they don't have very +- * accurate timing requirements. +- * +- * @return human readable duration in seconds +- */ ++}} ++ ++namespace testing::internal { ++ ++// Printer for std::chrono::duration types. ++// This is a workaround, since it's not a good thing to add this to std namespace. + template< class Rep, class Period > +-static std::ostream& operator<<(std::ostream& os, const std::chrono::duration& d) +-{ ++void PrintTo(const ::std::chrono::duration& d, ::std::ostream* os) { + auto seconds = std::chrono::duration_cast>(d); +-return os << seconds.count() << " s"; ++*os << seconds.count() << "s"; ++} ++ + } +-}} + + #endif /* SDBUS_CPP_INTEGRATIONTESTS_DEFS_H_ */ diff --git a/dev-cpp/sdbus-c++/files/sdbus-c++-static-libsystemd.patch b/dev-cpp/sdbus-c++/files/sdbus-c++-static-libsystemd.patch new file mode 100644 index ..d6f018fda175 --- /dev/null +++ b/dev-cpp/sdbus-c++/files/sdbus-c++-static-libsystemd.patch @@ -0,0 +1,10 @@ +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.0 + b/src/libsystemd/libsystemd.pc.in 2022-03-05 21:24:47.139338880 + +@@