c8151228d0
This reverts commit 7816e88f62.
I already told you last time (5.8) that this way of maintaining patches
(importing them all into git and reexporting them from there each time)
is not how I work (I want only those patches rebased and renamed that
actually need rebasing) and that you are only causing me more work.
Please keep your hands off my package from now on.
27 lines
1.4 KiB
Diff
27 lines
1.4 KiB
Diff
diff -ur qtwebengine-opensource-src-5.7.0/src/core/config/linux.pri qtwebengine-opensource-src-5.7.0-linux-pri/src/core/config/linux.pri
|
|
--- qtwebengine-opensource-src-5.7.0/src/core/config/linux.pri 2016-06-07 06:20:06.000000000 +0200
|
|
+++ qtwebengine-opensource-src-5.7.0-linux-pri/src/core/config/linux.pri 2016-07-17 22:18:17.312471202 +0200
|
|
@@ -46,3 +46,22 @@
|
|
use?(system_icu): GYP_CONFIG += use_system_icu=1 icu_use_data_file_flag=0
|
|
use?(system_ffmpeg): GYP_CONFIG += use_system_ffmpeg=1
|
|
use?(system_protobuf): GYP_CONFIG += use_system_protobuf=1
|
|
+
|
|
+# some more system packages, that are not checked for for some reason
|
|
+GYP_CONFIG += use_system_re2=1
|
|
+
|
|
+# yasm is only used on x86, and passing use_system_yasm makes the build fail on
|
|
+# other architectures (e.g., ARM), so make it conditional on the architecture
|
|
+contains(QT_ARCH, "x86_64")|contains(QT_ARCH, "i386") {
|
|
+ GYP_CONFIG += use_system_yasm=1
|
|
+}
|
|
+
|
|
+# link libpci instead of dlopening it, our Qt packaging depends on it anyway
|
|
+GYP_CONFIG += linux_link_libpci=1
|
|
+
|
|
+# run the unbundling script Chromium provides
|
|
+CHROMIUM_SRC_DIR = "$$QTWEBENGINE_ROOT/$$getChromiumSrcDir()"
|
|
+R_G_F_PY = "$$CHROMIUM_SRC_DIR/build/linux/unbundle/replace_gyp_files.py"
|
|
+R_G_F_PY_ARGS = "-D use_system_re2=1"
|
|
+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")
|