From 39264e59c293cfe3d6e29c7932a697c5c9af284c Mon Sep 17 00:00:00 2001
From: Vladimir Stoiakin <VStoiakin@lavabit.com>
Date: Mon, 29 May 2023 14:02:49 +0300
Subject: [PATCH] build: fix packaging with sdbus-c++
Change-Id: Ie7ab5f35d0f215cd32932f277dd7cc178e0dd2cc
---
INSTALL.md | 2 +-
daemon | 2 +-
extras/build/docker/Dockerfile.client-qt-gnulinux | 4 ++--
extras/packaging/gnu-linux/docker/Dockerfile_debian_unstable | 1 -
extras/packaging/gnu-linux/docker/Dockerfile_fedora_36 | 2 --
extras/packaging/gnu-linux/docker/Dockerfile_fedora_37 | 2 --
extras/packaging/gnu-linux/docker/Dockerfile_fedora_38 | 2 --
.../packaging/gnu-linux/docker/Dockerfile_opensuse-leap_15.4 | 2 --
extras/packaging/gnu-linux/rules/debian/control | 2 +-
extras/packaging/gnu-linux/rules/rpm/jami-daemon.spec | 2 +-
extras/packaging/gnu-linux/rules/snap/jami/snapcraft.yaml | 1 -
extras/scripts/build_daemon_macos.sh | 2 +-
12 files changed, 7 insertions(+), 17 deletions(-)
diff --git a/INSTALL.md b/INSTALL.md
index f52b64ba9..e2bca0758 100644
--- 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
diff --git a/daemon b/daemon
index 2eea2ce34..3dd5f4ebf 160000
--- a/daemon
+++ b/daemon
@@ -1 +1 @@
-Subproject commit 2eea2ce34ddb3eb99074a9f6c8fe7c39e2771848
+Subproject commit 3dd5f4ebfd138e423025fd9d90a879455eb39376
diff --git a/extras/build/docker/Dockerfile.client-qt-gnulinux b/extras/build/docker/Dockerfile.client-qt-gnulinux
index 92a4f9793..2e0910d59 100644
--- 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
\ No newline at end of file
+ libgtest-dev
diff --git a/extras/packaging/gnu-linux/docker/Dockerfile_debian_unstable b/extras/packaging/gnu-linux/docker/Dockerfile_debian_unstable
index 54228657b..f156d81d4 100644
--- 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
diff --git a/extras/packaging/gnu-linux/docker/Dockerfile_fedora_36 b/extras/packaging/gnu-linux/docker/Dockerfile_fedora_36
index f972d1c40..ac85af199 100644
--- 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 \
diff --git a/extras/packaging/gnu-linux/docker/Dockerfile_fedora_37 b/extras/packaging/gnu-linux/docker/Dockerfile_fedora_37
index b2d2af320..eab4b1545 100644
--- 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 \
diff --git a/extras/packaging/gnu-linux/docker/Dockerfile_fedora_38 b/extras/packaging/gnu-linux/docker/Dockerfile_fedora_38
index 528785e67..0623bee82 100644
--- 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 \
diff --git a/extras/packaging/gnu-linux/docker/Dockerfile_opensuse-leap_15.4 b/extras/packaging/gnu-linux/docker/Dockerfile_opensuse-leap_15.4
index db154b116..9ea718e37 100644
--- 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 \
diff --git a/extras/packaging/gnu-linux/rules/debian/control b/extras/packaging/gnu-linux/rules/debian/control
index 38ecdaac4..1b99d2f36 100644
--- 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,
diff --git a/extras/packaging/gnu-linux/rules/rpm/jami-daemon.spec b/extras/packaging/gnu-linux/rules/rpm/jami-daemon.spec
index 3a9e16793..08ae5d909 100644
--- 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
diff --git a/extras/packaging/gnu-linux/rules/snap/jami/snapcraft.yaml b/extras/packaging/gnu-linux/rules/snap/jami/snapcraft.yaml
index 7c67032e4..b25e94300 100644
--- 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
diff --git a/extras/scripts/build_daemon_macos.sh b/extras/scripts/build_daemon_macos.sh
index 7f63a8516..bd71911b6 100755
--- 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" ] &&
--
GitLab