5.15.1
This commit is contained in:
Jan Grulich
parent
0f2066a515
commit
c3347b713e
1
.gitignore
vendored
1
.gitignore
vendored
@ -12,3 +12,4 @@
|
||||
/qtwebengine-everywhere-src-5.14.1-clean.tar.xz
|
||||
/qtwebengine-everywhere-src-5.14.2-clean.tar.xz
|
||||
/qtwebengine-everywhere-src-5.15.0-clean.tar.xz
|
||||
/qtwebengine-everywhere-src-5.15.1-clean.tar.xz
|
||||
|
||||
@ -52,8 +52,8 @@
|
||||
|
||||
Summary: Qt5 - QtWebEngine components
|
||||
Name: qt5-qtwebengine
|
||||
Version: 5.15.0
|
||||
Release: 4%{?dist}
|
||||
Version: 5.15.1
|
||||
Release: 1%{?dist}
|
||||
|
||||
# See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
|
||||
# See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html
|
||||
@ -61,8 +61,8 @@ Release: 4%{?dist}
|
||||
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
|
||||
# leaned tarball with patent-encumbered codecs removed from the bundled FFmpeg
|
||||
# wget http://download.qt.io/official_releases/qt/5.14/5.14.2/submodules/qtwebengine-everywhere-src-5.14.2.tar.xz
|
||||
# ./clean_qtwebengine.sh 5.14.2
|
||||
# wget http://download.qt.io/official_releases/qt/5.15/5.15.1/submodules/qtwebengine-everywhere-src-5.15.1.tar.xz
|
||||
# ./clean_qtwebengine.sh 5.15.1
|
||||
Source0: qtwebengine-everywhere-src-%{version}-clean.tar.xz
|
||||
# cleanup scripts used above
|
||||
Source1: clean_qtwebengine.sh
|
||||
@ -101,8 +101,6 @@ Patch24: qtwebengine-everywhere-src-5.11.3-aarch64-new-stat.patch
|
||||
Patch26: qtwebengine-everywhere-5.13.2-use-python2.patch
|
||||
|
||||
## Upstream patches:
|
||||
# qtwebengine-chromium
|
||||
Patch100: qtwebengine-opensource-bison-37.patch
|
||||
|
||||
%if 0%{?fedora} || 0%{?epel} > 7
|
||||
# handled by qt5-srpm-macros, which defines %%qt5_qtwebengine_arches
|
||||
@ -401,8 +399,6 @@ popd
|
||||
%patch24 -p1 -b .aarch64-new-stat
|
||||
%patch26 -p1 -b .use-python2
|
||||
|
||||
%patch100 -p1 -b .bison37
|
||||
|
||||
# the xkbcommon config/feature was renamed in 5.12, so need to adjust QT_CONFIG references
|
||||
# when building on older Qt releases
|
||||
%if "%{_qt5_version}" < "5.12.0"
|
||||
@ -632,6 +628,9 @@ done
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Sep 11 2020 Jan Grulich <jgrulich@redhat.com> - 5.15.1-1
|
||||
- 5.15.1
|
||||
|
||||
* Fri Sep 04 2020 Than Ngo <than@redhat.com> - 5.15.0-4
|
||||
- Fix FTBFS
|
||||
|
||||
|
||||
@ -1,53 +0,0 @@
|
||||
From 1a53f5995697f5ac6fd501dbdc0ee39c9488ee66 Mon Sep 17 00:00:00 2001
|
||||
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
|
||||
Date: Fri, 14 Aug 2020 16:38:48 +0200
|
||||
Subject: [PATCH 1/1] Fix bison 3.7
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=utf8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Do a replace run inspired by newer versions of the script.
|
||||
|
||||
Fixes: QTBUG-86018
|
||||
Change-Id: Ib1dc771e22a662aff0fae842d135ad58fad08bc1
|
||||
Reviewed-by: Michael Brüning <michael.bruning@qt.io>
|
||||
---
|
||||
.../blink/renderer/build/scripts/rule_bison.py | 19 +++++++++++++++++++
|
||||
1 file changed, 19 insertions(+)
|
||||
|
||||
diff --git qtwebengine-everywhere-src-5.15.0/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/rule_bison.py qtwebengine-everywhere-src-5.15.0/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/rule_bison.py
|
||||
index f75e25fd23f..7e0767e951a 100755
|
||||
--- qtwebengine-everywhere-src-5.15.0/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/rule_bison.py
|
||||
+++ qtwebengine-everywhere-src-5.15.0/src/3rdparty/chromium/third_party/blink/renderer/build/scripts/rule_bison.py
|
||||
@@ -45,6 +45,19 @@ from utilities import abs
|
||||
|
||||
from blinkbuild.name_style_converter import NameStyleConverter
|
||||
|
||||
+def modify_file(path, prefix_lines, suffix_lines, replace_list=[]):
|
||||
+ prefix_lines = map(lambda s: s + '\n', prefix_lines)
|
||||
+ suffix_lines = map(lambda s: s + '\n', suffix_lines)
|
||||
+ with open(path, 'r') as f:
|
||||
+ old_lines = f.readlines()
|
||||
+ for i in range(len(old_lines)):
|
||||
+ for src, dest in replace_list:
|
||||
+ old_lines[i] = old_lines[i].replace(src, dest)
|
||||
+ new_lines = prefix_lines + old_lines + suffix_lines
|
||||
+ with open(path, 'w') as f:
|
||||
+ f.writelines(new_lines)
|
||||
+
|
||||
+
|
||||
assert len(sys.argv) == 4 or len(sys.argv) == 5
|
||||
|
||||
inputFile = abs(sys.argv[1])
|
||||
@@ -115,3 +128,9 @@ print >>outputHFile, '#define %s' % headerGuard
|
||||
print >>outputHFile, outputHContents
|
||||
print >>outputHFile, '#endif // %s' % headerGuard
|
||||
outputHFile.close()
|
||||
+
|
||||
+common_replace_list = [(inputRoot + '.hh',
|
||||
+ inputRoot + '.h')]
|
||||
+modify_file(
|
||||
+ outputCpp, [], [],
|
||||
+ replace_list=common_replace_list)
|
||||
--
|
||||
2.16.3
|
||||
2
sources
2
sources
@ -1,2 +1,2 @@
|
||||
SHA512 (qtwebengine-everywhere-src-5.15.0-clean.tar.xz) = 888c29bb1d461e2fee369c84938de7738ff56f95a63bb91df0f6ecbc46b1cbe5a6787486c15972dea1e210afe4f7adc65ef0926cf1de6545a532d3a85dec54af
|
||||
SHA512 (qtwebengine-everywhere-src-5.15.1-clean.tar.xz) = 13c71bce833ba46f16e3171b7b79d999db1688eae9000850c30274f5e68677b5338cb298b8f68b58f606135da538e3a2068e45545574e8bf462d0c314f36719a
|
||||
SHA512 (pulseaudio-12.2-headers.tar.gz) = a5a9bcbb16030b3bc83cc0cc8f5e7f90e0723d3e83258a5c77eacb32eaa267118a73fa7814fbcc99a24e4907916a2b371ebb6dedc4f45541c3acf6c834fd35be
|
||||
|
||||
Loading…
Reference in New Issue
Block a user