RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Add support for webkit2gtk-5.0 and webkit2gtk-4.1

This commit is contained in:
Ilya Fedin 2021-11-30 18:00:32 +04:00 committed by John Preston
parent 60a95df652
commit e5ee665fa4
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Telegram/Resources/langs/lang.strings
View File

@ -2016,7 +2016,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL
"lng_payments_webview_no_card" = "Unfortunately, you can't add a new card with current system configuration.";
"lng_payments_webview_no_use" = "Unfortunately, you can't use payments with current system configuration.";
"lng_payments_webview_install_edge" = "Please install {link}.";
"lng_payments_webview_install_webkit" = "Please install WebKitGTK 4 (webkit2gtk-4.0) using your package manager.";
"lng_payments_webview_install_webkit" = "Please install WebKitGTK (webkit2gtk-5.0/webkit2gtk-4.1/webkit2gtk-4.0) using your package manager.";
"lng_payments_webview_switch_mutter" = "Qt's window embedding doesn't work well with Mutter window manager. Please switch to another window manager or desktop environment.";
"lng_payments_webview_switch_wayland" = "There is no way to embed WebView window on Wayland. Please switch to X11.";
"lng_payments_sure_close" = "Are you sure you want to close this payment form? The changes you made will be lost.";

2
Telegram/build/docker/centos_env/Dockerfile
View File

@ -46,7 +46,7 @@ RUN ln -s /opt/cmake/bin/cmake /usr/local/bin/cmake
RUN rm $CMAKE_FILE
FROM builder AS patches
RUN git clone $GIT/desktop-app/patches.git && cd patches && git checkout 19e5e028c7
RUN git clone $GIT/desktop-app/patches.git && cd patches && git checkout b6c29e99da
FROM builder AS extra-cmake-modules

2
Telegram/lib_webview

@ -1 +1 @@
Subproject commit 754657aededfaa646bc6e8f48a18141982762785
Subproject commit 8be9c0ff274569cbb1bc9dd4ea9ed9089c37ca93

2
cmake

@ -1 +1 @@
Subproject commit fdd7abd2663d4f9f909372aa1dfb914101ce617c
Subproject commit c2b070275eecb546b9899495090d27ce55384917