From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1219247-garchives=archives.gentoo.org@lists.gentoo.org>
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 5048A138359
for <garchives@archives.gentoo.org>; Tue, 3 Nov 2020 06:09:56 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 755A0E0AA3;
Tue, 3 Nov 2020 06:09:55 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.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 B80BEE0AA3
for <gentoo-commits@lists.gentoo.org>; Tue, 3 Nov 2020 06:09:54 +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 F06BC340DA1
for <gentoo-commits@lists.gentoo.org>; Tue, 3 Nov 2020 06:09:52 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id 333DA3B2
for <gentoo-commits@lists.gentoo.org>; Tue, 3 Nov 2020 06:09:51 +0000 (UTC)
From: "Georgy Yakovlev" <gyakovlev@gentoo.org>
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" <gyakovlev@gentoo.org>
Message-ID: <1604383775.e0104e21c1e97cf60e3167d2ed2b5f17e3ae2280.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: e0104e21c1e97cf60e3167d2ed2b5f17e3ae2280
X-VCS-Branch: master
Date: Tue, 3 Nov 2020 06:09:51 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 0ac6f5df-1fb2-493d-8521-9741424f51cf
X-Archives-Hash: 8c12b52729ad6b03a0d1931c232ce756
commit: e0104e21c1e97cf60e3167d2ed2b5f17e3ae2280
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 3 06:09:09 2020 +0000
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Tue Nov 3 06:09:35 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0104e21
net-im/telegram-desktop: fix build with rlottie installed
Closes: https://bugs.gentoo.org/752417
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 | 4 +++-
net-im/telegram-desktop/telegram-desktop-2.4.6.ebuild | 4 +++-
2 files changed, 6 insertions(+), 2 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 3f5e956e93d..59754b053ca 100644
--- a/net-im/telegram-desktop/telegram-desktop-2.4.5.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-2.4.5.ebuild
@@ -96,6 +96,8 @@ 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
cmake_src_prepare
}
@@ -114,7 +116,7 @@ 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, prevent automagic.
+ -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 28d77efd6cf..77e61279504 100644
--- a/net-im/telegram-desktop/telegram-desktop-2.4.6.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-2.4.6.ebuild
@@ -96,6 +96,8 @@ 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
cmake_src_prepare
}
@@ -114,7 +116,7 @@ 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, prevent automagic.
+ -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