From 768651118f71077f623e44adec5f0c4aed2c3cd1 Mon Sep 17 00:00:00 2001
From: Peio Rigaux <peio.rigaux@belledonne-communitaions.com>
Date: Tue, 26 Oct 2021 10:19:41 +0200
Subject: [PATCH] rebuild qt after updating gitlab mirror to get qt 5.12.12

---
 .gitlab-ci.yml                                | 2 +-
 docker-files/bc-dev-debian9-qt-fuse-wget-gpg2 | 6 +++---
 linphone-app/build/rpm/qt5.spec               | 4 ++--
 tools/build_qt_rpm                            | 4 ++--
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 23104b8f3..a354cbf3c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -23,7 +23,7 @@ variables:
 # Docker image version
   ARCHLINUX_IMAGE_VERSION: latestupdated
   CENTOS_7_QT_IMAGE_VERSION: 20210401_python3
-  DEBIAN_9_QT_IMAGE_VERSION: 20210401_python3
+  DEBIAN_9_QT_IMAGE_VERSION: 20211027_update_qt_5.12.12
   DEBIAN_10_IMAGE_VERSION: 20210217_python3
   UBUNTU_ROLLING_IMAGE_VERSION: 20210217_python3
 
diff --git a/docker-files/bc-dev-debian9-qt-fuse-wget-gpg2 b/docker-files/bc-dev-debian9-qt-fuse-wget-gpg2
index f1ddd85c2..8fcdec1eb 100644
--- a/docker-files/bc-dev-debian9-qt-fuse-wget-gpg2
+++ b/docker-files/bc-dev-debian9-qt-fuse-wget-gpg2
@@ -17,10 +17,10 @@ RUN sudo apt-get update && sudo apt-get install -y libxcb-keysyms1-dev libxcb-im
 
 #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 fix/build_qt_5.12.11_to_fix_issues --single-branch https://gitlab.linphone.org/BC/public/linphone-desktop.git && \
+# 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.11/rpmbuild/RPMS/x86_64/" -iname "*.rpm" -exec sudo fakeroot alien -d {} + && \
+    find "./linphone-desktop/rpm-linphone-qt-5.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
 
diff --git a/linphone-app/build/rpm/qt5.spec b/linphone-app/build/rpm/qt5.spec
index 514e277be..5f0ce4b94 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.11
+%define _qt5_version 5.12
 %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 \
-  -system-xcb \
+  -qt-xcb \
   -xkbcommon \
   -system-freetype \
   -feature-freetype -fontconfig \
diff --git a/tools/build_qt_rpm b/tools/build_qt_rpm
index 42b023226..d8d3b0f7f 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.11'
+QT_VERSION='5.12'
 
 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.11)" ]; then git checkout 5.12.11; fi'
+git submodule foreach --recursive 'if [ -n "$(git branch -a | grep 5.12)" ]; then git checkout 5.12; fi'
 if [[ $? != 0 ]] ; then
   printf "${RED}Unable to checkout ${QT_VERSION}.${NC}\n"
   exit 1