[cmake] Update wxWidgets patches

[Orion Poplawski]

commit e411e9f683f07927c51d9e1a8f382081c6897f8e
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Mon Aug 25 09:38:00 2014 -0600

    Update wxWidgets patches

 cmake-FindwxWidgets.patch |   31 +++++++++++++++++++++++++------
 cmake-UsewxWidgets.patch  |   31 +++++++++++++++++++++++++++++++
 cmake.spec                |   10 ++++++++--
 3 files changed, 64 insertions(+), 8 deletions(-)
---
diff --git a/cmake-FindwxWidgets.patch b/cmake-FindwxWidgets.patch
index 1991197..64508a7 100644
--- a/cmake-FindwxWidgets.patch
+++ b/cmake-FindwxWidgets.patch
@@ -1,15 +1,34 @@
---- cmake-3.0.0-rc3/Modules/FindwxWidgets.cmake.orig	2014-03-20 10:50:27.000000000 -0600
-+++ cmake-3.0.0-rc3/Modules/FindwxWidgets.cmake	2014-04-04 09:34:41.194072417 -0600
-@@ -230,10 +230,10 @@
+From 33286235048495ceafb636d549d9a4e8891967ae Mon Sep 17 00:00:00 2001
+From: "Richard M. Shaw" <hobbes1069 at gmail.com>
+Date: Fri, 22 Aug 2014 11:35:00 -0500
+Subject: [PATCH] FindwxWidgets: Improve path detection logic when
+ cross-compiling.
+
+---
+ Modules/FindwxWidgets.cmake |    7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/Modules/FindwxWidgets.cmake b/Modules/FindwxWidgets.cmake
+index 45596a0..7ef06a8 100644
+--- a/Modules/FindwxWidgets.cmake
++++ b/Modules/FindwxWidgets.cmake
+@@ -229,13 +229,12 @@ else()
+ endif()
  
  #=====================================================================
++# Determine whether unix or win32 paths should be used
  #=====================================================================
 -if(WIN32 AND NOT CYGWIN AND NOT MSYS)
 +if(WIN32 AND NOT CYGWIN AND NOT MSYS AND NOT CMAKE_CROSSCOMPILING)
    set(wxWidgets_FIND_STYLE "win32")
  else()
 -  if(UNIX OR MSYS)
-+  if(UNIX OR MSYS OR WIN32 AND CMAKE_CROSSCOMPILING)
-     set(wxWidgets_FIND_STYLE "unix")
-   endif()
+-    set(wxWidgets_FIND_STYLE "unix")
+-  endif()
++  set(wxWidgets_FIND_STYLE "unix")
  endif()
+ 
+ #=====================================================================
+-- 
+1.7.10.4
+
diff --git a/cmake-UsewxWidgets.patch b/cmake-UsewxWidgets.patch
new file mode 100644
index 0000000..63c3b39
--- /dev/null
+++ b/cmake-UsewxWidgets.patch
@@ -0,0 +1,31 @@
+From e6fa6e60f6330ddf60294a0d9a6ed4cb3f27d4c4 Mon Sep 17 00:00:00 2001
+From: "Richard M. Shaw" <hobbes1069 at gmail.com>
+Date: Fri, 22 Aug 2014 10:27:48 -0500
+Subject: [PATCH] UsewxWidgets: CFLAGS are expected to be a string here, not a
+ list.
+
+---
+ Modules/UsewxWidgets.cmake |    7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/Modules/UsewxWidgets.cmake b/Modules/UsewxWidgets.cmake
+index f2f260d..b3633a6 100644
+--- a/Modules/UsewxWidgets.cmake
++++ b/Modules/UsewxWidgets.cmake
+@@ -88,8 +88,11 @@ if   (wxWidgets_FOUND)
+   endif()
+ 
+   if   (wxWidgets_CXX_FLAGS)
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${wxWidgets_CXX_FLAGS}")
+-    MSG("wxWidgets_CXX_FLAGS=${wxWidgets_CXX_FLAGS}")
++    # Flags are expected to be a string here, not a list.
++    string(REPLACE ";" " " wxWidgets_CXX_FLAGS_str "${wxWidgets_CXX_FLAGS}")
++    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${wxWidgets_CXX_FLAGS_str}")
++    MSG("wxWidgets_CXX_FLAGS=${wxWidgets_CXX_FLAGS_str}")
++    unset(wxWidgets_CXX_FLAGS_str)
+   endif()
+ 
+   # DEPRECATED JW
+-- 
+1.7.10.4
+
diff --git a/cmake.spec b/cmake.spec
index 7b5ee2f..5065e12 100644
--- a/cmake.spec
+++ b/cmake.spec
@@ -13,7 +13,7 @@
 
 Name:           cmake
 Version:        3.0.1
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Cross-platform make system
 
 Group:          Development/Tools
@@ -56,7 +56,9 @@ Patch9:         cmake-FindPythonLibs2.patch
 # Fix FindwxWidgets when cross-compiling for Windows
 # https://bugzilla.redhat.com/show_bug.cgi?id=1081207
 # http://public.kitware.com/Bug/view.php?id=11296
-Patch10:         cmake-FindwxWidgets.patch
+Patch10:        cmake-FindwxWidgets.patch
+# Upstream fix to UsewxWidgets for CFLAGS handling
+Patch11:        cmake-UsewxWidgets.patch
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -127,6 +129,7 @@ The %{name}-gui package contains the Qt based GUI for CMake.
 %patch8 -p1
 %patch9 -p1
 %patch10 -p1
+%patch11 -p1
 
 
 %build
@@ -248,6 +251,9 @@ update-mime-database %{?fedora:-n} %{_datadir}/mime &> /dev/null || :
 
 
 %changelog
+* Mon Aug 25 2014 Orion Poplawski <orion at cora.nwra.com> - 3.0.1-3
+- Update wxWidgets patches
+
 * Sat Aug 16 2014 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 3.0.1-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_21_22_Mass_Rebuild