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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 85F6A158094 for ; Thu, 1 Sep 2022 06:28:00 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 72717E0A8A; Thu, 1 Sep 2022 06:27:59 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 58DCCE0A8A for ; Thu, 1 Sep 2022 06:27:59 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 123AC340DD5 for ; Thu, 1 Sep 2022 06:27:58 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9F52B5B1 for ; Thu, 1 Sep 2022 06:27:56 +0000 (UTC) From: "Joonas Niilola" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Joonas Niilola" Message-ID: <1662013673.ff21849c5934e7dcd624f432c1fa8b84dd538a04.juippis@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-4.1.1-r1.ebuild net-im/telegram-desktop/telegram-desktop-4.1.1.ebuild X-VCS-Directories: net-im/telegram-desktop/ X-VCS-Committer: juippis X-VCS-Committer-Name: Joonas Niilola X-VCS-Revision: ff21849c5934e7dcd624f432c1fa8b84dd538a04 X-VCS-Branch: master Date: Thu, 1 Sep 2022 06:27:56 +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: 5e65d8f6-8e44-44a9-9db7-a14ef07f0e56 X-Archives-Hash: 3c5e37f61860d06b29f3cb997e1ddead commit: ff21849c5934e7dcd624f432c1fa8b84dd538a04 Author: Esteve Varela Colominas gmail com> AuthorDate: Tue Aug 23 15:43:44 2022 +0000 Commit: Joonas Niilola gentoo org> CommitDate: Thu Sep 1 06:27:53 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff21849c net-im/telegram-desktop: Hotfix for proper Qt selection They changed the variable for this, causing the build to prefer qt6 when it's available. Closes: https://bugs.gentoo.org/866157 Thanks-to: Agostino Sarubbo gentoo.org> Signed-off-by: Esteve Varela Colominas gmail.com> Closes: https://github.com/gentoo/gentoo/pull/26980 Signed-off-by: Joonas Niilola gentoo.org> .../{telegram-desktop-4.1.1.ebuild => telegram-desktop-4.1.1-r1.ebuild} | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/net-im/telegram-desktop/telegram-desktop-4.1.1.ebuild b/net-im/telegram-desktop/telegram-desktop-4.1.1-r1.ebuild similarity index 99% rename from net-im/telegram-desktop/telegram-desktop-4.1.1.ebuild rename to net-im/telegram-desktop/telegram-desktop-4.1.1-r1.ebuild index 363e89f23081..ea8aea70d791 100644 --- a/net-im/telegram-desktop/telegram-desktop-4.1.1.ebuild +++ b/net-im/telegram-desktop/telegram-desktop-4.1.1-r1.ebuild @@ -117,7 +117,7 @@ src_configure() { local mycmakeargs=( -DTDESKTOP_LAUNCHER_BASENAME="${PN}" -DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON # header only lib, some git version. prevents warnings. - -DDESKTOP_APP_QT6=$(usex qt6) + -DQT_VERSION_MAJOR=$(usex qt6 6 5) -DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=$(usex !dbus) -DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex !X)