diff options
| author |   Esteve Varela Colominas <esteve.varela@gmail.com> | 2022-12-12 16:36:04 +0100 |
|---|---|---|
| committer |   John Helmert III <ajak@gentoo.org> | 2022-12-12 21:00:34 -0600 |
| commit | 8851c84a31b65fb92cdf9d61689929c84d5d23bb (patch) | |
| tree | b7128bd9f598859584b8f812411c4a74bbf58ab3 /net-im | |
| parent | x11-misc/makedepend: Version bump to 1.0.8 (diff) | |
| download | gentoo-8851c84a31b65fb92cdf9d61689929c84d5d23bb.tar.gz gentoo-8851c84a31b65fb92cdf9d61689929c84d5d23bb.tar.bz2 gentoo-8851c84a31b65fb92cdf9d61689929c84d5d23bb.zip | |
net-im/telegram-desktop: Fix linking with ld.lld
Closes: https://bugs.gentoo.org/883935
Thanks-to: John Helmert III <ajak@gentoo.org>
Signed-off-by: Esteve Varela Colominas <esteve.varela@gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/28646
Signed-off-by: John Helmert III <ajak@gentoo.org>
Diffstat (limited to 'net-im')
3 files changed, 28 insertions, 0 deletions
diff --git a/net-im/telegram-desktop/files/tdesktop-4.4.1-fix-dupe-main-decl.patch b/net-im/telegram-desktop/files/tdesktop-4.4.1-fix-dupe-main-decl.patch new file mode 100644 index 000000000000..4c4f7b0377bd --- /dev/null +++ b/net-im/telegram-desktop/files/tdesktop-4.4.1-fix-dupe-main-decl.patch @@ -0,0 +1,26 @@ +From 37e03fb4289a3f46a5201caaebbdce8e441d55f5 Mon Sep 17 00:00:00 2001 +From: John Helmert III <ajak@gentoo.org> +Date: Sun, 11 Dec 2022 14:21:32 -0600 +Subject: [PATCH] fix duplicate main declaration + +Bug: https://bugs.gentoo.org/883935 +Signed-off-by: John Helmert III <ajak@gentoo.org> +--- + cmake/external/cld3/CMakeLists.txt | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/cmake/external/cld3/CMakeLists.txt b/cmake/external/cld3/CMakeLists.txt +index f351ca1..54c524b 100644 +--- a/cmake/external/cld3/CMakeLists.txt ++++ b/cmake/external/cld3/CMakeLists.txt +@@ -80,7 +80,6 @@ PRIVATE + script_span/generated_entities.cc + script_span/getonescriptspan.cc + script_span/getonescriptspan.h +- script_span/getonescriptspan_test.cc + script_span/utf8statetable.cc + script_span/offsetmap.cc + script_span/text_processing.cc +-- +2.38.1 + diff --git a/net-im/telegram-desktop/telegram-desktop-4.3.4-r2.ebuild b/net-im/telegram-desktop/telegram-desktop-4.3.4-r2.ebuild index 442730b0071d..adeaf57bd1ca 100644 --- a/net-im/telegram-desktop/telegram-desktop-4.3.4-r2.ebuild +++ b/net-im/telegram-desktop/telegram-desktop-4.3.4-r2.ebuild @@ -92,6 +92,7 @@ PATCHES=( "${FILESDIR}/tdesktop-4.3.4-fix-disabling-spellcheck.patch" "${FILESDIR}/tdesktop-4.3.4-qt5-incompatibility-1.patch" "${FILESDIR}/tdesktop-4.3.4-qt5-incompatibility-2.patch" + "${FILESDIR}/tdesktop-4.4.1-fix-dupe-main-decl.patch" ) # Current desktop-file-utils-0.26 does not understand Version=1.5 diff --git a/net-im/telegram-desktop/telegram-desktop-4.4.1.ebuild b/net-im/telegram-desktop/telegram-desktop-4.4.1.ebuild index b77e4471ba3d..ecd0b44efbec 100644 --- a/net-im/telegram-desktop/telegram-desktop-4.4.1.ebuild +++ b/net-im/telegram-desktop/telegram-desktop-4.4.1.ebuild @@ -89,6 +89,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}/tdesktop-4.2.4-jemalloc-only-telegram.patch" "${FILESDIR}/tdesktop-4.3.4-qt5-incompatibility-2.patch" + "${FILESDIR}/tdesktop-4.4.1-fix-dupe-main-decl.patch" ) # Current desktop-file-utils-0.26 does not understand Version=1.5 |