void/AyuGramDesktop
2
0
Fork 0
mirror of https://github.com/AyuGram/AyuGramDesktop.git synced 2025-06-06 23:24:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix build with GCC.

Browse source
This commit is contained in:
John Preston 2024-07-19 13:00:51 +03:00
parent a2fa1a52e2
commit 9461095c88
5 changed files with 18 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Telegram/SourceFiles/api/api_sending.cpp
View file

@ -80,18 +80,12 @@ void SendSimpleMedia(SendAction action, MTPInputMedia inputMedia) {
flags |= MessageFlag::HasReplyInfo; flags |= MessageFlag::HasReplyInfo;
sendFlags |= MTPmessages_SendMedia::Flag::f_reply_to; sendFlags |= MTPmessages_SendMedia::Flag::f_reply_to;
} }
const auto anonymousPost = peer->amAnonymous();
const auto silentPost = ShouldSendSilent(peer, action.options); const auto silentPost = ShouldSendSilent(peer, action.options);
InnerFillMessagePostFlags(action.options, peer, flags); InnerFillMessagePostFlags(action.options, peer, flags);
if (silentPost) { if (silentPost) {
sendFlags |= MTPmessages_SendMedia::Flag::f_silent; sendFlags |= MTPmessages_SendMedia::Flag::f_silent;
} }
const auto sendAs = action.options.sendAs; const auto sendAs = action.options.sendAs;
const auto messageFromId = sendAs
? sendAs->id
: anonymousPost
? 0
: session->userPeerId();
if (sendAs) { if (sendAs) {
sendFlags |= MTPmessages_SendMedia::Flag::f_send_as; sendFlags |= MTPmessages_SendMedia::Flag::f_send_as;
} }

2
Telegram/SourceFiles/inline_bots/bot_attach_web_view.cpp
View file

@ -1684,7 +1684,7 @@ std::shared_ptr<Main::SessionShow> AttachWebView::uiShow() {
using UniqueLayer = std::unique_ptr<Ui::LayerWidget>; using UniqueLayer = std::unique_ptr<Ui::LayerWidget>;
using ObjectBox = object_ptr<Ui::BoxContent>; using ObjectBox = object_ptr<Ui::BoxContent>;
const auto panel = _that ? _that->_panel.get() : nullptr; const auto panel = _that ? _that->_panel.get() : nullptr;
if (auto layerWidget = std::get_if<UniqueLayer>(&layer)) { if (v::is<UniqueLayer>(layer)) {
Unexpected("Layers in AttachWebView are not implemented."); Unexpected("Layers in AttachWebView are not implemented.");
} else if (auto box = std::get_if<ObjectBox>(&layer)) { } else if (auto box = std::get_if<ObjectBox>(&layer)) {
if (panel) { if (panel) {

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

@ -1,5 +1,6 @@
{%- set GIT = "https://github.com" -%} {%- set GIT = "https://github.com" -%}
{%- set GIT_FREEDESKTOP = GIT ~ "/gitlab-freedesktop-mirrors" -%} {%- 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 = "6.7.2" -%}
{%- set QT_TAG = "v" ~ QT -%} {%- set QT_TAG = "v" ~ QT -%}
{%- set CFLAGS_DEBUG = "-g -pipe -fPIC -fstack-protector-all -fstack-clash-protection -fcf-protection -D_GLIBCXX_ASSERTIONS" -%} {%- set CFLAGS_DEBUG = "-g -pipe -fPIC -fstack-protector-all -fstack-clash-protection -fcf-protection -D_GLIBCXX_ASSERTIONS" -%}
@ -313,8 +314,9 @@ RUN git clone -b libxcb-1.16 --depth=1 {{ GIT_FREEDESKTOP }}/libxcb.git \
&& rm -rf libxcb && rm -rf libxcb
FROM builder AS xcb-wm FROM builder AS xcb-wm
RUN git clone -b xcb-util-wm-0.4.2 --depth=1 --recursive --shallow-submodules {{ GIT_FREEDESKTOP }}/libxcb-wm.git \ RUN git clone -b xcb-util-wm-0.4.2 --depth=1 {{ GIT_FREEDESKTOP }}/libxcb-wm.git \
&& cd libxcb-wm \ && cd libxcb-wm \
&& {{ GIT_UPDATE_M4 }} \
&& ./autogen.sh --enable-static \ && ./autogen.sh --enable-static \
&& make -j$(nproc) \ && make -j$(nproc) \
&& make DESTDIR="{{ LibrariesPath }}/xcb-wm-cache" install \ && make DESTDIR="{{ LibrariesPath }}/xcb-wm-cache" install \
@ -322,8 +324,9 @@ RUN git clone -b xcb-util-wm-0.4.2 --depth=1 --recursive --shallow-submodules {{
&& rm -rf libxcb-wm && rm -rf libxcb-wm
FROM builder AS xcb-util FROM builder AS xcb-util
RUN git clone -b xcb-util-0.4.1 --depth=1 --recursive --shallow-submodules {{ GIT_FREEDESKTOP }}/libxcb-util.git \ RUN git clone -b xcb-util-0.4.1 --depth=1 {{ GIT_FREEDESKTOP }}/libxcb-util.git \
&& cd libxcb-util \ && cd libxcb-util \
&& {{ GIT_UPDATE_M4 }} \
&& ./autogen.sh --enable-static \ && ./autogen.sh --enable-static \
&& make -j$(nproc) \ && make -j$(nproc) \
&& make DESTDIR="{{ LibrariesPath }}/xcb-util-cache" install \ && make DESTDIR="{{ LibrariesPath }}/xcb-util-cache" install \
@ -333,8 +336,9 @@ RUN git clone -b xcb-util-0.4.1 --depth=1 --recursive --shallow-submodules {{ GI
FROM builder AS xcb-image FROM builder AS xcb-image
COPY --link --from=xcb-util {{ LibrariesPath }}/xcb-util-cache / COPY --link --from=xcb-util {{ LibrariesPath }}/xcb-util-cache /
RUN git clone -b xcb-util-image-0.4.1 --depth=1 --recursive --shallow-submodules {{ GIT_FREEDESKTOP }}/libxcb-image.git \ RUN git clone -b xcb-util-image-0.4.1 --depth=1 {{ GIT_FREEDESKTOP }}/libxcb-image.git \
&& cd libxcb-image \ && cd libxcb-image \
&& {{ GIT_UPDATE_M4 }} \
&& ./autogen.sh --enable-static \ && ./autogen.sh --enable-static \
&& make -j$(nproc) \ && make -j$(nproc) \
&& make DESTDIR="{{ LibrariesPath }}/xcb-image-cache" install \ && make DESTDIR="{{ LibrariesPath }}/xcb-image-cache" install \
@ -342,8 +346,9 @@ RUN git clone -b xcb-util-image-0.4.1 --depth=1 --recursive --shallow-submodules
&& rm -rf libxcb-image && rm -rf libxcb-image
FROM builder AS xcb-keysyms FROM builder AS xcb-keysyms
RUN git clone -b xcb-util-keysyms-0.4.1 --depth=1 --recursive --shallow-submodules {{ GIT_FREEDESKTOP }}/libxcb-keysyms.git \ RUN git clone -b xcb-util-keysyms-0.4.1 --depth=1 {{ GIT_FREEDESKTOP }}/libxcb-keysyms.git \
&& cd libxcb-keysyms \ && cd libxcb-keysyms \
&& {{ GIT_UPDATE_M4 }} \
&& ./autogen.sh --enable-static \ && ./autogen.sh --enable-static \
&& make -j$(nproc) \ && make -j$(nproc) \
&& make DESTDIR="{{ LibrariesPath }}/xcb-keysyms-cache" install \ && make DESTDIR="{{ LibrariesPath }}/xcb-keysyms-cache" install \
@ -351,8 +356,9 @@ RUN git clone -b xcb-util-keysyms-0.4.1 --depth=1 --recursive --shallow-submodul
&& rm -rf libxcb-keysyms && rm -rf libxcb-keysyms
FROM builder AS xcb-render-util FROM builder AS xcb-render-util
RUN git clone -b xcb-util-renderutil-0.3.10 --depth=1 --recursive --shallow-submodules {{ GIT_FREEDESKTOP }}/libxcb-render-util.git \ RUN git clone -b xcb-util-renderutil-0.3.10 --depth=1 {{ GIT_FREEDESKTOP }}/libxcb-render-util.git \
&& cd libxcb-render-util \ && cd libxcb-render-util \
&& {{ GIT_UPDATE_M4 }} \
&& ./autogen.sh --enable-static \ && ./autogen.sh --enable-static \
&& make -j$(nproc) \ && make -j$(nproc) \
&& make DESTDIR="{{ LibrariesPath }}/xcb-render-util-cache" install \ && make DESTDIR="{{ LibrariesPath }}/xcb-render-util-cache" install \
@ -364,8 +370,9 @@ COPY --link --from=xcb-util {{ LibrariesPath }}/xcb-util-cache /
COPY --link --from=xcb-image {{ LibrariesPath }}/xcb-image-cache / COPY --link --from=xcb-image {{ LibrariesPath }}/xcb-image-cache /
COPY --link --from=xcb-render-util {{ LibrariesPath }}/xcb-render-util-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 --shallow-submodules {{ GIT_FREEDESKTOP }}/libxcb-cursor.git \ RUN git clone -b xcb-util-cursor-0.1.4 --depth=1 {{ GIT_FREEDESKTOP }}/libxcb-cursor.git \
&& cd libxcb-cursor \ && cd libxcb-cursor \
&& {{ GIT_UPDATE_M4 }} \
&& ./autogen.sh --enable-static \ && ./autogen.sh --enable-static \
&& make -j$(nproc) \ && make -j$(nproc) \
&& make DESTDIR="{{ LibrariesPath }}/xcb-cursor-cache" install \ && make DESTDIR="{{ LibrariesPath }}/xcb-cursor-cache" install \
@ -613,12 +620,13 @@ RUN git clone -b n6.1.1 --depth=1 {{ GIT }}/FFmpeg/FFmpeg.git \
&& rm -rf ffmpeg && rm -rf ffmpeg
FROM builder AS pipewire FROM builder AS pipewire
RUN git clone -b 0.3.25 --depth=1 {{ GIT }}/PipeWire/pipewire.git \ RUN git clone -b 0.3.62 --depth=1 {{ GIT }}/PipeWire/pipewire.git \
&& cd pipewire \ && cd pipewire \
&& meson build \ && meson build \
--buildtype=plain \ --buildtype=plain \
-Dtests=disabled \ -Dtests=disabled \
-Dexamples=disabled \ -Dexamples=disabled \
-Dsession-managers=media-session \
-Dspa-plugins=disabled \ -Dspa-plugins=disabled \
&& meson compile -C build \ && meson compile -C build \
&& DESTDIR="{{ LibrariesPath }}/pipewire-cache" meson install -C build \ && DESTDIR="{{ LibrariesPath }}/pipewire-cache" meson install -C build \

1
Telegram/cmake/lib_tgcalls.cmake
View file

@ -259,6 +259,7 @@ PRIVATE
-Wno-ambiguous-reversed-operator -Wno-ambiguous-reversed-operator
-Wno-deprecated-declarations -Wno-deprecated-declarations
-Wno-unqualified-std-cast-call -Wno-unqualified-std-cast-call
-Wno-unused-function
) )
remove_target_sources(lib_tgcalls ${tgcalls_loc} remove_target_sources(lib_tgcalls ${tgcalls_loc}

2
cmake

@ -1 +1 @@
Subproject commit 3fe312335453073028a7bc5e7b3d65f42011e34a Subproject commit b3871c4efde37827263053d95e6f16fe34d4952e