On Mon Mar 16, 2020 at 06:17:38AM +0100, Rafael Sadowski wrote:
> Simple update qtwebkit to the latest version 5.212.0 Alpha 4:
>
> Release log:
> - https://github.com/qtwebkit/qtwebkit/releases/tag/qtwebkit-5.212.0-alpha4
>
> Port changes:
> - Add missing python model after reading release notes "QtWebKit does
> not require Python 2 anymore for building and can use Python 3
> instead"
> - removed icu patched, it has been merged upstream.
>
> Tested with otter-browser on amd64.
>
I would like to see this in the next release.
> OK?
>
> Index: Makefile
> ===================================================================
> RCS file: /cvs/ports/x11/qt5/qtwebkit/Makefile,v
> retrieving revision 1.19
> diff -u -p -u -p -r1.19 Makefile
> --- Makefile 25 Feb 2020 14:03:00 -0000 1.19
> +++ Makefile 16 Mar 2020 05:05:27 -0000
> @@ -9,15 +9,15 @@ CATEGORIES = www
> DPB_PROPERTIES = parallel
>
> VERSION = ${QT5_WEBKIT_VERSION}
> -DISTNAME = qtwebkit-${QT5_WEBKIT_VERSION}-alpha3
> +DISTNAME = qtwebkit-${QT5_WEBKIT_VERSION}-alpha4
> PKGNAME = qtwebkit-${QT5_WEBKIT_VERSION}
> -REVISION = 0
> +REVISION = 1
Any concept howto handle the version bump -alpha3 to -alpha4? We have
only rc[N], beta[N], pre[N], and pl[N]. Would it makes sense to add a
alpha[N]? We could of course also use EPOCH here.
Any opinions?
>
> -SHARED_LIBS += Qt5WebKit 3.0 # 5.9
> -SHARED_LIBS += Qt5WebKitWidgets 3.0 # 5.9
> +SHARED_LIBS += Qt5WebKit 3.1 # 5.9
> +SHARED_LIBS += Qt5WebKitWidgets 3.1 # 5.9
> SHARED_LIBS += JavaScriptCore 0.0 # 5.212.9
> -SHARED_LIBS += WebCore 0.0 # 5.212.9
> -SHARED_LIBS += WebKit2 0.0 # 5.212.9
> +SHARED_LIBS += WebCore 1.0 # 5.212.9
> +SHARED_LIBS += WebKit2 0.1 # 5.212.9
> SHARED_LIBS += WTF 0.0 # 5.212.9
>
> # Mostly LGPLv2.1 or LGPLv3 for code; FDLv1.3 for documentation.
> @@ -37,6 +37,7 @@ WANTLIB += hyphen icui18n icuuc jpeg m p
> MASTER_SITES =
> https://github.com/annulen/webkit/releases/download/${DISTNAME}/
>
> MODULES = devel/cmake \
> + lang/python \
> lang/ruby \
> x11/qt5
>
> @@ -46,6 +47,7 @@ CONFIGURE_STYLE = cmake
> # Remove default "first" target and build all
> ALL_TARGET =
>
> +MODPY_VERSION = ${MODPY_DEFAULT_VERSION_3}
> MODPY_RUNDEP = No
> MODRUBY_RUNDEP = No
>
> Index: distinfo
> ===================================================================
> RCS file: /cvs/ports/x11/qt5/qtwebkit/distinfo,v
> retrieving revision 1.3
> diff -u -p -u -p -r1.3 distinfo
> --- distinfo 19 Feb 2020 16:08:53 -0000 1.3
> +++ distinfo 16 Mar 2020 05:05:27 -0000
> @@ -1,2 +1,2 @@
> -SHA256 (qt/qtwebkit-5.212.0-alpha3.tar.xz) =
> NX7uWCRFV0Ry5BDr7OYy0G+g7JQ1j8Q0XypxOSLfXhc=
> -SIZE (qt/qtwebkit-5.212.0-alpha3.tar.xz) = 12457896
> +SHA256 (qt/qtwebkit-5.212.0-alpha4.tar.xz) =
> nKEm2pJzZk3SOjzNDJvrzre7U0vd10PbMcr2pabUqeY=
> +SIZE (qt/qtwebkit-5.212.0-alpha4.tar.xz) = 12528508
> Index: patches/patch-Source_JavaScriptCore_CMakeLists_txt
> ===================================================================
> RCS file:
> /cvs/ports/x11/qt5/qtwebkit/patches/patch-Source_JavaScriptCore_CMakeLists_txt,v
> retrieving revision 1.1
> diff -u -p -u -p -r1.1 patch-Source_JavaScriptCore_CMakeLists_txt
> --- patches/patch-Source_JavaScriptCore_CMakeLists_txt 19 Feb 2020
> 16:08:53 -0000 1.1
> +++ patches/patch-Source_JavaScriptCore_CMakeLists_txt 16 Mar 2020
> 05:05:27 -0000
> @@ -3,7 +3,7 @@ $OpenBSD: patch-Source_JavaScriptCore_CM
> Index: Source/JavaScriptCore/CMakeLists.txt
> --- Source/JavaScriptCore/CMakeLists.txt.orig
> +++ Source/JavaScriptCore/CMakeLists.txt
> -@@ -1286,6 +1286,7 @@ elseif (WTF_CPU_S390)
> +@@ -1287,6 +1287,7 @@ elseif (WTF_CPU_S390)
> elseif (WTF_CPU_S390X)
> elseif (WTF_CPU_MIPS)
> elseif (WTF_CPU_SH4)
> Index: patches/patch-Source_WebCore_dom_Document_cpp
> ===================================================================
> RCS file: patches/patch-Source_WebCore_dom_Document_cpp
> diff -N patches/patch-Source_WebCore_dom_Document_cpp
> --- patches/patch-Source_WebCore_dom_Document_cpp 19 Feb 2020 16:08:53
> -0000 1.2
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,31 +0,0 @@
> -$OpenBSD: patch-Source_WebCore_dom_Document_cpp,v 1.2 2020/02/19 16:08:53
> rsadowski Exp $
> -
> -Fix build with icu4c >=65
> -
> -Index: Source/WebCore/dom/Document.cpp
> ---- Source/WebCore/dom/Document.cpp.orig
> -+++ Source/WebCore/dom/Document.cpp
> -@@ -4407,12 +4407,12 @@ static bool isValidNameNonASCII(const UChar*
> character
> - unsigned i = 0;
> -
> - UChar32 c;
> -- U16_NEXT(characters, i, length, c)
> -+ U16_NEXT(characters, i, length, c);
> - if (!isValidNameStart(c))
> - return false;
> -
> - while (i < length) {
> -- U16_NEXT(characters, i, length, c)
> -+ U16_NEXT(characters, i, length, c);
> - if (!isValidNamePart(c))
> - return false;
> - }
> -@@ -4474,7 +4474,7 @@ bool Document::parseQualifiedName(const String& qualif
> -
> - for (unsigned i = 0; i < length;) {
> - UChar32 c;
> -- U16_NEXT(qualifiedName, i, length, c)
> -+ U16_NEXT(qualifiedName, i, length, c);
> - if (c == ':') {
> - if (sawColon) {
> - ec = NAMESPACE_ERR;
> Index: patches/patch-Source_WebKit_qt_WebCoreSupport_QWebFrameAdapter_cpp
> ===================================================================
> RCS file:
> /cvs/ports/x11/qt5/qtwebkit/patches/patch-Source_WebKit_qt_WebCoreSupport_QWebFrameAdapter_cpp,v
> retrieving revision 1.1
> diff -u -p -u -p -r1.1
> patch-Source_WebKit_qt_WebCoreSupport_QWebFrameAdapter_cpp
> --- patches/patch-Source_WebKit_qt_WebCoreSupport_QWebFrameAdapter_cpp
> 19 Feb 2020 16:08:53 -0000 1.1
> +++ patches/patch-Source_WebKit_qt_WebCoreSupport_QWebFrameAdapter_cpp
> 16 Mar 2020 05:05:27 -0000
> @@ -3,7 +3,7 @@ $OpenBSD: patch-Source_WebKit_qt_WebCore
> Index: Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp
> --- Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp.orig
> +++ Source/WebKit/qt/WebCoreSupport/QWebFrameAdapter.cpp
> -@@ -964,6 +964,9 @@ void QWebFrameAdapter::setViewportSize(const QSize& si
> +@@ -965,6 +965,9 @@ void QWebFrameAdapter::setViewportSize(const QSize& si
> if (view->needsLayout())
> view->layout();
> view->adjustViewSize();
>
