Docker/tavro-build-linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[DO-1054] Apdate qt version to 5.15.14 (#2)

Browse Source 
[DO-1054]

Reviewed-on: https://git.avroid.tech/Docker/tavro-build-linux/pulls/2
This commit is contained in:
Boris Shestov
2024-09-11 15:09:29 +03:00
parent 7dbcfa5c15
commit 40ea9163e2
4 changed files with 14 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CHANGELOG.md
View File

@@ -1,5 +1,13 @@
# Changelog
## 1.2
### 10.09.2024
CHANGE:
* Update qt version for build
## 1.1
### 27.05.2024

13
Dockerfile
View File

@@ -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
#-------------------------------------------------------------------------------

2
Makefile
View File

@@ -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

17
src/0001_fixed_build_with_libxi.patch
View File

@@ -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);