Delete qtwebengine-everywhere-src-5.10.0-linux-pri.patch.

The yasm part is obsolete because QtWebEngine uses nasm now (but
currently a bundled copy, that needs to be fixed).

The libpci part seems obsolete as well, -lpci is getting linked already.

Also restore an AWOL patch comment.
epel9
Kevin Kofler 3 years ago
parent c7db84b885
commit 9aa6750784

@ -79,9 +79,6 @@ Source10: macros.qt5-qtwebengine
# pulseaudio headers
Source20: pulseaudio-12.2-headers.tar.gz
# some tweaks to linux.pri (system yasm, link libpci, run unbundling script)
# FIXME/TODO: review, I *think* this is no longer needed -- rdieter
Patch0: qtwebengine-everywhere-src-5.10.0-linux-pri.patch
# quick hack to avoid checking for the nonexistent icudtl.dat and silence the
# resulting warnings - not upstreamable as is because it removes the fallback
# mechanism for the ICU data directory (which is not used in our builds because
@ -104,6 +101,7 @@ Patch7: chromium-hunspell-nullptr.patch
Patch24: qtwebengine-everywhere-src-5.11.3-aarch64-new-stat.patch
# Use Python2
Patch26: qtwebengine-everywhere-5.15.5-use-python2.patch
# FTBFS TRUE/FALSE undeclared
Patch31: qtwebengine-everywhere-src-5.15.5-TRUE.patch
## Upstream patches:
@ -392,7 +390,6 @@ mv pulse src/3rdparty/chromium/
pushd src/3rdparty/chromium
popd
#patch0 -p1 -b .linux-pri
%if 0%{?use_system_libicu}
%patch1 -p1 -b .no-icudtl-dat
%endif

@ -1,24 +0,0 @@
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
}
+
+# 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") {
+# gn_args += use_system_yasm=true
+#}
+
+# 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"
+R_G_F_PY_ARGS = "--system-libraries yasm"
+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…
Cancel
Save