Update patch metadata.

diff --git a/debian/patches/0007-Remove-march-native-from-mimalloc-build.patch b/debian/patches/0007-Remove-march-native-from-mimalloc-build.patch
deleted file mode 100644 (file)
index 8c18e31..0000000
--- a/debian/patches/0007-Remove-march-native-from-mimalloc-build.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From: Ryan Pavlik <ryan.pavlik@collabora.com>
-Date: Wed, 10 Feb 2021 16:20:25 -0600
-Subject: Remove -march=native from mimalloc build.
-
----
- extlib/mimalloc/CMakeLists.txt | 5 -----
- 1 file changed, 5 deletions(-)
-
-diff --git a/extlib/mimalloc/CMakeLists.txt b/extlib/mimalloc/CMakeLists.txt
-index 37616eb..e8e7f88 100644
---- a/extlib/mimalloc/CMakeLists.txt
-+++ b/extlib/mimalloc/CMakeLists.txt
-@@ -183,11 +183,6 @@ if(CMAKE_C_COMPILER_ID MATCHES "AppleClang|Clang|GNU|Intel" AND NOT CMAKE_SYSTEM
-   endif()
- endif()
- 
--# Architecture flags
--if(${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "arm")
--    list(APPEND mi_cflags -march=native)
--endif()
--
- # extra needed libraries
- if(WIN32)
-   list(APPEND mi_libraries psapi shell32 user32 bcrypt)

diff --git a/debian/patches/10_mimalloc_restrict_cpu_yield.patch b/debian/patches/10_mimalloc_restrict_cpu_yield.patch
index 7579cc8960a6c3f221d782eb0324ddefd9134e64..f05babe803ed0e57e03baa058c5e513a1c956856 100644 (file)
--- a/debian/patches/10_mimalloc_restrict_cpu_yield.patch
+++ b/debian/patches/10_mimalloc_restrict_cpu_yield.patch
@@ -1,7 +1,9 @@
 Subject: Restricts cpu yield instructions a little.
-From: Ryan Pavlik <ryan.pavlik@collabora.com>
-Last-Updated: 2021-01-23
 Forwarded: https://github.com/microsoft/mimalloc/pull/350
+From: Ryan Pavlik <ryan.pavlik@collabora.com>
+Last-Update: 2021-02-11
+Applied-Upstream: 3.0.0, https://github.com/solvespace/solvespace/commit/cdeb6c90fb753a2b0f6d033affedbcceab046758
+
 
 adding clobber for ARM and preventing older 32 bits chips not supporting this instruction.
 

diff --git a/debian/patches/11_update_js_three_r111.patch b/debian/patches/11_update_js_three_r111.patch
index 4488a2921416a55389582702b42b517c5e6ef729..51158624cda775979f1eb74318a36b10e0e2a15b 100644 (file)
--- a/debian/patches/11_update_js_three_r111.patch
+++ b/debian/patches/11_update_js_three_r111.patch
@@ -1,6 +1,11 @@
+Subject: Update javascript to be compatible with threejs r111
+Forwarded: https://github.com/solvespace/solvespace/pull/906
 From: Ryan Pavlik <ryan.pavlik@collabora.com>
+Last-Update: 2021-02-11
+Applied-Upstream: 3.0.0, https://github.com/solvespace/solvespace/commit/d16e33ac48cb717f24a06a30e268227c860476d2
+
 Date: Tue, 19 Jan 2021 17:22:35 -0600
-Subject: Update javascript to be compatible with threejs r111
+
 
 ---
  res/threejs/SolveSpaceControls.js | 8 ++++----

diff --git a/debian/patches/12_Remove-march-native-from-mimalloc-build.patch b/debian/patches/12_Remove-march-native-from-mimalloc-build.patch
new file mode 100644 (file)
index 0000000..40f0282
--- /dev/null
+++ b/debian/patches/12_Remove-march-native-from-mimalloc-build.patch
@@ -0,0 +1,29 @@
+Subject: Remove -march=native from mimalloc build.
+Bug: https://github.com/microsoft/mimalloc/issues/361
+Bug: https://github.com/solvespace/solvespace/issues/934
+From: Ryan Pavlik <ryan.pavlik@collabora.com>
+Last-Update: 2021-02-11
+
+Date: Wed, 10 Feb 2021 16:20:25 -0600
+
+
+---
+ extlib/mimalloc/CMakeLists.txt | 5 -----
+ 1 file changed, 5 deletions(-)
+
+diff --git a/extlib/mimalloc/CMakeLists.txt b/extlib/mimalloc/CMakeLists.txt
+index 37616eb..e8e7f88 100644
+--- a/extlib/mimalloc/CMakeLists.txt
++++ b/extlib/mimalloc/CMakeLists.txt
+@@ -183,11 +183,6 @@ if(CMAKE_C_COMPILER_ID MATCHES "AppleClang|Clang|GNU|Intel" AND NOT CMAKE_SYSTEM
+   endif()
+ endif()
+ 
+-# Architecture flags
+-if(${CMAKE_HOST_SYSTEM_PROCESSOR} MATCHES "arm")
+-    list(APPEND mi_cflags -march=native)
+-endif()
+-
+ # extra needed libraries
+ if(WIN32)
+   list(APPEND mi_libraries psapi shell32 user32 bcrypt)

diff --git a/debian/patches/series b/debian/patches/series
index 6941368980a4978cba91cfe02dcb11d168cbf438..7cad336f2b53f24263e0553d3a8ea2bf43b96e35 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,4 +4,4 @@
 04_use_system_unifont.patch
 10_mimalloc_restrict_cpu_yield.patch
 11_update_js_three_r111.patch
-0007-Remove-march-native-from-mimalloc-build.patch
+12_Remove-march-native-from-mimalloc-build.patch