bug#68573: closed ([PATCH gnome-team] gnu: sdbus-c++: Fix generated sdbus-c++.pc.)

[GNU bug Tracking System]

Your message dated Thu, 25 Jan 2024 16:33:32 +0100
with message-id <1061cfe557e27279ba0d3f9d32ebef45177feafb.camel@gmail.com>
and subject line Re: [PATCH gnome-team v2] gnu: sdbus-c++: Fix generated 
sdbus-c++.pc.
has caused the debbugs.gnu.org bug report #68573,
regarding [PATCH gnome-team] gnu: sdbus-c++: Fix generated sdbus-c++.pc.
to be marked as done.

(If you believe you have received this mail in error, please contact
help-debbugs@gnu.org.)


-- 
68573: https://debbugs.gnu.org/cgi/bugreport.cgi?bug=68573
GNU Bug Tracking System
Contact help-debbugs@gnu.org with problems
> --- Begin Message ---
>
>
>
> Subject: 
>
> [PATCH gnome-team] gnu: sdbus-c++: Fix generated sdbus-c++.pc.
>
>
>
>
> Date: 
>
> Thu, 18 Jan 2024 22:14:09 +0100
>
>
>
>
> User-agent: 
>
> Evolution 3.48.4 
>
>
>
>
> * gnu/packages/glib.scm (sdbus-c++) [#:phases 'fix-libelogind-requirement]:
> New phase.
>
> Change-Id: Id29369178f164fc60e6882aa664556924cf4bfa7
> ---
>  gnu/packages/glib.scm | 19 ++++++++++++++-----
>  1 file changed, 14 insertions(+), 5 deletions(-)
>
> diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
> index 7b8cc3286d..d84b848b62 100644
> --- a/gnu/packages/glib.scm
> +++ b/gnu/packages/glib.scm
> @@ -1289,11 +1289,20 @@ (define-public sdbus-c++
>                                  ;; Do not install tests.
>                                  "-DTESTS_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")))))))
> +      #:phases
> +      #~(modify-phases %standard-phases
> +          (add-after 'unpack 'do-not-install-tests
> +            (lambda _
> +              (substitute* "tests/CMakeLists.txt"
> +                (("/etc/dbus-1/system.d") "/tmp"))))
> +          (add-before 'install 'fix-libelogind-requirement
> +            (lambda _
> +              ;; sdbus-c++.pc requires 'elogind', but it should
> +              ;; require 'libelogind'. Fixed after 1.4.0 with
> +              ;; fb9e4ae37152648a67814458d3ff673b1d3ca089
> +              (substitute* "pkgconfig/sdbus-c++.pc"
> +                (("Requires: elogind")
> +                 "Requires: libelogind")))))))
>      (native-inputs (list googletest pkg-config))
>      (inputs (list expat))
>      (propagated-inputs (list elogind)) ;required by sdbus-c++.pc
>
> base-commit: 17c2e26068c5c36eb8ee1ec39a8695ef66f75c55
> -- 
> 2.41.0
>
>
>
> --- End Message ---
> --- Begin Message ---
>
>
>
> Subject: 
>
> Re: [PATCH gnome-team v2] gnu: sdbus-c++: Fix generated sdbus-c++.pc.
>
>
>
>
> Date: 
>
> Thu, 25 Jan 2024 16:33:32 +0100
>
>
>
>
> User-agent: 
>
> Evolution 3.46.4 
>
>
>
>
> Am Donnerstag, dem 18.01.2024 um 22:14 +0100 schrieb Vivien Kraus:
> > * gnu/packages/glib.scm (sdbus-c++) [#:phases]: Add 'fix-elogind-
> > requirement.
> > 
> > Change-Id: Id29369178f164fc60e6882aa664556924cf4bfa7
> Pushed.  Thanks
>
>
> --- End Message ---