summaryrefslogtreecommitdiff
path: root/dev-qt/qtnetwork
diff options
context:
space:
mode:
authorV3n3RiX <venerix@koprulu.sector>2021-10-20 10:22:14 +0100
committerV3n3RiX <venerix@koprulu.sector>2021-10-20 10:22:14 +0100
commit46eedbedafdb0040c37884982d4c775ce277fb7b (patch)
treedb33a91259730be84999e13a8d8168c799f50ac0 /dev-qt/qtnetwork
parente23a08d0c97a0cc415aaa165da840b056f93c997 (diff)
gentoo resync : 20.10.2021
Diffstat (limited to 'dev-qt/qtnetwork')
-rw-r--r--dev-qt/qtnetwork/Manifest6
-rw-r--r--dev-qt/qtnetwork/files/qtnetwork-5.15.2-QNetworkAccessManager-memleak.patch41
-rw-r--r--dev-qt/qtnetwork/qtnetwork-5.15.2-r11.ebuild2
-rw-r--r--dev-qt/qtnetwork/qtnetwork-5.15.2-r2.ebuild80
4 files changed, 2 insertions, 127 deletions
diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest
index f02663a15713..e4e03f7d449a 100644
--- a/dev-qt/qtnetwork/Manifest
+++ b/dev-qt/qtnetwork/Manifest
@@ -1,7 +1,3 @@
-AUX qtnetwork-5.15.2-QNetworkAccessManager-memleak.patch 2104 BLAKE2B 2fdeae57b0751f68273e79edb602b90c96d9a3287dec43c1fb3cf1e3b5cf17ae1570e62bc59b330748938cd1ca2b9326062ee61415114d1f08211235dcdae7a6 SHA512 880cab4279a663e4709f93aedf875f2fd3c17dcfd45fe57aa9b75887fbee981b13ff899d9223a37186f2c93493823ca36d4128500f2943b7ca67e409e6523ed3
DIST qtbase-5.15.2-a4f9e569.tar.gz 67964648 BLAKE2B 2be7351221c46846ef37308a0238aa4a39369da63fe5c3be5e142ff700c80e125821c06b43c9e4e949bd9f285222a60888303aef956c9b427a9a6c8ee3bc6b1a SHA512 b4be8132a1d7119fd9728f7bf2d72cdd27d2092e7f178a1f15707204f5ffade7ce505c897fd658bb19274bdd6238b2eb16f7fcfedff2567877dc3458b4091388
-DIST qtbase-5.15.2-gcc11.patch.xz 1208 BLAKE2B a2e5764b723adda991eca5b84cf8e15437a4832febd12e3c93cdc394931af666e17c01e229e9be7e0efc446a955cc26388c0f93cadfcabd93cc6b6f03bb41eb0 SHA512 da3a41ea5d9573a029946d26b26d51d6dce9c8b91db6d78ca71d8343d3ceb5010d21750dcb45abb663e227b5f068985ff4ed51da07efd17c64cc8dd5aef8f3e4
-DIST qtbase-everywhere-src-5.15.2.tar.xz 50179672 BLAKE2B 0e4bdaab43cf59664bde89f87ea260c39acc2ef866d8629d41d9c326cab0ab68bcd943c86a472ae74bc9fb0b7ad50795ccb66275bb6b77d1fcf0a38b5662cb42 SHA512 a549bfaf867d746ff744ab224eb65ac1bdcdac7e8457dfa379941b2b225a90442fcfc1e1175b9afb1f169468f8130b7ab917c67be67156520a4bfb5c92d304f9
-EBUILD qtnetwork-5.15.2-r11.ebuild 1663 BLAKE2B b4a6516dadb1b9127cf709bc25211459edf322120200e8e31b7bfba17d80ec2f8f92aaf48bdc443f120430bca1d5e68be8b0881f8c592e8ea6449bff30aca971 SHA512 a38ca5907ca1ba04e1cd327ec78540a8e65326e8fbc880340ba1fe9f8b82f4cefcf9ade6f12bf17b525a00b1ee0b44e9dcd23edba473b2ad3444771e2181c89e
-EBUILD qtnetwork-5.15.2-r2.ebuild 1835 BLAKE2B 683c4b2d419a041c89c08975db612d0e2c40d6c1969c7ce77640fd1c3259b39772485d89114fe71ceb7f3232ccb4b9cda9d3e2aded1b62ea8bd191116ef28e39 SHA512 2c58ed1f755b4a2b982534644aab38f0d59017ebc0168b79e77e1b3f6450f922edeff12a54f7701952baff278e02569b5cd41ae960b49b6fe0292b773109d6e4
+EBUILD qtnetwork-5.15.2-r11.ebuild 1661 BLAKE2B 72d1089771b6546c2425872e547420e7c4326af64b21f92b7008633fa36e7cbd0f064a339f486ad7ebcfefac76e136242273b9b902aacac92cd2fc1933a1af15 SHA512 e08756281594e069079dcb3fa2688c93a42a30f3efec0f7cfa1662edfc2bd5b444db75be2f47ac341192d44fef3610692eb76f2cbe048c2a2cb48756c52daa25
MISC metadata.xml 958 BLAKE2B 7d9b64c45710ec4b80132463178d63563b09fdb7c79f527a84017faa524f6f45f5ff566abea92f8cee5f9c62c7d6bb505d3789520559fd3864f402c18c35f771 SHA512 11948c91b244c607f2cd84c8165db6794be18d0f465ae27ed02086fcc1f8b3755e451b8203f447a05f53437cb04c8e4859de8e077f85360fe87ce846939408c1
diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.15.2-QNetworkAccessManager-memleak.patch b/dev-qt/qtnetwork/files/qtnetwork-5.15.2-QNetworkAccessManager-memleak.patch
deleted file mode 100644
index be2c1f6e1a04..000000000000
--- a/dev-qt/qtnetwork/files/qtnetwork-5.15.2-QNetworkAccessManager-memleak.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 0807f16eb407eaf8a5b34b67602d0a97778d945d Mon Sep 17 00:00:00 2001
-From: =?utf8?q?M=C3=A5rten=20Nordheim?= <marten.nordheim@qt.io>
-Date: Fri, 6 Nov 2020 12:51:42 +0100
-Subject: [PATCH] QNAM: Work around QObject finicky orphan cleanup details
-
-Details described in a comment.
-
-Task-number: QTBUG-88063
-Change-Id: I763ecfedf518de97615e04a8eaae0fe1fd784f52
-Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
-(cherry picked from commit 1c6d6cbb62c5e93cbcad2d740c3b0ed01095618c)
-Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
----
- src/network/access/qnetworkreplyhttpimpl.cpp | 12 +++++++++++-
- 1 file changed, 11 insertions(+), 1 deletion(-)
-
-diff --git a/src/network/access/qnetworkreplyhttpimpl.cpp b/src/network/access/qnetworkreplyhttpimpl.cpp
-index 21916f53f15..727c1a0316d 100644
---- a/src/network/access/qnetworkreplyhttpimpl.cpp
-+++ b/src/network/access/qnetworkreplyhttpimpl.cpp
-@@ -808,7 +808,17 @@ void QNetworkReplyHttpImplPrivate::postRequest(const QNetworkRequest &newHttpReq
-
- // For the synchronous HTTP, this is the normal way the delegate gets deleted
- // For the asynchronous HTTP this is a safety measure, the delegate deletes itself when HTTP is finished
-- QObject::connect(thread, SIGNAL(finished()), delegate, SLOT(deleteLater()));
-+ QMetaObject::Connection threadFinishedConnection =
-+ QObject::connect(thread, SIGNAL(finished()), delegate, SLOT(deleteLater()));
-+
-+ // QTBUG-88063: When 'delegate' is deleted the connection will be added to 'thread''s orphaned
-+ // connections list. This orphaned list will be cleaned up next time 'thread' emits a signal,
-+ // unfortunately that's the finished signal. It leads to a soft-leak so we do this to disconnect
-+ // it on deletion so that it cleans up the orphan immediately.
-+ QObject::connect(delegate, &QObject::destroyed, delegate, [threadFinishedConnection]() {
-+ if (bool(threadFinishedConnection))
-+ QObject::disconnect(threadFinishedConnection);
-+ });
-
- // Set the properties it needs
- delegate->httpRequest = httpRequest;
---
-2.16.3
diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.2-r11.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.2-r11.ebuild
index bc183a01e728..babaf742b4c9 100644
--- a/dev-qt/qtnetwork/qtnetwork-5.15.2-r11.ebuild
+++ b/dev-qt/qtnetwork/qtnetwork-5.15.2-r11.ebuild
@@ -10,7 +10,7 @@ inherit qt5-build
DESCRIPTION="Network abstraction library for the Qt5 framework"
if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
+ KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
fi
IUSE="bindist connman gssapi libproxy networkmanager sctp +ssl"
diff --git a/dev-qt/qtnetwork/qtnetwork-5.15.2-r2.ebuild b/dev-qt/qtnetwork/qtnetwork-5.15.2-r2.ebuild
deleted file mode 100644
index 23709c175e8b..000000000000
--- a/dev-qt/qtnetwork/qtnetwork-5.15.2-r2.ebuild
+++ /dev/null
@@ -1,80 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-QT5_MODULE="qtbase"
-inherit qt5-build
-
-DESCRIPTION="Network abstraction library for the Qt5 framework"
-SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/qtbase-${PV}-gcc11.patch.xz"
-
-if [[ ${QT5_BUILD_TYPE} == release ]]; then
- KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~sparc x86"
-fi
-
-IUSE="bindist connman gssapi libproxy networkmanager sctp +ssl"
-
-DEPEND="
- ~dev-qt/qtcore-${PV}:5=
- sys-libs/zlib:=
- connman? ( ~dev-qt/qtdbus-${PV} )
- gssapi? ( virtual/krb5 )
- libproxy? ( net-libs/libproxy )
- networkmanager? ( ~dev-qt/qtdbus-${PV} )
- sctp? ( kernel_linux? ( net-misc/lksctp-tools ) )
- ssl? (
- >=dev-libs/openssl-1.1.1:0=[bindist(-)=]
- )
-"
-RDEPEND="${DEPEND}
- connman? ( net-misc/connman )
- networkmanager? ( net-misc/networkmanager )
-"
-
-QT5_TARGET_SUBDIRS=(
- src/network
- src/plugins/bearer/generic
-)
-
-QT5_GENTOO_CONFIG=(
- libproxy:libproxy:
- ssl::SSL
- ssl::OPENSSL
- ssl:openssl-linked:LINKED_OPENSSL
-)
-
-QT5_GENTOO_PRIVATE_CONFIG=(
- :network
-)
-
-PATCHES=(
- "${FILESDIR}"/${P}-QNetworkAccessManager-memleak.patch # QTBUG-88063
- "${WORKDIR}"/qtbase-${PV}-gcc11.patch # bug 752012
-)
-
-pkg_setup() {
- use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman)
- use networkmanager && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager)
-}
-
-src_configure() {
- local myconf=(
- $(usex connman -dbus-linked '')
- $(usex gssapi -feature-gssapi -no-feature-gssapi)
- $(qt_use libproxy)
- $(usex networkmanager -dbus-linked '')
- $(qt_use sctp)
- $(usex ssl -openssl-linked '')
- )
- qt5-build_src_configure
-}
-
-src_install() {
- qt5-build_src_install
- # workaround for bug 652650
- if use ssl; then
- sed -e "/^#define QT_LINKED_OPENSSL/s/$/ true/" \
- -i "${D}${QT5_HEADERDIR}"/Gentoo/${PN}-qconfig.h || die
- fi
-}