mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-09-24 04:59:14 -07:00
sci-electronics/kicad: no duplicate patch
No need to copy & paste the patch, just use ${PN}-${PV}
Signed-off-by: Yixun Lan <dlan@gentoo.org>
This commit is contained in:
@@ -1,22 +0,0 @@
|
||||
https://bugs.gentoo.org/970924
|
||||
|
||||
CMake >= 4.0 has removed compatibility with cmake_minimum_required
|
||||
versions less than 3.5. Bump the minimum versions in vendored
|
||||
thirdparty code to fix the build.
|
||||
|
||||
--- a/thirdparty/sentry-native/external/crashpad/third_party/zlib/zlib/CMakeLists.txt
|
||||
+++ b/thirdparty/sentry-native/external/crashpad/third_party/zlib/zlib/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 3.0)
|
||||
+cmake_minimum_required(VERSION 3.5)
|
||||
set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
|
||||
|
||||
project(zlib C)
|
||||
--- a/thirdparty/pybind11/tests/test_cmake_build/subdirectory_target/CMakeLists.txt
|
||||
+++ b/thirdparty/pybind11/tests/test_cmake_build/subdirectory_target/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 3.4)
|
||||
+cmake_minimum_required(VERSION 3.5)
|
||||
|
||||
# The `cmake_minimum_required(VERSION 3.4...3.18)` syntax does not work with
|
||||
# some versions of VS that have a patched CMake 3.11. This forces us to emulate
|
||||
@@ -1,22 +0,0 @@
|
||||
https://bugs.gentoo.org/970924
|
||||
|
||||
CMake >= 4.0 has removed compatibility with cmake_minimum_required
|
||||
versions less than 3.5. Bump the minimum versions in vendored
|
||||
thirdparty code to fix the build.
|
||||
|
||||
--- a/thirdparty/sentry-native/external/crashpad/third_party/zlib/zlib/CMakeLists.txt
|
||||
+++ b/thirdparty/sentry-native/external/crashpad/third_party/zlib/zlib/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 3.0)
|
||||
+cmake_minimum_required(VERSION 3.5)
|
||||
set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS ON)
|
||||
|
||||
project(zlib C)
|
||||
--- a/thirdparty/pybind11/tests/test_cmake_build/subdirectory_target/CMakeLists.txt
|
||||
+++ b/thirdparty/pybind11/tests/test_cmake_build/subdirectory_target/CMakeLists.txt
|
||||
@@ -1,4 +1,4 @@
|
||||
-cmake_minimum_required(VERSION 3.4)
|
||||
+cmake_minimum_required(VERSION 3.5)
|
||||
|
||||
# The `cmake_minimum_required(VERSION 3.4...3.18)` syntax does not work with
|
||||
# some versions of VS that have a patched CMake 3.11. This forces us to emulate
|
||||
@@ -121,7 +121,7 @@ src_unpack() {
|
||||
}
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${P}-fix-cmake4-compat.patch # Bug 970924
|
||||
"${FILESDIR}"/${PN}-9.0.6-fix-cmake4-compat.patch # Bug 970924
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
|
||||
@@ -121,7 +121,7 @@ src_unpack() {
|
||||
}
|
||||
|
||||
PATCHES=(
|
||||
"${FILESDIR}"/${P}-fix-cmake4-compat.patch # Bug 970924
|
||||
"${FILESDIR}"/${PN}-9.0.6-fix-cmake4-compat.patch # Bug 970924
|
||||
)
|
||||
|
||||
src_prepare() {
|
||||
|
||||
Reference in New Issue
Block a user