diff options
author | Aidan Harris <mail@aidanharris.io> | 2019-06-21 17:59:58 +0100 |
---|---|---|
committer | Anthony G. Basile <blueness@gentoo.org> | 2019-06-22 09:11:13 -0400 |
commit | b5e619354bc10456fbbda75bbbc02cf9a2a98834 (patch) | |
tree | a20f578f31aa00c3d27b36d9cfc6f7c30a159966 | |
parent | net-libs/serf: fix OPENSSL_malloc_init not found (diff) | |
download | libressl-b5e619354bc10456fbbda75bbbc02cf9a2a98834.tar.gz libressl-b5e619354bc10456fbbda75bbbc02cf9a2a98834.tar.bz2 libressl-b5e619354bc10456fbbda75bbbc02cf9a2a98834.zip |
dev-qt/qtnetwork-5.12.4: Add 5.12.4
Signed-off-by: Aidan Harris <mail@aidanharris.io>
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
-rw-r--r-- | dev-qt/qtnetwork/files/qtnetwork-5.12.4-libressl.patch | 14 | ||||
-rw-r--r-- | dev-qt/qtnetwork/qtnetwork-5.12.4.ebuild | 68 |
2 files changed, 82 insertions, 0 deletions
diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.12.4-libressl.patch b/dev-qt/qtnetwork/files/qtnetwork-5.12.4-libressl.patch new file mode 100644 index 0000000..b200efa --- /dev/null +++ b/dev-qt/qtnetwork/files/qtnetwork-5.12.4-libressl.patch @@ -0,0 +1,14 @@ +diff --git a/src/network/ssl/qsslsocket_openssl.cpp b/src/network/ssl/qsslsocket_openssl.cpp +index c8bc6e06..76324ea5 100644 +--- a/src/network/ssl/qsslsocket_openssl.cpp ++++ b/src/network/ssl/qsslsocket_openssl.cpp +@@ -460,7 +460,7 @@ bool QSslSocketBackendPrivate::initSslContext() + q_SSL_set_psk_server_callback(ssl, &q_ssl_psk_server_callback); + } + #endif +-#if OPENSSL_VERSION_NUMBER >= 0x10101006L ++#if OPENSSL_VERSION_NUMBER >= 0x10101006L && !defined(LIBRESSL_VERSION_NUMBER) + // Set the client callback for TLSv1.3 PSK + if (mode == QSslSocket::SslClientMode + && QSslSocket::sslLibraryBuildVersionNumber() >= 0x10101006L) { + diff --git a/dev-qt/qtnetwork/qtnetwork-5.12.4.ebuild b/dev-qt/qtnetwork/qtnetwork-5.12.4.ebuild new file mode 100644 index 0000000..7778da7 --- /dev/null +++ b/dev-qt/qtnetwork/qtnetwork-5.12.4.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 +QT5_MODULE="qtbase" +inherit qt5-build + +DESCRIPTION="Network abstraction library for the Qt5 framework" + +if [[ ${QT5_BUILD_TYPE} == release ]]; then + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd" +fi + +IUSE="bindist connman libproxy libressl networkmanager sctp +ssl" + +DEPEND=" + ~dev-qt/qtcore-${PV} + sys-libs/zlib:= + connman? ( ~dev-qt/qtdbus-${PV} ) + libproxy? ( net-libs/libproxy ) + networkmanager? ( ~dev-qt/qtdbus-${PV} ) + sctp? ( kernel_linux? ( net-misc/lksctp-tools ) ) + ssl? ( + !libressl? ( dev-libs/openssl:0=[bindist=] ) + libressl? ( dev-libs/libressl:0= ) + ) +" +RDEPEND="${DEPEND} + connman? ( net-misc/connman ) + networkmanager? ( net-misc/networkmanager ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-5.12.1-libressl.patch + "${FILESDIR}"/${PN}-5.12.4-libressl.patch +) + +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 +) + +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 '') + $(qt_use libproxy) + $(usex networkmanager -dbus-linked '') + $(qt_use sctp) + $(usex ssl -openssl-linked '') + ) + qt5-build_src_configure +} |