aboutsummaryrefslogtreecommitdiff
path: root/dev-qt
diff options
context:
space:
mode:
authorAric Belsito <lluixhi@gmail.com>2016-10-12 10:48:55 -0700
committerAnthony G. Basile <blueness@gentoo.org>2016-10-17 19:05:33 -0400
commitbfcc277102bdb1b4586d81cd22b329a26db63e0b (patch)
tree3f1d35806d019f8ff14058cf8787ae729839896b /dev-qt
parentnet-wireless/wpa_supplicant: Add LibreSSL patch. (diff)
downloadlibressl-bfcc277102bdb1b4586d81cd22b329a26db63e0b.tar.gz
libressl-bfcc277102bdb1b4586d81cd22b329a26db63e0b.tar.bz2
libressl-bfcc277102bdb1b4586d81cd22b329a26db63e0b.zip
dev-qt/qtnetwork: Update to 5.6.2
Signed-off-by: Anthony G. Basile <blueness@gentoo.org>
Diffstat (limited to 'dev-qt')
-rw-r--r--dev-qt/qtnetwork/Manifest1
-rw-r--r--dev-qt/qtnetwork/files/qtnetwork-5.6.2-libressl-warn.patch12
-rw-r--r--dev-qt/qtnetwork/qtnetwork-5.6.2.ebuild62
3 files changed, 75 insertions, 0 deletions
diff --git a/dev-qt/qtnetwork/Manifest b/dev-qt/qtnetwork/Manifest
index 82fd07c..d698071 100644
--- a/dev-qt/qtnetwork/Manifest
+++ b/dev-qt/qtnetwork/Manifest
@@ -1,3 +1,4 @@
DIST qtbase-opensource-src-5.5.1.tar.xz 46389212 SHA256 dfa4e8a4d7e4c6b69285e7e8833eeecd819987e1bdbe5baa6b6facd4420de916 SHA512 4d31de136870025dfb7544f255798884af1ad4f3060b0c00a0467c98af1f7de368eb298d4c52ba6d1ad27e36060b30c0314ce7ba0744b15642420ec89587a575 WHIRLPOOL 8975a54a720105d1b12b4f50072b98157f6a91020ecd7bad12ab4a92b7ac4663713a82e87f033cc6ad49602a5f9468c6d3ee23120be6c15d63e55ea0b5a343c4
DIST qtbase-opensource-src-5.6.1-1.tar.xz 46788436 SHA256 329678347ec5ebb404225345300a8deb1e7c991322a4c50584be550c69be7c39 SHA512 e9660bee2e0acd91c3232831e4f1a99ad30b82b8ff26850494efec89a525499b721adfb63f7ede586408489d3ebf727b842cd12eab665c58769001454e7f661d WHIRLPOOL e26cf72d9644dbcb08d1269bdaa633be2e24de813deb62a1c77e448b6578f6761769664fc95c4131c342f077c092a777af8fed62ea35e5fdb0f2576d82b3c499
+DIST qtbase-opensource-src-5.6.2.tar.xz 46825164 SHA256 2f6eae93c5d982fe0a387a01aeb3435571433e23e9d9d9246741faf51f1ee787 SHA512 ff55204e6f0b046ccb03430ac6a22bd743bc2f3822625f0c23a481a8a7acb5d93f5b8e900815c70f10554887fbe26b3ee79f6d702acfa5c370e4e3cbd1f2b321 WHIRLPOOL 4a68aae4e471b0cfac3abf3652bb18cac8ffce17c941c8589a154bf07eb8d26945fab535f2e1acb866a584584c1811e953aa19fb1b3709831d85a620f0b6dc5a
DIST qtbase-opensource-src-5.7.0.tar.xz 43993020 SHA256 3e7b6d123cab23a587ccbc45173296b33786faa409dba0494e4658fda3ede646 SHA512 c082b835839ff23ce10463ccc364a0ee6255b4f48409c485181be8e039f5cdf00efa41ec220ddbd9b41e5c8a9fa29327af0e3450e10294b64bb729053eb7c63d WHIRLPOOL 2ba79ed2717ac7876228d9ab6455f97e0689f5d297dfc2fa7d089bde6b1c6bc38f30a467477482bb3af9e19afe95f5f5dbd76bcc835281ce473564cf45a77a92
diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.6.2-libressl-warn.patch b/dev-qt/qtnetwork/files/qtnetwork-5.6.2-libressl-warn.patch
new file mode 100644
index 0000000..0662b98
--- /dev/null
+++ b/dev-qt/qtnetwork/files/qtnetwork-5.6.2-libressl-warn.patch
@@ -0,0 +1,12 @@
+diff -Naur qtbase-opensource-src-5.6.2.orig/config.tests/unix/openssl/openssl.cpp qtbase-opensource-src-5.6.2/config.tests/unix/openssl/openssl.cpp
+--- qtbase-opensource-src-5.6.2.orig/config.tests/unix/openssl/openssl.cpp 2016-10-12 10:59:49.797703074 -0700
++++ qtbase-opensource-src-5.6.2/config.tests/unix/openssl/openssl.cpp 2016-10-12 11:01:51.944406142 -0700
+@@ -40,7 +40,7 @@
+ #include <openssl/ssl.h>
+
+ #if OPENSSL_VERSION_NUMBER-0 >= 0x10002000L && !defined(OPENSSL_NO_EC) && !defined(SSL_CTRL_SET_CURVES)
+-# error "OpenSSL was reported as >= 1.0.2 but is missing required features, possibly it's libressl which is unsupported"
++# warning "OpenSSL was reported as >= 1.0.2 but is missing required features, possibly it's libressl which is unsupported"
+ #endif
+
+ int main()
diff --git a/dev-qt/qtnetwork/qtnetwork-5.6.2.ebuild b/dev-qt/qtnetwork/qtnetwork-5.6.2.ebuild
new file mode 100644
index 0000000..6e5128a
--- /dev/null
+++ b/dev-qt/qtnetwork/qtnetwork-5.6.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+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 ~x86"
+fi
+
+IUSE="bindist connman libproxy libressl networkmanager +ssl"
+
+DEPEND="
+ ~dev-qt/qtcore-${PV}
+ >=sys-libs/zlib-1.2.5
+ connman? ( ~dev-qt/qtdbus-${PV} )
+ libproxy? ( net-libs/libproxy )
+ networkmanager? ( ~dev-qt/qtdbus-${PV} )
+ ssl? (
+ !libressl? ( dev-libs/openssl:0=[bindist=] )
+ libressl? ( dev-libs/libressl:0= )
+ )
+"
+RDEPEND="${DEPEND}
+ connman? ( net-misc/connman )
+ networkmanager? ( net-misc/networkmanager )
+"
+
+PATCHES=(
+ "${FILESDIR}/0001-Fix-compilation-with-libressl.patch" # bug 562050
+ "${FILESDIR}/${PN}-5.6.2-libressl-warn.patch"
+)
+
+QT5_TARGET_SUBDIRS=(
+ src/network
+ src/plugins/bearer/generic
+)
+
+QT5_GENTOO_CONFIG=(
+ libproxy
+ ssl::SSL
+ ssl::OPENSSL
+ ssl:openssl-linked:LINKED_OPENSSL
+)
+
+pkg_setup() {
+ use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman)
+ use networkmanager && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager)
+}
+
+src_configure() {
+ local myconf=(
+ $(use connman || use networkmanager && echo -dbus-linked)
+ $(qt_use libproxy)
+ $(usex ssl -openssl-linked '')
+ )
+ qt5-build_src_configure
+}