From e2d9c8ff20043faea6dc5e7354dff0d8a2a5c084 Mon Sep 17 00:00:00 2001
From: Iván Ávalos <avalos@disroot.org>
Date: Wed, 17 Aug 2022 22:27:17 -0500
Subject: First attempt to fix armv7h build

---
 libre/icecat/PKGBUILD               | 10 ++++++----
 libre/icecat/fix-rustc-armv7h.patch | 12 ++++++++++++
 2 files changed, 18 insertions(+), 4 deletions(-)
 create mode 100644 libre/icecat/fix-rustc-armv7h.patch

diff --git a/libre/icecat/PKGBUILD b/libre/icecat/PKGBUILD
index e2d101649..425619e32 100644
--- a/libre/icecat/PKGBUILD
+++ b/libre/icecat/PKGBUILD
@@ -49,7 +49,7 @@ source=(https://repo.parabola.nu/other/${pkgname}/${pkgname}-${_upstream_ver}.ta
         icecat.desktop icecat-safe.desktop
         0001-Use-remoting-name-for-GDK-application-names.patch
 )
-source_armv7h=(arm.patch
+source_armv7h=(fix-rustc-armv7h.patch
                build-arm-libopus.patch)
 source_i686=(avoid-libxul-OOM-python-check.patch
              rust-static-disable-network-test-on-static-libraries.patch)
@@ -59,7 +59,7 @@ sha256sums=('f2a149d562b0b441f4df1e395d00a36717f56001acf7f05d40ebab0088069661'
             '33dd309eeb99ec730c97ba844bf6ce6c7840f7d27da19c82389cdefee8c20208'
             'a7f5ae9f018678a391739365329a5a5b527b536bc9aac441c73ae811d2fa530d'
 )
-sha256sums_armv7h=('bc00516032330760444939c516a60c78f868631e1b37f075f0fe71a53737b966'
+sha256sums_armv7h=('aa8abfcabedde8fd8d06142db97c9de1d7446e579bc2746fcea09b3d7e60485f'
                    '2d4d91f7e35d0860225084e37ec320ca6cae669f6c9c8fe7735cdbd542e3a7c9')
 sha256sums_i686=('2f0c81a38c4578f68f5456b618fe84a78974072821488173eb55e0e72287e353'
                  '10c5276eab2e87f400a6ec15d7ffbef3b0407ee888dea36f1128927ca55b9041')
@@ -185,8 +185,10 @@ END
       # EME is disabled anyway in the built package, but better check if it exists for ARM each new release.
       sed -i 's|ac_add_options --disable-eme||' ../mozconfig
 
-      echo "applying arm.patch"
-      patch -p1 -i ../arm.patch
+      # echo "applying arm.patch"
+      # patch -p1 -i ../arm.patch
+      echo "applying fix-rustc-armv7h.patch"
+      patch -p1 -i ../fix-rustc-armv7h.patch
       echo "applying build-arm-libopus.patch"
       patch -p1 -i ../build-arm-libopus.patch
     ;;
diff --git a/libre/icecat/fix-rustc-armv7h.patch b/libre/icecat/fix-rustc-armv7h.patch
new file mode 100644
index 000000000..a083ca505
--- /dev/null
+++ b/libre/icecat/fix-rustc-armv7h.patch
@@ -0,0 +1,12 @@
+diff --git a/Cargo.toml b/Cargo.toml
+index 74658ce..a3455d1 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -58,6 +58,7 @@ opt-level = 2
+ rpath = false
+ debug-assertions = false
+ panic = "abort"
++codegen-units = 1
+ 
+ # Optimize build dependencies, because bindgen and proc macros / style
+ # compilation take more to run than to build otherwise.
-- 
cgit v1.2.3