Index: head/www/qt5-webkit/Makefile =================================================================== --- head/www/qt5-webkit/Makefile (revision 528539) +++ head/www/qt5-webkit/Makefile (revision 528540) @@ -1,61 +1,62 @@ # $FreeBSD$ PORTNAME= webkit -DISTVERSION= 5.212.0-alpha3 -PORTREVISION= 6 +DISTVERSION= 5.212.0-alpha4 CATEGORIES= www MASTER_SITES= https://github.com/qt${PORTNAME}/qt${PORTNAME}/releases/download/${DISTNAME}/ PKGNAMEPREFIX= qt5- DISTNAME= qt${PORTNAME}-${DISTVERSION} MAINTAINER= kde@FreeBSD.org COMMENT= QtWebKit with a more modern WebKit code base LIB_DEPENDS= libfontconfig.so:x11-fonts/fontconfig \ libhyphen.so:textproc/hyphen \ libicui18n.so:devel/icu \ libpng.so:graphics/png \ libwebp.so:graphics/webp \ libwoff2dec.so:devel/woff2 USES= bison cmake compiler:c++11-lang gnome gperf jpeg \ - pathfix perl5 pkgconfig python:2.7,build qt:5 sqlite:3 \ + pathfix perl5 pkgconfig python:3.5+,build qt:5 sqlite:3 \ tar:xz xorg USE_GNOME= glib20 libxml2 libxslt USE_PERL5= build USE_QT= core declarative gui location network opengl printsupport \ sensors testlib webchannel widgets \ buildtools_build qmake_build USE_RUBY= yes USE_XORG= x11 xcomposite xrender # Fix pkgconfig install paths. PATHFIX_CMAKELISTSTXT= PlatformQt.cmake RUBY_NO_RUN_DEPENDS= yes CMAKE_ARGS= -DPORT:STRING="Qt" \ -DKDE_INSTALL_INCLUDEDIR:PATH="${QT_INCDIR_REL}" \ -DKDE_INSTALL_LIBDIR:PATH="${QT_LIBDIR_REL}" CMAKE_ON= ENABLE_OPENGL CMAKE_OFF= USE_QT_MULTIMEDIA USE_LD_GOLD # Add -DNDEBUG to CXXFLAGS which in turn gets sucked into # CMAKE_CXX_FLAGS_RELEASE where we actually want to have it. # [for the ASSERT in Source/WebCore/platform/graphics/texmap/GraphicsLayerTextureMapper.cpp ] CXXFLAGS+= -DNDEBUG PLIST_SUB= FULLVER="${PORTVERSION:R}" SUB_FILES= pkg-install SUB_LIST= QT_INCDIR="${QT_INCDIR}" OPTIONS_DEFINE= GSTREAMER OPTIONS_DEFAULT= GSTREAMER GSTREAMER_LIB_DEPENDS= libgstapp-1.0.so:multimedia/gstreamer1-plugins \ libgstbase-1.0.so:multimedia/gstreamer1 GSTREAMER_USE= GSTREAMER1=core GSTREAMER_CMAKE_OFF= -DUSE_GSTREAMER:BOOL=OFF + +BINARY_ALIAS= python3=${PYTHON_CMD} .include Index: head/www/qt5-webkit/distinfo =================================================================== --- head/www/qt5-webkit/distinfo (revision 528539) +++ head/www/qt5-webkit/distinfo (revision 528540) @@ -1,3 +1,3 @@ -TIMESTAMP = 1561888451 -SHA256 (qtwebkit-5.212.0-alpha3.tar.xz) = 357eee582445574472e410ebece632d06fa0ec94358fc4345f2a713922df5e17 -SIZE (qtwebkit-5.212.0-alpha3.tar.xz) = 12457896 +TIMESTAMP = 1584376405 +SHA256 (qtwebkit-5.212.0-alpha4.tar.xz) = 9ca126da9273664dd23a3ccd0c9bebceb7bb534bddd743db31caf6a5a6d4a9e6 +SIZE (qtwebkit-5.212.0-alpha4.tar.xz) = 12528508 Index: head/www/qt5-webkit/files/patch-Source_WebCore_dom_Document.cpp =================================================================== --- head/www/qt5-webkit/files/patch-Source_WebCore_dom_Document.cpp (revision 528539) +++ head/www/qt5-webkit/files/patch-Source_WebCore_dom_Document.cpp (nonexistent) @@ -1,42 +0,0 @@ -Regressed by https://github.com/unicode-org/icu/commit/480bec3ea652 - -In file included from Source/WebCore/dom/DOMAllInOne.cpp:67: -Source/WebCore/dom/Document.cpp:4410:39: error: expected ';' after do/while statement - U16_NEXT(characters, i, length, c) - ^ - ; -Source/WebCore/dom/Document.cpp:4415:43: error: expected ';' after do/while statement - U16_NEXT(characters, i, length, c) - ^ - ; -Source/WebCore/dom/Document.cpp:4477:46: error: expected ';' after do/while statement - U16_NEXT(qualifiedName, i, length, c) - ^ - ; - ---- Source/WebCore/dom/Document.cpp.orig 2019-06-26 16:25:02 UTC -+++ 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; Property changes on: head/www/qt5-webkit/files/patch-Source_WebCore_dom_Document.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property