From b9538e9ed2af1db13b91cace8be84e1493a5170b Mon Sep 17 00:00:00 2001 From: Jan Horak Date: Tue, 28 Aug 2018 14:40:26 +0200 Subject: [PATCH] Fixing patch application and rejected aarch64 patch --- build-aarch64-skia.patch | 14 +++++++------- thunderbird.spec | 5 +++-- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/build-aarch64-skia.patch b/build-aarch64-skia.patch index 33d2d35..b23296e 100644 --- a/build-aarch64-skia.patch +++ b/build-aarch64-skia.patch @@ -1,12 +1,12 @@ -diff -up firefox-60.0/gfx/skia/skia/src/jumper/SkJumper_stages.cpp.aarch64-skia firefox-60.0/gfx/skia/skia/src/jumper/SkJumper_stages.cpp ---- firefox-60.0/gfx/skia/skia/src/jumper/SkJumper_stages.cpp.aarch64-skia 2018-04-20 12:07:26.242037226 +0200 -+++ firefox-60.0/gfx/skia/skia/src/jumper/SkJumper_stages.cpp 2018-04-20 12:12:58.916428432 +0200 +diff -up thunderbird-60.0/gfx/skia/skia/src/jumper/SkJumper_stages.cpp.aarch64-skia thunderbird-60.0/gfx/skia/skia/src/jumper/SkJumper_stages.cpp +--- thunderbird-60.0/gfx/skia/skia/src/jumper/SkJumper_stages.cpp.aarch64-skia 2018-08-28 14:36:13.555012053 +0200 ++++ thunderbird-60.0/gfx/skia/skia/src/jumper/SkJumper_stages.cpp 2018-08-28 14:38:17.160274150 +0200 @@ -666,7 +666,7 @@ SI F approx_powf(F x, F y) { } SI F from_half(U16 h) { --#if defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. -+#if 0 && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. +-#if defined(JUMPER_IS_NEON) && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. ++#if 0 && defined(JUMPER_IS_NEON) && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. return vcvt_f32_f16(h); #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512) @@ -14,8 +14,8 @@ diff -up firefox-60.0/gfx/skia/skia/src/jumper/SkJumper_stages.cpp.aarch64-skia } SI U16 to_half(F f) { --#if defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. -+#if 0 && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. +-#if defined(JUMPER_IS_NEON) && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. ++#if 0 && defined(JUMPER_IS_NEON) && defined(__aarch64__) && !defined(SK_BUILD_FOR_GOOGLE3) // Temporary workaround for some Google3 builds. return vcvt_f16_f32(f); #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512) diff --git a/thunderbird.spec b/thunderbird.spec index faa5c66..0252e73 100644 --- a/thunderbird.spec +++ b/thunderbird.spec @@ -232,6 +232,9 @@ debug %{name}, you want to install %{name}-debuginfo instead. # Patch for big endian platforms only %if 0%{?big_endian} %patch26 -p1 -b .icu +%patch305 -p1 -b .big-endian +%endif + %patch37 -p1 -b .jit-atomic-lucky %patch40 -p1 -b .aarch64-skia #ARM run-time patch @@ -243,9 +246,7 @@ debug %{name}, you want to install %{name}-debuginfo instead. %endif %patch417 -p1 -b .bug1375074-save-restore-x28 -%patch305 -p1 -b .big-endian %patch306 -p1 -b .1353817 -%endif #cd .. %if %{official_branding}