haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
kicad/patches/wxwidgets-3.0.2_macosx_yose...

12 lines
373 B
Diff
Raw Normal View History

Make OSX patch style consistent.
2016-09-17 16:19:45 +00:00
=== modified file 'src/osx/webview_webkit.mm'
--- src/osx/webview_webkit.mm 2014-09-16 07:27:52.000000000 -0600
OSX build fixes. * Make patches/wxwidgets-3.0.2_macosx_yosemite.patch usable. There were complaints here before that the patch does not work because it is a "metapatch" that tries to patch another patch (which is not in the tree and therefore fails). With this change, it becomes a normal patch again, that can be applied to the wxWidgets source tree as described in Documentation/compiling/mac-osx.txt. * Make scripts/library-repos-install.sh compatible with OSX: This involves checking for the correct option to enable extended regular expressions in sed during detect_pretty_repos, as the script uses "-r", which is only available in GNU sed. The sed shipped with Mac OSX is an older BSD descendant sed which needs "-E". This change has been tested to work on Mac OSX 10.10.1 and on an up-to-date Arch Linux. I also changed the error message during --install-prerequisites to inform users without apt-get or yum which programs need to be installed to use the script. * Add the execute flag to scripts/osx_build_wx.sh: At the moment, after fetching the source with bzr, one has to chmod the file by hand. This change change ensures consistency between the script and the build docs for OSX, which assumes the script to be executable.
2014-12-08 17:40:38 +00:00
+++ 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"
Fix previous version of patches/wxwidgets-3.0.2_macosx_yosemite.patch.
2014-11-13 00:38:18 +00:00
OSX build fixes. * Make patches/wxwidgets-3.0.2_macosx_yosemite.patch usable. There were complaints here before that the patch does not work because it is a "metapatch" that tries to patch another patch (which is not in the tree and therefore fails). With this change, it becomes a normal patch again, that can be applied to the wxWidgets source tree as described in Documentation/compiling/mac-osx.txt. * Make scripts/library-repos-install.sh compatible with OSX: This involves checking for the correct option to enable extended regular expressions in sed during detect_pretty_repos, as the script uses "-r", which is only available in GNU sed. The sed shipped with Mac OSX is an older BSD descendant sed which needs "-E". This change has been tested to work on Mac OSX 10.10.1 and on an up-to-date Arch Linux. I also changed the error message during --install-prerequisites to inform users without apt-get or yum which programs need to be installed to use the script. * Add the execute flag to scripts/osx_build_wx.sh: At the moment, after fetching the source with bzr, one has to chmod the file by hand. This change change ensures consistency between the script and the build docs for OSX, which assumes the script to be executable.
2014-12-08 17:40:38 +00:00
-#include <WebKit/WebKit.h>
+#include <WebKit/WebKitLegacy.h>
#include <WebKit/HIWebView.h>
#include <WebKit/CarbonUtils.h>