diff options
Diffstat (limited to 'dev-qt')
| -rw-r--r-- | dev-qt/qtnetwork/files/qtnetwork-5.10-libressl.patch | 42 | ||||
| -rw-r--r-- | dev-qt/qtnetwork/qtnetwork-5.10.9999-r1.ebuild | 4 | ||||
| -rw-r--r-- | dev-qt/qtwebengine/qtwebengine-5.10.9999-r1.ebuild (renamed from dev-qt/qtwebengine/qtwebengine-5.9.9999-r1.ebuild) | 8 |
3 files changed, 52 insertions, 2 deletions
diff --git a/dev-qt/qtnetwork/files/qtnetwork-5.10-libressl.patch b/dev-qt/qtnetwork/files/qtnetwork-5.10-libressl.patch new file mode 100644 index 0000000..3a1f80a --- /dev/null +++ b/dev-qt/qtnetwork/files/qtnetwork-5.10-libressl.patch @@ -0,0 +1,42 @@ +--- a/config.tests/unix/openssl11/openssl.cpp 2017-11-05 16:07:40.963385070 -0500 ++++ b/config.tests/unix/openssl11/openssl.cpp 2017-11-05 16:07:51.755255545 -0500 +@@ -39,7 +39,7 @@ + + #include <openssl/opensslv.h> + +-#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x10100000L ++#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x10100000L || defined(LIBRESSL_VERSION_NUMBER) + # error "OpenSSL >= 1.1 is required" + #endif + +--- a/src/network/ssl/qsslsocket_openssl_symbols_p.h 2017-11-06 00:02:18.919611226 -0500 ++++ b/src/network/ssl/qsslsocket_openssl_symbols_p.h 2017-11-06 00:09:46.879756111 -0500 +@@ -232,7 +232,7 @@ + int q_BIO_read(BIO *a, void *b, int c); + Q_AUTOTEST_EXPORT int q_BIO_write(BIO *a, const void *b, int c); + int q_BN_num_bits(const BIGNUM *a); +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if QT_CONFIG(opensslv11) + int q_BN_is_word(BIGNUM *a, BN_ULONG w); + #else + // BN_is_word is implemented purely as a +@@ -245,7 +245,7 @@ + // + // Users are required to include <openssl/bn.h>. + #define q_BN_is_word BN_is_word +-#endif // OPENSSL_VERSION_NUMBER >= 0x10100000L ++#endif // QT_CONFIG + BN_ULONG q_BN_mod_word(const BIGNUM *a, BN_ULONG w); + #ifndef OPENSSL_NO_EC + const EC_GROUP* q_EC_KEY_get0_group(const EC_KEY* k); +--- a/src/network/ssl/qsslsocket_openssl_symbols.cpp 2017-11-06 00:04:58.843877923 -0500 ++++ b/src/network/ssl/qsslsocket_openssl_symbols.cpp 2017-11-06 00:06:12.985074360 -0500 +@@ -1017,7 +1017,7 @@ + RESOLVEFUNC(EC_GROUP_get_degree) + #endif + RESOLVEFUNC(BN_num_bits) +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L ++#if QT_CONFIG(opensslv11) + RESOLVEFUNC(BN_is_word) + #endif + RESOLVEFUNC(BN_mod_word) diff --git a/dev-qt/qtnetwork/qtnetwork-5.10.9999-r1.ebuild b/dev-qt/qtnetwork/qtnetwork-5.10.9999-r1.ebuild index 24105c2..264a801 100644 --- a/dev-qt/qtnetwork/qtnetwork-5.10.9999-r1.ebuild +++ b/dev-qt/qtnetwork/qtnetwork-5.10.9999-r1.ebuild @@ -38,6 +38,10 @@ QT5_GENTOO_CONFIG=( ssl:openssl-linked:LINKED_OPENSSL ) +PATCHES=( + "${FILESDIR}/qtnetwork-5.10-libressl.patch" +) + pkg_setup() { use connman && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/connman) use networkmanager && QT5_TARGET_SUBDIRS+=(src/plugins/bearer/networkmanager) diff --git a/dev-qt/qtwebengine/qtwebengine-5.9.9999-r1.ebuild b/dev-qt/qtwebengine/qtwebengine-5.10.9999-r1.ebuild index cd913e8..d515498 100644 --- a/dev-qt/qtwebengine/qtwebengine-5.9.9999-r1.ebuild +++ b/dev-qt/qtwebengine/qtwebengine-5.10.9999-r1.ebuild @@ -8,13 +8,13 @@ inherit multiprocessing pax-utils python-any-r1 qt5-build DESCRIPTION="Library for rendering dynamic web content in Qt5 C++ and QML applications" if [[ ${QT5_BUILD_TYPE} == release ]]; then - KEYWORDS="~amd64 ~arm64 ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~x86" fi IUSE="alsa bindist geolocation pax_kernel pulseaudio +system-ffmpeg +system-icu widgets" RDEPEND=" - app-arch/snappy + app-arch/snappy:= dev-libs/glib:2 dev-libs/nspr dev-libs/nss @@ -22,6 +22,7 @@ RDEPEND=" ~dev-qt/qtdeclarative-${PV} ~dev-qt/qtgui-${PV} ~dev-qt/qtnetwork-${PV} + ~dev-qt/qtprintsupport-${PV} ~dev-qt/qtwebchannel-${PV}[qml] dev-libs/expat dev-libs/libevent:= @@ -78,6 +79,9 @@ src_prepare() { "${FILESDIR}/build_fix2.patch" ) + # bug 620444 - ensure local headers are used + find "${S}" -type f -name "*.pr[fio]" | xargs sed -i -e 's|INCLUDEPATH += |&$$QTWEBENGINE_ROOT/include |' || die + qt_use_disable_config alsa alsa src/core/config/linux.pri qt_use_disable_config pulseaudio pulseaudio src/core/config/linux.pri |