treewide: remove redundant patches and locks (#354215)

diff --git a/intern/smoke/intern/WAVELET_NOISE.h b/intern/smoke/intern/WAVELET_NOISE.h

index fce901b..1f73c5e 100644

--- a/intern/smoke/intern/WAVELET_NOISE.h

+++ b/intern/smoke/intern/WAVELET_NOISE.h

@@ -43,6 +43,7 @@

 #ifndef WAVELET_NOISE_H

 #define WAVELET_NOISE_H

+#include <string.h>

 #include <MERSENNETWISTER.h>

 #ifdef WIN32

From 9dd8048e28b65da0b904dfbace482f70ae768fd8 Mon Sep 17 00:00:00 2001

From: Jeff Muizelaar <jmuizelaar@mozilla.com>

Date: Tue, 5 Mar 2024 04:12:28 +0100

Subject: [PATCH] Bug 1882291. Switch to stdarch_arm_neon_intrinsics feature on

 rust >=1.78. r=glandium

We only need this on ARM32 because the ARM64 intrinsics are stable.

stdarch_arm_neon_intrinsics was split out from stdsimd here:

https://github.com/rust-lang/stdarch/pull/1486

Differential Revision: https://phabricator.services.mozilla.com/D203039

---

 Cargo.lock          | 1 +

 gfx/qcms/Cargo.toml | 3 +++

 gfx/qcms/build.rs   | 7 +++++++

 gfx/qcms/src/lib.rs | 6 ++++--

 4 files changed, 15 insertions(+), 2 deletions(-)

 create mode 100644 gfx/qcms/build.rs

diff --git a/Cargo.lock b/Cargo.lock

index aba397832e..8f0a879a87 100644

--- a/Cargo.lock

+++ b/Cargo.lock

@@ -4276,6 +4276,7 @@ name = "qcms"

 version = "0.2.0"

 dependencies = [

  "libc",

+ "version_check",

 ]

 [[package]]

diff --git a/gfx/qcms/Cargo.toml b/gfx/qcms/Cargo.toml

index e976054a7b..f50d6623a1 100644

--- a/gfx/qcms/Cargo.toml

+++ b/gfx/qcms/Cargo.toml

@@ -20,3 +20,6 @@ cmyk = []

 [dependencies]

 libc = {version = "0.2", optional = true }

+

+[build-dependencies]

+version_check = "0.9"

diff --git a/gfx/qcms/build.rs b/gfx/qcms/build.rs

new file mode 100644

index 0000000000..6810a8828e

--- /dev/null

+++ b/gfx/qcms/build.rs

@@ -0,0 +1,7 @@

+extern crate version_check as rustc;

+

+fn main() {

+    if rustc::is_min_version("1.78.0").unwrap_or(false) {

+        println!("cargo:rustc-cfg=stdsimd_split");

+    }

+}

diff --git a/gfx/qcms/src/lib.rs b/gfx/qcms/src/lib.rs

index c311964ee3..fc496816a8 100644

--- a/gfx/qcms/src/lib.rs

+++ b/gfx/qcms/src/lib.rs

@@ -7,9 +7,11 @@

 #![allow(non_upper_case_globals)]

 // These are needed for the neon SIMD code and can be removed once the MSRV supports the

 // instrinsics we use

-#![cfg_attr(feature = "neon", feature(stdsimd))]

+#![cfg_attr(all(stdsimd_split, target_arch = "arm", feature = "neon"), feature(stdarch_arm_neon_intrinsics))]

+#![cfg_attr(all(stdsimd_split, target_arch = "arm", feature = "neon"), feature(stdarch_arm_feature_detection))]

+#![cfg_attr(all(not(stdsimd_split), target_arch = "arm", feature = "neon"), feature(stdsimd))]

 #![cfg_attr(

-    feature = "neon",

+    all(target_arch = "arm", feature = "neon"),

     feature(arm_target_feature, raw_ref_op)

 )]

-- 

2.44.0

--- a/Cargo.lock

+++ b/Cargo.lock

@@ -1535,7 +1535,7 @@ checksum = "7300fbefb4dadc1af235a9cef3737cea692a9d97e1b9cbcd4ebdae6f8868e6fb"

 [[package]]

 name = "tiny"

-version = "0.10.0"

+version = "0.11.0"

 dependencies = [

  "clap",

  "dirs",

diff --git c/src/cgraphicsscene.cpp i/src/cgraphicsscene.cpp

index ac2929a..c399706 100644

--- c/src/cgraphicsscene.cpp

+++ i/src/cgraphicsscene.cpp

@@ -1436,7 +1436,7 @@ namespace Caneda

             QPointF newPos = m_currentWiringWire->mapFromScene(pos);

             QPointF refPos = m_currentWiringWire->port1()->pos();

-            if( abs(refPos.x()-newPos.x()) > abs(refPos.y()-newPos.y()) ) {

+            if( (refPos.x()-newPos.x()) > (refPos.y()-newPos.y()) ) {

                 m_currentWiringWire->movePort2(QPointF(newPos.x(), refPos.y()));

             }

             else {

diff --git a/Cargo.lock b/Cargo.lock

index 5ae2bd6..e4c6f18 100644

--- a/Cargo.lock

+++ b/Cargo.lock

@@ -5676,9 +5676,9 @@ dependencies = [

 [[package]]

 name = "time"

-version = "0.3.34"

+version = "0.3.36"

 source = "registry+https://github.com/rust-lang/crates.io-index"

-checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749"

+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"

 dependencies = [

  "deranged",

  "itoa",

@@ -5699,9 +5699,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"

 [[package]]

 name = "time-macros"

-version = "0.2.17"

+version = "0.2.18"

 source = "registry+https://github.com/rust-lang/crates.io-index"

-checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774"

+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"

 dependencies = [

  "num-conv",

  "time-core",