Lubuntu/cmake
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refresh patches

Browse Source 
- Drop Revert-commit-f745e049-temporarily.patch
  (applied upstream)

Gbp-Dch: full
This commit is contained in:
Timo Röhling 2022-05-25 21:02:04 +02:00
parent b46fe4adf6
commit 314e149f33
3 changed files with 2 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
debian/patches/0001-Prefer-Debian-default-version-of-Python.patch vendored
View File

@ -8,13 +8,13 @@ Forwarded: not-needed
1 file changed, 14 insertions(+)
diff --git a/Modules/FindPython/Support.cmake b/Modules/FindPython/Support.cmake
index afe9743..cc17495 100644
index cbb6c1c..7bde2e6 100644
--- a/Modules/FindPython/Support.cmake
+++ b/Modules/FindPython/Support.cmake
@@ -23,6 +23,20 @@ if (NOT DEFINED _${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR)
endif()
if (_${_PYTHON_PREFIX}_REQUIRED_VERSION_MAJOR EQUAL "3")
set(_${_PYTHON_PREFIX}_VERSIONS 3.11 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
set(_${_PYTHON_PREFIX}_VERSIONS 3.12 3.11 3.10 3.9 3.8 3.7 3.6 3.5 3.4 3.3 3.2 3.1 3.0)
+ # Debian-specific: prefer current default version
+ execute_process(
+ COMMAND py3versions -vd

24
debian/patches/0002-Revert-commit-f745e049-temporarily.patch vendored
View File

@ -1,24 +0,0 @@
From: =?utf-8?q?Timo_R=C3=B6hling?= <roehling@debian.org>
Date: Wed, 20 Apr 2022 20:03:10 +0200
Subject: Revert commit f745e049 temporarily
This commit introduced a regression with qa=+canary; it has
been reverted upstream pending further investigation.
Forwarded: https://gitlab.kitware.com/cmake/cmake/-/issues/23432
---
Modules/CMakeCheckCompilerFlagCommonPatterns.cmake | 1 -
1 file changed, 1 deletion(-)
diff --git a/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake b/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake
index 8f59acd..bda1d71 100644
--- a/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake
+++ b/Modules/CMakeCheckCompilerFlagCommonPatterns.cmake
@@ -13,7 +13,6 @@ macro (CHECK_COMPILER_FLAG_COMMON_PATTERNS _VAR)
FAIL_REGEX "unknown .*option" # Clang
FAIL_REGEX "optimization flag .* not supported" # Clang
FAIL_REGEX "unknown argument ignored" # Clang (cl)
- FAIL_REGEX "warning: .* ignored" # Clang (linker)
FAIL_REGEX "ignoring unknown option" # MSVC, Intel
FAIL_REGEX "warning D9002" # MSVC, any lang
FAIL_REGEX "option.*not supported" # Intel

1
debian/patches/series vendored
View File

@ -1,2 +1 @@
0001-Prefer-Debian-default-version-of-Python.patch
0002-Revert-commit-f745e049-temporarily.patch