diff --git a/docker-files/bc-dev-debian9-qt-fuse-wget-gpg2 b/docker-files/bc-dev-debian9-qt-fuse-wget-gpg2 index abbd1d34f..f1ddd85c2 100644 --- a/docker-files/bc-dev-debian9-qt-fuse-wget-gpg2 +++ b/docker-files/bc-dev-debian9-qt-fuse-wget-gpg2 @@ -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 diff --git a/linphone-app/build/rpm/qt5.spec b/linphone-app/build/rpm/qt5.spec index 291f71489..514e277be 100644 --- a/linphone-app/build/rpm/qt5.spec +++ b/linphone-app/build/rpm/qt5.spec @@ -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 \ diff --git a/tools/build_qt_rpm b/tools/build_qt_rpm index e911e6c91..42b023226 100755 --- a/tools/build_qt_rpm +++ b/tools/build_qt_rpm @@ -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