From 834c96592f0308e3b4215338c1e9c60bb9ff8a2c Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jan=20R=C4=99korajski?= Date: Sat, 27 Feb 2016 16:27:48 +0100 Subject: [PATCH] - up to 3.4.3 --- cmake-findpython.patch | 11 ----------- cmake-lib64.patch | 18 ++++++++++-------- cmake-libx32.patch | 18 ++++++++++-------- cmake-min-ver.patch | 40 ---------------------------------------- cmake.spec | 27 +++++++++++---------------- 5 files changed, 31 insertions(+), 83 deletions(-) delete mode 100644 cmake-findpython.patch delete mode 100644 cmake-min-ver.patch diff --git a/cmake-findpython.patch b/cmake-findpython.patch deleted file mode 100644 index f0b929a..0000000 --- a/cmake-findpython.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- cmake-3.0.2/Modules/FindPythonLibs.cmake~ 2014-01-16 18:15:08.000000000 +0100 -+++ cmake-3.0.2/Modules/FindPythonLibs.cmake 2014-10-21 11:59:07.048973118 +0200 -@@ -38,7 +38,7 @@ - - set(_PYTHON1_VERSIONS 1.6 1.5) - set(_PYTHON2_VERSIONS 2.7 2.6 2.5 2.4 2.3 2.2 2.1 2.0) --set(_PYTHON3_VERSIONS 3.4 3.3 3.2 3.1 3.0) -+set(_PYTHON3_VERSIONS 3.5 3.4 3.3 3.2 3.1 3.0) - - if(PythonLibs_FIND_VERSION) - if(PythonLibs_FIND_VERSION MATCHES "^[0-9]+\\.[0-9]+(\\.[0-9]+.*)?$") diff --git a/cmake-lib64.patch b/cmake-lib64.patch index 8a69ea1..7675ea4 100644 --- a/cmake-lib64.patch +++ b/cmake-lib64.patch @@ -11,12 +11,14 @@ endmacro() --- cmake-3.1.0/Modules/FindZLIB.cmake~ 2014-12-15 20:07:43.000000000 +0000 +++ cmake-3.1.0/Modules/FindZLIB.cmake 2014-12-24 21:00:27.139263296 +0000 -@@ -79,7 +79,7 @@ - # Try each search configuration. - foreach(search ${_ZLIB_SEARCHES}) - find_path(ZLIB_INCLUDE_DIR NAMES zlib.h ${${search}} PATH_SUFFIXES include) -- find_library(ZLIB_LIBRARY NAMES ${ZLIB_NAMES} ${${search}} PATH_SUFFIXES lib) -+ find_library(ZLIB_LIBRARY NAMES ${ZLIB_NAMES} ${${search}} PATH_SUFFIXES lib64) - endforeach() +@@ -85,8 +85,8 @@ + # Allow ZLIB_LIBRARY to be set manually, as the location of the zlib library + if(NOT ZLIB_LIBRARY) + foreach(search ${_ZLIB_SEARCHES}) +- find_library(ZLIB_LIBRARY_RELEASE NAMES ${ZLIB_NAMES} ${${search}} PATH_SUFFIXES lib) +- find_library(ZLIB_LIBRARY_DEBUG NAMES ${ZLIB_NAMES_DEBUG} ${${search}} PATH_SUFFIXES lib) ++ find_library(ZLIB_LIBRARY_RELEASE NAMES ${ZLIB_NAMES} ${${search}} PATH_SUFFIXES lib64) ++ find_library(ZLIB_LIBRARY_DEBUG NAMES ${ZLIB_NAMES_DEBUG} ${${search}} PATH_SUFFIXES lib64) + endforeach() - mark_as_advanced(ZLIB_LIBRARY ZLIB_INCLUDE_DIR) + include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake) diff --git a/cmake-libx32.patch b/cmake-libx32.patch index fd01384..a7eef84 100644 --- a/cmake-libx32.patch +++ b/cmake-libx32.patch @@ -39,15 +39,17 @@ diff -urN cmake-3.1.3/Modules/FindPkgConfig.cmake cmake-3.1.3.x32/Modules/FindPk diff -urN cmake-3.1.3/Modules/FindZLIB.cmake cmake-3.1.3.x32/Modules/FindZLIB.cmake --- cmake-3.1.3/Modules/FindZLIB.cmake 2015-02-11 16:17:39.000000000 +0000 +++ cmake-3.1.3.x32/Modules/FindZLIB.cmake 2015-03-05 21:07:55.935140350 +0000 -@@ -79,7 +79,7 @@ - # Try each search configuration. - foreach(search ${_ZLIB_SEARCHES}) - find_path(ZLIB_INCLUDE_DIR NAMES zlib.h ${${search}} PATH_SUFFIXES include) -- find_library(ZLIB_LIBRARY NAMES ${ZLIB_NAMES} ${${search}} PATH_SUFFIXES lib) -+ find_library(ZLIB_LIBRARY NAMES ${ZLIB_NAMES} ${${search}} PATH_SUFFIXES libx32) - endforeach() +@@ -85,8 +85,8 @@ + # Allow ZLIB_LIBRARY to be set manually, as the location of the zlib library + if(NOT ZLIB_LIBRARY) + foreach(search ${_ZLIB_SEARCHES}) +- find_library(ZLIB_LIBRARY_RELEASE NAMES ${ZLIB_NAMES} ${${search}} PATH_SUFFIXES lib) +- find_library(ZLIB_LIBRARY_DEBUG NAMES ${ZLIB_NAMES_DEBUG} ${${search}} PATH_SUFFIXES lib) ++ find_library(ZLIB_LIBRARY_RELEASE NAMES ${ZLIB_NAMES} ${${search}} PATH_SUFFIXES libx32) ++ find_library(ZLIB_LIBRARY_DEBUG NAMES ${ZLIB_NAMES_DEBUG} ${${search}} PATH_SUFFIXES libx32) + endforeach() - mark_as_advanced(ZLIB_LIBRARY ZLIB_INCLUDE_DIR) + include(${CMAKE_CURRENT_LIST_DIR}/SelectLibraryConfigurations.cmake) diff -urN cmake-3.1.3/Modules/GetPrerequisites.cmake cmake-3.1.3.x32/Modules/GetPrerequisites.cmake --- cmake-3.1.3/Modules/GetPrerequisites.cmake 2015-02-11 16:17:39.000000000 +0000 +++ cmake-3.1.3.x32/Modules/GetPrerequisites.cmake 2015-03-05 21:18:03.455135952 +0000 diff --git a/cmake-min-ver.patch b/cmake-min-ver.patch deleted file mode 100644 index f356a09..0000000 --- a/cmake-min-ver.patch +++ /dev/null @@ -1,40 +0,0 @@ -From b9ec9392da21a3421e48c6961976060d872faffb Mon Sep 17 00:00:00 2001 -From: Rolf Eike Beer -Date: Tue, 18 Aug 2015 12:14:43 +0200 -Subject: [PATCH 1/1] FindPkgConfig: remove variable dereference - -If CMAKE_MINIMUM_REQUIRED_VERSION is not set because no -cmake_minimum_required() call is present this line can lead to an error as that -string is empty so too few arguments are passed to if(): - -See also "/var/tmp/paludis/build/kde-krdc-15.08.0/work/build/CMakeFiles/CMakeOutput.log". -See also "/var/tmp/paludis/build/kde-krdc-15.08.0/work/build/CMakeFiles/CMakeError.log". -CMake Error at /usr/share/cmake/Modules/FindPkgConfig.cmake:112 (elseif): - given arguments: - - "VERSION_LESS" "3.1" - - Unknown arguments specified -Call Stack (most recent call first): - /usr/share/cmake/Modules/FindPkgConfig.cmake:501 (_pkgconfig_parse_options) - /usr/share/cmake/Modules/FindOpenSSL.cmake:43 (pkg_check_modules) ---- - Modules/FindPkgConfig.cmake | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake -index 526a62e..ae6903e 100644 ---- a/Modules/FindPkgConfig.cmake -+++ b/Modules/FindPkgConfig.cmake -@@ -109,7 +109,7 @@ macro(_pkgconfig_parse_options _result _is_req _is_silent _no_cmake_path _no_cma - set(${_no_cmake_path} 1) - set(${_no_cmake_environment_path} 1) - endif() -- elseif(${CMAKE_MINIMUM_REQUIRED_VERSION} VERSION_LESS 3.1) -+ elseif(CMAKE_MINIMUM_REQUIRED_VERSION VERSION_LESS 3.1) - set(${_no_cmake_path} 1) - set(${_no_cmake_environment_path} 1) - endif() --- -1.7.10.4 - diff --git a/cmake.spec b/cmake.spec index 195ae0f..d574b58 100644 --- a/cmake.spec +++ b/cmake.spec @@ -14,19 +14,17 @@ Summary: Cross-platform, open-source make system Summary(pl.UTF-8): Wieloplatformowy system make o otwartych źródłach Name: cmake -Version: 3.3.2 -Release: 3 +Version: 3.4.3 +Release: 1 License: BSD Group: Development/Building -Source0: http://www.cmake.org/files/v3.3/%{name}-%{version}.tar.gz -# Source0-md5: 5febbd11bcaac854a27eebaf4a124be2 +Source0: http://www.cmake.org/files/v3.4/%{name}-%{version}.tar.gz +# Source0-md5: 4cb3ff35b2472aae70f542116d616e63 Patch0: %{name}-lib64.patch -Patch1: %{name}-helpers.patch -Patch2: %{name}-findruby.patch -Patch3: cmake-min-ver.patch -Patch5: %{name}-findruby2.patch -Patch6: %{name}-findpython.patch -Patch7: %{name}-libx32.patch +Patch1: %{name}-libx32.patch +Patch2: %{name}-helpers.patch +Patch3: %{name}-findruby.patch +Patch4: %{name}-findruby2.patch URL: http://www.cmake.org/ %{?with_gui:BuildRequires: QtGui-devel} BuildRequires: jsoncpp-devel >= 1.6.2-2 @@ -115,15 +113,12 @@ Bashowe dopełnianie parametrów dla cmake'a. %if "%{_lib}" == "lib64" %patch0 -p1 %endif +%if "%{_lib}" == "libx32" %patch1 -p1 +%endif %patch2 -p1 %patch3 -p1 - -%patch5 -p1 -%patch6 -p1 -%if "%{_lib}" == "libx32" -%patch7 -p1 -%endif +%patch4 -p1 cat > "init.cmake" <