From dd10f9666dbe668aedaf6c4c337b4c749e5d4a07 Mon Sep 17 00:00:00 2001 From: "fuhua.wang" Date: Fri, 30 Jul 2021 14:19:25 +0800 Subject: [PATCH 1/2] =?UTF-8?q?[=E9=98=9F=E5=90=8D:=20=E5=A4=A7=E5=8A=9B?= =?UTF-8?q?=E5=87=BA=E5=A5=87=E8=BF=B9][=E9=A1=B9=E7=9B=AE:=20=E9=B2=B2?= =?UTF-8?q?=E9=B9=8F=E5=BA=94=E7=94=A8=E5=88=9B=E5=85=88=E5=A4=A7=E8=B5=9B?= =?UTF-8?q?openeuler-qt5-qtwebengine=E7=BC=96=E8=AF=91=E4=BC=98=E5=8C=96]?= =?UTF-8?q?=20[=E6=96=B9=E6=A1=88=E8=AF=B4=E6=98=8E=EF=BC=9A=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E7=BC=96=E8=AF=91=E9=97=AE=E9=A2=98]=20[=E6=96=B9?= =?UTF-8?q?=E6=A1=88=E9=A3=8E=E9=99=A9=EF=BC=9A=E6=97=A0]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- qt5-qtwebengine.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index 72aeacf..12ebcd0 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -6,7 +6,7 @@ Name: qt5-qtwebengine Version: 5.11.1 -Release: 10 +Release: 11 Summary: Qt5 - QtWebEngine components License: (LGPLv2 with exceptions or GPLv3 with exceptions) and BSD and LGPLv2+ and ASL 2.0 and IJG and MIT and GPLv2+ and ISC and OpenSSL and (MPLv1.1 or GPLv2 or LGPLv2) URL: http://www.qt.io -- Gitee From ad15871e8cdf82b7337a75edeab500e9527b95dc Mon Sep 17 00:00:00 2001 From: "fuhua.wang" Date: Fri, 30 Jul 2021 14:43:19 +0800 Subject: [PATCH 2/2] =?UTF-8?q?[=E9=98=9F=E5=90=8D:=20=E5=A4=A7=E5=8A=9B?= =?UTF-8?q?=E5=87=BA=E5=A5=87=E8=BF=B9][=E9=A1=B9=E7=9B=AE:=20=E9=B2=B2?= =?UTF-8?q?=E9=B9=8F=E5=BA=94=E7=94=A8=E5=88=9B=E5=85=88=E5=A4=A7=E8=B5=9B?= =?UTF-8?q?openeuler-qt5-qtwebengine=E7=BC=96=E8=AF=91=E4=BC=98=E5=8C=96]?= =?UTF-8?q?=20[=E6=96=B9=E6=A1=88=E8=AF=B4=E6=98=8E=EF=BC=9A=E9=AA=8C?= =?UTF-8?q?=E8=AF=81=E7=BC=96=E8=AF=91=E9=97=AE=E9=A2=98]=20[=E6=96=B9?= =?UTF-8?q?=E6=A1=88=E9=A3=8E=E9=99=A9=EF=BC=9A=E6=97=A0]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- qt5-qtwebengine.spec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index 12ebcd0..06f79fe 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -55,7 +55,7 @@ BuildRequires: pkgconfig(opus) pkgconfig(libevent) pkgconfig(zlib) pkgconfig(mi BuildRequires: pkgconfig(xi) pkgconfig(xcursor) pkgconfig(xext) pkgconfig(xfixes) pkgconfig(xrender) BuildRequires: pkgconfig(xdamage) pkgconfig(xcomposite) pkgconfig(xtst) pkgconfig(xrandr) pkgconfig(xscrnsaver) BuildRequires: pkgconfig(libcap) pkgconfig(libpulse) pkgconfig(alsa) pkgconfig(libpci) pkgconfig(dbus-1) -BuildRequires: pkgconfig(nss) pkgconfig(lcms2) perl-interpreter python2 pkgconfig(glib-2.0) +BuildRequires: pkgconfig(nss) pkgconfig(lcms2) perl-interpreter python3 pkgconfig(glib-2.0) Provides: bundled(chromium) = 61.0.3163.140 bundled(angle) = 2422 bundled(boringssl) bundled(brotli) Provides: bundled(ffmpeg) = 3.3 bundled(hunspell) = 1.6.0 bundled(iccjpeg) bundled(khronos_headers) Provides: bundled(leveldb) = 1.20 bundled(libjingle) bundled(libsrtp) = 2.1.0 bundled(libvpx) = 1.6.1 @@ -99,7 +99,7 @@ sed -i -e 's!\./!!g' src/3rdparty/chromium/third_party/angle/src/compiler/prepro sed -i -e '/toolprefix = /d' -e 's/\${toolprefix}//g' src/3rdparty/chromium/build/toolchain/linux/BUILD.gn cp -bv /usr/include/re2/*.h src/3rdparty/chromium/third_party/re2/src/re2/ cd src/3rdparty -python2 chromium/tools/licenses.py --file-template ../../tools/about_credits.tmpl \ +python3 chromium/tools/licenses.py --file-template ../../tools/about_credits.tmpl \ --entry-template ../../tools/about_credits_entry.tmpl credits >../webengine/doc/src/qtwebengine-3rdparty.qdoc cd - cp -p src/3rdparty/chromium/LICENSE LICENSE.Chromium -- Gitee