Skip to content
Snippets Groups Projects
Commit 47c61dff authored by Sébastien Blin's avatar Sébastien Blin
Browse files

misc: final cleanup for opensuse and debian

Change-Id: I07cf920ed99f460bffe1d8a16f3444706f4572c3
parent 6cd87423
No related branches found
No related tags found
No related merge requests found
...@@ -90,6 +90,10 @@ RUN zypper --non-interactive up -y && \ ...@@ -90,6 +90,10 @@ RUN zypper --non-interactive up -y && \
xz \ xz \
xkeyboard-config \ xkeyboard-config \
libnotify \ libnotify \
libQt5Sql-devel \
libQt5Gui-devel \
libqt5-qtbase-devel \
libqt5-qttools \
wget wget
RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-8 50 RUN update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-8 50
......
...@@ -94,6 +94,10 @@ RUN zypper --non-interactive up -y && \ ...@@ -94,6 +94,10 @@ RUN zypper --non-interactive up -y && \
xcb-util-renderutil-devel \ xcb-util-renderutil-devel \
xcb-util-wm-devel \ xcb-util-wm-devel \
xorg-x11-devel \ xorg-x11-devel \
libQt5Sql-devel \
libQt5Gui-devel \
libqt5-qtbase-devel \
libqt5-qttools \
xz \ xz \
libnotify \ libnotify \
xkeyboard-config \ xkeyboard-config \
......
...@@ -120,7 +120,8 @@ Package: jami-libclient ...@@ -120,7 +120,8 @@ Package: jami-libclient
Architecture: any Architecture: any
Depends: ${shlibs:Depends}, Depends: ${shlibs:Depends},
${misc:Depends}, ${misc:Depends},
jami-daemon (=${binary:Version}) jami-daemon (=${binary:Version}),
libqt-jami
Description: Secure and distributed voice, video and chat platform - daemon Description: Secure and distributed voice, video and chat platform - daemon
Jami (jami.net) is a secure and distributed voice, video and chat communication Jami (jami.net) is a secure and distributed voice, video and chat communication
platform that requires no centralized server and leaves the power of privacy platform that requires no centralized server and leaves the power of privacy
......
...@@ -99,6 +99,7 @@ override_dh_auto_configure: ...@@ -99,6 +99,7 @@ override_dh_auto_configure:
cmake \ cmake \
-DRING_BUILD_DIR=$(CURDIR)/daemon/src \ -DRING_BUILD_DIR=$(CURDIR)/daemon/src \
-DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
$(CMAKE_OPTIONS) \ $(CMAKE_OPTIONS) \
.. ..
...@@ -110,6 +111,7 @@ override_dh_auto_configure: ...@@ -110,6 +111,7 @@ override_dh_auto_configure:
cd build && \ cd build && \
cmake \ cmake \
-DCMAKE_INSTALL_PREFIX=/usr \ -DCMAKE_INSTALL_PREFIX=/usr \
-DCMAKE_INSTALL_LIBDIR=lib \
-DLibRingClient_PROJECT_DIR=/$(CURDIR)/lrc \ -DLibRingClient_PROJECT_DIR=/$(CURDIR)/lrc \
-DGSETTINGS_LOCALCOMPILE=OFF \ -DGSETTINGS_LOCALCOMPILE=OFF \
$(CMAKE_OPTIONS) \ $(CMAKE_OPTIONS) \
......
...@@ -31,6 +31,10 @@ BuildRequires: webkitgtk4-devel ...@@ -31,6 +31,10 @@ BuildRequires: webkitgtk4-devel
BuildRequires: libdbus-c++-devel BuildRequires: libdbus-c++-devel
BuildRequires: libappindicator-devel BuildRequires: libappindicator-devel
BuildRequires: webkit2gtk3-devel BuildRequires: webkit2gtk3-devel
BuildRequires: libQt5Sql-devel
BuildRequires: libQt5Gui-devel
BuildRequires: libqt5-qtbase-devel
BuildRequires: libqt5-qttools
%endif %endif
BuildRequires: clutter-devel BuildRequires: clutter-devel
BuildRequires: clutter-gtk-devel BuildRequires: clutter-gtk-devel
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment