D15210.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D15210.diff
View Options

	Index: head/www/qt5-webkit/Makefile
	===================================================================
	--- head/www/qt5-webkit/Makefile
	+++ head/www/qt5-webkit/Makefile
	@@ -2,7 +2,7 @@

	PORTNAME= webkit
	DISTVERSION= 5.212.0-alpha2
	-PORTREVISION= 7
	+PORTREVISION= 8
	CATEGORIES= www
	MASTER_SITES= https://github.com/annulen/${PORTNAME}/releases/download/${DISTNAME}/
	PKGNAMEPREFIX= qt5-
	Index: head/www/qt5-webkit/files/patch-Source_WebKit_qt_WebCoreSupport_QWebPageAdapter.cpp
	===================================================================
	--- head/www/qt5-webkit/files/patch-Source_WebKit_qt_WebCoreSupport_QWebPageAdapter.cpp
	+++ head/www/qt5-webkit/files/patch-Source_WebKit_qt_WebCoreSupport_QWebPageAdapter.cpp
	@@ -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