[gtk-osx: 1/17] Add CMake patch for 10.11

[John Ralls <jralls src gnome org>]

commit a0875fe4286776242768462f58c3d74fb1f2b132
Author: Philip Chimento <philip chimento gmail com>
Date:   Sun Oct 18 13:48:12 2015 -0700

    Add CMake patch for 10.11
    
    This contains a fix which is necessary for building with the Mac OS X
    10.11 SDK.
    
    https://cmake.org/gitweb?p=cmake.git;a=commit;h=01b6ecdb41ec0a60f8abc70555aca6eb1463fe3f

 modulesets-stable/bootstrap.modules |    4 +++-
 patches/cmake-libnetwork.patch      |   19 +++++++++++++++++++
 patches/patch status                |    4 ++++
 3 files changed, 26 insertions(+), 1 deletions(-)
---
diff --git a/modulesets-stable/bootstrap.modules b/modulesets-stable/bootstrap.modules
index 4d23b8b..6cf5cd0 100644
--- a/modulesets-stable/bootstrap.modules
+++ b/modulesets-stable/bootstrap.modules
@@ -58,7 +58,9 @@
   <!-- cmakes ./configure is picky about invalid flags so we manually set it -->
   <autotools id="cmake" autogen-sh="bootstrap"
             autogen-template="%(srcdir)s/%(autogen-sh)s --prefix=%(prefix)s">
-    <branch repo="cmake" module="v3.2/cmake-3.2.1.tar.gz" version="3.2.1"/>
+    <branch repo="cmake" module="v3.2/cmake-3.2.1.tar.gz" version="3.2.1">
+      <patch file="cmake-libnetwork.patch" strip="1"/>
+    </branch>
   </autotools>
 
   <autotools id="m4" autogen-sh="configure">
diff --git a/patches/cmake-libnetwork.patch b/patches/cmake-libnetwork.patch
new file mode 100644
index 0000000..f4cb715
--- /dev/null
+++ b/patches/cmake-libnetwork.patch
@@ -0,0 +1,19 @@
+diff --git a/Utilities/cmcurl/CMakeLists.txt b/Utilities/cmcurl/CMakeLists.txt
+index d12c73f..39b70c0 100644 (file)
+--- a/Utilities/cmcurl/CMakeLists.txt
++++ b/Utilities/cmcurl/CMakeLists.txt
+@@ -43,6 +43,14 @@ if(WIN32)
+   set(HAVE_INET_PTON 0 CACHE INTERNAL "Do not use inet_pton")
+ endif()
+ 
++# Starting with OSX 10.11 there is an unrelated libnetwork library which will
++# be picked up during curl configuration. Linking against this library is
++# unnecessary and breaks backward compatibility of the resulting binaries
++# because libnetwork is unavailable on older OSX versions.
++if(APPLE)
++  set(HAVE_LIBNETWORK 0 CACHE INTERNAL "Do not use libnetwork")
++endif(APPLE)
++
+ # Disable warnings to avoid changing 3rd party code.
+ if(CMAKE_C_COMPILER_ID MATCHES
+     "^(GNU|Clang|AppleClang|XL|VisualAge|SunPro|MIPSpro|HP|Intel)$")
diff --git a/patches/patch status b/patches/patch status
index 3e91cb0..97624ea 100644
--- a/patches/patch status      
+++ b/patches/patch status      
@@ -75,3 +75,7 @@ py2cairo-python2.6: py2cairo-python2.6-Dont-try-to-guess-arch.patch
                Needed to work around broken behaviour in waf.
                Not sure if this will ever be fixed.
                https://code.google.com/p/waf/issues/detail?id=1505
+
+cmake:         cmake-libnetwork.patch
+               Necessary when building on 10.11. Should be fixed in CMake 3.4.
+               https://cmake.org/gitweb?p=cmake.git;a=commit;h=01b6ecdb41ec0a60f8abc70555aca6eb1463fe3f