update linux-pri.patch for python2
...instead of fixing it seperately
This commit is contained in:
parent
6ef5248a05
commit
6df43488ca
@ -77,8 +77,6 @@ Patch2: qtwebengine-opensource-src-5.12.1-fix-extractcflag.patch
|
||||
# disable NEON vector instructions on ARM where the NEON code FTBFS due to
|
||||
# GCC bug https://bugzilla.redhat.com/show_bug.cgi?id=1282495
|
||||
Patch3: qtwebengine-opensource-src-5.9.0-no-neon.patch
|
||||
# python -> python2
|
||||
Patch7: qtwebengine-everywhere-src-5.12.1-python2.patch
|
||||
# remove Android dependencies from openmax_dl ARM NEON detection (detect.c)
|
||||
Patch10: qtwebengine-opensource-src-5.9.0-openmax-dl-neon.patch
|
||||
# Force verbose output from the GN bootstrap process
|
||||
|
@ -19,5 +19,5 @@ diff -ur qtwebengine-everywhere-src-5.10.0/src/core/config/linux.pri qtwebengine
|
||||
+CHROMIUM_SRC_DIR = "$$QTWEBENGINE_ROOT/$$getChromiumSrcDir()"
|
||||
+R_G_F_PY = "$$CHROMIUM_SRC_DIR/build/linux/unbundle/replace_gn_files.py"
|
||||
+R_G_F_PY_ARGS = "--system-libraries yasm"
|
||||
+log("Running python $$R_G_F_PY $$R_G_F_PY_ARGS$${EOL}")
|
||||
+!system("python $$R_G_F_PY $$R_G_F_PY_ARGS"): error("-- unbundling failed")
|
||||
+log("Running python2 $$R_G_F_PY $$R_G_F_PY_ARGS$${EOL}")
|
||||
+!system("python2 $$R_G_F_PY $$R_G_F_PY_ARGS"): error("-- unbundling failed")
|
||||
|
@ -1,11 +0,0 @@
|
||||
diff -up qtwebengine-everywhere-src-5.12.1/src/core/config/linux.pri.python2 qtwebengine-everywhere-src-5.12.1/src/core/config/linux.pri
|
||||
--- qtwebengine-everywhere-src-5.12.1/src/core/config/linux.pri.python2 2019-02-01 09:30:19.194657298 -0600
|
||||
+++ qtwebengine-everywhere-src-5.12.1/src/core/config/linux.pri 2019-02-01 10:53:16.756357279 -0600
|
||||
@@ -205,5 +205,5 @@ gn_args += linux_link_libpci=true
|
||||
CHROMIUM_SRC_DIR = "$$QTWEBENGINE_ROOT/$$getChromiumSrcDir()"
|
||||
R_G_F_PY = "$$CHROMIUM_SRC_DIR/build/linux/unbundle/replace_gn_files.py"
|
||||
R_G_F_PY_ARGS = "--system-libraries yasm"
|
||||
-log("Running python $$R_G_F_PY $$R_G_F_PY_ARGS$${EOL}")
|
||||
-!system("python $$R_G_F_PY $$R_G_F_PY_ARGS"): error("-- unbundling failed")
|
||||
+log("Running python2 $$R_G_F_PY $$R_G_F_PY_ARGS$${EOL}")
|
||||
+!system("python2 $$R_G_F_PY $$R_G_F_PY_ARGS"): error("-- unbundling failed")
|
Loading…
Reference in New Issue
Block a user