[rpms/firefox] f44: build fixes

[Martin Stransky <stransky@redhat.com>]

A new commit has been pushed.

Repo   : rpms/firefox
Branch : f44
Commit : a281d198b25f62a6b0442ae40c3b1b7eb3f71e6c
Author : Martin Stransky <stransky@redhat.com>
Date   : 2026-07-17T08:15:37+02:00
Stats  : +16/-15 in 3 file(s)
URL    : https://src.fedoraproject.org/rpms/firefox/c/a281d198b25f62a6b0442ae40c3b1b7eb3f71e6c?branch=f44

Log:
build fixes

---
diff --git a/build-aarch64-skia.patch b/build-aarch64-skia.patch
index 9223bb8..3c653b3 100644
--- a/build-aarch64-skia.patch
+++ b/build-aarch64-skia.patch
@@ -1,7 +1,7 @@
-diff -up firefox-134.0-build/firefox-134.0/gfx/skia/skia/modules/skcms/src/Transform_inl.h.aarch64-skia firefox-134.0-build/firefox-134.0/gfx/skia/skia/modules/skcms/src/Transform_inl.h
---- firefox-134.0/gfx/skia/skia/modules/skcms/src/Transform_inl.h.aarch64-skia	2024-12-30 19:30:46.000000000 +0100
-+++ firefox-134.0/gfx/skia/skia/modules/skcms/src/Transform_inl.h	2025-01-02 20:51:07.855087265 +0100
-@@ -151,7 +151,7 @@ SI U32 to_fixed(F f) {  return (U32)cast
+diff -up firefox-153.0/gfx/skia/skia/modules/skcms/src/Transform_inl.h.aarch64-skia firefox-153.0/gfx/skia/skia/modules/skcms/src/Transform_inl.h
+--- firefox-153.0/gfx/skia/skia/modules/skcms/src/Transform_inl.h.aarch64-skia	2026-07-15 22:09:44.000000000 +0200
++++ firefox-153.0/gfx/skia/skia/modules/skcms/src/Transform_inl.h	2026-07-17 07:41:58.356927894 +0200
+@@ -146,7 +146,7 @@ SI U32 to_fixed(F f) {  return (U32)cast
  
  
  SI F F_from_Half(U16 half) {
@@ -19,15 +19,16 @@ diff -up firefox-134.0-build/firefox-134.0/gfx/skia/skia/modules/skcms/src/Trans
      return (U16)vcvt_f16_f32(f);
  #elif defined(USING_AVX512F)
      return (U16)_mm512_cvtps_ph((__m512 )f, _MM_FROUND_CUR_DIRECTION );
-diff -up firefox-134.0-build/firefox-134.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h.aarch64-skia firefox-134.0-build/firefox-134.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h
---- firefox-134.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h.aarch64-skia	2025-01-02 20:51:07.856087299 +0100
-+++ firefox-134.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h	2025-01-02 23:09:47.802283444 +0100
-@@ -1421,7 +1421,7 @@ SI F from_half(U16 h) {
+diff -up firefox-153.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h.aarch64-skia firefox-153.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h
+--- firefox-153.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h.aarch64-skia	2026-07-15 22:09:43.000000000 +0200
++++ firefox-153.0/gfx/skia/skia/src/opts/SkRasterPipeline_opts.h	2026-07-17 08:05:34.884194825 +0200
+@@ -1447,7 +1447,8 @@ SI F from_half(U16 h) {
  }
  
  SI U16 to_half(F f) {
 -#if defined(SKRP_CPU_NEON) && defined(SK_CPU_ARM64)
-+#if 0 // defined(SKRP_CPU_NEON) && defined(SK_CPU_ARM64)
++#if 0
++    // defined(SKRP_CPU_NEON) && defined(SK_CPU_ARM64)
      return (U16)vcvt_f16_f32(f);
  
- #elif defined(SKRP_CPU_SKX)
+ #elif defined(SKRP_CPU_ML4)

diff --git a/firefox.spec b/firefox.spec
index 1a418f4..cbb5caf 100644
--- a/firefox.spec
+++ b/firefox.spec
@@ -238,12 +238,12 @@ Source49:       wasi.patch.template
 Source50:       wasi-sdk-30.tar.gz
 
 # Build patches
-Patch40:        build-aarch64-skia.patch
+#Patch40:        build-aarch64-skia.patch
 Patch44:        build-arm-libopus.patch
 Patch71:        0001-GLIBCXX-fix-for-GCC-12.patch
 Patch78:        firefox-i686-build.patch
 Patch80:        wasi.patch
-Patch81:        firefox-gcc-15.0-s390.patch
+#Patch81:        firefox-gcc-15.0-s390.patch
 Patch85:        build-wasm32-wasip1.patch
 
 # Fedora specific patches
@@ -520,11 +520,11 @@ This package contains results of tests executed during build.
 # there is a compare of config and js/config directories and .orig suffix is
 # ignored during this compare.
 
-%patch -P40 -p1 -b .aarch64-skia
+#%patch -P40 -p1 -b .aarch64-skia
 %patch -P44 -p1 -b .build-arm-libopus
 %patch -P71 -p1 -b .0001-GLIBCXX-fix-for-GCC-12
 %patch -P78 -p1 -b .firefox-i686
-%patch -P81 -p1 -b .firefox-gcc-15.0-s390
+#%patch -P81 -p1 -b .firefox-gcc-15.0-s390
 %if 0%{?fedora} >= 44 || 0%{?rhel} >= 11
 %patch -P85 -p1 -b .wasm32-wasip1
 %endif

diff --git a/wasi.patch b/wasi.patch
index 70be783..1fe5e19 100644
--- a/wasi.patch
+++ b/wasi.patch
@@ -6,7 +6,7 @@ diff -up firefox-134.0.1/toolkit/moz.configure.wasi firefox-134.0.1/toolkit/moz.
          if wasi_sysroot:
              log.info("Using wasi sysroot in %s", wasi_sysroot)
 -            return ["--sysroot=%s" % wasi_sysroot]
-+            return ["--sysroot=%s" % wasi_sysroot, "-nodefaultlibs",  "-lc", "-lwasi-emulated-process-clocks", "-lc++", "-lc++abi", "/raid/CVS/firefox/firefox-152.0-build/firefox-152.0/wasi-sdk-30/build/sysroot/install/wasi-resource-dir/lib/wasm32-unknown-wasip1/libclang_rt.builtins.a"]
++            return ["--sysroot=%s" % wasi_sysroot, "-nodefaultlibs",  "-lc", "-lwasi-emulated-process-clocks", "-lc++", "-lc++abi", "/raid/CVS/firefox/firefox-153.0-build/firefox-153.0/wasi-sdk-30/build/sysroot/install/wasi-resource-dir/lib/wasm32-unknown-wasip1/libclang_rt.builtins.a"]
          return []
  
      set_config("WASI_SYSROOT", wasi_sysroot)