GNU bug report logs - #74256
[PATCH] gnu: sdbus-c++: Update to 2.0.0.

Previous Next

To add a comment to this bug, you must first unarchive it, by sending
a message to control AT debbugs.gnu.org, with unarchive 74256 in the body.
You can then email your comments to 74256 AT debbugs.gnu.org in the normal way.

Toggle the display of automated, internal messages from the tracker.

Message #5 received at submit <at> debbugs.gnu.org (full text, mbox):

From: Sisiutl <sisiutl <at> egregore.fun>
To: guix-patches <at> gnu.org
Cc: Sisiutl <sisiutl <at> egregore.fun>
Subject: [PATCH] gnu: sdbus-c++: Update to 2.0.0.
Date: Fri,  8 Nov 2024 13:30:43 +0100

* 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(-)

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

Message #8 received at 74256 <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: Sisiutl <sisiutl <at> egregore.fun>
Cc: 74256 <at> debbugs.gnu.org
Subject: Re: [bug#74256] [PATCH] gnu: sdbus-c++: Update to 2.0.0.
Date: Sun, 29 Dec 2024 23:57:22 +0100

Hi,

Sisiutl <sisiutl <at> egregore.fun> skribis:

> * gnu/packages/glib.scm (sdbus-c++): Update to 2.0.0.
>
> Change-Id: I7f2fb86e72fc536fe2fb92672fc38d2444b1bbb5

Sorry for the logn delay.

Building fails with:

--8<---------------cut here---------------start------------->8---
starting phase `check'
make: *** No rule to make target 'sdbus-c++-unit-tests'.  Stop.

Test suite failed, dumping logs.
error: in phase 'check': uncaught exception:
%exception #<&invoke-error program: "make" arguments: ("sdbus-c++-unit-tests" "-j" "4") exit-status: 2 term-signal: #f stop-signal: #f> 
phase `check' failed after 0.0 seconds
command "make" "sdbus-c++-unit-tests" "-j" "4" failed with status 2
build process 6 exited with status 256
--8<---------------cut here---------------end--------------->8---

Could you take a look?

Thanks,
Ludo’.

Message #11 received at 74256 <at> debbugs.gnu.org (full text, mbox):

From: John Kehayias <john.kehayias <at> protonmail.com>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: Sisiutl <sisiutl <at> egregore.fun>, 74256 <at> debbugs.gnu.org
Subject: Re: [bug#74256] [PATCH V2 1/2] gnu: sdbus-c++: Update to 2.0.0.
Date: Thu, 02 Jan 2025 05:52:21 +0000

[Message part 1 (text/plain, inline)]

Hello,

On Sun, Dec 29, 2024 at 11:57 PM, Ludovic Courtès wrote:

> Hi,
>
> Sisiutl <sisiutl <at> egregore.fun> skribis:
>
>> * gnu/packages/glib.scm (sdbus-c++): Update to 2.0.0.
>>
>> Change-Id: I7f2fb86e72fc536fe2fb92672fc38d2444b1bbb5
>

I was just looking to update this package as well (to add hypridle, an
idle helper for the Hyprland compositor system). I tried to go to the
latest version but I think it needs a newer googletest (there is a
pending patch for it) which will require a branch for rebuilding.

> Sorry for the logn delay.
>
> Building fails with:
>
> starting phase `check'
> make: *** No rule to make target 'sdbus-c++-unit-tests'.  Stop.
>
> Test suite failed, dumping logs.
> error: in phase 'check': uncaught exception:
> %exception #<&invoke-error program: "make" arguments: ("sdbus-c++-unit-tests" "-j" "4") exit-status: 2 term-signal: #f stop-signal: #f>
> phase `check' failed after 0.0 seconds
> command "make" "sdbus-c++-unit-tests" "-j" "4" failed with status 2
> build process 6 exited with status 256
>
> Could you take a look?
>

The problem is the configure flags changed and now have a prefix of
"SDBUSCPP_" (note the extra underscores in the original patch here).
Also, the underscore was removed in "CODE_GEN".

I fixed this in the v2 patch (attached) and would have just pushed it,
but found out that libjami fails to build with this update (the other
dependent xdg-desktop-portal-hyprland also fails but is fixed with a
trivial version update).

I didn't see an easier way than just adding back the older sdbus-c++
version for use by libjami, in a followup patch in the next email. Since
this is a less trivial change I send it for review here.

> Thanks,
> Ludo’.

Thanks both!
John

[0001-gnu-sdbus-c-Update-to-2.0.0.patch (text/x-patch, attachment)]

Message #14 received at 74256 <at> debbugs.gnu.org (full text, mbox):

From: John Kehayias <john.kehayias <at> protonmail.com>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: Sisiutl <sisiutl <at> egregore.fun>, 74256 <at> debbugs.gnu.org
Subject: Re: [bug#74256] [PATCH V2 2/2] gnu: Add sdbus-c++-1.4.0.
Date: Thu, 02 Jan 2025 05:55:51 +0000

[Message part 1 (text/plain, inline)]

Followup patch to add older sdbus-c++ for libjami.

Note: my first email with my v2 of the original patch bounced on trying
to reach the original author: "Host found but no data record of
requested type" error. Will still include in the CC here though.

[0002-gnu-Add-sdbus-c-1.4.0.patch (text/x-patch, attachment)]

Message #17 received at 74256 <at> debbugs.gnu.org (full text, mbox):

From: Ludovic Courtès <ludo <at> gnu.org>
To: John Kehayias <john.kehayias <at> protonmail.com>
Cc: Sisiutl <sisiutl <at> egregore.fun>, 74256 <at> debbugs.gnu.org
Subject: Re: [bug#74256] [PATCH V2 1/2] gnu: sdbus-c++: Update to 2.0.0.
Date: Sat, 04 Jan 2025 22:44:59 +0100

Hello,

John Kehayias <john.kehayias <at> protonmail.com> skribis:

> I fixed this in the v2 patch (attached) and would have just pushed it,
> but found out that libjami fails to build with this update (the other
> dependent xdg-desktop-portal-hyprland also fails but is fixed with a
> trivial version update).

[...]

> Followup patch to add older sdbus-c++ for libjami.

Both LGTM.  I would suggest pushing them as a single commit, so that the
change is self-contained and libjami works both before and after.

Thanks,
Ludo’.

Message #22 received at 74256-done <at> debbugs.gnu.org (full text, mbox):

From: John Kehayias <john.kehayias <at> protonmail.com>
To: Ludovic Courtès <ludo <at> gnu.org>
Cc: Sisiutl <sisiutl <at> egregore.fun>, 74256-done <at> debbugs.gnu.org
Subject: Re: [bug#74256] [PATCH V2 1/2] gnu: sdbus-c++: Update to 2.0.0.
Date: Mon, 06 Jan 2025 19:33:45 +0000

On Sat, Jan 04, 2025 at 10:44 PM, Ludovic Courtès wrote:

> Both LGTM.  I would suggest pushing them as a single commit, so that the
> change is self-contained and libjami works both before and after.
>
> Thanks,
> Ludo’.

Thanks, did just that with 33fa8fd0d0b2291a28d7967c4e214378ae1401e8.

John

Previous Next

GNU bug tracking system
Copyright (C) 1999 Darren O. Benham, 1997,2003 nCipher Corporation Ltd, 1994-97 Ian Jackson.