diff --git a/Telegram/SourceFiles/iv/iv_prepare.cpp b/Telegram/SourceFiles/iv/iv_prepare.cpp index 15d5edaa7..2f8a5398b 100644 --- a/Telegram/SourceFiles/iv/iv_prepare.cpp +++ b/Telegram/SourceFiles/iv/iv_prepare.cpp @@ -432,7 +432,7 @@ QByteArray Parser::block(const MTPDpageBlockFooter &data) { } QByteArray Parser::block(const MTPDpageBlockDivider &data) { - return tag("hr", { { "class", "divider" } }); + return tag("hr", Attributes{ { "class", "divider" } }); } QByteArray Parser::block(const MTPDpageBlockAnchor &data) { diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile index 82f184cb8..660b194d9 100644 --- a/Telegram/build/docker/centos_env/Dockerfile +++ b/Telegram/build/docker/centos_env/Dockerfile @@ -1,8 +1,8 @@ {%- set GIT = "https://github.com" -%} {%- set GIT_FREEDESKTOP = GIT ~ "/gitlab-freedesktop-mirrors" -%} {%- set GIT_UPDATE_M4 = "git submodule set-url m4 https://gitlab.freedesktop.org/xorg/util/xcb-util-m4 && git config -f .gitmodules submodule.m4.shallow true && git submodule init && git submodule update" -%} -{%- set QT = "6.7.2" -%} -{%- set QT_TAG = "v" ~ QT -%} +{%- set QT = "6.8.0" -%} +{%- set QT_TAG = "v" ~ QT ~ "-beta4" -%} {%- set CFLAGS_DEBUG = "$CFLAGS -O0 -fno-lto -U_FORTIFY_SOURCE" -%} {%- set LibrariesPath = "/usr/src/Libraries" -%} @@ -42,7 +42,7 @@ FROM builder AS patches RUN git init patches \ && cd patches \ && git remote add origin {{ GIT }}/desktop-app/patches.git \ - && git fetch --depth=1 origin 85a1c4ec327ed390a27e85f2162c31525220a50d \ + && git fetch --depth=1 origin 5361159037f844567cfffbd98c90d48d052fb5d0 \ && git reset --hard FETCH_HEAD \ && rm -rf .git @@ -726,24 +726,18 @@ RUN git clone -b {{ QT_TAG }} --depth=1 {{ GIT }}/qt/qt5.git \ && cd ../qtwayland \ && find ../../patches/qtwayland_{{ QT }} -type f -print0 | sort -z | xargs -r0 git apply \ && cd .. \ - && ./configure \ - CMAKE_BUILD_TYPE=None \ - -opensource \ - -confirm-license \ - -qt-libpng \ - -qt-harfbuzz \ - -qt-pcre \ - -no-icu \ - INPUT_forkfd_pidfd=no \ - -no-feature-xcb-sm \ - -static \ - -dbus-runtime \ - -openssl-linked \ - -system-webp \ - -nomake examples \ - -nomake tests \ - && cmake --build . --parallel \ - && DESTDIR="{{ LibrariesPath }}/qt-cache" cmake --install . \ + && cmake -GNinja -B build . \ + -DCMAKE_BUILD_TYPE=None \ + -DBUILD_SHARED_LIBS=OFF \ + -DINPUT_libpng=qt \ + -DINPUT_harfbuzz=qt \ + -DINPUT_pcre=qt \ + -DFEATURE_icu=OFF \ + -DFEATURE_xcb_sm=OFF \ + -DINPUT_dbus=runtime \ + -DINPUT_openssl=linked \ + && cmake --build build --parallel \ + && DESTDIR="{{ LibrariesPath }}/qt-cache" cmake --install build \ && cd .. \ && rm -rf qt5 diff --git a/Telegram/build/prepare/prepare.py b/Telegram/build/prepare/prepare.py index 67e767003..9c3047d5a 100644 --- a/Telegram/build/prepare/prepare.py +++ b/Telegram/build/prepare/prepare.py @@ -1620,7 +1620,7 @@ mac: make install """) else: # qt > '6' - branch = 'v$QT' + ('-lts-lgpl' if qt < '6.3' else '') + branch = 'v$QT' + ('-lts-lgpl' if qt < '6.3' else '-beta4') stage('qt_' + qt, """ git clone -b """ + branch + """ https://github.com/qt/qt5.git qt_$QT cd qt_$QT diff --git a/Telegram/build/qt_version.py b/Telegram/build/qt_version.py index 2bc778741..515683309 100644 --- a/Telegram/build/qt_version.py +++ b/Telegram/build/qt_version.py @@ -6,7 +6,7 @@ def resolve(arch): elif sys.platform == 'win32': if arch == 'arm' or 'qt6' in sys.argv: print('Choosing Qt 6.') - os.environ['QT'] = '6.7.2' + os.environ['QT'] = '6.8.0' elif os.environ.get('QT') is None: print('Choosing Qt 5.') os.environ['QT'] = '5.15.13' diff --git a/Telegram/lib_base b/Telegram/lib_base index fa02c719d..601c20431 160000 --- a/Telegram/lib_base +++ b/Telegram/lib_base @@ -1 +1 @@ -Subproject commit fa02c719d19bc647bcde4ba172b72d05bacb6a79 +Subproject commit 601c20431cc3f91de01e1b13a033e0a41cd36353 diff --git a/cmake b/cmake index 8d7e2e089..ed508c3cd 160000 --- a/cmake +++ b/cmake @@ -1 +1 @@ -Subproject commit 8d7e2e089ffed0134b4d899d3fec4ba556981a60 +Subproject commit ed508c3cdcade563026768dc97774f02f074f887 diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index dfba0b01e..d8658c525 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -166,7 +166,7 @@ parts: patches: source: https://github.com/desktop-app/patches.git source-depth: 1 - source-commit: 85a1c4ec327ed390a27e85f2162c31525220a50d + source-commit: 5361159037f844567cfffbd98c90d48d052fb5d0 plugin: dump override-pull: | craftctl default @@ -292,7 +292,7 @@ parts: - patches qt: - plugin: nil + plugin: cmake build-environment: - LDFLAGS: ${LDFLAGS:+$LDFLAGS} -s build-packages: @@ -378,10 +378,17 @@ parts: - zlib1g - mesa-vulkan-drivers - xkb-data + cmake-generator: Ninja + cmake-parameters: + - -DCMAKE_BUILD_TYPE=Release + - -DCMAKE_INSTALL_PREFIX=/usr + - -DCMAKE_PREFIX_PATH=$CRAFT_STAGE/usr + - -DINSTALL_LIBDIR=/usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR + - -DINPUT_openssl=linked override-pull: | - QT=6.7.2 + QT=6.8.0 - git clone -b v${QT} --depth=1 https://github.com/qt/qt5.git . + git clone -b v${QT}-beta4 --depth=1 https://github.com/qt/qt5.git . git submodule update --init --recursive --depth=1 qtbase qtdeclarative qtwayland qtimageformats qtsvg qtshadertools cd qtbase @@ -389,21 +396,6 @@ parts: cd ../qtwayland find $CRAFT_STAGE/patches/qtwayland_${QT} -type f -print0 | sort -z | xargs -r0 git apply cd .. - override-build: | - ./configure \ - -prefix /usr \ - -libdir /usr/lib/$CRAFT_ARCH_TRIPLET_BUILD_FOR \ - -release \ - -opensource \ - -confirm-license \ - -openssl-linked \ - -nomake examples \ - -nomake tests \ - -- \ - -DCMAKE_PREFIX_PATH=$CRAFT_STAGE/usr - - cmake --build . -j$CRAFT_PARALLEL_BUILD_COUNT - DESTDIR="$CRAFT_PART_INSTALL" cmake --install . prime: - -./usr/bin - -./usr/doc