build: fix packaging with sdbus-c++

Change-Id: Ie7ab5f35d0f215cd32932f277dd7cc178e0dd2cc
2025-12-18 00:36:35 +08:00 · 2023-05-29 14:02:49 +03:00
parent 9ef9684556
commit 39264e59c2
12 changed files with 7 additions and 17 deletions
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -109,7 +109,7 @@ If you use a Qt version that is not system-wide installed, you need to
 specify its path using the `--qt` flag, e.g.
 `./build.py --install --qt=/home/<username>/Qt/6.2.1/gcc_64`.

-Now you will have the daemon in `daemon/bin/jamid` and the client in
+Now you will have the daemon in `daemon/bin/dbus/jamid` and the client in
 `build/jami`. You can now run Jami using:

 ```bash
--- a/2
+++ b/2
--- a/extras/build/docker/Dockerfile.client-qt-gnulinux
+++ b/extras/build/docker/Dockerfile.client-qt-gnulinux
@@ -22,7 +22,7 @@ RUN apt-get install -y -o Acquire::Retries=10 \
        cmake \
        libtool \
        libdbus-1-dev \
-        libdbus-c++-dev \
+        libsystemd-dev \
        libargon2-0-dev \
        libcanberra-gtk3-dev \
        libclutter-gtk-1.0-dev \
@@ -66,4 +66,4 @@ RUN apt-get install -y -o Acquire::Retries=10 \
        libssl-dev
 RUN apt-get install -y pandoc \
        googletest \
-        libgtest-dev
+        libgtest-dev
--- a/extras/packaging/gnu-linux/docker/Dockerfile_debian_unstable
+++ b/extras/packaging/gnu-linux/docker/Dockerfile_debian_unstable
@@ -9,7 +9,6 @@ RUN apt-get update && \
        equivs \
        python-is-python3 \
        libdbus-1-dev \
-        libdbus-c++-dev \
        wget

 ADD extras/packaging/gnu-linux/scripts/prebuild-package-debian.sh /opt/prebuild-package-debian.sh
--- a/extras/packaging/gnu-linux/docker/Dockerfile_fedora_36
+++ b/extras/packaging/gnu-linux/docker/Dockerfile_fedora_36
@@ -26,8 +26,6 @@ RUN dnf install -y \
        expat-devel \
        pcre-devel \
        yaml-cpp-devel \
-        dbus-c++-devel \
-        dbus-devel \
        libXext-devel \
        libXfixes-devel \
        yasm \
--- a/extras/packaging/gnu-linux/docker/Dockerfile_fedora_37
+++ b/extras/packaging/gnu-linux/docker/Dockerfile_fedora_37
@@ -27,8 +27,6 @@ RUN dnf install -y \
        expat-devel \
        pcre-devel \
        yaml-cpp-devel \
-        dbus-c++-devel \
-        dbus-devel \
        libXext-devel \
        libXfixes-devel \
        yasm \
--- a/extras/packaging/gnu-linux/docker/Dockerfile_fedora_38
+++ b/extras/packaging/gnu-linux/docker/Dockerfile_fedora_38
@@ -27,8 +27,6 @@ RUN dnf install -y \
        expat-devel \
        pcre-devel \
        yaml-cpp-devel \
-        dbus-c++-devel \
-        dbus-devel \
        libXext-devel \
        libXfixes-devel \
        yasm \
--- a/extras/packaging/gnu-linux/docker/Dockerfile_opensuse-leap_15.4
+++ b/extras/packaging/gnu-linux/docker/Dockerfile_opensuse-leap_15.4
@@ -23,7 +23,6 @@ RUN zypper --non-interactive install -y \
        libtool \
        pcre-devel \
        yaml-cpp-devel \
-        libdbus-c++-devel \
        libXext-devel \
        libXfixes-devel \
        yasm \
@@ -51,7 +50,6 @@ RUN zypper --non-interactive install -y \
        clutter-gtk-devel \
        libnma-devel \
        libcryptopp-devel \
-        libdbus-c++-devel \
        libexpat-devel \
        gnome-icon-theme-symbolic \
        libgsm-devel \
--- a/extras/packaging/gnu-linux/rules/debian/control
+++ b/extras/packaging/gnu-linux/rules/debian/control
@@ -16,7 +16,7 @@ Build-Depends: debhelper (>= 9),
               libayatana-appindicator3-dev | libappindicator3-dev,
 # daemon
               libdbus-1-dev,
-               libdbus-c++-dev,
+               libsystemd-dev,
               libupnp-dev,
               libgnutls28-dev,
               libpulse-dev,
--- a/extras/packaging/gnu-linux/rules/rpm/jami-daemon.spec
+++ b/extras/packaging/gnu-linux/rules/rpm/jami-daemon.spec
@@ -35,7 +35,7 @@ BuildRequires: opus-devel
 BuildRequires: pulseaudio-libs-devel
 %endif
 %if %{defined suse_version}
-BuildRequires: libdbus-c++-devel
+BuildRequires: systemd-devel
 BuildRequires: libexpat-devel
 BuildRequires: libopus-devel
 BuildRequires: libpulse-devel
--- a/extras/packaging/gnu-linux/rules/snap/jami/snapcraft.yaml
+++ b/extras/packaging/gnu-linux/rules/snap/jami/snapcraft.yaml
@@ -309,7 +309,6 @@ parts:
    - libjsoncpp-dev
    - libnm-dev # connectivityChanged()
    - libdbus-1-dev # dbus
-    - libdbus-c++-dev
    - libpulse-dev # pulse
    - libudev-dev
    - libopus-dev # Avoid to build opus from contrib
--- a/extras/scripts/build_daemon_macos.sh
+++ b/extras/scripts/build_daemon_macos.sh
@@ -52,7 +52,7 @@ for ARCH in "${ARCHS[@]}"; do
    # force to build every contrib
    for dir in "$DAEMON"/contrib/src/*/; do
      PKG=$(basename -- "$dir")
-      if [ "$PKG" != "dbus-cpp" ] && [ "$PKG" != "natpmp" ] &&
+      if [ "$PKG" != "sdbus-cpp" ] && [ "$PKG" != "natpmp" ] &&
        [ "$PKG" != "portaudio" ] && [ "$PKG" != "pthreads" ] &&
        [ "$PKG" != "lttng-ust" ] && [ "$PKG" != "openssl" ] &&
        [ "$PKG" != "media-sdk" ] && [ "$PKG" != "jack" ] &&