On Fri Oct 26, 2018 at 05:19:15PM +0200, Rafael Sadowski wrote:
> Update Qt to the latest 5.9 TLS. I removed almost all libressl patches
> and the backports patches from upstream.
>
> Can any of the libressl fallas look over it? According to the tickets,
> everything's closed.
>
> I know it's crazy these days. Maybe someone will find a free bulk build
> slot for the diff below.
>
> Rafael Sadowski
>
> Index: Makefile.version
> ===================================================================
> RCS file: /cvs/ports/x11/qt5/Makefile.version,v
> retrieving revision 1.6
> diff -u -p -u -p -r1.6 Makefile.version
> --- Makefile.version 5 Jul 2018 09:49:13 -0000 1.6
> +++ Makefile.version 26 Oct 2018 15:05:44 -0000
> @@ -1,13 +1,13 @@
> # $OpenBSD: Makefile.version,v 1.6 2018/07/05 09:49:13 rsadowski Exp $
> # Common source for Qt5 version
>
> -QT5_VERSION = 5.9.6
> -QT5_DIST_VERSION = 5.9.6
> +QT5_VERSION = 5.9.7
> +QT5_DIST_VERSION = 5.9.7
> QT5_WEBKIT_VERSION = 5.9.0
>
> # This one is used for building dependencies for examples and documentation,
> # which obviously should be in sync with core packages.
> -QT5_NEXT_VERSION = 5.10
> +QT5_NEXT_VERSION = 5.12
>
It should stay that way for now. Note from Vadim. Thanks!
> RCS file: qtbase/patches/patch-config_tests_openssl_openssl_cpp
> diff -N qtbase/patches/patch-config_tests_openssl_openssl_cpp
> --- qtbase/patches/patch-config_tests_openssl_openssl_cpp 24 Oct 2017 10:12:19 -0000 1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,22 +0,0 @@
> -$OpenBSD: patch-config_tests_openssl_openssl_cpp,v 1.1 2017/10/24 10:12:19 rsadowski Exp $
> -LibreSSL _is_ fine.
> -Index: config.tests/openssl/openssl.cpp
> ---- config.tests/openssl/openssl.cpp.orig
> -+++ config.tests/openssl/openssl.cpp
> -@@ -38,16 +38,7 @@
> - ****************************************************************************/
> -
> - #include <openssl/opensslv.h>
> --
> --#if !defined(OPENSSL_VERSION_NUMBER) || OPENSSL_VERSION_NUMBER-0 < 0x0090700fL
> --# error "OpenSSL >= 0.9.7 is required"
> --
No comments:
Post a Comment