From cf736ae9116314f01ab1ba9ca49bd6268fb28f61 Mon Sep 17 00:00:00 2001 From: Geoffrey Oxberry Date: Sat, 20 Jan 2018 05:53:50 -0800 Subject: [PATCH] qt@4 : update corewlan patch for OS X 10.1[23] (#6943) Update the qt4 CoreWLAN patch to apply to macOS/OS X 10.12 and 10.13, which both still use the CoreWLAN framework in their SDKs (although it's apparently deprecated?!). Without this patch update, `spack install qt@4.8.6` fails on macOS/OS X 10.12 because the linker cannot find headers from the CoreWLAN framework. --- .../builtin/packages/qt/qt4-corewlan-new-osx.patch | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/var/spack/repos/builtin/packages/qt/qt4-corewlan-new-osx.patch b/var/spack/repos/builtin/packages/qt/qt4-corewlan-new-osx.patch index 370edf7fa5..a4b652e401 100644 --- a/var/spack/repos/builtin/packages/qt/qt4-corewlan-new-osx.patch +++ b/var/spack/repos/builtin/packages/qt/qt4-corewlan-new-osx.patch @@ -1,16 +1,16 @@ diff -Nr -U5 qt-everywhere-opensource-src-4.8.6/src/plugins/bearer/corewlan/corewlan.pro qt-everywhere-opensource-src-4.8.6.corewlan-new-osx/src/plugins/bearer/corewlan/corewlan.pro --- qt-everywhere-opensource-src-4.8.6/src/plugins/bearer/corewlan/corewlan.pro 2014-04-10 14:37:12.000000000 -0400 +++ qt-everywhere-opensource-src-4.8.6.corewlan-new-osx/src/plugins/bearer/corewlan/corewlan.pro 2015-12-02 12:21:34.608585392 -0500 -@@ -3,11 +3,11 @@ - +@@ -3,9 +3,9 @@ + QT = core network LIBS += -framework Foundation -framework SystemConfiguration - + contains(QT_CONFIG, corewlan) { - isEmpty(QMAKE_MAC_SDK)|contains(QMAKE_MAC_SDK, "/Developer/SDKs/MacOSX10\.[67]\.sdk") { -+ isEmpty(QMAKE_MAC_SDK)|contains(QMAKE_MAC_SDK, ".*MacOSX10\.([6789]|1[01])\.sdk") { ++ isEmpty(QMAKE_MAC_SDK)|contains(QMAKE_MAC_SDK, ".*MacOSX10\.([6789]|1[0123])\.sdk") { LIBS += -framework CoreWLAN -framework Security } } - + HEADERS += qcorewlanengine.h \