[gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/

["Georgy Yakovlev" <gyakovlev@gentoo.org>]

commit:     3e1aff19083e24d03e511451ed830fadb5808b57
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Sun Feb  9 20:55:10 2020 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Sun Feb  9 23:13:04 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e1aff19

net-im/telegram-desktop: revbump, fixes, optional pulse

Bug: https://bugs.gentoo.org/707372
Bug: https://bugs.gentoo.org/707288
Closes: https://bugs.gentoo.org/708606
Package-Manager: Portage-2.3.88, Repoman-2.3.20
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 ...10.ebuild => telegram-desktop-1.9.10-r1.ebuild} | 22 +++++++++++++---------
 .../telegram-desktop-1.9.10.ebuild                 |  1 +
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/net-im/telegram-desktop/telegram-desktop-1.9.10.ebuild b/net-im/telegram-desktop/telegram-desktop-1.9.10-r1.ebuild
similarity index 89%
copy from net-im/telegram-desktop/telegram-desktop-1.9.10.ebuild
copy to net-im/telegram-desktop/telegram-desktop-1.9.10-r1.ebuild
index d08b1979022..fcae9f9ea3e 100644
--- a/net-im/telegram-desktop/telegram-desktop-1.9.10.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-1.9.10-r1.ebuild
@@ -13,11 +13,13 @@ DESCRIPTION="Official desktop client for Telegram"
 HOMEPAGE="https://desktop.telegram.org"
 SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz"
 
-LICENSE="GPL-3-with-openssl-exception Unlicense"
+LICENSE="GPL-3-with-openssl-exception"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc64"
-IUSE="dbus gtk3 libressl spell"
+IUSE="alsa dbus gtk3 libressl pulseaudio spell"
 
+# dbus still required to build, but use flag disables dbus usage at runtime
+# pkg-config will pick up gtk2 first if found, needs a workaround
 RDEPEND="!net-im/telegram-desktop-bin
 	app-arch/lz4
 	app-arch/xz-utils
@@ -25,16 +27,18 @@ RDEPEND="!net-im/telegram-desktop-bin
 	libressl? ( dev-libs/libressl:0= )
 	>=dev-cpp/ms-gsl-2.1.0
 	dev-cpp/range-v3
+	dev-libs/libdbusmenu-qt[qt5(+)]
 	dev-libs/xxhash
 	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
 	dev-qt/qtimageformats:5
 	dev-qt/qtnetwork:5
 	media-libs/fontconfig:=
-	media-libs/openal[pulseaudio]
-	media-libs/opus
-	media-sound/pulseaudio
+	media-libs/libtgvoip[alsa?,pulseaudio?]
+	media-libs/openal[alsa?,pulseaudio?]
 	sys-libs/zlib[minizip]
 	virtual/ffmpeg
+	virtual/libiconv
 	x11-libs/libva[X,drm]
 	x11-libs/libX11
 	|| (
@@ -45,12 +49,11 @@ RDEPEND="!net-im/telegram-desktop-bin
 		dev-qt/qtwidgets:5[png,X(-)]
 		dev-qt/qtwidgets:5[png,xcb(-)]
 	)
-	dbus? ( dev-qt/qtdbus:5 )
 	gtk3? (
 		dev-libs/libappindicator:3
 		x11-libs/gtk+:3
-		sys-apps/xdg-desktop-portal
 	)
+	pulseaudio? ( media-sound/pulseaudio )
 	spell? ( app-text/enchant:= )
 "
 
@@ -61,13 +64,15 @@ BDEPEND="
 	>=dev-util/cmake-3.16
 	virtual/pkgconfig
 "
+REQUIRED_USE="|| ( alsa pulseaudio )"
+
+S="${WORKDIR}/${MY_P}"
 
 PATCHES=(
 	"${FILESDIR}/0002-PPC-big-endian.patch"
 	"${FILESDIR}/musl.patch"
 )
 
-S="${WORKDIR}/${MY_P}"
 
 src_configure() {
 	local mycxxflags=(
@@ -91,7 +96,6 @@ src_configure() {
 		-DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF
 		-DTDESKTOP_DISABLE_DESKTOP_FILE_GENERATION=ON
 		-DTDESKTOP_LAUNCHER_BASENAME="${PN}"
-		-DTDESKTOP_USE_PACKAGED_TGVOIP=OFF
 		-DDESKTOP_APP_DISABLE_SPELLCHECK="$(usex spell OFF ON)"
 		-DTDESKTOP_DISABLE_GTK_INTEGRATION="$(usex gtk3 OFF ON)"
 		-DTDESKTOP_DISABLE_DBUS_INTEGRATION="$(usex dbus OFF ON)"

diff --git a/net-im/telegram-desktop/telegram-desktop-1.9.10.ebuild b/net-im/telegram-desktop/telegram-desktop-1.9.10.ebuild
index d08b1979022..9ef754c699f 100644
--- a/net-im/telegram-desktop/telegram-desktop-1.9.10.ebuild
+++ b/net-im/telegram-desktop/telegram-desktop-1.9.10.ebuild
@@ -25,6 +25,7 @@ RDEPEND="!net-im/telegram-desktop-bin
 	libressl? ( dev-libs/libressl:0= )
 	>=dev-cpp/ms-gsl-2.1.0
 	dev-cpp/range-v3
+	dev-libs/libdbusmenu-qt[qt5(+)]
 	dev-libs/xxhash
 	dev-qt/qtcore:5
 	dev-qt/qtimageformats:5