| 1 |
commit: 3e1aff19083e24d03e511451ed830fadb5808b57 |
| 2 |
Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Feb 9 20:55:10 2020 +0000 |
| 4 |
Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Feb 9 23:13:04 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e1aff19 |
| 7 |
|
| 8 |
net-im/telegram-desktop: revbump, fixes, optional pulse |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/707372 |
| 11 |
Bug: https://bugs.gentoo.org/707288 |
| 12 |
Closes: https://bugs.gentoo.org/708606 |
| 13 |
Package-Manager: Portage-2.3.88, Repoman-2.3.20 |
| 14 |
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> |
| 15 |
|
| 16 |
...10.ebuild => telegram-desktop-1.9.10-r1.ebuild} | 22 +++++++++++++--------- |
| 17 |
.../telegram-desktop-1.9.10.ebuild | 1 + |
| 18 |
2 files changed, 14 insertions(+), 9 deletions(-) |
| 19 |
|
| 20 |
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 |
| 21 |
similarity index 89% |
| 22 |
copy from net-im/telegram-desktop/telegram-desktop-1.9.10.ebuild |
| 23 |
copy to net-im/telegram-desktop/telegram-desktop-1.9.10-r1.ebuild |
| 24 |
index d08b1979022..fcae9f9ea3e 100644 |
| 25 |
--- a/net-im/telegram-desktop/telegram-desktop-1.9.10.ebuild |
| 26 |
+++ b/net-im/telegram-desktop/telegram-desktop-1.9.10-r1.ebuild |
| 27 |
@@ -13,11 +13,13 @@ DESCRIPTION="Official desktop client for Telegram" |
| 28 |
HOMEPAGE="https://desktop.telegram.org" |
| 29 |
SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${MY_P}.tar.gz" |
| 30 |
|
| 31 |
-LICENSE="GPL-3-with-openssl-exception Unlicense" |
| 32 |
+LICENSE="GPL-3-with-openssl-exception" |
| 33 |
SLOT="0" |
| 34 |
KEYWORDS="~amd64 ~ppc64" |
| 35 |
-IUSE="dbus gtk3 libressl spell" |
| 36 |
+IUSE="alsa dbus gtk3 libressl pulseaudio spell" |
| 37 |
|
| 38 |
+# dbus still required to build, but use flag disables dbus usage at runtime |
| 39 |
+# pkg-config will pick up gtk2 first if found, needs a workaround |
| 40 |
RDEPEND="!net-im/telegram-desktop-bin |
| 41 |
app-arch/lz4 |
| 42 |
app-arch/xz-utils |
| 43 |
@@ -25,16 +27,18 @@ RDEPEND="!net-im/telegram-desktop-bin |
| 44 |
libressl? ( dev-libs/libressl:0= ) |
| 45 |
>=dev-cpp/ms-gsl-2.1.0 |
| 46 |
dev-cpp/range-v3 |
| 47 |
+ dev-libs/libdbusmenu-qt[qt5(+)] |
| 48 |
dev-libs/xxhash |
| 49 |
dev-qt/qtcore:5 |
| 50 |
+ dev-qt/qtdbus:5 |
| 51 |
dev-qt/qtimageformats:5 |
| 52 |
dev-qt/qtnetwork:5 |
| 53 |
media-libs/fontconfig:= |
| 54 |
- media-libs/openal[pulseaudio] |
| 55 |
- media-libs/opus |
| 56 |
- media-sound/pulseaudio |
| 57 |
+ media-libs/libtgvoip[alsa?,pulseaudio?] |
| 58 |
+ media-libs/openal[alsa?,pulseaudio?] |
| 59 |
sys-libs/zlib[minizip] |
| 60 |
virtual/ffmpeg |
| 61 |
+ virtual/libiconv |
| 62 |
x11-libs/libva[X,drm] |
| 63 |
x11-libs/libX11 |
| 64 |
|| ( |
| 65 |
@@ -45,12 +49,11 @@ RDEPEND="!net-im/telegram-desktop-bin |
| 66 |
dev-qt/qtwidgets:5[png,X(-)] |
| 67 |
dev-qt/qtwidgets:5[png,xcb(-)] |
| 68 |
) |
| 69 |
- dbus? ( dev-qt/qtdbus:5 ) |
| 70 |
gtk3? ( |
| 71 |
dev-libs/libappindicator:3 |
| 72 |
x11-libs/gtk+:3 |
| 73 |
- sys-apps/xdg-desktop-portal |
| 74 |
) |
| 75 |
+ pulseaudio? ( media-sound/pulseaudio ) |
| 76 |
spell? ( app-text/enchant:= ) |
| 77 |
" |
| 78 |
|
| 79 |
@@ -61,13 +64,15 @@ BDEPEND=" |
| 80 |
>=dev-util/cmake-3.16 |
| 81 |
virtual/pkgconfig |
| 82 |
" |
| 83 |
+REQUIRED_USE="|| ( alsa pulseaudio )" |
| 84 |
+ |
| 85 |
+S="${WORKDIR}/${MY_P}" |
| 86 |
|
| 87 |
PATCHES=( |
| 88 |
"${FILESDIR}/0002-PPC-big-endian.patch" |
| 89 |
"${FILESDIR}/musl.patch" |
| 90 |
) |
| 91 |
|
| 92 |
-S="${WORKDIR}/${MY_P}" |
| 93 |
|
| 94 |
src_configure() { |
| 95 |
local mycxxflags=( |
| 96 |
@@ -91,7 +96,6 @@ src_configure() { |
| 97 |
-DDESKTOP_APP_USE_PACKAGED_VARIANT=OFF |
| 98 |
-DTDESKTOP_DISABLE_DESKTOP_FILE_GENERATION=ON |
| 99 |
-DTDESKTOP_LAUNCHER_BASENAME="${PN}" |
| 100 |
- -DTDESKTOP_USE_PACKAGED_TGVOIP=OFF |
| 101 |
-DDESKTOP_APP_DISABLE_SPELLCHECK="$(usex spell OFF ON)" |
| 102 |
-DTDESKTOP_DISABLE_GTK_INTEGRATION="$(usex gtk3 OFF ON)" |
| 103 |
-DTDESKTOP_DISABLE_DBUS_INTEGRATION="$(usex dbus OFF ON)" |
| 104 |
|
| 105 |
diff --git a/net-im/telegram-desktop/telegram-desktop-1.9.10.ebuild b/net-im/telegram-desktop/telegram-desktop-1.9.10.ebuild |
| 106 |
index d08b1979022..9ef754c699f 100644 |
| 107 |
--- a/net-im/telegram-desktop/telegram-desktop-1.9.10.ebuild |
| 108 |
+++ b/net-im/telegram-desktop/telegram-desktop-1.9.10.ebuild |
| 109 |
@@ -25,6 +25,7 @@ RDEPEND="!net-im/telegram-desktop-bin |
| 110 |
libressl? ( dev-libs/libressl:0= ) |
| 111 |
>=dev-cpp/ms-gsl-2.1.0 |
| 112 |
dev-cpp/range-v3 |
| 113 |
+ dev-libs/libdbusmenu-qt[qt5(+)] |
| 114 |
dev-libs/xxhash |
| 115 |
dev-qt/qtcore:5 |
| 116 |
dev-qt/qtimageformats:5 |
Archives