From 40ea9163e214d66a9cfa946dd281789b48f7df31 Mon Sep 17 00:00:00 2001
From: Boris Shestov <boris.shestov@avroid.tech>
Date: Wed, 11 Sep 2024 15:09:29 +0300
Subject: [PATCH] [DO-1054] Apdate qt version to 5.15.14 (#2)

[DO-1054]

Reviewed-on: https://git.avroid.tech/Docker/tavro-build-linux/pulls/2
---
 CHANGELOG.md                          |  8 ++++++++
 Dockerfile                            | 13 +++++--------
 Makefile                              |  2 +-
 src/0001_fixed_build_with_libxi.patch | 17 -----------------
 4 files changed, 14 insertions(+), 26 deletions(-)
 delete mode 100644 src/0001_fixed_build_with_libxi.patch

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1fc9e7f..7ef6b20 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,13 @@
 # Changelog
 
+## 1.2
+
+### 10.09.2024
+
+CHANGE:
+
+* Update qt version for build
+
 ## 1.1
 
 ### 27.05.2024
diff --git a/Dockerfile b/Dockerfile
index 3d1399d..3281d43 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -3,14 +3,12 @@ ARG DOCKER_REGISTRY=harbor.avroid.tech
 # https://hub.docker.com/_/ubuntu
 FROM ${DOCKER_REGISTRY}/all/base-build-image:1.4
 LABEL description="Linux image for Tavro build" \
-      tools.qt.version="5.6.3"
+      tools.qt.version="5.15.14"
 
 ###QT BUILD###
 ARG NEXUS_URL="https://nexus.avroid.tech"
 ARG NEXUS_QT_REPO="qt_repo" \
-    VERSION=5.6.3
-
-COPY * /patches/
+    VERSION=5.15.14
 
 # Install packages for qt and dependencies
 RUN apt update && \
@@ -55,10 +53,9 @@ RUN apt update && \
 
 #download, configure and build qt
 RUN wget ${NEXUS_URL}/repository/${NEXUS_QT_REPO}/v${VERSION}/qt-everywhere-opensource-src-${VERSION}.tar.xz && tar -xJf qt-everywhere-opensource-src-${VERSION}.tar.xz && \
-	ln -sf /usr/bin/python3 /usr/bin/python && \
-	cd qt-everywhere* && for file in /patches/*.patch; do patch -p1 < /patches/0001_fixed_build_with_libxi.patch; done && \
-	./configure -release -opensource -confirm-license -nomake tests -nomake examples -skip qt3d -skip qtactiveqt -skip qtandroidextras -skip qtdoc -skip qtmacextras -skip qtscript -skip qtwayland -skip qtwebchannel -skip qtwebengine -skip qtwebview -skip qtwinextras -skip qtserialbus -system-xcb -system-harfbuzz -system-libjpeg -no-openssl && \
-	make -j$(nproc) && make install -j$(nproc) && cd .. && rm -rf qt-everywhere* patches
+	ln -sf /usr/bin/python3 /usr/bin/python && rm qt-everywhere-opensource-src-${VERSION}.tar.xz && cd qt-everywhere* && \
+	./configure -release -opensource -confirm-license -nomake tests -nomake examples -skip qt3d -skip qtactiveqt -skip qtandroidextras -skip qtdoc -skip qtmacextras -skip qtscript -skip qtwayland -skip qtwebchannel -skip qtwebengine -skip qtwebview -skip qtwinextras -skip qtserialbus -xkbcommon -system-harfbuzz -system-libjpeg -no-openssl && \
+	make -j$(nproc) && make install -j$(nproc) && cd .. && rm -rf qt-everywhere*
 
 # Personalization
 #-------------------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index daf1b63..910b206 100644
--- a/Makefile
+++ b/Makefile
@@ -2,7 +2,7 @@
 
 IMAGE_NAME = tavro-build-linux
 IMAGE_GROUP = tavro
-IMAGE_TAG = 1.1
+IMAGE_TAG = 1.2
 REVISION =
 DOCKER_REGISTRY = harbor.avroid.tech
 
diff --git a/src/0001_fixed_build_with_libxi.patch b/src/0001_fixed_build_with_libxi.patch
deleted file mode 100644
index 41394fb..0000000
--- a/src/0001_fixed_build_with_libxi.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/qtbase/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp	2023-08-21 14:35:51.107483754 +0300
-+++ b/qtbase/src/plugins/platforms/xcb/qxcbconnection_xi2.cpp	2023-08-21 16:14:51.554260285 +0300
-@@ -698,14 +698,6 @@
-                          " Minimum libXi version required is 1.7.4."
-                          " Expect issues with touch behavior.");
-             }
--#elif LIBXI_MAJOR == 1 && (LIBXI_MINOR < 7 || (LIBXI_MINOR == 7 && LIBXI_PATCH < 4))
--            static bool allowTouchWarningShown = false;
--            if (!allowTouchWarningShown) {
--                allowTouchWarningShown = true;
--                qWarning("Skipping XIAllowTouchEvents() due to not having libXi >= 1.7.4."
--                         " libXi version at build time was %d.%d.%d."
--                         " Expect issues with touch behavior.", LIBXI_MAJOR, LIBXI_MINOR, LIBXI_PATCH);
--            }
- #else
-             XIAllowTouchEvents(static_cast<Display *>(m_xlib_display), xiDeviceEvent->deviceid,
-                                xiDeviceEvent->detail, xiDeviceEvent->event, XIAcceptTouch);