- Revert some local build changes that slipped in inadvertently

- Remove a local patch that was added to trunk as wxwidgets-3.0.0_macosx_scrolledwindow.patch

CMakeLists.txt

@@ -406,7 +406,7 @@ add_definitions( -DWX_COMPATIBILITY )
 # See line 41 of CMakeModules/FindwxWidgets.cmake
 set( wxWidgets_CONFIG_OPTIONS --static=no )
 
-find_package( wxWidgets 3.0.0 COMPONENTS gl adv html core net base xml REQUIRED )
+find_package( wxWidgets 3.0.0 COMPONENTS gl aui adv html core net base xml REQUIRED )
 
 # Include wxWidgets macros.
 include( ${wxWidgets_USE_FILE} )
@@ -435,8 +435,8 @@ if( APPLE AND USE_OSX_DEPS_BUILDER )
     # This should be built in all cases, if swig exec is not available
     # will be impossible also enable SCRIPTING being for PCBNEW required immediately
 
-    #include( download_pcre )
-    #include( download_swig )
+    include( download_pcre )
+    include( download_swig )
 
 
     #set(CMAKE_FIND_LIBRARY_SUFFIXES ".a;.so;.dylib;.dll")
@@ -462,7 +462,6 @@ if( APPLE AND USE_OSX_DEPS_BUILDER )
         message(STATUS "Scripting ENABLED")
         include( download_wxpython )
 
-        set( SWIG_ROOT        /opt/local )
         set( SWIG_EXECUTABLE  ${SWIG_ROOT}/bin/swig )
         set( SWIG_INCLUDE     ${SWIG_ROOT}/include )
         set( PYTHON_DEST ${LIBWXPYTHON_ROOT}/wxPython/lib/python2.6/site-packages )
@@ -477,7 +476,7 @@ if( APPLE AND USE_OSX_DEPS_BUILDER )
         set( PYTHON_DEST ${LIBWXPYTHON_ROOT}/wxPython/lib/python2.6/site-packages )
 
         add_dependencies( lib-dependencies libwxpython )
-        #add_dependencies( lib-dependencies swig )
+        add_dependencies( lib-dependencies swig )
     else()
         include( download_wxwidgets )
         add_dependencies( lib-dependencies libwx )

CMakeModules/download_boost.cmake

@@ -159,10 +159,6 @@ if( APPLE )
             message( "-- BOOST found 32/64 Address Model" )
 
             set( BOOST_ADDRESSMODEL "address-model=32_64" )
-        else()
-            message( "-- BOOST found 64 Address Model" )
-
-            set( BOOST_ADDRESSMODEL "address-model=64" )
         endif()
 
         if( (CMAKE_OSX_ARCHITECTURES MATCHES "x86_64" OR CMAKE_OSX_ARCHITECTURES MATCHES "386") AND

kicad/Info.plist

@@ -33,7 +33,6 @@
     <key>LSEnvironment</key>
         <dict>
             <key>KIGITHUB</key>     <string>https://github.com/kicad</string>
-            <key>KISYSMOD</key>     <string>/Library/Application Support/KiCad/pretty</string>
         </dict>
 </dict>
 </plist>

patches/wxwidgets-3.0.0_macosx_bug_15684.patch

@@ -1,50 +0,0 @@
-=== modified file 'src/generic/scrlwing.cpp'
---- src/generic/scrlwing.cpp	2013-12-16 05:42:30 -0800
-+++ src/generic/scrlwing.cpp	2014-10-21 01:19:02 -0700
-@@ -214,9 +214,6 @@
-         return true;
-     }
- 
--    if ( processed && event.IsCommandEvent())
--        return true;
--
-     // For wxEVT_PAINT the user code can either handle this event as usual or
-     // override virtual OnDraw(), so if the event hasn't been handled we need
-     // to call this virtual function ourselves.
-@@ -235,6 +232,11 @@
-         return true;
-     }
- 
-+    // If the user code handled this event, it should prevent the default 
-+    // handling from taking place, so don't do anything else in this case. 
-+    if ( processed ) 
-+        return true; 
-+
-     if ( evType == wxEVT_CHILD_FOCUS )
-     {
-         m_scrollHelper->HandleOnChildFocus((wxChildFocusEvent &)event);
-=== modified file 'src/generic/vscroll.cpp'
---- src/generic/vscroll.cpp	2013-12-16 05:42:30 -0800
-+++ src/generic/vscroll.cpp	2014-10-21 01:19:09 -0700
-@@ -89,9 +89,6 @@
-         return true;
-     }
- 
--    if ( processed && event.IsCommandEvent())
--        return true;
--
-     // For wxEVT_PAINT the user code can either handle this event as usual or
-     // override virtual OnDraw(), so if the event hasn't been handled we need
-     // to call this virtual function ourselves.
-@@ -110,6 +107,11 @@
-         return true;
-     }
- 
-+    // If the user code handled this event, it should prevent the default 
-+    // handling from taking place, so don't do anything else in this case. 
-+    if ( processed ) 
-+        return true; 
-+
-     // reset the skipped flag (which might have been set to true in
-     // ProcessEvent() above) to be able to test it below
-     bool wasSkipped = event.GetSkipped();