From: "Georgy Yakovlev" <gyakovlev@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/, net-im/telegram-desktop/files/
Date: Wed, 12 Feb 2020 09:10:26 +0000 (UTC) [thread overview]
Message-ID: <1581498604.c793aa288187e2094355eb2aa841340adb48315c.gyakovlev@gentoo> (raw)
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
next reply other threads:[~2020-02-12 9:10 UTC|newest]
Thread overview: 38+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-12 9:10 Georgy Yakovlev [this message]
-- strict thread matches above, loose matches on Subject: below --
2024-07-09 0:27 [gentoo-commits] repo/gentoo:master commit in: net-im/telegram-desktop/, net-im/telegram-desktop/files/ Yixun Lan
2024-07-04 13:47 Yixun Lan
2023-10-31 1:07 Yixun Lan
2023-10-07 22:26 Ionen Wolkens
2023-07-15 16:25 Sam James
2023-07-15 16:25 Sam James
2023-06-10 13:43 Sam James
2023-02-22 23:03 Georgy Yakovlev
2023-01-22 23:36 Georgy Yakovlev
2022-11-29 14:59 Georgy Yakovlev
2022-10-03 22:52 Georgy Yakovlev
2022-08-03 17:40 Georgy Yakovlev
2022-03-13 18:20 Arthur Zamarin
2022-03-13 18:20 Arthur Zamarin
2022-02-16 19:43 Georgy Yakovlev
2022-01-06 23:47 Georgy Yakovlev
2021-09-24 17:33 Georgy Yakovlev
2021-09-16 12:07 Georgy Yakovlev
2021-08-13 23:30 Georgy Yakovlev
2021-08-04 8:31 Georgy Yakovlev
2021-07-20 2:44 Georgy Yakovlev
2021-06-12 22:49 Georgy Yakovlev
2021-06-04 18:45 Georgy Yakovlev
2021-04-28 13:16 Georgy Yakovlev
2021-04-23 19:06 Georgy Yakovlev
2020-07-17 18:14 Georgy Yakovlev
2020-07-17 17:58 Georgy Yakovlev
2020-06-29 23:39 Georgy Yakovlev
2020-04-24 20:02 Georgy Yakovlev
2020-04-24 20:02 Georgy Yakovlev
2020-03-31 12:51 Georgy Yakovlev
2020-03-19 17:47 Georgy Yakovlev
2020-03-19 17:47 Georgy Yakovlev
2020-02-26 2:44 Georgy Yakovlev
2020-02-25 8:17 Georgy Yakovlev
2020-02-14 6:21 Georgy Yakovlev
2020-01-25 10:32 Georgy Yakovlev
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1581498604.c793aa288187e2094355eb2aa841340adb48315c.gyakovlev@gentoo \
--to=gyakovlev@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox