void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-07-29 00:43:10 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Install Qt to global prefix in Dockerfile

Browse source
This commit is contained in:
Ilya Fedin 2025-05-21 21:40:30 +00:00 • committed by John Preston
parent ae45189436
commit f0cfbacb4f
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Telegram/build/docker/centos_env/Dockerfile
View file

@ -722,6 +722,7 @@ RUN git clone -b {{ QT_TAG }} --depth=1 {{ GIT }}/qt/qt5.git \
&& find ../../patches/qtwayland_{{ QT }} -type f -print0 | sort -z | xargs -r0 git apply \ && find ../../patches/qtwayland_{{ QT }} -type f -print0 | sort -z | xargs -r0 git apply \
&& cd .. \ && cd .. \
&& cmake -B build . \ && cmake -B build . \
-DCMAKE_INSTALL_PREFIX=/usr/local \
-DBUILD_SHARED_LIBS=OFF \ -DBUILD_SHARED_LIBS=OFF \
-DQT_GENERATE_SBOM=OFF \ -DQT_GENERATE_SBOM=OFF \
-DINPUT_libpng=qt \ -DINPUT_libpng=qt \
@ -868,7 +869,6 @@ COPY --link --from=ada {{ LibrariesPath }}/ada-cache /
COPY --link --from=tde2e {{ LibrariesPath }}/tde2e-cache / COPY --link --from=tde2e {{ LibrariesPath }}/tde2e-cache /
WORKDIR ../tdesktop WORKDIR ../tdesktop
ENV QT {{ QT }}
ENV BOOST_INCLUDEDIR /usr/include/boost1.78 ENV BOOST_INCLUDEDIR /usr/include/boost1.78
ENV BOOST_LIBRARYDIR /usr/lib64/boost1.78 ENV BOOST_LIBRARYDIR /usr/lib64/boost1.78

7
Telegram/build/qt_version.py
View file

@ -5,10 +5,9 @@ def resolve(arch):
os.environ['QT'] = '6.2.12' os.environ['QT'] = '6.2.12'
elif sys.platform == 'win32': elif sys.platform == 'win32':
if arch == 'arm' or 'qt6' in sys.argv: if arch == 'arm' or 'qt6' in sys.argv:
print('Choosing Qt 6.')
os.environ['QT'] = '6.9.0' os.environ['QT'] = '6.9.0'
elif os.environ.get('QT') is None: else:
print('Choosing Qt 5.')
os.environ['QT'] = '5.15.15' os.environ['QT'] = '5.15.15'
elif os.environ.get('QT') is None:
return False
print('Choosing Qt ' + os.environ.get('QT'))
return True return True