mirrors/linphone-desktop
1
0
Fork 0
mirror of https://gitlab.linphone.org/BC/public/linphone-desktop.git synced 2026-01-17 11:28:07 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Modified docker file and QT build script to build qt version 5.12.11

Browse source
This commit is contained in:
Peio Rigaux 2021-10-21 11:00:02 +02:00 • committed by Julien Wadel
parent 0952dfb48b
commit 06a3b2a5d4
3 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
docker-files/bc-dev-debian9-qt-fuse-wget-gpg2
View file

@ -11,14 +11,16 @@ 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..)
RUN sudo apt-get update && sudo apt-get install -y libxkbcommon* flite1-dev libspeechd-dev speech-dispatcher libfontconfig1-dev qdbus-qt5 libqt5dbus5 libdbus-1-dev libdbus-glib-1-dev libatspi2.0-0 libatspi2.0-dev
#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
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
#needed fot qt to find dbus
ENV PKG_CONFIG_PATH=/usr/lib/x86_64-linux-gnu/pkgconfig
# Build qt5.12.5
RUN git clone -b master --single-branch https://gitlab.linphone.org/BC/public/linphone-desktop.git && \
RUN git clone -b fix/build_qt_5.12.11_to_fix_issues --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.5/rpmbuild/RPMS/x86_64/" -iname "*.rpm" -exec sudo fakeroot alien -d {} + && \
find "./linphone-desktop/rpm-linphone-qt-5.12.11/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

4
linphone-app/build/rpm/qt5.spec
View file

@ -1,6 +1,6 @@
# -*- rpm-spec -*-
%define _qt5_version 5.12.5
%define _qt5_version 5.12.11
%define _qt5_dir /opt/com.belledonne-communications/linphone
%define _qt5_archdatadir %{_qt5_dir}
@ -59,7 +59,7 @@ Qt is a software toolkit for developing applications.
-qt-libjpeg \
-qt-libpng \
-qt-pcre \
-qt-xcb \
-system-xcb \
-xkbcommon \
-system-freetype \
-feature-freetype -fontconfig \

4
tools/build_qt_rpm
View file

@ -4,7 +4,7 @@
# See: http://doc.qt.io/qt-5/configure-options.html
REPO_URL='https://gitlab.linphone.org/BC/public/external/qt/qt5.git'
QT_VERSION='5.12.5'
QT_VERSION='5.12.11'
RPM_NAME=linphone-qt-${QT_VERSION}
@ -41,7 +41,7 @@ do
done
git checkout "${QT_VERSION}"
git submodule foreach --recursive 'if [ -n "$(git branch -a | grep 5.12.5)" ]; then git checkout 5.12.5; fi'
git submodule foreach --recursive 'if [ -n "$(git branch -a | grep 5.12.11)" ]; then git checkout 5.12.11; fi'
if [[ $? != 0 ]] ; then
printf "${RED}Unable to checkout ${QT_VERSION}.${NC}\n"
exit 1