packages: cmake/cmake.spec, cmake/cmake-parse.patch (NEW) - fix for: -D opt...

[draenog]

Author: draenog                      Date: Fri Jan 28 18:53:38 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix for: -D option can't use value with equals sign
- rel. 2

---- Files affected:
packages/cmake:
   cmake.spec (1.54 -> 1.55) , cmake-parse.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/cmake/cmake.spec
diff -u packages/cmake/cmake.spec:1.54 packages/cmake/cmake.spec:1.55
--- packages/cmake/cmake.spec:1.54	Thu Nov 11 07:15:15 2010
+++ packages/cmake/cmake.spec	Fri Jan 28 19:53:33 2011
@@ -13,13 +13,14 @@
 Summary(pl.UTF-8):	Wieloplatformowy system make o otwartych źródłach
 Name:		cmake
 Version:	2.8.3
-Release:	1
+Release:	2
 License:	BSD
 Group:		Development/Building
 Source0:	http://www.cmake.org/files/v2.8/%{name}-%{version}.tar.gz
 # Source0-md5:	a76a44b93acf5e3badda9de111385921
 Patch0:		%{name}-lib64.patch
 Patch1:		%{name}-tinfo.patch
+Patch2:		%{name}-parse.patch
 URL:		http://www.cmake.org/
 %{?with_gui:BuildRequires:	QtGui-devel}
 BuildRequires:	libarchive-devel
@@ -68,6 +69,7 @@
 %patch0 -p1
 %endif
 %patch1 -p0
+%patch2 -p1
 
 cat > "init.cmake" <<EOF
 SET (CURSES_INCLUDE_PATH "/usr/include/ncurses" CACHE PATH " " FORCE)
@@ -138,6 +140,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.55  2011/01/28 18:53:33  draenog
+- fix for: -D option can't use value with equals sign
+- rel. 2
+
 Revision 1.54  2010/11/11 06:15:15  qboosh
 - removed redundant libarchive R (soname dep is autodetected)
 

================================================================
Index: packages/cmake/cmake-parse.patch
diff -u /dev/null packages/cmake/cmake-parse.patch:1.1
--- /dev/null	Fri Jan 28 19:53:38 2011
+++ packages/cmake/cmake-parse.patch	Fri Jan 28 19:53:33 2011
@@ -0,0 +1,31 @@
+commit 6fe8624b7ff39f8511f4f4d7ebcbc5681932a6a5
+Author: Ben Boeckel <ben.boeckel at kitware.com>
+Date:   Mon Nov 22 14:56:55 2010 -0500
+
+    Fix parsing of cache variables without a type
+    
+    These mainly come from the command line or manual entries in the
+    CMakeCache.txt file. We want to stop at the first '=' because this is
+    what is most likely to have been meant. The variable can be quoted if
+    the '=' is intended.
+    
+    Caveat: What if one wants both '"' and '=' in a variable name?
+
+diff --git a/Source/cmCacheManager.cxx b/Source/cmCacheManager.cxx
+index 2aa6236..fe6467a 100644
+--- a/Source/cmCacheManager.cxx
++++ b/Source/cmCacheManager.cxx
+@@ -97,10 +97,10 @@ bool cmCacheManager::ParseEntry(const char* entry,
+                                 std::string& var,
+                                 std::string& value)
+ {
+-  // input line is:         key:type=value
++  // input line is:         key=value
+   static cmsys::RegularExpression reg(
+-    "^([^:]*)=(.*[^\r\t ]|[\r\t ]*)[\r\t ]*$");
+-  // input line is:         "key":type=value
++    "^([^=]*)=(.*[^\r\t ]|[\r\t ]*)[\r\t ]*$");
++  // input line is:         "key"=value
+   static cmsys::RegularExpression regQuoted(
+     "^\"([^\"]*)\"=(.*[^\r\t ]|[\r\t ]*)[\r\t ]*$");
+   bool flag = false;
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/cmake/cmake.spec?r1=1.54&r2=1.55&f=u