Hello community,
here is the log from the commit of package cmake for openSUSE:Factory checked
in at 2015-08-31 22:58:19
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/cmake (Old)
and /work/SRC/openSUSE:Factory/.cmake.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "cmake"
Changes:
--------
--- /work/SRC/openSUSE:Factory/cmake/cmake.changes 2015-08-19
13:41:00.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.cmake.new/cmake.changes 2015-08-31
22:58:21.000000000 +0200
@@ -1,0 +2,6 @@
+Fri Aug 28 20:48:10 UTC 2015 - tittiatc...@gmail.com
+
+- Resolve the error when cmake_minimum_required() is not set
+ * cmake-3.3.1-FindPkgConfig_remove_variable_dereference.patch
+
+-------------------------------------------------------------------
New:
----
cmake-3.3.1-FindPkgConfig_remove_variable_dereference.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cmake.spec ++++++
--- /var/tmp/diff_new_pack.WMlfbs/_old 2015-08-31 22:58:22.000000000 +0200
+++ /var/tmp/diff_new_pack.WMlfbs/_new 2015-08-31 22:58:22.000000000 +0200
@@ -36,6 +36,8 @@
Patch4: form.patch
# PATCH-FIX-UPSTREAM system-libs.patch -- allow choosing between bundled and
system jsoncpp & form libs
Patch5: system-libs.patch
+# PATCH-FIX-UPSTREAM
cmake-3.3.1-FindPkgConfig_remove_variable_dereference.patch - Resolve the issue
when cmake:minimum_required is not set
+Patch6: cmake-3.3.1-FindPkgConfig_remove_variable_dereference.patch
BuildRequires: curl-devel
BuildRequires: fdupes
BuildRequires: gcc-c++
@@ -67,6 +69,7 @@
%patch2 -p1
%patch4 -p1
%patch5 -p1
+%patch6 -p1
%build
export CXXFLAGS="%{optflags}"
++++++ cmake-3.3.1-FindPkgConfig_remove_variable_dereference.patch ++++++
>From b9ec9392da21a3421e48c6961976060d872faffb Mon Sep 17 00:00:00 2001
From: Rolf Eike Beer <e...@sf-mail.de>
Date: Tue, 18 Aug 2015 12:14:43 +0200
Subject: [PATCH] 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
