[packages/qt5-qtwebengine] fix build with icu 65; rel 2

atler atler at pld-linux.org
Wed Oct 9 00:41:05 CEST 2019


commit 53b0aebeaeb0e6d772c777b74ab3850f8593ced3
Author: Jan Palus <atler at pld-linux.org>
Date:   Wed Oct 9 00:05:23 2019 +0200

    fix build with icu 65; rel 2

 icu65.patch          | 12 ++++++++++++
 qt5-qtwebengine.spec |  8 +++++---
 2 files changed, 17 insertions(+), 3 deletions(-)
---
diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec
index 38e30a2..13475f9 100644
--- a/qt5-qtwebengine.spec
+++ b/qt5-qtwebengine.spec
@@ -8,14 +8,15 @@ Summary:	The Qt5 WebEngine library
 Summary(pl.UTF-8):	Biblioteka Qt5 WebEngine
 Name:		qt5-%{orgname}
 Version:	5.13.1
-Release:	1
+Release:	2
 License:	LGPL v3 or GPL v2+ or commercial
 Group:		X11/Libraries
 Source0:	http://download.qt.io/official_releases/qt/5.13/%{version}/submodules/%{orgname}-everywhere-src-%{version}.tar.xz
 # Source0-md5:	0f6a3e3d9c1a17be769fca94d4a8f7cb
 Patch0:		remove-compiler-check.patch
 Patch1:		x32.patch
-Patch2:		pulseaudio13.patch
+Patch2:		icu65.patch
+Patch3:		pulseaudio13.patch
 URL:		http://www.qt.io/
 BuildRequires:	Mesa-khrplatform-devel
 BuildRequires:	Qt5Core-devel >= %{version}
@@ -181,8 +182,9 @@ Przykłady do biblioteki Qt5 WebEngine.
 %ifarch x32
 %patch1 -p1
 %endif
+%patch2 -p1
 cd ./src/3rdparty/chromium
-%patch2 -p2
+%patch3 -p2
 
 %build
 %ifarch x32
diff --git a/icu65.patch b/icu65.patch
new file mode 100644
index 0000000..155c75f
--- /dev/null
+++ b/icu65.patch
@@ -0,0 +1,12 @@
+diff -urN qtwebengine-everywhere-src-5.13.1.orig/src/3rdparty/chromium/third_party/blink/renderer/core/dom/document.cc qtwebengine-everywhere-src-5.13.1/src/3rdparty/chromium/third_party/blink/renderer/core/dom/document.cc
+--- qtwebengine-everywhere-src-5.13.1.orig/src/3rdparty/chromium/third_party/blink/renderer/core/dom/document.cc	2019-08-09 15:46:06.000000000 +0200
++++ qtwebengine-everywhere-src-5.13.1/src/3rdparty/chromium/third_party/blink/renderer/core/dom/document.cc	2019-10-09 00:00:16.500761947 +0200
+@@ -5710,7 +5710,7 @@
+ 
+   for (unsigned i = 0; i < length;) {
+     UChar32 c;
+-    U16_NEXT(characters, i, length, c)
++    U16_NEXT(characters, i, length, c);
+     if (c == ':') {
+       if (saw_colon)
+         return ParseQualifiedNameResult(kQNMultipleColons);
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/qt5-qtwebengine.git/commitdiff/53b0aebeaeb0e6d772c777b74ab3850f8593ced3



More information about the pld-cvs-commit mailing list