Hello community, here is the log from the commit of package libqt5-qtwebkit for openSUSE:Factory checked in at 2018-02-28 19:59:44 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqt5-qtwebkit (Old) and /work/SRC/openSUSE:Factory/.libqt5-qtwebkit.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqt5-qtwebkit" Wed Feb 28 19:59:44 2018 rev:46 rq:579485 version:5.212~alpha2 Changes: -------- --- /work/SRC/openSUSE:Factory/libqt5-qtwebkit/libqt5-qtwebkit.changes 2018-02-19 12:59:32.665157326 +0100 +++ /work/SRC/openSUSE:Factory/.libqt5-qtwebkit.new/libqt5-qtwebkit.changes 2018-02-28 19:59:47.086361911 +0100 @@ -1,0 +2,14 @@ +Fri Feb 23 08:23:52 UTC 2018 - m...@suse.com + +- Re-ordering patches +- Add fix-nullptr-crash-in-QWebPage-selectedHtml-when-selectedRange.patch + * Fix crash in QWebPage::selectedHtml() when selectedRange is nullptr +- Add fix-nullTerminatedWCharToString-loses-last-character.patch + * Fix nullTerminatedWCharToString loses last character of input string + +------------------------------------------------------------------- +Thu Feb 15 07:52:57 UTC 2018 - fab...@ritter-vogt.de + +- Use gcc-7 on 42.3 to fix mismatch with the optflags + +------------------------------------------------------------------- New: ---- fix-nullTerminatedWCharToString-loses-last-character.patch fix-nullptr-crash-in-QWebPage-selectedHtml-when-selectedRange.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqt5-qtwebkit.spec ++++++ --- /var/tmp/diff_new_pack.NO8N4C/_old 2018-02-28 19:59:48.570308216 +0100 +++ /var/tmp/diff_new_pack.NO8N4C/_new 2018-02-28 19:59:48.574308070 +0100 @@ -39,25 +39,37 @@ Source: https://github.com/annulen/webkit/releases/download/%{tar_version}/%{tar_version}.tar.xz Source1: baselibs.conf Source99: libqt5-qtwebkit-rpmlintrc +# openSUSE specific patches # PATCH-FIX-OPENSUSE Enable X11 target build always as we didn't ship Xcb Plugin cmake file - m...@suse.com Patch0: enable_x11_target_always.patch # PATCH-FIX-OPENSUSE Patch1: tell-the-truth-about-private-api.patch +# PATCH-FIX-OPENSUSE +Patch2: qt5webkit-symver.patch + +# Upstream patches # PATCH-FIX-UPSTREAM Fix segfaults when built with gcc7 - m...@suse.com -Patch2: webkit-fix-WTF-StringImpl-copyChars-segfaults-with-gcc7.patch +Patch100: webkit-fix-WTF-StringImpl-copyChars-segfaults-with-gcc7.patch # PATCH-FIX-UPSTREAM Fix build when Qt uses OpenGL ES 2 -Patch3: fix-gles-detection.patch -# PATCH-FIX-OPENSUSE -Patch4: qt5webkit-symver.patch +Patch101: fix-gles-detection.patch # PATCH-FIX-UPSTREAM https://github.com/annulen/webkit/commit/f51554bf104ab0491370f66631fe46143a23d5c2 -Patch5: fix-build-with-cmake-3.10.diff +Patch102: fix-build-with-cmake-3.10.diff +Patch103: fix-nullTerminatedWCharToString-loses-last-character.patch +Patch104: fix-nullptr-crash-in-QWebPage-selectedHtml-when-selectedRange.patch # openSUSE Leap 42.x defaults to GCC 4 %if 0%{?suse_version} == 1315 +%if 0%{?sle_version} <= 120200 %define _cxx g++-6 %define _cc gcc-6 BuildRequires: gcc6 BuildRequires: gcc6-c++ +%else +%define _cxx g++-7 +%define _cc gcc-7 +BuildRequires: gcc7 +BuildRequires: gcc7-c++ +%endif #!BuildIgnore: libgcc_s1 %else %define _cxx g++ @@ -132,9 +144,11 @@ %patch0 -p1 %patch1 -p1 %patch2 -p1 -%patch3 -p1 -%patch4 -p1 -%patch5 -p1 +%patch100 -p1 +%patch101 -p1 +%patch102 -p1 +%patch103 -p1 +%patch104 -p1 %package -n %libname Summary: Qt 5 WebKit Widget library ++++++ fix-nullTerminatedWCharToString-loses-last-character.patch ++++++ >From 8368c860e2e7949dae175abb5bb87cd2e4bf8206 Mon Sep 17 00:00:00 2001 From: "annu...@yandex.ru" <annu...@yandex.ru@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Date: Wed, 18 Oct 2017 14:57:13 +0000 Subject: [PATCH] REGRESSION(r217771): nullTerminatedWCharToString loses last character of input string https://bugs.webkit.org/show_bug.cgi?id=178444 Reviewed by Per Arne Vollan. * wtf/text/win/WCharStringExtras.h: (WTF::nullTerminatedWCharToString): git-svn-id: http://svn.webkit.org/repository/webkit/trunk@223606 268f45cc-cd09-0410-ab3c-d52691b4dbfc --- Source/WTF/wtf/text/win/WCharStringExtras.h | 2 +- 1 files changed, 1 insertions(+), 1 deletion(-) diff --git a/Source/WTF/wtf/text/win/WCharStringExtras.h b/Source/WTF/wtf/text/win/WCharStringExtras.h index 9d004e51595..d41f46294d3 100644 --- a/Source/WTF/wtf/text/win/WCharStringExtras.h +++ b/Source/WTF/wtf/text/win/WCharStringExtras.h @@ -60,7 +60,7 @@ inline String wcharToString(const wchar_t* characters, unsigned length) inline String nullTerminatedWCharToString(const wchar_t* characters) { - return wcharToString(characters, wcslen(characters) - 1); + return wcharToString(characters, wcslen(characters)); } } // namespace WTF -- 2.16.1 ++++++ fix-nullptr-crash-in-QWebPage-selectedHtml-when-selectedRange.patch ++++++ >From 0e75f3272d149bc64899c161f150eb341a2417af Mon Sep 17 00:00:00 2001 From: Konstantin Tokarev <annu...@yandex.ru> Date: Thu, 28 Dec 2017 12:17:21 +0300 Subject: [PATCH] Fix crash in QWebPage::selectedHtml() when selectedRange is nullptr Change-Id: Ia618d5044ab0b4e8293c7d53de936b323982656c --- Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp b/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp index 89e872fb208..00dc0c48841 100644 --- a/Source/WebKit/qt/WebCoreSupport/QWebPageAdapter.cpp +++ b/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 -- 2.16.1
