commit 70541a8cb7f1a8c87a17226d8adc110f2776cd91
Author: Jan Rękorajski <[email protected]>
Date: Thu Feb 10 13:46:22 2022 +0100
- up to 3.22.2
cmake-findruby.patch | 20 ++++++++++----------
cmake-findruby2.patch | 10 +++++-----
cmake.spec | 8 ++++----
3 files changed, 19 insertions(+), 19 deletions(-)
---
diff --git a/cmake.spec b/cmake.spec
index 9dfd334..820adf1 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -17,12 +17,12 @@
Summary: Cross-platform, open-source make system
Summary(pl.UTF-8): Wieloplatformowy system make o otwartych źródłach
Name: cmake
-Version: 3.17.2
+Version: 3.22.2
Release: 1
License: BSD
Group: Development/Building
-Source0: https://cmake.org/files/v3.17/%{name}-%{version}.tar.gz
-# Source0-md5: fa62a3e1a736213f1d38dbe723550484
+Source0: https://cmake.org/files/v3.22/%{name}-%{version}.tar.gz
+# Source0-md5: f96b91224aa14b09565325b51d60af43
Patch0: %{name}-lib64.patch
Patch1: %{name}-libx32.patch
Patch2: %{name}-helpers.patch
@@ -127,7 +127,7 @@ Bashowe dopełnianie parametrów dla cmake'a.
%if "%{_lib}" == "libx32"
%patch1 -p1
%endif
-%patch2 -p1
+#%patch2 -p1
%patch3 -p1
%patch4 -p1
diff --git a/cmake-findruby.patch b/cmake-findruby.patch
index d4451bf..dca7e9d 100644
--- a/cmake-findruby.patch
+++ b/cmake-findruby.patch
@@ -14,19 +14,19 @@ diff -up cmake-2.8.10-rc1/Modules/FindRuby.cmake.findruby
cmake-2.8.10-rc1/Modul
--- cmake-2.8.10-rc1/Modules/FindRuby.cmake.findruby 2012-10-02
10:12:18.000000000 -0600
+++ cmake-2.8.10-rc1/Modules/FindRuby.cmake 2012-10-02 15:50:30.463292214
-0600
@@ -110,14 +110,8 @@
- _RUBY_CONFIG_VAR("sitearchdir" RUBY_SITEARCH_DIR)
- _RUBY_CONFIG_VAR("sitelibdir" RUBY_SITELIB_DIR)
+ _RUBY_CONFIG_VAR("sitearchdir" Ruby_SITEARCH_DIR)
+ _RUBY_CONFIG_VAR("sitelibdir" Ruby_SITELIB_DIR)
- # vendor_ruby available ?
-- execute_process(COMMAND ${RUBY_EXECUTABLE} -r vendor-specific -e "print
'true'"
-- OUTPUT_VARIABLE RUBY_HAS_VENDOR_RUBY ERROR_QUIET)
+- execute_process(COMMAND ${Ruby_EXECUTABLE} -r vendor-specific -e "print
'true'"
+- OUTPUT_VARIABLE Ruby_HAS_VENDOR_RUBY ERROR_QUIET)
-
-- if(RUBY_HAS_VENDOR_RUBY)
-- _RUBY_CONFIG_VAR("vendorlibdir" RUBY_VENDORLIB_DIR)
-- _RUBY_CONFIG_VAR("vendorarchdir" RUBY_VENDORARCH_DIR)
+- if(Ruby_HAS_VENDOR_RUBY)
+- _RUBY_CONFIG_VAR("vendorlibdir" Ruby_VENDORLIB_DIR)
+- _RUBY_CONFIG_VAR("vendorarchdir" Ruby_VENDORARCH_DIR)
- endif()
-+ _RUBY_CONFIG_VAR("vendorlibdir" RUBY_VENDORLIB_DIR)
-+ _RUBY_CONFIG_VAR("vendorarchdir" RUBY_VENDORARCH_DIR)
++ _RUBY_CONFIG_VAR("vendorlibdir" Ruby_VENDORLIB_DIR)
++ _RUBY_CONFIG_VAR("vendorarchdir" Ruby_VENDORARCH_DIR)
# save the results in the cache so we don't have to run ruby the next time
again
- set(RUBY_VERSION_MAJOR ${RUBY_VERSION_MAJOR} CACHE PATH "The Ruby
major version" FORCE)
+ set(Ruby_VERSION_MAJOR ${Ruby_VERSION_MAJOR} CACHE PATH "The Ruby
major version" FORCE)
diff --git a/cmake-findruby2.patch b/cmake-findruby2.patch
index 2f6677f..32fa6ef 100644
--- a/cmake-findruby2.patch
+++ b/cmake-findruby2.patch
@@ -2,10 +2,10 @@ diff -urNp -x '*.orig'
cmake-3.17.2.org/Modules/FindRuby.cmake cmake-3.17.2/Modu
--- cmake-3.17.2.org/Modules/FindRuby.cmake 2021-04-12 22:19:23.761018307
+0200
+++ cmake-3.17.2/Modules/FindRuby.cmake 2021-04-12 22:19:24.521040438
+0200
@@ -207,6 +207,7 @@ if( "${Ruby_FIND_VERSION_SHORT_NODOT}" G
- find_path(RUBY_CONFIG_INCLUDE_DIR
+ find_path(Ruby_CONFIG_INCLUDE_DIR
NAMES ruby/config.h config.h
HINTS
-+ ${RUBY_HDR_DIR}
- ${RUBY_HDR_DIR}/${RUBY_ARCH}
- ${RUBY_ARCH_DIR}
- ${RUBY_ARCHHDR_DIR}
++ ${Ruby_HDR_DIR}
+ ${Ruby_HDR_DIR}/${Ruby_ARCH}
+ ${Ruby_ARCH_DIR}
+ ${Ruby_ARCHHDR_DIR}
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/cmake.git/commitdiff/70541a8cb7f1a8c87a17226d8adc110f2776cd91
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
