This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git openssh-6.2p13/Makefile.in openssh-6.2p1/Makefile.in | |
index d327787..ed7920e 100644 | |
--- openssh-6.2p13/Makefile.in | |
+++ openssh-6.2p1/Makefile.in | |
@@ -59,6 +59,7 @@ ENT=@ENT@ | |
XAUTH_PATH=@XAUTH_PATH@ | |
LDFLAGS=-L. -Lopenbsd-compat/ @LDFLAGS@ | |
EXEEXT=@EXEEXT@ | |
+KEYCHAIN_LDFLAGS=@KEYCHAIN_LDFLAGS@ | |
MANFMT=@MANFMT@ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git openssh-6.2p13/Makefile.in openssh-6.2p1/Makefile.in | |
index d327787..0c60b96 100644 | |
--- openssh-6.2p13/Makefile.in | |
+++ openssh-6.2p1/Makefile.in | |
@@ -37,7 +37,7 @@ PATHS= -DSSHDIR=\"$(sysconfdir)\" \ | |
-D_PATH_SSH_KEY_SIGN=\"$(SSH_KEYSIGN)\" \ | |
-D_PATH_SSH_PKCS11_HELPER=\"$(SSH_PKCS11_HELPER)\" \ | |
-D_PATH_SSH_PIDDIR=\"$(piddir)\" \ | |
- -D_PATH_PRIVSEP_CHROOT_DIR=\"$(PRIVSEP_PATH)\" | |
+ -D_PATH_PRIVSEP_CHROOT_DIR=\"$(PRIVSEP_PATH)\" \ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
<? $your_google_calendar="https://www.google.com/calendar/embed?whatever"; | |
$url= parse_url($your_google_calendar); | |
$google_domain = $url['scheme'].'://'.$url['host'].dirname($url['path']).'/'; | |
// Load and parse Google's raw calendar | |
$dom = new DOMDocument; | |
$dom->loadHTMLfile($your_google_calendar); | |
// Change Google's CSS file to use absolute URLs (assumes there's only one element) | |
$css = $dom->getElementByTagName('link')->item(0); | |
$css_href = $css->getAttributes('href'); | |
$css->setAttributes('href', $google_domain . $css_href); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- a/wxPython-src-3.0.1.1/src/osx/webview_webkit.mm 2014-11-20 19:08:54.000000000 -0700 | |
+++ b/wxPython-src-3.0.1.1/src/osx/webview_webkit.mm 2014-11-20 19:09:05.000000000 -0700 | |
@@ -28,7 +28,7 @@ | |
#include "wx/hashmap.h" | |
#include "wx/filesys.h" | |
-#include <WebKit/WebKit.h> | |
+#include <WebKit/WebKitLegacy.h> | |
#include <WebKit/HIWebView.h> | |
#include <WebKit/CarbonUtils.h> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
--- src/osx/webview_webkit.mm.orig 2014-12-20 00:23:39.000000000 -0700 | |
+++ src/osx/webview_webkit.mm 2014-12-20 00:35:03.000000000 -0700 | |
@@ -28,7 +28,12 @@ | |
#include "wx/hashmap.h" | |
#include "wx/filesys.h" | |
+#if __MAC_OS_X_VERSION_MAX_ALLOWED >= 101000 | |
+#include <WebKit/WebKitLegacy.h> | |
+#else | |
#include <WebKit/WebKit.h> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
=== modified file 'CMakeModules/download_boost.cmake' | |
--- CMakeModules/download_boost.cmake 2015-02-18 02:19:26.000000000 -0700 | |
+++ CMakeModules/download_boost.cmake 2015-02-18 02:07:00.000000000 -0700 | |
@@ -32,6 +32,11 @@ | |
set( BOOST_RELEASE 1.54.0 ) | |
set( BOOST_MD5 15cb8c0803064faef0c4ddf5bc5ca279 ) # re-calc this on every RELEASE change | |
+if( APPLE ) | |
+ set( BOOST_RELEASE 1.57.0 ) | |
+ set( BOOST_MD5 1be49befbdd9a5ce9def2983ba3e7b76 ) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
=== modified file 'Makefile.in' | |
--- Makefile.in 2014-06-08 14:30:42 +0000 | |
+++ Makefile.in 2014-06-08 14:30:57 +0000 | |
@@ -14619,7 +14619,7 @@ | |
monodll_carbon_frame.o \ | |
monodll_carbon_mdi.o \ | |
monodll_carbon_metafile.o \ | |
- monodll_carbon_overlay.o \ | |
+ monodll_osx_cocoa_overlay.o \ | |
monodll_carbon_popupwin.o \ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff -u kicad-mac-packaging/cmake_settings kicad-mac-packaging-snakes/cmake_settings | |
--- kicad-mac-packaging/cmake_settings 2015-02-28 12:07:52.000000000 -0700 | |
+++ kicad-mac-packaging-snakes/cmake_settings 2015-02-28 07:44:02.000000000 -0700 | |
@@ -1,3 +1,3 @@ | |
#!/bin/bash | |
-CMAKE_SETTINGS="-DCMAKE_C_COMPILER=`which clang` -DCMAKE_CXX_COMPILER=`which clang++` -DCMAKE_OSX_SYSROOT=../MacOSX10.7.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.7 -DwxWidgets_CONFIG_EXECUTABLE=../wx/wx-bin/bin/wx-config -DKICAD_SCRIPTING=OFF -DKICAD_SCRIPTING_MODULES=OFF -DKICAD_SCRIPTING_WXPYTHON=OFF -DCMAKE_INSTALL_PREFIX=../bin -DCMAKE_BUILD_TYPE=Release" | |
+CMAKE_SETTINGS="-DCMAKE_C_COMPILER=`which clang` -DCMAKE_CXX_COMPILER=`which clang++` -DCMAKE_OSX_SYSROOT=../MacOSX10.7.sdk -DCMAKE_OSX_DEPLOYMENT_TARGET=10.7 -DwxWidgets_CONFIG_EXECUTABLE=../wx/wx-bin/bin/wx-config -DKICAD_SCRIPTING=ON -DKICAD_SCRIPTING_MODULES=ON -DKICAD_SCRIPTING_WXPYTHON=ON -DPYTHON_EXECUTABLE=`which python` -DPYTHON_SITE_PACKAGE_PATH=`pwd`/wx/wx-bin/lib/python2.7/site |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff -ruN wxPython-src-3.0.2.0/Makefile.in wxPython-src-3.0.2-1.0/Makefile.in | |
--- wxPython-src-3.0.2.0/Makefile.in 2014-10-08 10:51:06.000000000 -0600 | |
+++ wxPython-src-3.0.2-1.0/Makefile.in 2015-05-20 18:54:34.000000000 -0600 | |
@@ -14645,7 +14645,7 @@ | |
monodll_carbon_frame.o \ | |
monodll_carbon_mdi.o \ | |
monodll_carbon_metafile.o \ | |
- monodll_carbon_overlay.o \ | |
+ monodll_osx_cocoa_overlay.o \ | |
monodll_carbon_popupwin.o \ |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff --git a/cmake/Modules/GrPython.cmake b/cmake/Modules/GrPython.cmake | |
index 791114e..b2297f5 100644 | |
--- a/cmake/Modules/GrPython.cmake | |
+++ b/cmake/Modules/GrPython.cmake | |
@@ -74,7 +74,7 @@ macro(GR_PYTHON_CHECK_MODULE desc mod cmd have) | |
message(STATUS "") | |
message(STATUS "Python checking for ${desc}") | |
execute_process( | |
- COMMAND ${PYTHON_EXECUTABLE} -c " | |
+ COMMAND ${PYTHON_EXECUTABLE} -c "import wxversion; wxversion.select(\"3.0.2.0\"); |
OlderNewer