Date: Friday, October 2, 2020 @ 13:10:39 Author: farseerfc Revision: 715480
archrelease: copy trunk to community-x86_64 Added: telegram-desktop/repos/community-x86_64/Fix_xcb_wayland.patch (from rev 715479, telegram-desktop/trunk/Fix_xcb_wayland.patch) telegram-desktop/repos/community-x86_64/PKGBUILD (from rev 715479, telegram-desktop/trunk/PKGBUILD) telegram-desktop/repos/community-x86_64/Use-tg_owt-webrtc-fork.patch (from rev 715479, telegram-desktop/trunk/Use-tg_owt-webrtc-fork.patch) Deleted: telegram-desktop/repos/community-x86_64/Fix_xcb_wayland.patch telegram-desktop/repos/community-x86_64/PKGBUILD telegram-desktop/repos/community-x86_64/Use-tg_owt-webrtc-fork.patch ------------------------------+ Fix_xcb_wayland.patch | 70 +++++++++++------------ PKGBUILD | 104 +++++++++++++++++----------------- Use-tg_owt-webrtc-fork.patch | 122 ++++++++++++++++++++--------------------- 3 files changed, 148 insertions(+), 148 deletions(-) Deleted: Fix_xcb_wayland.patch =================================================================== --- Fix_xcb_wayland.patch 2020-10-02 13:09:52 UTC (rev 715479) +++ Fix_xcb_wayland.patch 2020-10-02 13:10:39 UTC (rev 715480) @@ -1,35 +0,0 @@ -diff -Naur tdesktop-2.3.2-full/Telegram/SourceFiles/platform/linux/specific_linux.cpp tdesktop-2.3.2-full.patched/Telegram/SourceFiles/platform/linux/specific_linux.cpp ---- tdesktop-2.3.2-full/Telegram/SourceFiles/platform/linux/specific_linux.cpp 2020-08-23 15:36:52.000000000 +0200 -+++ tdesktop-2.3.2-full.patched/Telegram/SourceFiles/platform/linux/specific_linux.cpp 2020-09-02 08:38:32.950087151 +0200 -@@ -298,6 +298,20 @@ - } - #endif // !TDESKTOP_DISABLE_GTK_INTEGRATION - -+bool IsXCBExtensionPresent( -+ xcb_connection_t *connection, -+ xcb_extension_t *ext) { -+ const auto reply = xcb_get_extension_data( -+ connection, -+ ext); -+ -+ if (!reply) { -+ return false; -+ } -+ -+ return reply->present; -+} -+ - std::optional<crl::time> XCBLastUserInputTime() { - const auto native = QGuiApplication::platformNativeInterface(); - if (!native) { -@@ -311,6 +325,10 @@ - return std::nullopt; - } - -+ if (!IsXCBExtensionPresent(connection, &xcb_screensaver_id)) { -+ return std::nullopt; -+ } -+ - const auto screen = xcb_setup_roots_iterator(xcb_get_setup(connection)).data; - if (!screen) { - return std::nullopt; Copied: telegram-desktop/repos/community-x86_64/Fix_xcb_wayland.patch (from rev 715479, telegram-desktop/trunk/Fix_xcb_wayland.patch) =================================================================== --- Fix_xcb_wayland.patch (rev 0) +++ Fix_xcb_wayland.patch 2020-10-02 13:10:39 UTC (rev 715480) @@ -0,0 +1,35 @@ +diff -Naur tdesktop-2.3.2-full/Telegram/SourceFiles/platform/linux/specific_linux.cpp tdesktop-2.3.2-full.patched/Telegram/SourceFiles/platform/linux/specific_linux.cpp +--- tdesktop-2.3.2-full/Telegram/SourceFiles/platform/linux/specific_linux.cpp 2020-08-23 15:36:52.000000000 +0200 ++++ tdesktop-2.3.2-full.patched/Telegram/SourceFiles/platform/linux/specific_linux.cpp 2020-09-02 08:38:32.950087151 +0200 +@@ -298,6 +298,20 @@ + } + #endif // !TDESKTOP_DISABLE_GTK_INTEGRATION + ++bool IsXCBExtensionPresent( ++ xcb_connection_t *connection, ++ xcb_extension_t *ext) { ++ const auto reply = xcb_get_extension_data( ++ connection, ++ ext); ++ ++ if (!reply) { ++ return false; ++ } ++ ++ return reply->present; ++} ++ + std::optional<crl::time> XCBLastUserInputTime() { + const auto native = QGuiApplication::platformNativeInterface(); + if (!native) { +@@ -311,6 +325,10 @@ + return std::nullopt; + } + ++ if (!IsXCBExtensionPresent(connection, &xcb_screensaver_id)) { ++ return std::nullopt; ++ } ++ + const auto screen = xcb_setup_roots_iterator(xcb_get_setup(connection)).data; + if (!screen) { + return std::nullopt; Deleted: PKGBUILD =================================================================== --- PKGBUILD 2020-10-02 13:09:52 UTC (rev 715479) +++ PKGBUILD 2020-10-02 13:10:39 UTC (rev 715480) @@ -1,52 +0,0 @@ -# Maintainer: Sven-Hendrik Haase <svenst...@gmail.com> -# Contributor: hexchain <i...@hexchain.org> -pkgname=telegram-desktop -pkgver=2.4.0 -pkgrel=1 -pkgdesc='Official Telegram Desktop client' -arch=('x86_64') -url="https://desktop.telegram.org/" -license=('GPL3') -depends=('hunspell' 'ffmpeg' 'hicolor-icon-theme' 'lz4' 'minizip' 'openal' - 'qt5-imageformats' 'xxhash' 'libdbusmenu-qt5' 'qt5-wayland' 'gtk3') -makedepends=('cmake' 'git' 'ninja' 'python' 'range-v3' 'tl-expected' 'microsoft-gsl' 'libwebrtc') -optdepends=('ttf-opensans: default Open Sans font family') -source=("https://github.com/telegramdesktop/tdesktop/releases/download/v${pkgver}/tdesktop-${pkgver}-full.tar.gz" -"Use-tg_owt-webrtc-fork.patch" -"Update-webrtc-packaged-build-for-tg_owt.patch::https://github.com/desktop-app/cmake_helpers/commit/d955882cb4d4c94f61a9b1df62b7f93d3c5bff7d.patch" -) -sha512sums=('8b62caadc97aacfc4d5313f3420dd258162d8ffd77acfbf27b7561b3dd7274248d90e37d304160d5bc0f5fedf7dbaa5b51e3b2b3cb8213c2ea4bb4c9b43ef6b1' - '071591c6bb71435f8186dcaf570703718051f00366dbbe3f13c4df3706d3de1f168bff4bfa707ad1d6f09f5505c925f0b01d76fd65efe904f3ba7db693d63f43' - 'b3c44e76a3907f7acc197746b471564577e912bf0561e9576dc8459211c88f400716437bcaa10967376461c69c8a98a56477d26d3feb9ca34747d9208bf5f6c6') - -prepare() { - cd tdesktop-$pkgver-full/cmake - patch -R -Np1 -i ${srcdir}/Update-webrtc-packaged-build-for-tg_owt.patch - patch -R -Np1 -i ${srcdir}/Use-tg_owt-webrtc-fork.patch - sed 's|set(webrtc_build_loc ${webrtc_loc}/out/$<CONFIG>/obj)|set(webrtc_build_loc /usr/lib)|' -i external/webrtc/CMakeLists.txt -} - -build() { - cd tdesktop-$pkgver-full - - # Turns out we're allowed to use the official API key that telegram uses for their snap builds: - # https://github.com/telegramdesktop/tdesktop/blob/8fab9167beb2407c1153930ed03a4badd0c2b59f/snap/snapcraft.yaml#L87-L88 - # Thanks @primeos! - cmake . \ - -B build \ - -G Ninja \ - -DCMAKE_INSTALL_PREFIX="/usr" \ - -DCMAKE_BUILD_TYPE=Release \ - -DTDESKTOP_API_ID=611335 \ - -DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c \ - -DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME=ON \ - -DTDESKTOP_LAUNCHER_BASENAME="telegramdesktop" \ - -DDESKTOP_APP_SPECIAL_TARGET="" \ - -DDESKTOP_APP_WEBRTC_LOCATION=/usr/include/libwebrtc - ninja -C build -} - -package() { - cd tdesktop-$pkgver-full - DESTDIR=$pkgdir ninja -C build install -} Copied: telegram-desktop/repos/community-x86_64/PKGBUILD (from rev 715479, telegram-desktop/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2020-10-02 13:10:39 UTC (rev 715480) @@ -0,0 +1,52 @@ +# Maintainer: Sven-Hendrik Haase <svenst...@gmail.com> +# Contributor: hexchain <i...@hexchain.org> +pkgname=telegram-desktop +pkgver=2.4.1 +pkgrel=1 +pkgdesc='Official Telegram Desktop client' +arch=('x86_64') +url="https://desktop.telegram.org/" +license=('GPL3') +depends=('hunspell' 'ffmpeg' 'hicolor-icon-theme' 'lz4' 'minizip' 'openal' + 'qt5-imageformats' 'xxhash' 'libdbusmenu-qt5' 'qt5-wayland' 'gtk3') +makedepends=('cmake' 'git' 'ninja' 'python' 'range-v3' 'tl-expected' 'microsoft-gsl' 'libwebrtc') +optdepends=('ttf-opensans: default Open Sans font family') +source=("https://github.com/telegramdesktop/tdesktop/releases/download/v${pkgver}/tdesktop-${pkgver}-full.tar.gz" +"Use-tg_owt-webrtc-fork.patch" +"Update-webrtc-packaged-build-for-tg_owt.patch::https://github.com/desktop-app/cmake_helpers/commit/d955882cb4d4c94f61a9b1df62b7f93d3c5bff7d.patch" +) +sha512sums=('ce9dee9e94db49661ce5608891965de017794ee989ad2a38117158c230489cdac5880eb8e16b192694b7f72f28ff82231aadf411cfa0b7ce5d1f7a9b4f1eb3b7' + '071591c6bb71435f8186dcaf570703718051f00366dbbe3f13c4df3706d3de1f168bff4bfa707ad1d6f09f5505c925f0b01d76fd65efe904f3ba7db693d63f43' + 'b3c44e76a3907f7acc197746b471564577e912bf0561e9576dc8459211c88f400716437bcaa10967376461c69c8a98a56477d26d3feb9ca34747d9208bf5f6c6') + +prepare() { + cd tdesktop-$pkgver-full/cmake + patch -R -Np1 -i ${srcdir}/Update-webrtc-packaged-build-for-tg_owt.patch + patch -R -Np1 -i ${srcdir}/Use-tg_owt-webrtc-fork.patch + sed 's|set(webrtc_build_loc ${webrtc_loc}/out/$<CONFIG>/obj)|set(webrtc_build_loc /usr/lib)|' -i external/webrtc/CMakeLists.txt +} + +build() { + cd tdesktop-$pkgver-full + + # Turns out we're allowed to use the official API key that telegram uses for their snap builds: + # https://github.com/telegramdesktop/tdesktop/blob/8fab9167beb2407c1153930ed03a4badd0c2b59f/snap/snapcraft.yaml#L87-L88 + # Thanks @primeos! + cmake . \ + -B build \ + -G Ninja \ + -DCMAKE_INSTALL_PREFIX="/usr" \ + -DCMAKE_BUILD_TYPE=Release \ + -DTDESKTOP_API_ID=611335 \ + -DTDESKTOP_API_HASH=d524b414d21f4d37f08684c1df41ac9c \ + -DTDESKTOP_DISABLE_REGISTER_CUSTOM_SCHEME=ON \ + -DTDESKTOP_LAUNCHER_BASENAME="telegramdesktop" \ + -DDESKTOP_APP_SPECIAL_TARGET="" \ + -DDESKTOP_APP_WEBRTC_LOCATION=/usr/include/libwebrtc + ninja -C build +} + +package() { + cd tdesktop-$pkgver-full + DESTDIR=$pkgdir ninja -C build install +} Deleted: Use-tg_owt-webrtc-fork.patch =================================================================== --- Use-tg_owt-webrtc-fork.patch 2020-10-02 13:09:52 UTC (rev 715479) +++ Use-tg_owt-webrtc-fork.patch 2020-10-02 13:10:39 UTC (rev 715480) @@ -1,61 +0,0 @@ -From 4c8956027de8e8e8b984c5daa643aacb14a89123 Mon Sep 17 00:00:00 2001 -From: John Preston <johnprestonm...@gmail.com> -Date: Thu, 20 Aug 2020 16:06:55 +0400 -Subject: [PATCH] Use tg_owt webrtc fork. - ---- - external/webrtc/CMakeLists.txt | 8 ++++---- - init_target.cmake | 2 +- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/external/webrtc/CMakeLists.txt b/external/webrtc/CMakeLists.txt -index 2a09508..1273291 100644 ---- a/external/webrtc/CMakeLists.txt -+++ b/external/webrtc/CMakeLists.txt -@@ -10,10 +10,10 @@ add_library(desktop-app::external_webrtc ALIAS external_webrtc) - if (DESKTOP_APP_WEBRTC_LOCATION) - set(webrtc_loc ${DESKTOP_APP_WEBRTC_LOCATION}) - else() -- set(webrtc_loc ${libs_loc}/webrtc/src) -+ set(webrtc_loc ${libs_loc}/tg_owt/src) - endif() - --set(webrtc_build_loc ${webrtc_loc}/out/$<CONFIG>/obj) -+set(webrtc_build_loc ${libs_loc}/tg_owt/out/$<CONFIG>) - - target_compile_definitions(external_webrtc - INTERFACE -@@ -64,7 +64,7 @@ INTERFACE - ) - - set(webrtc_libs -- ${webrtc_lib_prefix}webrtc -+ ${webrtc_lib_prefix}tg_owt - ) - if (APPLE) - target_include_directories(external_webrtc -@@ -87,7 +87,7 @@ if (WIN32) - wmcodecdspuuid.lib - amstrmid.lib - msdmo.lib -- ) -+ ) - elseif (APPLE) - target_link_libraries(external_webrtc - INTERFACE -diff --git a/init_target.cmake b/init_target.cmake -index 936a364..3a4806b 100644 ---- a/init_target.cmake -+++ b/init_target.cmake -@@ -17,7 +17,7 @@ endfunction() - - function(init_target target_name) # init_target(my_target folder_name) - if (ARGC GREATER 1) -- if (${ARGV1} STREQUAL cxx_std_14 OR ${ARGV1} STREQUAL cxx_std_11) -+ if (${ARGV1} STREQUAL cxx_std_14 OR ${ARGV1} STREQUAL cxx_std_11 OR ${ARGV1} STREQUAL cxx_std_17) - target_compile_features(${target_name} PUBLIC ${ARGV1}) - else() - target_compile_features(${target_name} PUBLIC ${MAXIMUM_CXX_STANDARD}) --- -2.28.0 - Copied: telegram-desktop/repos/community-x86_64/Use-tg_owt-webrtc-fork.patch (from rev 715479, telegram-desktop/trunk/Use-tg_owt-webrtc-fork.patch) =================================================================== --- Use-tg_owt-webrtc-fork.patch (rev 0) +++ Use-tg_owt-webrtc-fork.patch 2020-10-02 13:10:39 UTC (rev 715480) @@ -0,0 +1,61 @@ +From 4c8956027de8e8e8b984c5daa643aacb14a89123 Mon Sep 17 00:00:00 2001 +From: John Preston <johnprestonm...@gmail.com> +Date: Thu, 20 Aug 2020 16:06:55 +0400 +Subject: [PATCH] Use tg_owt webrtc fork. + +--- + external/webrtc/CMakeLists.txt | 8 ++++---- + init_target.cmake | 2 +- + 2 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/external/webrtc/CMakeLists.txt b/external/webrtc/CMakeLists.txt +index 2a09508..1273291 100644 +--- a/external/webrtc/CMakeLists.txt ++++ b/external/webrtc/CMakeLists.txt +@@ -10,10 +10,10 @@ add_library(desktop-app::external_webrtc ALIAS external_webrtc) + if (DESKTOP_APP_WEBRTC_LOCATION) + set(webrtc_loc ${DESKTOP_APP_WEBRTC_LOCATION}) + else() +- set(webrtc_loc ${libs_loc}/webrtc/src) ++ set(webrtc_loc ${libs_loc}/tg_owt/src) + endif() + +-set(webrtc_build_loc ${webrtc_loc}/out/$<CONFIG>/obj) ++set(webrtc_build_loc ${libs_loc}/tg_owt/out/$<CONFIG>) + + target_compile_definitions(external_webrtc + INTERFACE +@@ -64,7 +64,7 @@ INTERFACE + ) + + set(webrtc_libs +- ${webrtc_lib_prefix}webrtc ++ ${webrtc_lib_prefix}tg_owt + ) + if (APPLE) + target_include_directories(external_webrtc +@@ -87,7 +87,7 @@ if (WIN32) + wmcodecdspuuid.lib + amstrmid.lib + msdmo.lib +- ) ++ ) + elseif (APPLE) + target_link_libraries(external_webrtc + INTERFACE +diff --git a/init_target.cmake b/init_target.cmake +index 936a364..3a4806b 100644 +--- a/init_target.cmake ++++ b/init_target.cmake +@@ -17,7 +17,7 @@ endfunction() + + function(init_target target_name) # init_target(my_target folder_name) + if (ARGC GREATER 1) +- if (${ARGV1} STREQUAL cxx_std_14 OR ${ARGV1} STREQUAL cxx_std_11) ++ if (${ARGV1} STREQUAL cxx_std_14 OR ${ARGV1} STREQUAL cxx_std_11 OR ${ARGV1} STREQUAL cxx_std_17) + target_compile_features(${target_name} PUBLIC ${ARGV1}) + else() + target_compile_features(${target_name} PUBLIC ${MAXIMUM_CXX_STANDARD}) +-- +2.28.0 +