diff --git a/Telegram/SourceFiles/platform/linux/linux_xdp_open_with_dialog.cpp b/Telegram/SourceFiles/platform/linux/linux_xdp_open_with_dialog.cpp index 876e57207e..15f3e3fa18 100644 --- a/Telegram/SourceFiles/platform/linux/linux_xdp_open_with_dialog.cpp +++ b/Telegram/SourceFiles/platform/linux/linux_xdp_open_with_dialog.cpp @@ -122,8 +122,6 @@ bool ShowXDPOpenWithDialog(const QString &filepath) { } }); - const auto fdList = Gio::UnixFDList::create(); - fdList->append(fd); auto outFdList = Glib::RefPtr(); connection->call_sync( @@ -132,7 +130,7 @@ bool ShowXDPOpenWithDialog(const QString &filepath) { "OpenFile", Glib::VariantContainerBase::create_tuple({ Glib::Variant::create(parentWindowId), - Glib::wrap(g_variant_new_handle(0)), + Glib::Variant::create_handle(0), Glib::Variant{ fd }), outFdList, std::string(base::Platform::XDP::kService)); diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile index 24fb5f8b19..0a917b7293 100644 --- a/Telegram/build/docker/centos_env/Dockerfile +++ b/Telegram/build/docker/centos_env/Dockerfile @@ -53,7 +53,7 @@ ENV CXXFLAGS $CFLAGS FROM builder AS patches RUN git clone {{ GIT }}/desktop-app/patches.git \ && cd patches \ - && git checkout 355c563138 \ + && git checkout c95e7f1bb7 \ && rm -rf .git FROM builder AS nasm @@ -655,8 +655,7 @@ FROM patches AS glibmm COPY --link --from=mm-common {{ LibrariesPath }}/mm-common-cache / COPY --link --from=libsigcplusplus {{ LibrariesPath }}/libsigcplusplus-cache / -# equals to glib version of Ubuntu 14.04 -RUN git clone -b 2.40.0 --depth=1 {{ GIT }}/GNOME/glibmm.git \ +RUN git clone -b 2.56.1 --depth=1 {{ GIT }}/GNOME/glibmm.git \ && cd glibmm \ && git apply ../patches/glibmm.patch \ && export ACLOCAL_PATH="/usr/local/share/aclocal" \ diff --git a/Telegram/lib_base b/Telegram/lib_base index 7afbe96f01..986a867f85 160000 --- a/Telegram/lib_base +++ b/Telegram/lib_base @@ -1 +1 @@ -Subproject commit 7afbe96f015c6facea90de1af5d61eac3389f308 +Subproject commit 986a867f85716843eafbef6e2ae0820ea30d6cfc