From de1306ed70887aca564834c9f070f86c53668a2d Mon Sep 17 00:00:00 2001 From: Peio Rigaux Date: Tue, 22 Feb 2022 18:28:56 +0100 Subject: [PATCH] Added webengine dependencies and use C++14 fir qt build (mandatory for webengine) --- docker-files/bc-dev-debian9-qt-fuse-wget-gpg2 | 9 +++++---- linphone-app/build/rpm/qt5.spec | 8 +++++++- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/docker-files/bc-dev-debian9-qt-fuse-wget-gpg2 b/docker-files/bc-dev-debian9-qt-fuse-wget-gpg2 index 8fcdec1eb..41fbbc931 100644 --- a/docker-files/bc-dev-debian9-qt-fuse-wget-gpg2 +++ b/docker-files/bc-dev-debian9-qt-fuse-wget-gpg2 @@ -11,16 +11,17 @@ RUN sudo apt-get update && sudo apt-get install -y pigz #xkbcommon is needed for special keyboard features #flite1-dev, libspeechd-dev speech-dispatcher are needed for text to speech #libfontconfig1-dev is needed to load correct fonts (support of ideograms, etc..) -#needed for xcb : libfontconfig1-dev libfreetype6-dev libx11-dev libxext-dev libxfixes-dev libxi-dev libxrender-dev libxcb1-dev libx11-xcb-dev libxcb-glx0-dev libxkbcommon-x11-dev +#needed for xcb : libfontconfig1-dev ilibfreetype6-dev libx11-dev libxext-dev libxfixes-dev libxi-dev libxrender-dev libxcb1-dev libx11-xcb-dev libxcb-glx0-dev libxkbcommon-x11-dev +#needed for webengine : libxcursor-dev libxcomposite-dev libxdamage-dev libxrandr-dev libxtst-dev libxss-dev libdbus-1-dev libevent-dev libfontconfig1-dev libcap-dev libpulse-dev libudev-dev libpci-dev libnss3-dev libasound2-dev libegl1-mesa-dev gperf bison nodejs RUN sudo apt-get update && sudo apt-get install -y libxkbcommon* flite1-dev libspeechd-dev speech-dispatcher libfontconfig1-dev libfreetype6-dev libx11-dev libxext-dev libxfixes-dev libxi-dev libxrender-dev libx11-xcb* libxcb* qdbus-qt5 libqt5dbus5 libdbus-1-dev libdbus-glib-1-dev libatspi2.0-0 libatspi2.0-dev -RUN sudo apt-get update && sudo apt-get install -y libxcb-keysyms1-dev libxcb-image0-dev libxcb-shm0-dev libxcb-icccm4-dev libxcb-sync0-dev libxcb-xfixes0-dev libxcb-shape0-dev libxcb-randr0-dev libxcb-render-util0-dev +RUN sudo apt-get update && sudo apt-get install -y libxcb-keysyms1-dev libxcb-image0-dev libxcb-shm0-dev libxcb-icccm4-dev libxcb-sync0-dev libxcb-xfixes0-dev libxcb-shape0-dev libxcb-randr0-dev libxcb-render-util0-dev libxcursor-dev libxcomposite-dev libxdamage-dev libxrandr-dev libxtst-dev libxss-dev libdbus-1-dev libevent-dev libfontconfig1-dev libcap-dev libpulse-dev libudev-dev libpci-dev libnss3-dev libasound2-dev libegl1-mesa-dev gperf bison nodejs #needed fot qt to find dbus ENV PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig # Build qt5.12.12 RUN git clone -b master --single-branch https://gitlab.linphone.org/BC/public/linphone-desktop.git && \ ./linphone-desktop/tools/build_qt_rpm && \ - find "./linphone-desktop/rpm-linphone-qt-5.12/rpmbuild/RPMS/x86_64/" -iname "*.rpm" -exec sudo fakeroot alien -d {} + && \ + find "./linphone-desktop/rpm-linphone-qt-5.12.12/rpmbuild/RPMS/x86_64/" -iname "*.rpm" -exec sudo fakeroot alien -d {} + && \ find "." -maxdepth 1 -iname "*.deb" -exec sudo dpkg -i --force-overwrite {} + && \ rm -rf ./linphone-desktop @@ -32,5 +33,5 @@ RUN sudo apt-get install -y wget fuse libfuse2 gnupg2 USER bc WORKDIR /home/bc -ENV PS1='\[\e[34m\]\u@bc-dev-centos7>\[\e[0m\] ' +ENV PS1='\[\e[34m\]\u@bc-debian9-qt-fuse-gpg2>\[\e[0m\] ' CMD bash diff --git a/linphone-app/build/rpm/qt5.spec b/linphone-app/build/rpm/qt5.spec index 916d07e55..d6f18d71f 100644 --- a/linphone-app/build/rpm/qt5.spec +++ b/linphone-app/build/rpm/qt5.spec @@ -10,6 +10,7 @@ %define _qt5_libdir %{_qt5_dir}/lib %define _qt5_plugindir %{_qt5_dir}/plugins %define _qt5_translationdir %{_qt5_dir}/translations +%define _qt5_resourcedir %{_qt5_dir}/resources Name: linphone-qt Summary: Qt5 @@ -47,7 +48,7 @@ Qt is a software toolkit for developing applications. -confirm-license \ -release \ -shared \ - -c++std c++11 \ + -c++std c++14 \ -silent \ -nomake examples \ -nomake tests \ @@ -94,6 +95,11 @@ make install INSTALL_ROOT=%{buildroot} -j12 %{_qt5_libdir}/libQt5*.so* %{_qt5_plugindir}/*/*.so* %{_qt5_translationdir}/ +%{_qt5_resourcedir}/qtwebengine*_resources* +%{_qt5_resourcedir}/icudtl.dat +%{_qt5_dir}/libexec/QtWebEngineProcess + + %files devel %defattr(-,root,root,-)