2020-09-11 08:56:41 +00:00
|
|
|
diff --git a/src/buildtools/config/linux.pri b/src/buildtools/config/linux.pri
|
|
|
|
index 56c18bd..cb17c7a 100644
|
|
|
|
--- a/src/buildtools/config/linux.pri
|
|
|
|
+++ b/src/buildtools/config/linux.pri
|
|
|
|
@@ -176,3 +176,19 @@ host_build {
|
|
|
|
}
|
|
|
|
gn_args += use_glib=false
|
Update to 5.9.0
* Sat Jun 10 2017 Kevin Kofler <Kevin@tigcc.ticalc.org> - 5.9.0-1
- Update to 5.9.0
- Update version numbers of bundled stuff
- Use bundled libsrtp and protobuf, Chromium dropped unbundling support for them
- Add missing Provides: bundled(hunspell) for the spellchecking added in 5.8
- Rebase linux-pri, no-neon, system-icu-utf, no-sse2, arm-fpu-fix,
openmax-dl-neon and webrtc-neon-detect patches (port to GN)
- Sync system-nspr-prtime patch with Debian (they ported it to GN)
- Rebase fix-extractcflag patch
- Restore NEON runtime detection in Skia, drop old skia-neon patch (rewritten)
- Drop webrtc-neon, v8-gcc7, pdfium-gcc7, wtf-gcc7, fix-open-in-new-tab and
fix-dead-keys patches, fixed upstream
- Update system libvpx/libwebp version requirements (libvpx now F25+ only)
- Drop the flag hacks (-g1 -fno-delete-null-pointer-checks) that are fixed
upstream, force -g2 on x86_64 instead
2017-06-10 13:09:01 +00:00
|
|
|
}
|
|
|
|
+
|
|
|
|
+# 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
|
2021-06-28 19:07:15 +00:00
|
|
|
+#contains(QT_ARCH, "x86_64")|contains(QT_ARCH, "i386") {
|
|
|
|
+# gn_args += use_system_yasm=true
|
|
|
|
+#}
|
Update to 5.9.0
* Sat Jun 10 2017 Kevin Kofler <Kevin@tigcc.ticalc.org> - 5.9.0-1
- Update to 5.9.0
- Update version numbers of bundled stuff
- Use bundled libsrtp and protobuf, Chromium dropped unbundling support for them
- Add missing Provides: bundled(hunspell) for the spellchecking added in 5.8
- Rebase linux-pri, no-neon, system-icu-utf, no-sse2, arm-fpu-fix,
openmax-dl-neon and webrtc-neon-detect patches (port to GN)
- Sync system-nspr-prtime patch with Debian (they ported it to GN)
- Rebase fix-extractcflag patch
- Restore NEON runtime detection in Skia, drop old skia-neon patch (rewritten)
- Drop webrtc-neon, v8-gcc7, pdfium-gcc7, wtf-gcc7, fix-open-in-new-tab and
fix-dead-keys patches, fixed upstream
- Update system libvpx/libwebp version requirements (libvpx now F25+ only)
- Drop the flag hacks (-g1 -fno-delete-null-pointer-checks) that are fixed
upstream, force -g2 on x86_64 instead
2017-06-10 13:09:01 +00:00
|
|
|
+
|
|
|
|
+# link libpci instead of dlopening it, our Qt packaging depends on it anyway
|
|
|
|
+gn_args += linux_link_libpci=true
|
|
|
|
+
|
|
|
|
+# run the unbundling script Chromium provides
|
|
|
|
+CHROMIUM_SRC_DIR = "$$QTWEBENGINE_ROOT/$$getChromiumSrcDir()"
|
|
|
|
+R_G_F_PY = "$$CHROMIUM_SRC_DIR/build/linux/unbundle/replace_gn_files.py"
|
2017-10-14 20:53:08 +00:00
|
|
|
+R_G_F_PY_ARGS = "--system-libraries yasm"
|
2019-02-13 22:34:16 +00:00
|
|
|
+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")
|