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

Fix src/3rdparty/chromium/build/linux/unbundle/re2.gn

Browse Source
This commit is contained in:
Kevin Kofler 2017-06-10 23:28:39 +02:00
parent 0b8f82e836
commit ac7d2ae4c9
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
qt5-qtwebengine.spec
View File

@ -100,6 +100,8 @@ Patch12: qtwebengine-opensource-src-5.9.0-webrtc-neon-detect.patch
Patch20: qtwebengine-opensource-src-5.8.0-qt57.patch Patch20: qtwebengine-opensource-src-5.8.0-qt57.patch
# Force verbose output from the GN bootstrap process # Force verbose output from the GN bootstrap process
Patch21: qtwebengine-opensource-src-5.9.0-gn-bootstrap-verbose.patch Patch21: qtwebengine-opensource-src-5.9.0-gn-bootstrap-verbose.patch
# Fix src/3rdparty/chromium/build/linux/unbundle/re2.gn
Patch22: qtwebengine-opensource-src-5.9.0-system-re2.patch
# Backport upstream patch to fix GN FTBFS on aarch64 (QTBUG-61128) # Backport upstream patch to fix GN FTBFS on aarch64 (QTBUG-61128)
# https://codereview.qt-project.org/196178 # https://codereview.qt-project.org/196178
Patch100: qtwebengine-opensource-src-5.9.0-gn-aarch64.patch Patch100: qtwebengine-opensource-src-5.9.0-gn-aarch64.patch
@ -350,6 +352,7 @@ BuildArch: noarch
%patch12 -p1 -b .webrtc-neon-detect %patch12 -p1 -b .webrtc-neon-detect
%patch20 -p1 -b .qt57 %patch20 -p1 -b .qt57
%patch21 -p1 -b .gn-bootstrap-verbose %patch21 -p1 -b .gn-bootstrap-verbose
%patch22 -p1 -b .system-re2
%patch100 -p1 -b .gn-aarch64 %patch100 -p1 -b .gn-aarch64
%patch101 -p1 -b .aarch64-gcc-toolchain %patch101 -p1 -b .aarch64-gcc-toolchain
# fix // in #include in content/renderer/gpu to avoid debugedit failure # fix // in #include in content/renderer/gpu to avoid debugedit failure
@ -567,6 +570,7 @@ done
- Force verbose output from the GN bootstrap process - Force verbose output from the GN bootstrap process
- Backport upstream patch to fix GN FTBFS on aarch64 (QTBUG-61128) - Backport upstream patch to fix GN FTBFS on aarch64 (QTBUG-61128)
- Backport patch to fix FTBFS with GCC on aarch64 from upstream Chromium - Backport patch to fix FTBFS with GCC on aarch64 from upstream Chromium
- Fix src/3rdparty/chromium/build/linux/unbundle/re2.gn
* Sat May 13 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.8.0-14 * Sat May 13 2017 Rex Dieter <rdieter@fedoraproject.org> - 5.8.0-14
- fix rpm macros - fix rpm macros

24
qtwebengine-opensource-src-5.9.0-system-re2.patch Normal file
View File

@ -0,0 +1,24 @@
diff -ur qtwebengine-opensource-src-5.9.0/src/3rdparty/chromium/build/linux/unbundle/re2.gn qtwebengine-opensource-src-5.9.0-system-re2/src/3rdparty/chromium/build/linux/unbundle/re2.gn
--- qtwebengine-opensource-src-5.9.0/src/3rdparty/chromium/build/linux/unbundle/re2.gn 2017-05-18 16:51:44.000000000 +0200
+++ qtwebengine-opensource-src-5.9.0-system-re2/src/3rdparty/chromium/build/linux/unbundle/re2.gn 2017-06-10 23:22:13.065385884 +0200
@@ -5,13 +5,14 @@
import("//build/shim_headers.gni")
shim_headers("re2_shim") {
- root_path = "src"
+ root_path = "src/re2"
+ prefix = "re2/"
headers = [
- "re2/filtered_re2.h",
- "re2/re2.h",
- "re2/set.h",
- "re2/stringpiece.h",
- "re2/variadic_function.h",
+ "filtered_re2.h",
+ "re2.h",
+ "set.h",
+ "stringpiece.h",
+ "variadic_function.h",
]
}