(address . guix-patches@gnu.org)(name . Sisiutl)(address . sisiutl@egregore.fun)
20241108123050.23571-1-sisiutl@egregore.fun
* gnu/packages/glib.scm (sdbus-c++): Update to 2.0.0.
Change-Id: I7f2fb86e72fc536fe2fb92672fc38d2444b1bbb5
---
gnu/packages/glib.scm | 20 ++++++--------------
1 file changed, 6 insertions(+), 14 deletions(-)
Toggle diff (52 lines)
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index a15a7ce58a..bcb1c39ea3 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -1299,7 +1299,7 @@ (define-public sdbus-c++
;; file.
(package
(name "sdbus-c++")
- (version "1.4.0")
+ (version "2.0.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -1308,31 +1308,23 @@ (define-public sdbus-c++
(file-name (git-file-name name version))
(sha256
(base32
- "111l2rl0pg9r5cdrhqpac4v22cnq41skxxfk3cng81l0n05v1sh0"))))
+ "1s6vhzln0rvac2r3v8nq08hsjhyz3y46fsy18i23ppjm30apkiav"))))
(build-system cmake-build-system)
(arguments
(list
;; Avoid the integration test, which requires a system bus.
#:test-target "sdbus-c++-unit-tests"
- #:configure-flags #~(list "-DBUILD_CODE_GEN=ON"
- "-DBUILD_TESTS=ON"
+ #:configure-flags #~(list "-DSDBUS_CPP_BUILD_CODE_GEN=ON"
+ "-DSDBUS_CPP_BUILD_TESTS=ON"
;; Do not install tests.
- "-DTESTS_INSTALL_PATH=/tmp"
+ "-DSDBUS_CPP_TESTS_INSTALL_PATH=/tmp"
"-DCMAKE_VERBOSE_MAKEFILE=ON")
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'do-not-install-tests
(lambda _
(substitute* "tests/CMakeLists.txt"
- (("/etc/dbus-1/system.d") "/tmp"))))
- (add-after 'unpack 'fix-elogind-requirement
- (lambda _
- ;; sdbus-c++.pc requires 'elogind', but it should
- ;; require 'libelogind'. Fixed after 1.4.0 with
- ;; fb9e4ae37152648a67814458d3ff673b1d3ca089
- (substitute* "pkgconfig/sdbus-c++.pc.in"
- (("@LIBSYSTEMD@")
- "libelogind")))))))
+ (("/etc/dbus-1/system.d") "/tmp")))))))
(native-inputs (list googletest pkg-config))
(inputs (list expat))
(propagated-inputs (list elogind)) ;required by sdbus-c++.pc
--
2.46.0