Accepting request 1179232 from mozilla

Fix build errors with packed_simd_2 and ICU

OBS-URL: https://build.opensuse.org/request/show/1179232
OBS-URL: https://build.opensuse.org/package/show/mozilla:Factory/seamonkey?expand=0&rev=60

mozilla-bmo1862601.patch

@@ -0,0 +1,16 @@
+--- a/intl/lwbrk/LineBreaker.cpp
++++ b/intl/lwbrk/LineBreaker.cpp
+@@ -559,7 +559,12 @@
+     /* REGIONAL_INDICATOR = 39,           [RI] */ CLASS_CHARACTER,
+     /* E_BASE = 40,                       [EB] */ CLASS_BREAKABLE,
+     /* E_MODIFIER = 41,                   [EM] */ CLASS_CHARACTER,
+-    /* ZWJ = 42,                          [ZWJ]*/ CLASS_CHARACTER
++    /* ZWJ = 42,                          [ZWJ]*/ CLASS_CHARACTER,
++    /* AKSARA = 43,                       [AK] */ CLASS_CHARACTER,
++    /* AKSARA_PREBASE = 44,               [AP] */ CLASS_CHARACTER,
++    /* AKSARA_START = 45,                 [AS] */ CLASS_CHARACTER,
++    /* VIRAMA_FINAL = 46,                 [VF] */ CLASS_CHARACTER,
++    /* VIRAMA = 47,                       [VI] */ CLASS_CHARACTER,
+   };
+ 
+   static_assert(U_LB_COUNT == mozilla::ArrayLength(sUnicodeLineBreakToClass),

seamonkey.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Jun 07 00:42:26 UTC 2024 - Tristan Miller <psychonaut@nothingisreal.com>
+
+- add patch mozilla-bmo1896958.patch adapted from
+  https://bugzilla.mozilla.org/show_bug.cgi?id=1896958 to fix
+  compilation with rust >= 1.78
+- add patch mozilla-bmo.patch adapted from
+  https://bugzilla.mozilla.org/show_bug.cgi?id=1862601 to fix
+  build failure using --system-icu on Tumbleweed
+
 -------------------------------------------------------------------
 Thu Mar 28 15:00:02 UTC 2024 - Tristan Miller <psychonaut@nothingisreal.com>
 

seamonkey.spec

@@ -93,6 +93,8 @@ Patch3:         seamonkey-lto.patch
 Patch4:         seamonkey-man-page.patch
 Patch5:         reproducible.patch
 Patch6:         mozilla-bmo531915.patch
+Patch7:         mozilla-bmo1896958.patch
+Patch8:         mozilla-bmo1862601.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         /bin/sh coreutils
 Provides:       seamonkey-mail = %{version}
@@ -229,6 +231,16 @@ cp %{SOURCE12} GNUmakefile
 %patch -P 5 -p1
 %patch -P 6 -p1
 
+# Fix Rust builds on Tumbleweed; see https://bugzilla.mozilla.org/show_bug.cgi?id=1896958
+%if 0%{?suse_version} > 1600
+%patch -P 7 -p1
+%endif
+
+# Fix --system-icu builds on Tumbleweed; see https://bugzilla.mozilla.org/show_bug.cgi?id=1862601
+%if 0%{?suse_version} > 1600
+%patch -P 8 -p1
+%endif
+
 cat << EOF > .mozconfig
 mk_add_options MOZILLA_OFFICIAL=1
 mk_add_options BUILD_OFFICIAL=1
@@ -261,7 +273,7 @@ ac_add_options --with-system-nss
 %endif
 ac_add_options --with-system-zlib
 ac_add_options --with-system-bz2
-%if 0%{?suse_version} > 1500 || 0%{?sle_version} >= 150200 && 0%{?is_opensuse}
+%if 0%{?suse_version} > 1600 || 0%{?sle_version} >= 150200 && 0%{?is_opensuse}
 ac_add_options --with-system-webp
 ac_add_options --with-system-icu
 %endif
@@ -318,7 +330,7 @@ find . -regex ".*\.c\|.*\.cpp\|.*\.h" \
 # As of 2.53.13, Tumbleweed builds are failing due to the linker
 # issue <https://bugzilla.mozilla.org/show_bug.cgi?id=1778981>
 # so we disable LTO.
-%if 0%{?suse_version} > 1500
+%if 0%{?suse_version} > 1600
 %define _lto_cflags %{nil}
 %endif
 export SUSE_ASNEEDED=0