Merge lp:~metacollin/kicad/yosemite_fix into lp:kicad/product

[metacollin]

Building wx with the osx_build_wx.sh script fails if using the 10.10 OS X SDK, and while there was a patch for this, it was unsafe and would cause wx to build against the 10.10 SDK but fail against any previous versions. I removed that patch and replaced it with one that is safe and will build correctly against any SDK and can be applied automatically. I also added it to the osx_build_wx.sh script so it is applied, making a total of 4 patches instead of 3.

[lp:~metacollin/kicad/yosemite_fix]

5340. By metacollin on 2014-12-26

Fixed permissions of the osx_build_wx.sh script

[Wayne Stambaugh (stambaughw)]

Would one of the OSX developers please verify this merge request before I merge this into the product branch?

[lp:~metacollin/kicad/yosemite_fix]

5341. By metacollin on 2015-01-03

merged with latest revision

[metacollin (metacollin)]

I know this is a tiny tiny merge request patch, but I wanted to do something modest and small since I am very new to the project. I did test this against the 10.6-10.10 SDKs, as well as within a virtualized 10.8 environment and my own 10.10.2 system, using wx 3.0.0, 3.0.1.1, and 3.0.2.

It's not particularly sexy and rebuilding wx is probably not exactly an appealing proposition to the other OS X developers, but it should be noted that without this patch, one can only build kicad against the OS X 10.9 or earlier SDKs and there is no documentation included on dealing with this issue, so its definitely a very small fix, but pretty important.

Here ( http://trac.wxwidgets.org/ticket/16329 ) is more documentation about the issue. It's been fixed in the development branch of wx, but that release is a ways off, and introduces a ton of changes (like the addition of iOS support).

Also, apologies if such a small merge request like this is too small and kind of wasting everyone's time. I am new to collaborative development so I may unintentionally make a few faux pas until I figure things out.

I've also created a homebrew --HEAD only tap for kicad, and I'm currently pulling in the patch via gist,

> On Dec 30, 2014, at 9:17 AM, Wayne Stambaugh <email address hidden> wrote:
>
> Would one of the OSX developers please verify this merge request before I merge this into the product branch?
> --
> https://code.launchpad.net/~metacollin/kicad/yosemite_fix/+merge/245369
> You are the owner of lp:~metacollin/kicad/yosemite_fix.

[Chris Pavlina (pavlina-chris)]

Collin, is this still relevant, or should I close it?

review: Needs Information

Unmerged revisions

5341. By metacollin on 2015-01-03

merged with latest revision

5340. By metacollin on 2014-12-26

Fixed permissions of the osx_build_wx.sh script

5339. By metacollin on 2014-12-25

Added patch that safely patches wx to build regardless of which OS X SDK is being linked (including yosemite) and added this to the osx_build_wx.sh script.

5338. By metacollin on 2014-12-25

Added patch that safely patches wx to build regardless of which OS X SDK is being linked (including yosemite) and added this to the osx_build_wx.sh script.

=== added file 'patches/wxwidgets-3.0.0_macosx_yosemite.patch'
--- patches/wxwidgets-3.0.0_macosx_yosemite.patch	1970-01-01 00:00:00 +0000
+++ patches/wxwidgets-3.0.0_macosx_yosemite.patch	2015-01-03 23:57:37 +0000
@@ -0,0 +1,15 @@
+--- 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>
++#endif
++
+ #include <WebKit/HIWebView.h>
+ #include <WebKit/CarbonUtils.h>
+ 

=== removed file 'patches/wxwidgets-3.0.2_macosx_yosemite.patch'
--- patches/wxwidgets-3.0.2_macosx_yosemite.patch	2014-12-08 17:40:38 +0000
+++ patches/wxwidgets-3.0.2_macosx_yosemite.patch	1970-01-01 00:00:00 +0000
@@ -1,10 +0,0 @@
---- src/osx/webview_webkit.mm.orig	2014-09-16 07:27:52.000000000 -0600
-+++ src/osx/webview_webkit.mm	2014-09-16 07:28:12.000000000 -0600
-@@ -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>

=== modified file 'scripts/osx_build_wx.sh' (properties changed: -x to +x)
--- scripts/osx_build_wx.sh	2014-11-28 17:34:00 +0000
+++ scripts/osx_build_wx.sh	2015-01-03 23:57:37 +0000
@@ -140,6 +140,7 @@
 doPatch "$1" "$3/patches/wxwidgets-3.0.0_macosx.patch"
 doPatch "$1" "$3/patches/wxwidgets-3.0.0_macosx_bug_15908.patch"
 doPatch "$1" "$3/patches/wxwidgets-3.0.0_macosx_soname.patch"
+doPatch "$1" "$3/patches/wxwidgets-3.0.0_macosx_yosemite.patch"
 
 # configure and build wxWidgets
 wxWidgets_configure "$1" "$2" "$4"