From 2e960e1561425c81a27a6068fcc2ae4f27127e4d Mon Sep 17 00:00:00 2001 From: Kevin Kofler Date: Sun, 15 Oct 2017 01:14:16 +0200 Subject: [PATCH] Document the arm-fpu-fix rebase in 5.9.2-1 - arm-fpu-fix patch: Drop the host tools hunk added in 5.9.0-2, fixed upstream Also rename the patch file from qtwebengine-opensource-src-5.9.0-arm-fpu-fix.patch to qtwebengine-opensource-src-5.9.2-arm-fpu-fix.patch because the patch was rebased. Otherwise, it is easy to miss that the patch was rebased. (I did, I only noticed it now while working on the RPM Fusion package. And I might easily have missed it again and run into a build failure due to that.) --- qt5-qtwebengine.spec | 3 ++- ...patch => qtwebengine-opensource-src-5.9.2-arm-fpu-fix.patch | 0 2 files changed, 2 insertions(+), 1 deletion(-) rename qtwebengine-opensource-src-5.9.0-arm-fpu-fix.patch => qtwebengine-opensource-src-5.9.2-arm-fpu-fix.patch (100%) diff --git a/qt5-qtwebengine.spec b/qt5-qtwebengine.spec index afd4c56..052c342 100644 --- a/qt5-qtwebengine.spec +++ b/qt5-qtwebengine.spec @@ -102,7 +102,7 @@ Patch5: qtwebengine-opensource-src-5.9.0-system-icu-utf.patch # also build V8 shared and twice on i686 (once for x87, once for SSE2) Patch6: qtwebengine-opensource-src-5.9.1-no-sse2.patch # fix missing ARM -mfpu setting -Patch9: qtwebengine-opensource-src-5.9.0-arm-fpu-fix.patch +Patch9: qtwebengine-opensource-src-5.9.2-arm-fpu-fix.patch # remove Android dependencies from openmax_dl ARM NEON detection (detect.c) Patch10: qtwebengine-opensource-src-5.9.0-openmax-dl-neon.patch # restore NEON runtime detection in Skia: revert upstream review 1952953004, @@ -575,6 +575,7 @@ done - Add BuildRequires: qt5-qtquickcontrols2-devel for the examples - Rebase linux-pri patch - Drop qt57 and qtbug-61521 patches, fixed upstream +- arm-fpu-fix patch: Drop the host tools hunk added in 5.9.0-2, fixed upstream * Mon Oct 09 2017 Rex Dieter - 5.9.1-5 - rebuild (qt5) diff --git a/qtwebengine-opensource-src-5.9.0-arm-fpu-fix.patch b/qtwebengine-opensource-src-5.9.2-arm-fpu-fix.patch similarity index 100% rename from qtwebengine-opensource-src-5.9.0-arm-fpu-fix.patch rename to qtwebengine-opensource-src-5.9.2-arm-fpu-fix.patch