Your message dated Fri, 29 Dec 2023 21:23:45 +0000
with message-id <e1rjkkx-006xol...@fasolo.debian.org>
and subject line Bug#1059422: fixed in sdbus-cpp 1.4.0-2
has caused the Debian Bug report #1059422,
regarding sdbus-cpp: pkgconfig fails to resolve systemd dependency
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)


-- 
1059422: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1059422
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Source: sdbus-cpp
Version: 1.4.0-1
Severity: serious
Justification: causes dependent packages to fail to build from source
Tags: patch upstream

Dear maintainer,

The upstream sdbus-cpp 1.4.0 release shipped with a problematic
sdbus-c++.pc pkgconfig file that causes dependent packages that
use it to fail to build from source.  For example:

https://buildd.debian.org/status/fetch.php?pkg=ring&arch=amd64&ver=20230922.0%7Eds2-1%2Bb1&stamp=1701601320&raw=0

The issue was reported[1] and fixed[2] upstream already, but
there hasn't been a new release as of yet.  Given the severity
of the issue, please consider doing an upload with the attached
patch for the time being, until upstream releases a new version
with the fix included.

I'd look to do an NMU with the patch in the next week or two if you
may be unavailable/busy, so as to unbreak dependent packages' build.

Thanks,
-a

[1] https://github.com/Kistler-Group/sdbus-cpp/issues/377
[2] https://github.com/Kistler-Group/sdbus-cpp/pull/378

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2803722..7d29973 100644
--- 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)
diff --git a/pkgconfig/sdbus-c++.pc.in b/pkgconfig/sdbus-c++.pc.in
index 07034769..1e17f33d 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@PKGCONFIG_REQS@: @LIBSYSTEMD@
+Requires@PKGCONFIG_REQS@: @PKGCONFIG_DEPS@
 Version: @SDBUSCPP_VERSION@
 Libs: -L${libdir} -l@PROJECT_NAME@
 Cflags: -I${includedir}
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 56c48528..85abf97e 100644
--- 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})

--- End Message ---
--- Begin Message ---
Source: sdbus-cpp
Source-Version: 1.4.0-2
Done: Shengjing Zhu <z...@debian.org>

We believe that the bug you reported is fixed in the latest version of
sdbus-cpp, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 1059...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Shengjing Zhu <z...@debian.org> (supplier of updated sdbus-cpp package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@ftp-master.debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Format: 1.8
Date: Sat, 30 Dec 2023 05:00:40 +0800
Source: sdbus-cpp
Architecture: source
Version: 1.4.0-2
Distribution: unstable
Urgency: medium
Maintainer: Shengjing Zhu <z...@debian.org>
Changed-By: Shengjing Zhu <z...@debian.org>
Closes: 1059422
Changes:
 sdbus-cpp (1.4.0-2) unstable; urgency=medium
 .
   * Cherry pick upstream patch to fix resolving libsystemd dependency with
     pkgconfig (Closes: #1059422)
Checksums-Sha1:
 bfe36981c068c5db76bfa591af606c841cfdec90 1623 sdbus-cpp_1.4.0-2.dsc
 67785fb73b2b384da5b8374498f3eecd54142b1a 6088 sdbus-cpp_1.4.0-2.debian.tar.xz
 e7baac3c10178282cd773584b426527b188db6c4 5821 
sdbus-cpp_1.4.0-2_source.buildinfo
Checksums-Sha256:
 0d4d6c989a72483723cef14d824e035edb278ece863e60445edef647069b03fe 1623 
sdbus-cpp_1.4.0-2.dsc
 c2468ba2d5edc30e3668560a184b78bd2205ac3163ad88092bd5358028bfe883 6088 
sdbus-cpp_1.4.0-2.debian.tar.xz
 973d101238ac78668206098d4db94760e954c21e2aab87e05c863d62de869f2d 5821 
sdbus-cpp_1.4.0-2_source.buildinfo
Files:
 a2ad1e4b8528d5dbfb8f90ea4b350170 1623 libdevel optional sdbus-cpp_1.4.0-2.dsc
 a02a6e13b47ba28a01a18f4b7f7e56fa 6088 libdevel optional 
sdbus-cpp_1.4.0-2.debian.tar.xz
 4762a77c898c734749a4f9c94d9249d9 5821 libdevel optional 
sdbus-cpp_1.4.0-2_source.buildinfo

-----BEGIN PGP SIGNATURE-----

iHUEARYIAB0WIQSRhdT1d2eu7mxV1B5/RPol6lUUywUCZY8zxQAKCRB/RPol6lUU
y+AkAP4piAmcERDSwP8Po7GV0O19sJRhslmVVba9Qo366VGvTAEAilyK3+jj20CC
0vo2bJKrr00CZJKQiyf4RiZo8Lb1Ags=
=scG6
-----END PGP SIGNATURE-----

--- End Message ---

Reply via email to