From: Peter Michael Green Date: Thu, 11 Aug 2022 13:43:41 +0000 (+0000) Subject: Update quilt patches. X-Git-Tag: archive/raspbian/1%102.1.1-1+rpi1~3 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f71241180a9a642b70f9c28a31e27feab2af392b;p=thunderbird.git Update quilt patches. --- diff --git a/debian/patches/disable-neon-in-qcms.patch b/debian/patches/disable-neon-in-qcms.patch index 1446e8a311..cd366cb8f2 100644 --- a/debian/patches/disable-neon-in-qcms.patch +++ b/debian/patches/disable-neon-in-qcms.patch @@ -1,16 +1,9 @@ From: Peter Michael Green -Date: Wed, 7 Oct 2020 19:41:49 +0000 -X-Dgit-Generated: 78.3.0esr-2+rpi1 b1f30fd7ea0b729a7bbc7dc1e804e2a0cc0c573a Subject: Disable neon in qcms. - ---- - -diff --git a/gfx/qcms/qcmsint.h b/gfx/qcms/qcmsint.h -index b08fc9490b..3f5ad40145 100644 ---- a/gfx/qcms/qcmsint.h -+++ b/gfx/qcms/qcmsint.h -@@ -96,18 +96,18 @@ void qcms_transform_data_bgra_out_lut_altivec(const qcms_transform *transform, +--- thunderbird-102.1.1.orig/gfx/qcms/qcmsint.h ++++ thunderbird-102.1.1/gfx/qcms/qcmsint.h +@@ -96,18 +96,18 @@ void qcms_transform_data_bgra_out_lut_al unsigned char *dest, size_t length); @@ -41,11 +34,9 @@ index b08fc9490b..3f5ad40145 100644 extern bool qcms_supports_iccv4; extern bool qcms_supports_neon; -diff --git a/gfx/qcms/src/lib.rs b/gfx/qcms/src/lib.rs -index 7987ae2f31..d432ab5e5a 100644 ---- a/gfx/qcms/src/lib.rs -+++ b/gfx/qcms/src/lib.rs -@@ -62,8 +62,8 @@ pub use transform::DataType; +--- thunderbird-102.1.1.orig/gfx/qcms/src/lib.rs ++++ thunderbird-102.1.1/gfx/qcms/src/lib.rs +@@ -64,8 +64,8 @@ pub use transform::DataType; pub use transform::Transform; #[cfg(any(target_arch = "x86", target_arch = "x86_64"))] mod transform_avx; @@ -56,14 +47,12 @@ index 7987ae2f31..d432ab5e5a 100644 #[cfg(any(target_arch = "x86", target_arch = "x86_64"))] mod transform_sse2; mod transform_util; -diff --git a/gfx/qcms/src/transform.rs b/gfx/qcms/src/transform.rs -index f3d9e8b4c4..b5e5351837 100644 ---- a/gfx/qcms/src/transform.rs -+++ b/gfx/qcms/src/transform.rs +--- thunderbird-102.1.1.orig/gfx/qcms/src/transform.rs ++++ thunderbird-102.1.1/gfx/qcms/src/transform.rs @@ -21,11 +21,11 @@ - // OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION // WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + #![allow(clippy::missing_safety_doc)] -#[cfg(all(any(target_arch = "arm", target_arch = "aarch64"), feature = "neon"))] +/*#[cfg(all(any(target_arch = "arm", target_arch = "aarch64"), feature = "neon"))] use crate::transform_neon::{ @@ -74,7 +63,7 @@ index f3d9e8b4c4..b5e5351837 100644 use crate::{ chain::chain_transform, double_to_s15Fixed16Number, -@@ -1364,7 +1364,7 @@ pub fn transform_create( +@@ -1369,7 +1369,7 @@ pub fn transform_create( } } @@ -83,7 +72,7 @@ index f3d9e8b4c4..b5e5351837 100644 let neon_supported = is_arm_feature_detected!("neon"); #[cfg(all(target_arch = "aarch64", feature = "neon"))] let neon_supported = is_aarch64_feature_detected!("neon"); -@@ -1378,7 +1378,7 @@ pub fn transform_create( +@@ -1383,7 +1383,7 @@ pub fn transform_create( } else if in_type == BGRA8 { transform.transform_fn = Some(qcms_transform_data_bgra_out_lut_neon) } diff --git a/debian/patches/patch-out-neon-in-freebl.patch b/debian/patches/patch-out-neon-in-freebl.patch index fb7796ee51..69cbb65b2a 100644 --- a/debian/patches/patch-out-neon-in-freebl.patch +++ b/debian/patches/patch-out-neon-in-freebl.patch @@ -1,15 +1,8 @@ From: Peter Michael Green -Date: Thu, 29 Oct 2020 03:19:17 +0000 -X-Dgit-Generated: 1:78.4.0-1~deb10u1+rpi1 1d0bbfdae9ecd6b3ad6b08bddb57439bb12dac5e Subject: Patch out neon in freebl - ---- - -diff --git a/security/nss/lib/freebl/Makefile b/security/nss/lib/freebl/Makefile -index 0b8c6f42fa4..0e60a0631ab 100644 ---- a/security/nss/lib/freebl/Makefile -+++ b/security/nss/lib/freebl/Makefile +--- thunderbird-102.1.1.orig/security/nss/lib/freebl/Makefile ++++ thunderbird-102.1.1/security/nss/lib/freebl/Makefile @@ -153,9 +153,9 @@ ifeq ($(CPU_ARCH),aarch64) endif endif @@ -23,7 +16,7 @@ index 0b8c6f42fa4..0e60a0631ab 100644 ifdef CC_IS_CLANG DEFINES += -DUSE_HW_AES -DUSE_HW_SHA1 -DUSE_HW_SHA2 EXTRA_SRCS += aes-armv8.c sha1-armv8.c sha256-armv8.c -@@ -774,9 +774,9 @@ USES_SOFTFLOAT_ABI := $(shell $(CC) -o - -E -dM - $(CFLAGS) < /dev/null | grep _ +@@ -774,9 +774,9 @@ USES_SOFTFLOAT_ABI := $(shell $(CC) -o - $(OBJDIR)/$(PROG_PREFIX)aes-armv8$(OBJ_SUFFIX): CFLAGS += -march=armv8-a -mfpu=crypto-neon-fp-armv8$(if $(USES_SOFTFLOAT_ABI), -mfloat-abi=softfp) $(OBJDIR)/$(PROG_PREFIX)sha1-armv8$(OBJ_SUFFIX): CFLAGS += -march=armv8-a -mfpu=crypto-neon-fp-armv8$(if $(USES_SOFTFLOAT_ABI), -mfloat-abi=softfp) $(OBJDIR)/$(PROG_PREFIX)sha256-armv8$(OBJ_SUFFIX): CFLAGS += -march=armv8-a -mfpu=crypto-neon-fp-armv8$(if $(USES_SOFTFLOAT_ABI), -mfloat-abi=softfp) @@ -36,10 +29,8 @@ index 0b8c6f42fa4..0e60a0631ab 100644 endif ifeq ($(CPU_ARCH),aarch64) -diff --git a/security/nss/lib/freebl/freebl.gyp b/security/nss/lib/freebl/freebl.gyp -index e7703baf8d..bf30643dbf 100644 ---- a/security/nss/lib/freebl/freebl.gyp -+++ b/security/nss/lib/freebl/freebl.gyp +--- thunderbird-102.1.1.orig/security/nss/lib/freebl/freebl.gyp ++++ thunderbird-102.1.1/security/nss/lib/freebl/freebl.gyp @@ -103,13 +103,13 @@ ], }, @@ -82,63 +73,6 @@ index e7703baf8d..bf30643dbf 100644 [ 'target_arch=="x64"', { 'sources': [ 'verified/Hacl_Poly1305_256.c', -@@ -260,15 +260,15 @@ - 'dependencies': [ - '<(DEPTH)/exports.gyp:nss_exports' - ], -- 'cflags': [ -- '-march=armv7', -- '-mfpu=neon', -- '<@(softfp_cflags)', -- ], -- 'cflags_mozilla': [ -- '-mfpu=neon', -- '<@(softfp_cflags)', -- ] -+ #'cflags': [ -+ # '-march=armv7', -+ # '-mfpu=neon', -+ # '<@(softfp_cflags)', -+ #], -+ #'cflags_mozilla': [ -+ # '-mfpu=neon', -+ # '<@(softfp_cflags)', -+ #] - }, - { - 'target_name': 'gcm-aes-aarch64_c_lib', -diff --git a/security/nss/lib/freebl/gcm.c b/security/nss/lib/freebl/gcm.c -index ac461b4885..67b58fdeea 100644 ---- a/security/nss/lib/freebl/gcm.c -+++ b/security/nss/lib/freebl/gcm.c -@@ -25,7 +25,7 @@ - #elif defined(__arm__) && defined(IS_LITTLE_ENDIAN) && \ - !defined(NSS_DISABLE_ARM32_NEON) - /* We don't test on big endian platform, so disable this on big endian. */ --#define USE_ARM_GCM -+//#define USE_ARM_GCM - #endif - - /* Forward declarations */ -diff --git a/security/nss/lib/freebl/rijndael.c b/security/nss/lib/freebl/rijndael.c -index 82b1f419d9..e255787646 100644 ---- a/security/nss/lib/freebl/rijndael.c -+++ b/security/nss/lib/freebl/rijndael.c -@@ -20,10 +20,10 @@ - #include "gcm.h" - #include "mpi.h" - --#if !defined(IS_LITTLE_ENDIAN) && !defined(NSS_X86_OR_X64) -+//#if !defined(IS_LITTLE_ENDIAN) && !defined(NSS_X86_OR_X64) - // not test yet on big endian platform of arm - #undef USE_HW_AES --#endif -+//#endif - - #ifdef __powerpc64__ - #include "ppc-crypto.h" ---- thunderbird-91.4.1.orig/security/nss/lib/freebl/freebl.gyp -+++ thunderbird-91.4.1/security/nss/lib/freebl/freebl.gyp @@ -251,25 +251,25 @@ }] ] @@ -152,15 +86,15 @@ index 82b1f419d9..e255787646 100644 - 'dependencies': [ - '<(DEPTH)/exports.gyp:nss_exports' - ], -- #'cflags': [ -- # '-march=armv7', -- # '-mfpu=neon', -- # '<@(softfp_cflags)', -- #], -- #'cflags_mozilla': [ -- # '-mfpu=neon', -- # '<@(softfp_cflags)', -- #] +- 'cflags': [ +- '-march=armv7', +- '-mfpu=neon', +- '<@(softfp_cflags)', +- ], +- 'cflags_mozilla': [ +- '-mfpu=neon', +- '<@(softfp_cflags)', +- ] - }, + #{ + # 'target_name': 'gcm-aes-arm32-neon_c_lib', @@ -222,9 +156,41 @@ index 82b1f419d9..e255787646 100644 'defines!': [ 'NSS_DISABLE_ARM32_NEON', ], ---- thunderbird-91.4.1.orig/third_party/rust/nss_build_common/src/lib.rs -+++ thunderbird-91.4.1/third_party/rust/nss_build_common/src/lib.rs -@@ -109,9 +109,9 @@ fn get_nss_libs(kind: LinkingKind) -> Ve +--- thunderbird-102.1.1.orig/security/nss/lib/freebl/gcm.c ++++ thunderbird-102.1.1/security/nss/lib/freebl/gcm.c +@@ -25,7 +25,7 @@ + #elif defined(__arm__) && defined(IS_LITTLE_ENDIAN) && \ + !defined(NSS_DISABLE_ARM32_NEON) + /* We don't test on big endian platform, so disable this on big endian. */ +-#define USE_ARM_GCM ++//#define USE_ARM_GCM + #endif + + /* Forward declarations */ +--- thunderbird-102.1.1.orig/security/nss/lib/freebl/rijndael.c ++++ thunderbird-102.1.1/security/nss/lib/freebl/rijndael.c +@@ -20,10 +20,10 @@ + #include "gcm.h" + #include "mpi.h" + +-#if !defined(IS_LITTLE_ENDIAN) && !defined(NSS_X86_OR_X64) ++//#if !defined(IS_LITTLE_ENDIAN) && !defined(NSS_X86_OR_X64) + // not test yet on big endian platform of arm + #undef USE_HW_AES +-#endif ++//#endif + + #ifdef __powerpc64__ + #include "ppc-crypto.h" +--- thunderbird-102.1.1.orig/third_party/rust/nss_build_common/.cargo-checksum.json ++++ thunderbird-102.1.1/third_party/rust/nss_build_common/.cargo-checksum.json +@@ -1 +1 @@ +-{"files":{"Cargo.toml":"4f1d37d926e853eb9f3d8074b45c00a317e2b4aafbc339a471430d28526716e9","src/lib.rs":"1cbfa62f63ce62078b51105c28bd4783c0045a4059175a1644ac0cc79837bf00"},"package":null} +\ No newline at end of file ++{"files":{"Cargo.toml":"4f1d37d926e853eb9f3d8074b45c00a317e2b4aafbc339a471430d28526716e9","src/lib.rs":"e1b529d6facc6f16a234a81d4b39904002ee023539a73bd29fae75e9a433fef3"},"package":null} +--- thunderbird-102.1.1.orig/third_party/rust/nss_build_common/src/lib.rs ++++ thunderbird-102.1.1/third_party/rust/nss_build_common/src/lib.rs +@@ -117,9 +117,9 @@ fn get_nss_libs(kind: LinkingKind) -> Ve if target_arch == "x86_64" || target_arch == "x86" { static_libs.push("gcm-aes-x86_c_lib"); } @@ -237,12 +203,3 @@ index 82b1f419d9..e255787646 100644 if target_arch == "aarch64" { static_libs.push("gcm-aes-aarch64_c_lib"); } -diff --git a/third_party/rust/nss_build_common/.cargo-checksum.json b/third_party/rust/nss_build_common/.cargo-checksum.json -index c29a0010987..11e5f160379 100644 ---- a/third_party/rust/nss_build_common/.cargo-checksum.json -+++ b/third_party/rust/nss_build_common/.cargo-checksum.json -@@ -1 +1 @@ --{"files":{"Cargo.toml":"4f1d37d926e853eb9f3d8074b45c00a317e2b4aafbc339a471430d28526716e9","src/lib.rs":"a9077862fc7c45044178fa2675a04d0b31a27574d93a328e03df3108342dd6e4"},"package":null} -\ No newline at end of file -+{"files":{"Cargo.toml":"4f1d37d926e853eb9f3d8074b45c00a317e2b4aafbc339a471430d28526716e9","src/lib.rs":"e66390f87683fccc863a5c847000efbe86ac27161f5e3574ba354302267f288c"},"package":null} -\ No newline at end of file