diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile index ab867d0ad..bff8ab485 100644 --- a/Telegram/build/docker/centos_env/Dockerfile +++ b/Telegram/build/docker/centos_env/Dockerfile @@ -1,7 +1,7 @@ {%- set GIT = "https://github.com" -%} {%- set GIT_FREEDESKTOP = GIT ~ "/gitlab-freedesktop-mirrors" -%} -{%- set QT = "6.4.2" -%} -{%- set QT_TAG = "v" ~ QT -%} +{%- set QT = "6.5.0" -%} +{%- set QT_TAG = "v" ~ QT ~ "-beta3" -%} {%- set QT_PREFIX = "/usr/local/desktop-app/Qt-" ~ QT -%} {%- set OPENSSL_VER = "1_1_1" -%} {%- set OPENSSL_PREFIX = "/usr/local/desktop-app/openssl-1.1.1" -%} @@ -14,6 +14,7 @@ # syntax=docker/dockerfile:1 FROM centos:7 AS builder-base +ENV LANG en_US.UTF-8 ENV LIBRARY_PATH /usr/local/lib64:/usr/local/lib:/lib64:/lib:/usr/lib64:/usr/lib ENV LD_LIBRARY_PATH $LIBRARY_PATH ENV PKG_CONFIG_PATH /usr/local/lib64/pkgconfig:/usr/local/lib/pkgconfig:/usr/local/share/pkgconfig @@ -21,7 +22,7 @@ ENV PKG_CONFIG_PATH /usr/local/lib64/pkgconfig:/usr/local/lib/pkgconfig:/usr/loc RUN yum -y install https://dl.fedoraproject.org/pub/epel/epel-release-latest-7.noarch.rpm \ && yum -y install https://packages.endpointdev.com/rhel/7/os/x86_64/endpoint-repo.x86_64.rpm \ && yum -y install centos-release-scl \ - && yum -y install git rh-python38-python-pip autoconf automake libtool patch \ + && yum -y install git rh-python38-python-pip autoconf automake libtool patch gperf \ fontconfig-devel freetype-devel libX11-devel at-spi2-core-devel alsa-lib-devel \ pulseaudio-libs-devel mesa-libGL-devel mesa-libEGL-devel mesa-libgbm-devel \ libdrm-devel vulkan-devel gtk3-devel \ @@ -56,7 +57,7 @@ ENV CXXFLAGS $CFLAGS FROM builder AS patches RUN git clone {{ GIT }}/desktop-app/patches.git \ && cd patches \ - && git checkout 9aa30bc442 \ + && git checkout 73f5d4762f \ && rm -rf .git FROM builder AS nasm @@ -382,6 +383,19 @@ RUN git clone -b 0.3.9 --depth=1 --recursive {{ GIT_FREEDESKTOP }}/libxcb-render && cd .. \ && rm -rf libxcb-render-util +FROM builder AS xcb-cursor +COPY --link --from=xcb-util {{ LibrariesPath }}/xcb-util-cache / +COPY --link --from=xcb-image {{ LibrariesPath }}/xcb-image-cache / +COPY --link --from=xcb-render-util {{ LibrariesPath }}/xcb-render-util-cache / + +RUN git clone -b xcb-util-cursor-0.1.4 --depth=1 --recursive {{ GIT_FREEDESKTOP }}/libxcb-cursor.git \ + && cd libxcb-cursor \ + && ./autogen.sh --enable-static \ + && make -j$(nproc) \ + && make DESTDIR="{{ LibrariesPath }}/xcb-cursor-cache" install \ + && cd .. \ + && rm -rf libxcb-cursor + FROM builder AS libXext RUN git clone -b libXext-1.3.4 --depth=1 {{ GIT_FREEDESKTOP }}/libxext.git \ && cd libxext \ @@ -693,6 +707,7 @@ COPY --link --from=xcb-util {{ LibrariesPath }}/xcb-util-cache / COPY --link --from=xcb-image {{ LibrariesPath }}/xcb-image-cache / COPY --link --from=xcb-keysyms {{ LibrariesPath }}/xcb-keysyms-cache / COPY --link --from=xcb-render-util {{ LibrariesPath }}/xcb-render-util-cache / +COPY --link --from=xcb-cursor {{ LibrariesPath }}/xcb-cursor-cache / COPY --link --from=wayland {{ LibrariesPath }}/wayland-cache / COPY --link --from=openssl {{ LibrariesPath }}/openssl-cache / COPY --link --from=xkbcommon {{ LibrariesPath }}/xkbcommon-cache / @@ -705,9 +720,11 @@ RUN git clone -b {{ QT_TAG }} --depth=1 git://code.qt.io/qt/qt5.git qt_{{ QT }} && cd qtbase \ && find ../../patches/qtbase_{{ QT }} -type f -print0 | sort -z | xargs -r0 git apply \ && cd ../qtdeclarative \ - && sed -i '/add_subdirectory(quickcontrols2)/d' src/CMakeLists.txt \ - && sed -i '/add_subdirectory(quickdialogs2)/d' src/CMakeLists.txt \ + && sed -i '/add_subdirectory(quickcontrols)/d' src/CMakeLists.txt \ + && sed -i '/add_subdirectory(quickdialogs)/d' src/CMakeLists.txt \ && sed -i '/add_subdirectory(quicknativestyle)/d' src/CMakeLists.txt \ + && cd ../qtwayland \ + && sed -i '/| MFD_ALLOW_SEALING/{n;N;d}' src/client/qwaylandshmbackingstore.cpp \ && cd .. \ && ./configure -prefix "{{ QT_PREFIX }}" \ CMAKE_BUILD_TYPE=None \ @@ -811,6 +828,7 @@ COPY --link --from=xcb-util {{ LibrariesPath }}/xcb-util-cache / COPY --link --from=xcb-image {{ LibrariesPath }}/xcb-image-cache / COPY --link --from=xcb-keysyms {{ LibrariesPath }}/xcb-keysyms-cache / COPY --link --from=xcb-render-util {{ LibrariesPath }}/xcb-render-util-cache / +COPY --link --from=xcb-cursor {{ LibrariesPath }}/xcb-cursor-cache / COPY --link --from=libXext {{ LibrariesPath }}/libXext-cache / COPY --link --from=libXfixes {{ LibrariesPath }}/libXfixes-cache / COPY --link --from=libXtst {{ LibrariesPath }}/libXtst-cache / diff --git a/Telegram/lib_ui b/Telegram/lib_ui index 0b87868b1..3043ec69e 160000 --- a/Telegram/lib_ui +++ b/Telegram/lib_ui @@ -1 +1 @@ -Subproject commit 0b87868b1d708020155571d4e0c90095e58d6572 +Subproject commit 3043ec69ea3aed8a846c0e57f6566166e717d453 diff --git a/Telegram/lib_webview b/Telegram/lib_webview index 2f0157b7d..69aec516f 160000 --- a/Telegram/lib_webview +++ b/Telegram/lib_webview @@ -1 +1 @@ -Subproject commit 2f0157b7d8875b27ad3497180a2b2ccef3d28b95 +Subproject commit 69aec516f1a3553c6870ae30adbf11b174858694 diff --git a/cmake b/cmake index b5dd1db12..31eb39596 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit b5dd1db1298a3e953ddcf6ab07532bf183f5c76f +Subproject commit 31eb395967d5da6f07bd1e3f5f5f9bdaac94cb85 diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 162b4c15b..bd3bb099b 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -427,6 +427,7 @@ parts: - libx11-dev - libx11-xcb-dev - libxcb1-dev + - libxcb-cursor-dev - libxcb-glx0-dev - libxcb-icccm4-dev - libxcb-image0-dev @@ -440,7 +441,6 @@ parts: - libxcb-util-dev - libxcb-xfixes0-dev - libxcb-xkb-dev - - libxcursor-dev - libxkbcommon-dev - libxkbcommon-x11-dev - zlib1g-dev @@ -468,6 +468,7 @@ parts: - libx11-6 - libx11-xcb1 - libxcb1 + - libxcb-cursor0 - libxcb-glx0 - libxcb-icccm4 - libxcb-image0 @@ -481,14 +482,13 @@ parts: - libxcb-util1 - libxcb-xfixes0 - libxcb-xkb1 - - libxcursor1 - libxkbcommon0 - libxkbcommon-x11-0 - zlib1g override-pull: | - QT=6.4.2 + QT=6.5.0 - git clone -b v${QT} --depth=1 git://code.qt.io/qt/qt5.git . + git clone -b v${QT}-beta3 --depth=1 git://code.qt.io/qt/qt5.git . git submodule update --init --recursive --depth=1 qtbase qtdeclarative qtwayland qtimageformats qtsvg qt5compat qtshadertools cd qtbase