Use custom xdg-shell fork for shadows on Wayland

This commit is contained in:
Ilya Fedin 2021-06-10 23:43:35 +04:00 committed by John Preston
parent 2f986660ff
commit 8d0f5bb828
6 changed files with 11 additions and 2 deletions

3
.gitmodules vendored
View File

@ -94,3 +94,6 @@
[submodule "Telegram/ThirdParty/mallocng"]
path = Telegram/ThirdParty/mallocng
url = https://github.com/desktop-app/mallocng.git
[submodule "Telegram/lib_waylandshells"]
path = Telegram/lib_waylandshells
url = https://github.com/desktop-app/lib_waylandshells.git

View File

@ -18,6 +18,9 @@ endif()
add_subdirectory(lib_storage)
add_subdirectory(lib_lottie)
add_subdirectory(lib_qr)
if (LINUX AND NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
add_subdirectory(lib_waylandshells)
endif()
add_subdirectory(lib_webrtc)
add_subdirectory(lib_webview)
add_subdirectory(codegen)
@ -110,6 +113,7 @@ elseif (LINUX)
if (NOT DESKTOP_APP_DISABLE_WAYLAND_INTEGRATION)
target_link_libraries(Telegram
PRIVATE
desktop-app::lib_waylandshells
desktop-app::external_kwayland
)
endif()

View File

@ -771,6 +771,7 @@ RUN cmake3 --build out/Debug -- -j$(nproc)
FROM builder
COPY --from=extra-cmake-modules ${LibrariesPath}/extra-cmake-modules-cache /
COPY --from=libffi ${LibrariesPath}/libffi-cache /
COPY --from=xz ${LibrariesPath}/xz-cache /
COPY --from=libproxy ${LibrariesPath}/libproxy-cache /

@ -1 +1 @@
Subproject commit 098eb59f2f4635640f8a5f2e53bee2f689f2d0b3
Subproject commit 43efd9e3077075f3dbebc9c1cf696c1bd280901f

@ -0,0 +1 @@
Subproject commit 817eb075dd5470f858c7e72cee8ea0a299c2a974

2
cmake

@ -1 +1 @@
Subproject commit bcc0ac15f497513455aa144ffe4e658f7aca0e73
Subproject commit 4caa8674681fb50a2244b58eb701508017c360d6