From 18833d2d94f6c937edea83ead19d7dde8bc4bca6 Mon Sep 17 00:00:00 2001 From: Ilya Fedin Date: Mon, 25 Apr 2022 05:38:39 +0400 Subject: [PATCH] kotatogram-desktop: fix build with KF5.94 --- .../telegram/kotatogram-desktop/default.nix | 1 + .../telegram/kotatogram-desktop/kf594.patch | 57 +++++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/kf594.patch diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix index f46a918d3c61..d7dbff715bac 100644 --- a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/default.nix @@ -98,6 +98,7 @@ stdenv.mkDerivation rec { }; patches = [ + ./kf594.patch ./shortcuts-binary-path.patch # let it build with nixpkgs 10.12 sdk ./kotato-10.12-sdk.patch diff --git a/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/kf594.patch b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/kf594.patch new file mode 100644 index 000000000000..0fa2d8bc8f6e --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telegram/kotatogram-desktop/kf594.patch @@ -0,0 +1,57 @@ +diff --git a/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp b/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp +index 7641579aa..3c195e397 100644 +--- a/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp ++++ b/Telegram/SourceFiles/platform/linux/linux_wayland_integration.cpp +@@ -9,10 +9,10 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL + + #include "base/platform/base_platform_info.h" + +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include + + using namespace KWayland::Client; + +Submodule Telegram/lib_base contains modified content +diff --git a/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp b/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp +index 32f0de6..30a087f 100644 +--- a/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp ++++ b/Telegram/lib_base/base/platform/linux/base_linux_wayland_integration.cpp +@@ -13,11 +13,11 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL + #include + #include + +-#include +-#include +-#include +-#include +-#include ++#include ++#include ++#include ++#include ++#include + + using namespace KWayland::Client; + +Submodule Telegram/lib_ui contains modified content +diff --git a/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp b/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp +index 01f1e80..163cb6a 100644 +--- a/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp ++++ b/Telegram/lib_ui/ui/platform/linux/ui_linux_wayland_integration.cpp +@@ -24,8 +24,8 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL + #include + #include + +-#include +-#include ++#include ++#include + + Q_DECLARE_METATYPE(QMargins); +