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