commit: a7f024200dab411bafaaf5207e115f75d521e847 Author: Esteve Varela Colominas <esteve.varela <AT> gmail <DOT> com> AuthorDate: Fri Apr 30 14:06:43 2021 +0000 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> CommitDate: Mon May 3 17:01:38 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7f02420
net-im/telegram-desktop: include patch upstream references Signed-off-by: Esteve Varela Colominas <esteve.varela <AT> gmail.com> Closes: https://github.com/gentoo/gentoo/pull/20616 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> media-libs/tg_owt/tg_owt-0_pre20210422.ebuild | 4 +++- net-im/telegram-desktop/telegram-desktop-2.7.4.ebuild | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/media-libs/tg_owt/tg_owt-0_pre20210422.ebuild b/media-libs/tg_owt/tg_owt-0_pre20210422.ebuild index 9861bd95232..0c5ed6f7895 100644 --- a/media-libs/tg_owt/tg_owt-0_pre20210422.ebuild +++ b/media-libs/tg_owt/tg_owt-0_pre20210422.ebuild @@ -42,11 +42,12 @@ S="${WORKDIR}/${PN}-${TG_OWT_COMMIT}" src_unpack() { unpack "${P}.tar.gz" - cd "$S/src/third_party/libyuv" || die + cd "${S}/src/third_party/libyuv" || die unpack "libyuv-${LIBYUV_COMMIT}.tar.gz" } src_prepare() { + # https://github.com/desktop-app/tg_owt/pull/55 eapply "${FILESDIR}/Allow-using-packaged-third_party.patch" # We aren't installing any third_party headers @@ -57,6 +58,7 @@ src_prepare() { # Remove screen_drawer files that cause linking errors # (not used right now I don't think, maybe in a future version) + # https://github.com/desktop-app/tg_owt/issues/58 sed -i -e '/desktop_capture\/screen_drawer\.cc/d' \ -e '/desktop_capture\/screen_drawer_lock_posix\.cc/d' CMakeLists.txt || die diff --git a/net-im/telegram-desktop/telegram-desktop-2.7.4.ebuild b/net-im/telegram-desktop/telegram-desktop-2.7.4.ebuild index 63ffd479879..609781f96cb 100644 --- a/net-im/telegram-desktop/telegram-desktop-2.7.4.ebuild +++ b/net-im/telegram-desktop/telegram-desktop-2.7.4.ebuild @@ -66,7 +66,10 @@ REQUIRED_USE=" S="${WORKDIR}/${MY_P}" PATCHES=( + # https://github.com/desktop-app/cmake_helpers/pull/91 + # https://github.com/desktop-app/lib_webview/pull/2 "${FILESDIR}/tdesktop-2.7.3-disable-webkit-separately.patch" + # https://github.com/desktop-app/lib_webview/commit/0b4100d7cecc4e748c51f3f51ebfd1392ec3978a "${FILESDIR}/tdesktop-2.7.3-webview-include-gdkx.patch" )