main/qt5-qtbase: upgrade to 5.6.1_p1

2 files changed, 57 insertions, 14 deletions

diff --git a/main/qt5-qtbase/APKBUILD b/main/qt5-qtbase/APKBUILD
index a64230b606..a2a824163f 100644
--- a/main/qt5-qtbase/APKBUILD
+++ b/main/qt5-qtbase/APKBUILD
@@ -1,11 +1,12 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=qt5-qtbase
-pkgver=5.6.0
-_ver=${pkgver/_/-}
+pkgver=5.6.1_p1
+_ver=${pkgver/_p/-}
+_ver=${_ver/_/-}
 _ver=${_ver/beta0/beta}
 _ver=${_ver/rc0/rc}
 _V=${_ver/rc/RC}
-pkgrel=3
+pkgrel=0
 pkgdesc="Qt5 - QtBase components"
 url="http://qt-project.org/"
 arch="all"
@@ -14,7 +15,7 @@ _sub="$pkgname-sqlite $pkgname-odbc $pkgname-postgresql $pkgname-mysql
 	$pkgname-tds $pkgname-x11"
 depends=""
 depends_dev="mesa-dev libice-dev libsm-dev libx11-dev libxext-dev
-	openssl-dev fontconfig-dev freetype-dev glib-dev libpng-dev zlib-dev
+	libressl-dev fontconfig-dev freetype-dev glib-dev libpng-dev zlib-dev
 	sqlite-dev dbus-dev perl $_sub"
 makedepends="$depends_dev
 	bison
@@ -51,14 +52,15 @@ case $pkgver in
 esac
 source="http://download.qt-project.org/$_rel/qt/${pkgver%.*}/$_ver/submodules/qtbase-opensource-src-$_V.tar.xz
 	qt-musl-iconv-no-bom.patch
+	libressl-compat.patch
 	"
 
 _qt5_prefix=/usr/lib/qt5
 _qt5_datadir=/usr/share/qt5
 
-_builddir="$srcdir"/qtbase-opensource-src-$_V
+builddir="$srcdir"/qtbase-opensource-src-${_V%-*}
 prepare() {
-	cd "$_builddir"
+	cd "$builddir"
 	for i in $source; do
 		case $i in
 		*.patch)
@@ -76,7 +78,7 @@ prepare() {
 build() {
 	local _arch
 
-	cd "$_builddir"
+	cd "$builddir"
 
 	./configure -confirm-license -opensource \
 		-archdatadir "$_qt5_prefix" \
@@ -120,7 +122,7 @@ build() {
 }
 
 package() {
-	cd "$_builddir"
+	cd "$builddir"
 	make INSTALL_ROOT="$pkgdir" install || return 1
 	mkdir -p "$pkgdir"/usr/bin/
 	for i in "$pkgdir"/$_qt5_prefix/bin/*; do
@@ -205,9 +207,12 @@ x11() {
 	return 0
 }
 
-md5sums="d6b6cfd333c22829c6c85fc52ceed019  qtbase-opensource-src-5.6.0.tar.xz
-077e31e0cb0d25637a3b3638fffbef3c  qt-musl-iconv-no-bom.patch"
-sha256sums="6efa8a5c559e92b2e526d48034e858023d5fd3c39115ac1bfd3bb65834dbd67a  qtbase-opensource-src-5.6.0.tar.xz
-40b337c16bbb1d259f315fe5a1b110f9917223aee53b82809934efa4fa5e62a3  qt-musl-iconv-no-bom.patch"
-sha512sums="5b2a5842346475be0944fc44bc09ff5b5d5da167246310de132f034e17ebbcbbf103b6f085dbf8b566389694bd095227aa1ed569b93e0f9a8f02da51d8fe076e  qtbase-opensource-src-5.6.0.tar.xz
-a185ea5e984d2636e3f9f6c4ed8fad66a17575da0679724da60a3dc519468ab45aa9369f43ce5c64f07cb730910e36623164aefafca3aabe0359c62becca870e  qt-musl-iconv-no-bom.patch"
+md5sums="6f8036a82f8b7fda65cd98f89ca99628  qtbase-opensource-src-5.6.1-1.tar.xz
+077e31e0cb0d25637a3b3638fffbef3c  qt-musl-iconv-no-bom.patch
+4d9825668b5d571ef4d0d0ea787721af  libressl-compat.patch"
+sha256sums="329678347ec5ebb404225345300a8deb1e7c991322a4c50584be550c69be7c39  qtbase-opensource-src-5.6.1-1.tar.xz
+40b337c16bbb1d259f315fe5a1b110f9917223aee53b82809934efa4fa5e62a3  qt-musl-iconv-no-bom.patch
+f26a62f1747db5b4be4a812a23ca0b7ae49ee14596a719cdbaf5ea39ddb64bcf  libressl-compat.patch"
+sha512sums="e9660bee2e0acd91c3232831e4f1a99ad30b82b8ff26850494efec89a525499b721adfb63f7ede586408489d3ebf727b842cd12eab665c58769001454e7f661d  qtbase-opensource-src-5.6.1-1.tar.xz
+a185ea5e984d2636e3f9f6c4ed8fad66a17575da0679724da60a3dc519468ab45aa9369f43ce5c64f07cb730910e36623164aefafca3aabe0359c62becca870e  qt-musl-iconv-no-bom.patch
+7b73964efef1a6c00cf98da7569dba1c93c0a9ff3a397ce2e38a0c203505dbb49e9bfb751e0e59af75b3ee237fb6f320caee4bab3e2e564236d484cf1879388b  libressl-compat.patch"
diff --git a/main/qt5-qtbase/libressl-compat.patch b/main/qt5-qtbase/libressl-compat.patch
new file mode 100644
index 0000000000..cc6d3aadbe
--- /dev/null
+++ b/main/qt5-qtbase/libressl-compat.patch
@@ -0,0 +1,38 @@
+The checks for OPENSSL_VERSION_NUMBER > 0x10002000 are used to
+enable openssl specific macros and functions which libressl
+obviously does not provide, thus add some additional tests
+to disable that code for libressl.
+
+--- qtbase/src/network/ssl/qsslcontext_openssl.cpp	2015-06-29 22:04:46.000000000 +0200
++++ qtbase/src/network/ssl/qsslcontext_openssl.cpp	2015-07-04 03:51:25.926570550 +0200
+@@ -338,7 +338,7 @@
+ 
+     const QVector<QSslEllipticCurve> qcurves = sslContext->sslConfiguration.ellipticCurves();
+     if (!qcurves.isEmpty()) {
+-#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_EC)
++#if OPENSSL_VERSION_NUMBER >= 0x10002000L && !defined(OPENSSL_NO_EC) && defined(SSL_CTRL_SET_CURVES)
+         // Set the curves to be used
+         if (q_SSLeay() >= 0x10002000L) {
+             // SSL_CTX_ctrl wants a non-const pointer as last argument,
+--- qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp	2015-06-29 22:04:46.000000000 +0200
++++ qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp	2015-07-04 03:58:29.430569295 +0200
+@@ -406,7 +406,7 @@
+ DEFINEFUNC(EC_KEY *, EC_KEY_new_by_curve_name, int nid, nid, return 0, return)
+ DEFINEFUNC(void, EC_KEY_free, EC_KEY *ecdh, ecdh, return, DUMMYARG)
+ DEFINEFUNC2(size_t, EC_get_builtin_curves, EC_builtin_curve * r, r, size_t nitems, nitems, return 0, return)
+-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
++#if (OPENSSL_VERSION_NUMBER >= 0x10002000L) && !defined(LIBRESSL_VERSION_NUMBER)
+ DEFINEFUNC(int, EC_curve_nist2nid, const char *name, name, return 0, return)
+ #endif // OPENSSL_VERSION_NUMBER >= 0x10002000L
+ #endif // OPENSSL_NO_EC
+--- qtbase/src/network/ssl/qsslellipticcurve_openssl.cpp	2015-07-04 04:05:26.110568061 +0200
++++ qtbase/src/network/ssl/qsslellipticcurve_openssl.cpp	2015-07-04 04:06:01.709567956 +0200
+@@ -76,7 +76,7 @@
+ 
+     int nid = q_OBJ_sn2nid(curveNameLatin1.data());
+ 
+-#if OPENSSL_VERSION_NUMBER >= 0x10002000L
++#if (OPENSSL_VERSION_NUMBER >= 0x10002000L) && !defined(LIBRESSL_VERSION_NUMBER)
+     if (nid == 0 && q_SSLeay() >= 0x10002000L)
+         nid = q_EC_curve_nist2nid(curveNameLatin1.data());
+ #endif // OPENSSL_VERSION_NUMBER >= 0x10002000L