From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 96832158009 for ; Thu, 22 Jun 2023 15:52:02 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E342EE085E; Thu, 22 Jun 2023 15:52:01 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id C840CE085E for ; Thu, 22 Jun 2023 15:52:01 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id D6F6B335D9E for ; Thu, 22 Jun 2023 15:52:00 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E7791990 for ; Thu, 22 Jun 2023 15:51:58 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1687449104.014aa49c8371ae6fe80faf90e8d4b4ab1aec116c.asturm@gentoo> Subject: [gentoo-commits] proj/qt:master commit in: dev-qt/qtnetwork/ X-VCS-Repository: proj/qt X-VCS-Files: dev-qt/qtnetwork/metadata.xml dev-qt/qtnetwork/qtnetwork-5.15.10.9999.ebuild X-VCS-Directories: dev-qt/qtnetwork/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 014aa49c8371ae6fe80faf90e8d4b4ab1aec116c X-VCS-Branch: master Date: Thu, 22 Jun 2023 15:51:58 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 02224641-9504-4b97-89d6-33a550d14da8 X-Archives-Hash: b121736f0c4bfa85f5666a1ea836f244 commit: 014aa49c8371ae6fe80faf90e8d4b4ab1aec116c Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Jun 19 19:50:20 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Jun 22 15:51:44 2023 +0000 URL: https://gitweb.gentoo.org/proj/qt.git/commit/?id=014aa49c dev-qt/qtnetwork: Drop bearer plugins (IUSE=connman,networkmanager) Can not drop src/plugins/bearer/generic (builds libqgenericbearer.so) though, as without it things like akonadi (KMail remains offline) and Plasma POTD stop working. QTBUG: https://bugreports.qt.io/browse/QTBUG-114666 Upstream in #kde-devel: - the bearer plugins were created in another era: for Symbian, when we weren't always connected to the Internet and the user maybe didn't want to turn on their data - now, we're always connected, so the bearer plugins are unnecessary - they've been removed from Qt 6 due to their design problems - so just do the same in Qt 5: don't use them - especially when upstream has already declared "the use of this API is a design flaw" Signed-off-by: Andreas Sturmlechner gentoo.org> dev-qt/qtnetwork/metadata.xml | 3 --- dev-qt/qtnetwork/qtnetwork-5.15.10.9999.ebuild | 16 ++-------------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/dev-qt/qtnetwork/metadata.xml b/dev-qt/qtnetwork/metadata.xml index 8a8481b4..dfe9a543 100644 --- a/dev-qt/qtnetwork/metadata.xml +++ b/dev-qt/qtnetwork/metadata.xml @@ -6,12 +6,9 @@ Gentoo Qt Project - Enable net-misc/connman-based bearer plugin Enable support for GSSAPI (virtual/krb5) Use net-libs/libproxy for automatic HTTP/SOCKS proxy configuration - Enable net-misc/networkmanager-based - bearer plugin https://bugreports.qt.io/ diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.10.9999.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.10.9999.ebuild index f41edbd2..148c6d9f 100644 --- a/dev-qt/qtnetwork/qtnetwork-5.15.10.9999.ebuild +++ b/dev-qt/qtnetwork/qtnetwork-5.15.10.9999.ebuild @@ -13,22 +13,17 @@ inherit qt5-build DESCRIPTION="Network abstraction library for the Qt5 framework" -IUSE="connman gssapi libproxy networkmanager sctp +ssl" +IUSE="gssapi libproxy sctp +ssl" DEPEND=" =dev-qt/qtcore-${QT5_PV}*:5= sys-libs/zlib:= - connman? ( =dev-qt/qtdbus-${QT5_PV}* ) gssapi? ( virtual/krb5 ) libproxy? ( net-libs/libproxy ) - networkmanager? ( =dev-qt/qtdbus-${QT5_PV}* ) sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) ssl? ( >=dev-libs/openssl-1.1.1:0= ) " -RDEPEND="${DEPEND} - connman? ( net-misc/connman ) - networkmanager? ( net-misc/networkmanager ) -" +RDEPEND="${DEPEND}" QT5_TARGET_SUBDIRS=( src/network @@ -46,17 +41,10 @@ QT5_GENTOO_PRIVATE_CONFIG=( :network ) -pkg_setup() { - use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman) - use networkmanager && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager) -} - src_configure() { local myconf=( - $(usev connman -dbus-linked) $(qt_use gssapi feature-gssapi) $(qt_use libproxy) - $(usev networkmanager -dbus-linked) $(qt_use sctp) $(usev ssl -openssl-linked) )