commit: 389337ebc052399781deb2f56c0cbb3408ddc1dd
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 3 06:27:15 2020 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Tue Nov 3 06:27:27 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=389337eb
net-im/telegram-desktop: prevent cmake warning
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>
net-im/telegram-desktop/telegram-desktop-2.4.5.ebuild | 8 +++++---
net-im/telegram-desktop/telegram-desktop-2.4.6.ebuild | 8 +++++---
2 files changed, 10 insertions(+), 6 deletions(-)
diff --git a/net-im/telegram-desktop/telegram-desktop-2.4.5.ebuild
b/net-im/telegram-desktop/telegram-desktop-2.4.5.ebuild
index 59754b053ca..9c70f67350e 100644
--- a/net-im/telegram-desktop/telegram-desktop-2.4.5.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-2.4.5.ebuild
@@ -96,8 +96,11 @@ pkg_pretend() {
src_prepare() {
# conditional patching is bad, but we want vanilla telegram with webrtc.
use webrtc || local PATCHES=( "${FILESDIR}/no-webrtc-build.patch" )
- # i asked upstream for explicit toggle, they did not listen. #752417
- sed -i 's/DESKTOP_APP_USE_PACKAGED/DESKTOP_APP_USE_PACKAGED_FAKE/'
cmake/external/rlottie/CMakeLists.txt || die
+
+ # no explicit toggle #752417
+ sed -i 's/DESKTOP_APP_USE_PACKAGED/NO_ONE_WILL_EVER_SET_THIS/' \
+ cmake/external/rlottie/CMakeLists.txt || die
+
cmake_src_prepare
}
@@ -116,7 +119,6 @@ src_configure() {
# EXPECTED VARIANT
# gtk is really needed for image copy-paste due to
https://bugreports.qt.io/browse/QTBUG-56595
local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_rlottie=ON # it does not build
with system one #752417
-DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON # header only lib,
some git version. prevents warnings.
-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON
-DDESKTOP_APP_USE_GLIBC_WRAPS=OFF
diff --git a/net-im/telegram-desktop/telegram-desktop-2.4.6.ebuild
b/net-im/telegram-desktop/telegram-desktop-2.4.6.ebuild
index 77e61279504..ce48a64e77c 100644
--- a/net-im/telegram-desktop/telegram-desktop-2.4.6.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-2.4.6.ebuild
@@ -96,8 +96,11 @@ pkg_pretend() {
src_prepare() {
# conditional patching is bad, but we want vanilla telegram with webrtc.
use webrtc || local PATCHES=( "${FILESDIR}/no-webrtc-build.patch" )
- # i asked upstream for explicit toggle, they did not listen. #752417
- sed -i 's/DESKTOP_APP_USE_PACKAGED/DESKTOP_APP_USE_PACKAGED_FAKE/'
cmake/external/rlottie/CMakeLists.txt || die
+
+ # no explicit toggle #752417
+ sed -i 's/DESKTOP_APP_USE_PACKAGED/NO_ONE_WILL_EVER_SET_THIS/' \
+ cmake/external/rlottie/CMakeLists.txt || die
+
cmake_src_prepare
}
@@ -116,7 +119,6 @@ src_configure() {
# EXPECTED VARIANT
# gtk is really needed for image copy-paste due to
https://bugreports.qt.io/browse/QTBUG-56595
local mycmakeargs=(
- -DCMAKE_DISABLE_FIND_PACKAGE_rlottie=ON # it does not build
with system one #752417
-DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON # header only lib,
some git version. prevents warnings.
-DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON
-DDESKTOP_APP_USE_GLIBC_WRAPS=OFF
