commit da809505894c5f16c4b8f03ce514c2879d909f6c
Author: Jan Palus <[email protected]>
Date: Fri Sep 15 20:50:30 2023 +0200
up to 3.27.5
atomic.patch | 11 -----------
cmake-zlib.patch | 20 --------------------
cmake.spec | 8 ++------
3 files changed, 2 insertions(+), 37 deletions(-)
---
diff --git a/cmake.spec b/cmake.spec
index 506c6fb..ac4e928 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -17,20 +17,18 @@
Summary: Cross-platform, open-source make system
Summary(pl.UTF-8): Wieloplatformowy system make o otwartych źródłach
Name: cmake
-Version: 3.27.3
+Version: 3.27.5
Release: 1
License: BSD
Group: Development/Building
Source0: https://cmake.org/files/v3.27/%{name}-%{version}.tar.gz
-# Source0-md5: 7228f5fcc8a858fdeac27e29bda0c144
+# Source0-md5: fbda83fa70276f6971cab8cdb1407191
Patch0: %{name}-lib64.patch
Patch1: %{name}-libx32.patch
Patch2: %{name}-jni.patch
Patch3: %{name}-findruby.patch
Patch4: %{name}-findruby2.patch
Patch5: disable-completness-check.patch
-Patch6: %{name}-zlib.patch
-Patch7: atomic.patch
URL: https://cmake.org/
# system zlib,bzip2,xz,zstd used only when without system libarchive
%if %{with gui}
@@ -148,8 +146,6 @@ Bashowe dopełnianie parametrów dla cmake'a.
%patch3 -p1
%patch4 -p1
%patch5 -p1
-%patch6 -p1
-%patch7 -p1
%{__sed} -i -e '1s,/usr/bin/env bash,/bin/bash,' \
Modules/Compiler/XL-Fortran/cpp
diff --git a/atomic.patch b/atomic.patch
deleted file mode 100644
index 0bb0f3a..0000000
--- a/atomic.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- cmake-3.27.3.orig/Source/Checks/cm_cxx_features.cmake 2023-08-16
19:46:35.000000000 +0200
-+++ cmake-3.27.3/Source/Checks/cm_cxx_features.cmake 2023-08-23
23:10:16.079757726 +0200
-@@ -96,7 +96,7 @@
- set(CMake_HAVE_CXX_FILESYSTEM FALSE)
- endif()
-
--if(CMAKE_SYSTEM_NAME STREQUAL "Linux" AND CMAKE_SYSTEM_PROCESSOR MATCHES
"armv7l|sparc")
-+if(CMAKE_SYSTEM_NAME STREQUAL "Linux")
- cm_check_cxx_feature(atomic_builtin)
- if(NOT CMake_HAVE_CXX_ATOMIC_BUILTIN)
- set(cm_check_cxx_feature_LINK_LIBRARIES atomic)
diff --git a/cmake-zlib.patch b/cmake-zlib.patch
deleted file mode 100644
index a53ab1e..0000000
--- a/cmake-zlib.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- cmake-3.27.3/Modules/FindZLIB.cmake.orig 2023-08-16 19:46:35.000000000
+0200
-+++ cmake-3.27.3/Modules/FindZLIB.cmake 2023-08-23 16:25:36.123237881
+0200
-@@ -179,9 +179,15 @@ if(ZLIB_INCLUDE_DIR AND EXISTS "${ZLIB_I
-
- string(REGEX REPLACE "^.*ZLIB_VERSION \"([0-9]+).*$" "\\1"
ZLIB_VERSION_MAJOR "${ZLIB_H}")
- string(REGEX REPLACE "^.*ZLIB_VERSION \"[0-9]+\\.([0-9]+).*$" "\\1"
ZLIB_VERSION_MINOR "${ZLIB_H}")
-- string(REGEX REPLACE "^.*ZLIB_VERSION \"[0-9]+\\.[0-9]+\\.([0-9]+).*$"
"\\1" ZLIB_VERSION_PATCH "${ZLIB_H}")
-- set(ZLIB_VERSION_STRING
"${ZLIB_VERSION_MAJOR}.${ZLIB_VERSION_MINOR}.${ZLIB_VERSION_PATCH}")
-+ set(ZLIB_VERSION_STRING "${ZLIB_VERSION_MAJOR}.${ZLIB_VERSION_MINOR}")
-
-+ # only append a PATCH version if it exists:
-+ set(ZLIB_VERSION_PATCH "")
-+ if( "${ZLIB_H}" MATCHES "ZLIB_VERSION \"[0-9]+\\.[0-9]+\\.([0-9]+)")
-+ set(ZLIB_VERSION_PATCH "${CMAKE_MATCH_1}")
-+ string(APPEND ZLIB_VERSION_STRING ".${ZLIB_VERSION_PATCH}")
-+ endif()
-+
- # only append a TWEAK version if it exists:
- set(ZLIB_VERSION_TWEAK "")
- if( "${ZLIB_H}" MATCHES "ZLIB_VERSION
\"[0-9]+\\.[0-9]+\\.[0-9]+\\.([0-9]+)")
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/cmake.git/commitdiff/da809505894c5f16c4b8f03ce514c2879d909f6c
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
