From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CB3D3138359 for ; Tue, 3 Nov 2020 06:27:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id ECDC2E0AA3; Tue, 3 Nov 2020 06:27:51 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id D1674E0AA3 for ; Tue, 3 Nov 2020 06:27:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8BAE3335D6A for ; Tue, 3 Nov 2020 06:27:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CD6A73B2 for ; Tue, 3 Nov 2020 06:27:47 +0000 (UTC) From: "Georgy Yakovlev" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Georgy Yakovlev" Message-ID: <1604384847.389337ebc052399781deb2f56c0cbb3408ddc1dd.gyakovlev@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-im/telegram-desktop/telegram-desktop-2.4.5.ebuild net-im/telegram-desktop/telegram-desktop-2.4.6.ebuild X-VCS-Directories: net-im/telegram-desktop/ X-VCS-Committer: gyakovlev X-VCS-Committer-Name: Georgy Yakovlev X-VCS-Revision: 389337ebc052399781deb2f56c0cbb3408ddc1dd X-VCS-Branch: master Date: Tue, 3 Nov 2020 06:27:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: dc508cd8-ae39-4f2d-8d2f-58cba7d6bb9e X-Archives-Hash: c12ab715d268e792a6a03631865ef6a0 commit: 389337ebc052399781deb2f56c0cbb3408ddc1dd Author: Georgy Yakovlev gentoo org> AuthorDate: Tue Nov 3 06:27:15 2020 +0000 Commit: Georgy Yakovlev gentoo 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 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