lilith/jami-client-qt
1
0
Fork 0
mirror of https://git.jami.net/savoirfairelinux/jami-client-qt.git synced 2025-07-23 17:05:28 +02:00
Code Activity

build: fix packaging with sdbus-c++

Browse source 
Change-Id: Ie7ab5f35d0f215cd32932f277dd7cc178e0dd2cc
This commit is contained in:
Vladimir Stoiakin 2023-05-29 14:02:49 +03:00 • committed by Sébastien Blin
parent 9ef9684556
commit 39264e59c2
12 changed files with 7 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
INSTALL.md
View file

@ -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

2
daemon

@ -1 +1 @@
Subproject commit 2eea2ce34ddb3eb99074a9f6c8fe7c39e2771848
Subproject commit 3dd5f4ebfd138e423025fd9d90a879455eb39376

4
extras/build/docker/Dockerfile.client-qt-gnulinux
View file

@ -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

1
extras/packaging/gnu-linux/docker/Dockerfile_debian_unstable
View file

@ -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

2
extras/packaging/gnu-linux/docker/Dockerfile_fedora_36
View file

@ -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 \

2
extras/packaging/gnu-linux/docker/Dockerfile_fedora_37
View file

@ -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 \

2
extras/packaging/gnu-linux/docker/Dockerfile_fedora_38
View file

@ -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 \

2
extras/packaging/gnu-linux/docker/Dockerfile_opensuse-leap_15.4
View file

@ -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 \

2
extras/packaging/gnu-linux/rules/debian/control
View file

@ -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,

2
extras/packaging/gnu-linux/rules/rpm/jami-daemon.spec
View file

@ -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

1
extras/packaging/gnu-linux/rules/snap/jami/snapcraft.yaml
View file

@ -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

2
extras/scripts/build_daemon_macos.sh
View file

@ -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" ] &&