Gentoo Archives: gentoo-commits

From: Joonas Niilola <juippis@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/
Date: Thu, 01 Sep 2022 06:28:00
Message-Id: 1662013673.ff21849c5934e7dcd624f432c1fa8b84dd538a04.juippis@gentoo
1 commit: ff21849c5934e7dcd624f432c1fa8b84dd538a04
2 Author: Esteve Varela Colominas <esteve.varela <AT> gmail <DOT> com>
3 AuthorDate: Tue Aug 23 15:43:44 2022 +0000
4 Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 1 06:27:53 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ff21849c
7
8 net-im/telegram-desktop: Hotfix for proper Qt selection
9
10 They changed the variable for this, causing the build to prefer qt6 when
11 it's available.
12
13 Closes: https://bugs.gentoo.org/866157
14 Thanks-to: Agostino Sarubbo <ago <AT> gentoo.org>
15 Signed-off-by: Esteve Varela Colominas <esteve.varela <AT> gmail.com>
16 Closes: https://github.com/gentoo/gentoo/pull/26980
17 Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
18
19 .../{telegram-desktop-4.1.1.ebuild => telegram-desktop-4.1.1-r1.ebuild} | 2 +-
20 1 file changed, 1 insertion(+), 1 deletion(-)
21
22 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
23 similarity index 99%
24 rename from net-im/telegram-desktop/telegram-desktop-4.1.1.ebuild
25 rename to net-im/telegram-desktop/telegram-desktop-4.1.1-r1.ebuild
26 index 363e89f23081..ea8aea70d791 100644
27 --- a/net-im/telegram-desktop/telegram-desktop-4.1.1.ebuild
28 +++ b/net-im/telegram-desktop/telegram-desktop-4.1.1-r1.ebuild
29 @@ -117,7 +117,7 @@ src_configure() {
30 local mycmakeargs=(
31 -DTDESKTOP_LAUNCHER_BASENAME="${PN}"
32 -DCMAKE_DISABLE_FIND_PACKAGE_tl-expected=ON # header only lib, some git version. prevents warnings.
33 - -DDESKTOP_APP_QT6=$(usex qt6)
34 + -DQT_VERSION_MAJOR=$(usex qt6 6 5)
35
36 -DDESKTOP_APP_DISABLE_DBUS_INTEGRATION=$(usex !dbus)
37 -DDESKTOP_APP_DISABLE_X11_INTEGRATION=$(usex !X)