Ticket #39806: wxWidgets-devel.2.9.5.patch

Portfile

@@ -6 +6 @@
 
 name            wxWidgets-devel
 conflicts       wxgtk wxWidgets
-version         2.9.4
-epoch           20120709
-revision        4
+version         2.9.5
 
 license         wxwidgets-3.1
 categories      graphics devel
@@ -32 +30 @@
 distfiles       ${distname}-${version}${extract.suffix}
 dist_subdir     ${distname}/${version}
 
-checksums           rmd160  62301f8ce39a8aa96e65318f9d1e947c9dc09c50 \
-                    sha256  6c530c35f40c3b1a5f9a4577c3ee8a9982e745081f23e3fbb9951d6d17514d12
+checksums           rmd160  f5c91099b2cf3e39eadbcf99df0dd9a97017d47f \
+                    sha256  b74ba96ca537cc5d049d21ec9ab5eb2670406a4aa9f1ea4845ea84a9955a6e02
                     
 depends_lib     port:jpeg \
                 port:tiff \
@@ -61 +59 @@
 extract.only    ${distname}-${version}${extract.suffix}
 
 patch.dir   ${worksrcpath}/..
-patchfiles  patch-configure-change_install_names.diff \
-            patch-src-osx-cocoa-window.mm.diff
+patchfiles  patch-configure-change_install_names.diff
 
+
 configure.cmd   ../configure
 configure.ldflags   -L${build.dir}/lib -L${prefix}/lib
 

files/patch-configure-change_install_names.diff

@@ -1 @@
---- configure   2011-10-19 17:36:57.000000000 +0200
-+++ configure   2011-10-19 18:01:41.000000000 +0200
-@@ -19176,10 +19176,10 @@
+--- configure.orig
++++ configure
+@@ -19436,10 +19436,10 @@ $as_echo "$as_me: WARNING: --enable-macosx_arch is ignored when --enable-univers
      fi
  
      if test "x$wxUSE_UNIVERSAL_BINARY" != xyes; then
@@ -13 +13 @@
          fi
      fi
  
-@@ -19204,8 +19204,6 @@
-         disable_macosx_deps=yes
+@@ -19466,8 +19466,6 @@ $as_echo "$as_me: WARNING: Disabling precompiled headers due to universal binary
+         bk_use_pch=no
      fi
  
 -    OSX_ARCH_OPTS=`echo $OSX_ARCH_OPTS | sed -e 's/^/-arch /' -e 's/,/ -arch /g'`
@@ -22 +22 @@
      CXXFLAGS="$OSX_ARCH_OPTS $CXXFLAGS"
      CFLAGS="$OSX_ARCH_OPTS $CFLAGS"
      OBJCXXFLAGS="$OSX_ARCH_OPTS $OBJCXXFLAGS"
-@@ -29071,16 +29069,18 @@
+@@ -29407,16 +29405,18 @@ rm -f core conftest.err conftest.$ac_objext \
              DYLIB_RPATH_POSTLINK="${HOST_PREFIX}install_name_tool -id \$@ \$@"
              cat <<EOF >change-install-names
  #!/bin/sh
@@ -47 +47 @@
          fi
  
                                          HEADER_PAD_OPTION="-headerpad_max_install_names"
---- configure.in        2011-10-19 17:36:57.000000000 +0200
-+++ configure.in        2011-10-19 17:38:38.000000000 +0200
-@@ -3847,16 +3847,18 @@
+--- configure.in.orig
++++ configure.in
+@@ -3835,16 +3835,18 @@ if test "$wxUSE_SHARED" = "yes"; then
              DYLIB_RPATH_POSTLINK="${HOST_PREFIX}install_name_tool -id \$@ \$@"
              cat <<EOF >change-install-names
  #!/bin/sh
@@ -63 +63 @@
 +changes=''
 +for dep in \$libnames; do
 +    changes="\$changes -change \$4/\$dep \$3/\$dep"
- done
++done
 +for i in \$libnames; do
 +    ${HOST_PREFIX}install_name_tool \$changes -id \$3/\$i \$1/\$i
-+done
+ done
 +${HOST_PREFIX}install_name_tool \$changes \$2/wxrc-2.9
  EOF
              chmod +x change-install-names

files/patch-src-osx-cocoa-window.mm.diff

@@ -1 @@
-Upstream: http://trac.wxwidgets.org/changeset/72195
---- src/osx/cocoa/window.mm (revision 72169)
-+++ src/osx/cocoa/window.mm (revision 72195)
-@@ -456,4 +456,9 @@
- - (CGFloat)deviceDeltaX;
- - (CGFloat)deviceDeltaY;
-+
-+// 10.7+
-+- (BOOL)hasPreciseScrollingDeltas;
-+- (CGFloat)scrollingDeltaX;
-+- (CGFloat)scrollingDeltaY;
- @end
- 
-@@ -610,21 +615,37 @@
-             wxevent.SetEventType( wxEVT_MOUSEWHEEL ) ;
- 
--            // see http://developer.apple.com/qa/qa2005/qa1453.html
--            // for more details on why we have to look for the exact type
--            
--            const EventRef cEvent = (EventRef) [nsEvent eventRef];
--            bool isMouseScrollEvent = false;
--            if ( cEvent )
--                isMouseScrollEvent = ::GetEventKind(cEvent) == kEventMouseScroll;
--                
--            if ( isMouseScrollEvent )
-+            if ( UMAGetSystemVersion() >= 0x1070 )
-             {
--                deltaX = [nsEvent deviceDeltaX];
--                deltaY = [nsEvent deviceDeltaY];
-+                if ( [nsEvent hasPreciseScrollingDeltas] )
-+                {
-+                    deltaX = [nsEvent scrollingDeltaX];
-+                    deltaY = [nsEvent scrollingDeltaY];
-+                }
-+                else
-+                {
-+                    deltaX = [nsEvent scrollingDeltaX] * 10;
-+                    deltaY = [nsEvent scrollingDeltaY] * 10;
-+                }
-             }
-             else
-             {
--                deltaX = ([nsEvent deltaX] * 10);
--                deltaY = ([nsEvent deltaY] * 10);
-+                const EventRef cEvent = (EventRef) [nsEvent eventRef];
-+                // see http://developer.apple.com/qa/qa2005/qa1453.html
-+                // for more details on why we have to look for the exact type
-+
-+                bool isMouseScrollEvent = false;
-+                if ( cEvent )
-+                    isMouseScrollEvent = ::GetEventKind(cEvent) == kEventMouseScroll;
-+
-+                if ( isMouseScrollEvent )
-+                {
-+                    deltaX = [nsEvent deviceDeltaX];
-+                    deltaY = [nsEvent deviceDeltaY];
-+                }
-+                else
-+                {
-+                    deltaX = ([nsEvent deltaX] * 10);
-+                    deltaY = ([nsEvent deltaY] * 10);
-+                }
-             }
-