rpms/qt5-qtwebengine
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix FTBFS

Browse Source
This commit is contained in:
Than Ngo 2020-09-06 10:44:40 +02:00
parent 9f9009e6e2
commit 0f2066a515
2 changed files with 61 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
qt5-qtwebengine.spec
View File

@ -53,7 +53,7 @@
Summary: Qt5 - QtWebEngine components
Name: qt5-qtwebengine
Version: 5.15.0
Release: 3%{?dist}
Release: 4%{?dist}
# See LICENSE.GPL LICENSE.LGPL LGPL_EXCEPTION.txt, for details
# See also http://qt-project.org/doc/qt-5.0/qtdoc/licensing.html
@ -102,6 +102,7 @@ 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
@ -400,6 +401,8 @@ 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"
@ -462,7 +465,7 @@ export NINJA_PATH=%{__ninja}
%{qmake_qt5} \
%{?debug_config:CONFIG+="%{debug_config}}" \
CONFIG+="link_pulseaudio" \
CONFIG+="link_pulseaudio use_gold_linker" \
%{?use_system_libicu:QMAKE_EXTRA_ARGS+="-system-webengine-icu"} \
QMAKE_EXTRA_ARGS+="-webengine-kerberos" \
.
@ -629,6 +632,9 @@ done
%changelog
* Fri Sep 04 2020 Than Ngo <than@redhat.com> - 5.15.0-4
- Fix FTBFS
* Sat Aug 01 2020 Fedora Release Engineering <releng@fedoraproject.org> - 5.15.0-3
- Second attempt - Rebuilt for
https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild

53
qtwebengine-opensource-bison-37.patch Normal file
View File

@ -0,0 +1,53 @@
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