commit: c793aa288187e2094355eb2aa841340adb48315c Author: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> AuthorDate: Wed Feb 12 09:04:21 2020 +0000 Commit: Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org> CommitDate: Wed Feb 12 09:10:04 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c793aa28
net-im/telegram-desktop: remove gtk3 useflag from 1.9.12 gtk integration is unneeded with system-qt according to upstream also remove unneeded musl patch and make possible to build without qdbus (patch will be upstream) Package-Manager: Portage-2.3.88, Repoman-2.3.20 Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org> net-im/telegram-desktop/files/1.9.12-dbus.patch | 13 +++++++++++++ net-im/telegram-desktop/telegram-desktop-1.9.12.ebuild | 12 +++--------- 2 files changed, 16 insertions(+), 9 deletions(-) diff --git a/net-im/telegram-desktop/files/1.9.12-dbus.patch b/net-im/telegram-desktop/files/1.9.12-dbus.patch new file mode 100644 index 00000000000..d622645d8f8 --- /dev/null +++ b/net-im/telegram-desktop/files/1.9.12-dbus.patch @@ -0,0 +1,13 @@ +diff --git a/cmake/external/CMakeLists.txt b/cmake/external/CMakeLists.txt +index b52e2cd..e868a63 100644 +--- a/cmake/external/CMakeLists.txt ++++ b/cmake/external/CMakeLists.txt +@@ -24,7 +24,7 @@ add_subdirectory(rlottie) + if (APPLE) + add_subdirectory(sp_media_key_tap) + endif() +-if (LINUX) ++if (LINUX AND Qt5DBus_FOUND AND dbusmenu-qt5_FOUND) + add_subdirectory(statusnotifieritem) + endif() + add_subdirectory(variant) diff --git a/net-im/telegram-desktop/telegram-desktop-1.9.12.ebuild b/net-im/telegram-desktop/telegram-desktop-1.9.12.ebuild index 79b0ce1d5a0..7dd055b0574 100644 --- a/net-im/telegram-desktop/telegram-desktop-1.9.12.ebuild +++ b/net-im/telegram-desktop/telegram-desktop-1.9.12.ebuild @@ -16,10 +16,8 @@ SRC_URI="https://github.com/telegramdesktop/tdesktop/releases/download/v${PV}/${ LICENSE="GPL-3-with-openssl-exception" SLOT="0" KEYWORDS="~amd64 ~ppc64" -IUSE="+alsa ayatana dbus gtk3 libressl pulseaudio spell" +IUSE="+alsa ayatana dbus 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:= @@ -31,7 +29,6 @@ RDEPEND=" dev-libs/libdbusmenu-qt[qt5(+)] dev-libs/xxhash dev-qt/qtcore:5 - dev-qt/qtdbus:5 dev-qt/qtimageformats:5 dev-qt/qtnetwork:5 dev-qt/qtsvg:5 @@ -53,7 +50,7 @@ RDEPEND=" dev-qt/qtwidgets:5[png,xcb(-)] ) ayatana? ( dev-libs/libappindicator:3 ) - gtk3? ( x11-libs/gtk+:3 ) + dbus? ( dev-qt/qtdbus:5 ) pulseaudio? ( media-sound/pulseaudio ) spell? ( app-text/enchant:= ) " @@ -74,7 +71,7 @@ S="${WORKDIR}/${MY_P}" PATCHES=( "${FILESDIR}/0002-PPC-big-endian.patch" - "${FILESDIR}/musl.patch" + "${FILESDIR}/${PV}-dbus.patch" ) src_configure() { @@ -90,7 +87,6 @@ src_configure() { # it fals with tl-expected-1.0.0, so we use bundled for now to avoid git rev snapshots # EXPECTED VARIANT local mycmakeargs=( - -Ddisable_autoupdate=1 -DDESKTOP_APP_DISABLE_CRASH_REPORTS=ON -DDESKTOP_APP_USE_GLIBC_WRAPS=OFF -DDESKTOP_APP_USE_PACKAGED=ON @@ -100,9 +96,7 @@ src_configure() { -DTDESKTOP_DISABLE_DESKTOP_FILE_GENERATION=ON -DTDESKTOP_LAUNCHER_BASENAME="${PN}" -DDESKTOP_APP_DISABLE_SPELLCHECK="$(usex spell OFF ON)" - -DTDESKTOP_DISABLE_GTK_INTEGRATION="$(usex gtk3 OFF ON)" -DTDESKTOP_DISABLE_DBUS_INTEGRATION="$(usex dbus OFF ON)" - -DTDESKTOP_FORCE_GTK_FILE_DIALOG="$(usex gtk3)" ) if [[ -n ${MY_TDESKTOP_API_ID} && -n ${MY_TDESKTOP_API_HASH} ]]; then
