rpms/thunderbird
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fixing patch application and rejected aarch64 patch

Browse Source
This commit is contained in:
Jan Horak 2018-08-28 14:40:26 +02:00
parent 2fb4c70ebd
commit b9538e9ed2
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
build-aarch64-skia.patch
View File

@ -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 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
--- firefox-60.0/gfx/skia/skia/src/jumper/SkJumper_stages.cpp.aarch64-skia 2018-04-20 12:07:26.242037226 +0200 --- thunderbird-60.0/gfx/skia/skia/src/jumper/SkJumper_stages.cpp.aarch64-skia 2018-08-28 14:36:13.555012053 +0200
+++ firefox-60.0/gfx/skia/skia/src/jumper/SkJumper_stages.cpp 2018-04-20 12:12:58.916428432 +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) { @@ -666,7 +666,7 @@ SI F approx_powf(F x, F y) {
} }
SI F from_half(U16 h) { SI F from_half(U16 h) {
-#if 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(__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); return vcvt_f32_f16(h);
#elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512) #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) { SI U16 to_half(F f) {
-#if 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(__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); return vcvt_f16_f32(f);
#elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512) #elif defined(JUMPER_IS_HSW) || defined(JUMPER_IS_AVX512)

5
thunderbird.spec
View File

@ -232,6 +232,9 @@ debug %{name}, you want to install %{name}-debuginfo instead.
# Patch for big endian platforms only # Patch for big endian platforms only
%if 0%{?big_endian} %if 0%{?big_endian}
%patch26 -p1 -b .icu %patch26 -p1 -b .icu
%patch305 -p1 -b .big-endian
%endif
%patch37 -p1 -b .jit-atomic-lucky %patch37 -p1 -b .jit-atomic-lucky
%patch40 -p1 -b .aarch64-skia %patch40 -p1 -b .aarch64-skia
#ARM run-time patch #ARM run-time patch
@ -243,9 +246,7 @@ debug %{name}, you want to install %{name}-debuginfo instead.
%endif %endif
%patch417 -p1 -b .bug1375074-save-restore-x28 %patch417 -p1 -b .bug1375074-save-restore-x28
%patch305 -p1 -b .big-endian
%patch306 -p1 -b .1353817 %patch306 -p1 -b .1353817
%endif
#cd .. #cd ..
%if %{official_branding} %if %{official_branding}