summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Sturmlechner <asturm@gentoo.org>2024-08-29 19:02:48 +0200
committerAndreas Sturmlechner <asturm@gentoo.org>2024-08-29 21:02:34 +0200
commit2619890b9c7c012734161b7dfd32e9a616471ade (patch)
tree59e930f50527c3f16d469c6ac68984e945d1fe18 /dev-build/cmake/files/cmake-3.27.4-0001-FindPkgConfig-ignore-whitespace-separators-in-versio.patch
parentx11-misc/xdg-utils: drop 1.1.3_p20210805-r2, 1.2.1-r1, 1.2.1-r2 (diff)
downloadgentoo-2619890b9c7c012734161b7dfd32e9a616471ade.tar.gz
gentoo-2619890b9c7c012734161b7dfd32e9a616471ade.tar.bz2
gentoo-2619890b9c7c012734161b7dfd32e9a616471ade.zip
dev-build/cmake: drop 3.29.3, 3.29.6, 3.30.0, 3.30.1
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'dev-build/cmake/files/cmake-3.27.4-0001-FindPkgConfig-ignore-whitespace-separators-in-versio.patch')
-rw-r--r--dev-build/cmake/files/cmake-3.27.4-0001-FindPkgConfig-ignore-whitespace-separators-in-versio.patch38
1 files changed, 0 insertions, 38 deletions
diff --git a/dev-build/cmake/files/cmake-3.27.4-0001-FindPkgConfig-ignore-whitespace-separators-in-versio.patch b/dev-build/cmake/files/cmake-3.27.4-0001-FindPkgConfig-ignore-whitespace-separators-in-versio.patch
deleted file mode 100644
index 9ee8a1c9fcbf..000000000000
--- a/dev-build/cmake/files/cmake-3.27.4-0001-FindPkgConfig-ignore-whitespace-separators-in-versio.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-https://gitlab.kitware.com/cmake/cmake/-/merge_requests/8789
-
-From d47771bbb96a8435401950fb504b06003ec0babb Mon Sep 17 00:00:00 2001
-From: Paul Zander <negril.nx+gentoo@gmail.com>
-Date: Sat, 9 Sep 2023 13:45:19 +0200
-Subject: [PATCH] FindPkgConfig: ignore whitespace separators in version check
-
-The regex used to split up the version if it contains an operator fails
-if the string contains whitespaces. Resulting in an extra whitespace
-after the package name and before the package version leading to
-breakage in pkgconf and thus webkit-gtk.
-
-See:
-https://github.com/pkgconf/pkgconf/issues/317
-https://bugs.webkit.org/show_bug.cgi?id=261125
-https://bugs.gentoo.org/913644
----
- Modules/FindPkgConfig.cmake | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
-index 4d29f4505..6e8b78441 100644
---- a/Modules/FindPkgConfig.cmake
-+++ b/Modules/FindPkgConfig.cmake
-@@ -563,8 +563,8 @@ macro(_pkg_check_modules_internal _is_required _is_silent _no_cmake_path _no_cma
- foreach (_pkg_check_modules_pkg ${_pkg_check_modules_list})
- set(_pkg_check_modules_exist_query)
-
-- # check whether version is given
-- if (_pkg_check_modules_pkg MATCHES "(.*[^><])(=|[><]=?)(.*)")
-+ # check whether version is given while ignoring whitespace
-+ if (_pkg_check_modules_pkg MATCHES "(.*[^>< \t])[ \t]*(=|[><]=?)[ \t]*(.*)")
- set(_pkg_check_modules_pkg_name "${CMAKE_MATCH_1}")
- set(_pkg_check_modules_pkg_op "${CMAKE_MATCH_2}")
- set(_pkg_check_modules_pkg_ver "${CMAKE_MATCH_3}")
---
-2.42.0
-