From 81b8f20732954c4508baf2f77472b5435e3f851f Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Wed, 14 Sep 2022 11:10:11 +0100
Subject: gentoo auto-resync : 14:09:2022 - 11:10:10

---
 media-gfx/solvespace/Manifest                      |  1 -
 .../files/solvespace-3.0-use-system-mimalloc.patch | 74 ----------------------
 2 files changed, 75 deletions(-)
 delete mode 100644 media-gfx/solvespace/files/solvespace-3.0-use-system-mimalloc.patch

(limited to 'media-gfx/solvespace')

diff --git a/media-gfx/solvespace/Manifest b/media-gfx/solvespace/Manifest
index b841e8db4d28..a69269d86d32 100644
--- a/media-gfx/solvespace/Manifest
+++ b/media-gfx/solvespace/Manifest
@@ -1,4 +1,3 @@
-AUX solvespace-3.0-use-system-mimalloc.patch 2152 BLAKE2B 242a4aefcf2ebf985503b6574218ea01fa5b8e79c7e1c7f34e42ebbf5d01611d8b46fc27cf59e6cffc61c466bcba7f593686a4bed08dd90b96dcfe9a73ae5191 SHA512 460a94a41b8517e8ced27edde6a456b4d5bce03b72887a89022866fecc7e18930c81549542850a2b184a7f6282b754e3ab8292b542684dbde5986e3c36b29ef2
 AUX solvespace-3.1-use-system-mimalloc.patch 1330 BLAKE2B c7e1c4d58f8739a7d15fe5fdb6c26323bd8da4a485af34dd4152f157a98352eb00fbf1e9c1bfae01567fef93bc96776d1fd05451fd0903963d7070d1a8f10013 SHA512 ff2dfd0f7620630fd633e74b3c0992b6b7fa3ec47145358eccfddadce6f32c9c3351665424b51cb016a2e472b3e887762c7a07bacc00a129aa6c01890cb8cc78
 DIST libdxfrw-0.6.3-0b7b7b709d9299565db603f878214656ef5e9ddf.tar.gz 691804 BLAKE2B 84c90a591fac71144e9e13aace7c1a00dfc1bd6f27b0bcde6b60541f5b5d3ccc04ae1c759f60cb467445cc884840d04bf4613b5cc553fbbf6951cac33a084d50 SHA512 9ab498aa7f369be79d800e8ca5ec55fa54be79d0778937b81d4c8da776b3419cb8a75400b54b205efc338da32e2e781afd0bed1bd8efed1a0b212dc8682a2615
 DIST mimalloc-2.0.6-f819dbb4e4813fab464aee16770f39f11476bfea.tar.gz 1129745 BLAKE2B 95ea6e64afaa6931e18a22db45ba39d554917e109028adb624120442329bb458d24d7f22a233931c5e15b8b0ce4cc5130b0d4cba0db270a9c84453afd70c33e9 SHA512 b02a76d8a7668a4d3dc8c761473f609060b834761918b58d2143d54dbeb4c342e213010f9402d1c55035b04860936c2f8df73b84e111f5e90b3d58db62c5f85f
diff --git a/media-gfx/solvespace/files/solvespace-3.0-use-system-mimalloc.patch b/media-gfx/solvespace/files/solvespace-3.0-use-system-mimalloc.patch
deleted file mode 100644
index 485a870449b2..000000000000
--- a/media-gfx/solvespace/files/solvespace-3.0-use-system-mimalloc.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From eb8cd7a379503a0206d6ff43a2ce0749a32f2a37 Mon Sep 17 00:00:00 2001
-From: Matthew Smith <matthew@gentoo.org>
-Date: Fri, 11 Mar 2022 18:11:27 +0000
-Subject: [PATCH] build: Use system mimalloc
-
----
- CMakeLists.txt     |  8 --------
- src/CMakeLists.txt | 12 +++---------
- 2 files changed, 3 insertions(+), 17 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index bdd3670..93485d7 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -173,14 +173,6 @@ endif()
- message(STATUS "Using in-tree libdxfrw")
- add_subdirectory(extlib/libdxfrw)
- 
--message(STATUS "Using in-tree mimalloc")
--set(MI_OVERRIDE OFF CACHE BOOL "")
--set(MI_BUILD_SHARED OFF CACHE BOOL "")
--set(MI_BUILD_OBJECT OFF CACHE BOOL "")
--set(MI_BUILD_TESTS OFF CACHE BOOL "")
--add_subdirectory(extlib/mimalloc EXCLUDE_FROM_ALL)
--set(MIMALLOC_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/extlib/mimalloc/include)
--
- if(WIN32 OR APPLE)
-     # On Win32 and macOS we use vendored packages, since there is little to no benefit
-     # to trying to find system versions. In particular, trying to link to libraries from
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 5ac7b41..9f4e2f7 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -55,10 +55,7 @@ target_include_directories(slvs
- 
- target_link_libraries(slvs
-     ${util_LIBRARIES}
--    mimalloc-static)
--
--add_dependencies(slvs
--    mimalloc-static)
-+    mimalloc)
- 
- set_target_properties(slvs PROPERTIES
-     PUBLIC_HEADER ${CMAKE_SOURCE_DIR}/include/slvs.h
-@@ -213,9 +210,6 @@ add_library(solvespace-core STATIC
-     ${solvespace_core_HEADERS}
-     ${solvespace_core_SOURCES})
- 
--add_dependencies(solvespace-core
--    mimalloc-static)
--
- target_link_libraries(solvespace-core
-     ${OpenMP_CXX_LIBRARIES}
-     dxfrw
-@@ -223,7 +217,7 @@ target_link_libraries(solvespace-core
-     ${ZLIB_LIBRARY}
-     ${PNG_LIBRARY}
-     ${FREETYPE_LIBRARY}
--    mimalloc-static)
-+    mimalloc)
- 
- if(Backtrace_FOUND)
-     target_link_libraries(solvespace-core
-@@ -430,4 +424,4 @@ if(APPLE)
-             COMMENT "Bundling executable solvespace-cli"
-             VERBATIM)
-     endif()
--endif()
-\ No newline at end of file
-+endif()
--- 
-2.35.1
-
-- 
cgit v1.2.3