[108270] trunk/dports/graphics/wxWidgets30

[jwa at macports.org]

Revision: 108270
          https://trac.macports.org/changeset/108270
Author:   jwa at macports.org
Date:     2013-07-17 09:03:13 -0700 (Wed, 17 Jul 2013)
Log Message:
-----------
wxWidgets30: version bump to 2.9.5, remove unnecessary patch file

Modified Paths:
--------------
    trunk/dports/graphics/wxWidgets30/Portfile

Removed Paths:
-------------
    trunk/dports/graphics/wxWidgets30/files/patch-src-osx-cocoa-window.mm.diff

Modified: trunk/dports/graphics/wxWidgets30/Portfile
===================================================================
--- trunk/dports/graphics/wxWidgets30/Portfile	2013-07-17 15:48:42 UTC (rev 108269)
+++ trunk/dports/graphics/wxWidgets30/Portfile	2013-07-17 16:03:13 UTC (rev 108270)
@@ -5,9 +5,8 @@
 
 name            wxWidgets30
 conflicts       wxgtk wxWidgets
-version         2.9.4
-revision        2
-epoch           20120709
+version         2.9.5
+epoch           20130717
 
 license         wxwidgets-3.1
 categories      graphics devel
@@ -31,8 +30,8 @@
 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 \
@@ -53,8 +52,7 @@
 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

Deleted: trunk/dports/graphics/wxWidgets30/files/patch-src-osx-cocoa-window.mm.diff
===================================================================
--- trunk/dports/graphics/wxWidgets30/files/patch-src-osx-cocoa-window.mm.diff	2013-07-17 15:48:42 UTC (rev 108269)
+++ trunk/dports/graphics/wxWidgets30/files/patch-src-osx-cocoa-window.mm.diff	2013-07-17 16:03:13 UTC (rev 108270)
@@ -1,64 +0,0 @@
-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);
-+                }
-             }
-             
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130717/79a8e439/attachment.html>