Index: branches/2018Q2/www/qt5-webkit/Makefile
===================================================================
--- branches/2018Q2/www/qt5-webkit/Makefile	(revision 468622)
+++ branches/2018Q2/www/qt5-webkit/Makefile	(revision 468623)
@@ -1,53 +1,53 @@
 # $FreeBSD$
 
 PORTNAME=		webkit
 DISTVERSION=		5.212.0-alpha2
-PORTREVISION=		6
+PORTREVISION=		7
 CATEGORIES=		www
 MASTER_SITES=		https://github.com/annulen/${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 \
 			libgstapp-1.0.so:multimedia/gstreamer1-plugins \
 			libgstbase-1.0.so:multimedia/gstreamer1 \
 			libhyphen.so:textproc/hyphen \
 			libicui18n.so:devel/icu \
 			libpng.so:graphics/png \
 			libwebp.so:graphics/webp
 
 USES=			bison cmake:outsource gperf jpeg pathfix perl5 pkgconfig \
 			python:2.7,build sqlite:3 tar:xz
 USE_GNOME=		glib20 libxml2 libxslt
 USE_GSTREAMER1=		core
 USE_QT5=		core gui location network opengl printsupport \
 			qml quick 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}" \
 			-DENABLE_OPENGL:BOOL=TRUE \
 			-DUSE_QT_MULTIMEDIA:BOOL=FALSE
 
 # 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}"
 
 .include <bsd.port.mk>
Index: branches/2018Q2/www/qt5-webkit/files/patch-Source_WebKit_qt_WebCoreSupport_QWebPageAdapter.cpp
===================================================================
--- branches/2018Q2/www/qt5-webkit/files/patch-Source_WebKit_qt_WebCoreSupport_QWebPageAdapter.cpp	(nonexistent)
+++ branches/2018Q2/www/qt5-webkit/files/patch-Source_WebKit_qt_WebCoreSupport_QWebPageAdapter.cpp	(revision 468623)
@@ -0,0 +1,18 @@
+Fix crash in QWebPage::selectedHtml() when selectedRange is nullptr
+
+obtained from: https://github.com/annulen/webkit/commit/0e75f3272d149bc64899c161f150eb341a2417af
+
+--- Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp.orig	2017-06-09 14:11:36 UTC
++++ Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp
+@@ -390,7 +390,10 @@ QString QWebPageAdapter::selectedText() const
+ 
+ QString QWebPageAdapter::selectedHtml() const
+ {
+-    return page->focusController().focusedOrMainFrame().editor().selectedRange()->toHTML();
++    RefPtr<Range> range = page->focusController().focusedOrMainFrame().editor().selectedRange();
++    if (!range)
++        return QString();
++    return range->toHTML();
+ }
+ 
+ bool QWebPageAdapter::isContentEditable() const

Property changes on: branches/2018Q2/www/qt5-webkit/files/patch-Source_WebKit_qt_WebCoreSupport_QWebPageAdapter.cpp
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: branches/2018Q2
===================================================================
--- branches/2018Q2	(revision 468622)
+++ branches/2018Q2	(revision 468623)

Property changes on: branches/2018Q2
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head:r468386