From ae934551018085a5886dc6a94b40c03e52213773 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Fri, 17 Mar 2023 17:05:56 +0400 Subject: [PATCH] Update glibmm to 2.76.0 --- .../platform/linux/notifications_manager_linux.cpp | 9 ++++----- Telegram/build/docker/centos_env/Dockerfile | 2 +- Telegram/lib_base | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp index 456d51ff8..456be21ba 100644 --- a/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp +++ b/Telegram/SourceFiles/platform/linux/notifications_manager_linux.cpp @@ -711,12 +711,11 @@ void NotificationData::setImage(const QImage &image) { return ba; }(); - const auto imageBytes = Glib::Bytes::create( - imageData.constData(), - imageData.size()); - _notification->set_icon( - Glib::wrap(g_bytes_icon_new(imageBytes->gobj()))); + Gio::BytesIcon::create( + Glib::Bytes::create( + imageData.constData(), + imageData.size()))); return; } diff --git a/Telegram/build/docker/centos_env/Dockerfile b/Telegram/build/docker/centos_env/Dockerfile index f4e226782..76457531d 100644 --- a/Telegram/build/docker/centos_env/Dockerfile +++ b/Telegram/build/docker/centos_env/Dockerfile @@ -678,7 +678,7 @@ RUN git clone -b xkbcommon-1.3.1 --depth=1 {{ GIT }}/xkbcommon/libxkbcommon.git FROM patches AS glibmm COPY --link --from=libffi {{ LibrariesPath }}/libffi-cache / -RUN git clone -b 2.74.0 --depth=1 {{ GIT }}/GNOME/glibmm.git \ +RUN git clone -b 2.76.0 --depth=1 {{ GIT }}/GNOME/glibmm.git \ && cd glibmm \ && git apply ../patches/glibmm.patch \ && CFLAGS="$CFLAGS {{ CFLAGS_LTO }}" CXXFLAGS="$CXXFLAGS {{ CFLAGS_LTO }}" meson build \ diff --git a/Telegram/lib_base b/Telegram/lib_base index 7d8e59786..27872afd2 160000 --- a/Telegram/lib_base +++ b/Telegram/lib_base @@ -1 +1 @@ -Subproject commit 7d8e59786851c5bc94f02d62d1da88ddcbce27a8 +Subproject commit 27872afd2ddc88b05e2b41ce3fc3156465d73906