[108794] trunk/dports/graphics/wxWidgets-devel
mojca at macports.org
mojca at macports.org
Thu Aug 1 17:31:39 PDT 2013
Revision: 108794
https://trac.macports.org/changeset/108794
Author: mojca at macports.org
Date: 2013-08-01 17:31:39 -0700 (Thu, 01 Aug 2013)
Log Message:
-----------
wxWidgets-devel: update to 2.9.5 (fixes #39806, #35651, #37624, #39409)
Modified Paths:
--------------
trunk/dports/graphics/wxWidgets-devel/Portfile
trunk/dports/graphics/wxWidgets-devel/files/patch-configure-change_install_names.diff
Removed Paths:
-------------
trunk/dports/graphics/wxWidgets-devel/files/patch-src-osx-cocoa-window.mm.diff
Modified: trunk/dports/graphics/wxWidgets-devel/Portfile
===================================================================
--- trunk/dports/graphics/wxWidgets-devel/Portfile 2013-08-02 00:15:42 UTC (rev 108793)
+++ trunk/dports/graphics/wxWidgets-devel/Portfile 2013-08-02 00:31:39 UTC (rev 108794)
@@ -6,9 +6,8 @@
name wxWidgets-devel
conflicts wxgtk wxWidgets
-version 2.9.4
-epoch 20120709
-revision 4
+version 2.9.5
+epoch 20130717
license wxwidgets-3.1
categories graphics devel
@@ -32,8 +31,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 \
@@ -61,8 +60,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
@@ -79,16 +77,17 @@
--disable-sdltest \
--enable-unicode \
--enable-display \
- --enable-xrc
+ --enable-xrc \
+ --with-macosx-sdk=no \
+ --with-macosx-version-min=no
build.target
use_parallel_build yes
variant universal {
- configure.args-append --enable-universal_binary \
- --with-macosx-sdk=${configure.sdkroot}/ \
- --with-macosx-version-min=${macosx_deployment_target}
+ set archs [join ${configure.universal_archs} ,]
+ configure.args-append --enable-universal_binary=${archs}
}
configure.ccache no
@@ -98,15 +97,6 @@
ln -sf ${confscript} ${destroot}${prefix}/bin/wx-config
}
-#platform darwin 11 {
-# # 'InsetRect' was not declared in this scope
-# macosx_deployment_target 10.6
-#}
-
-post-patch {
- reinplace "s|@@MP_ARCH_FLAGS@@|[get_canonical_archflags]|g" ${worksrcpath}/../configure
-}
-
default_variants +sdl
variant monolithic description {build only one library} {
Modified: trunk/dports/graphics/wxWidgets-devel/files/patch-configure-change_install_names.diff
===================================================================
--- trunk/dports/graphics/wxWidgets-devel/files/patch-configure-change_install_names.diff 2013-08-02 00:15:42 UTC (rev 108793)
+++ trunk/dports/graphics/wxWidgets-devel/files/patch-configure-change_install_names.diff 2013-08-02 00:31:39 UTC (rev 108794)
@@ -1,28 +1,6 @@
---- configure 2011-10-19 17:36:57.000000000 +0200
-+++ configure 2011-10-19 18:01:41.000000000 +0200
-@@ -19176,10 +19176,10 @@
- fi
-
- if test "x$wxUSE_UNIVERSAL_BINARY" != xyes; then
-- OSX_ARCH_OPTS=$wxUSE_UNIVERSAL_BINARY
-+ OSX_ARCH_OPTS="@@MP_ARCH_FLAGS@@"
- else OSX_ARCH_OPTS="ppc,i386"
- if test "$wxUSE_OSX_COCOA" = 1; then
-- OSX_ARCH_OPTS="$OSX_ARCH_OPTS,x86_64"
-+ OSX_ARCH_OPTS="@@MP_ARCH_FLAGS@@"
- fi
- fi
-
-@@ -19204,8 +19204,6 @@
- disable_macosx_deps=yes
- fi
-
-- OSX_ARCH_OPTS=`echo $OSX_ARCH_OPTS | sed -e 's/^/-arch /' -e 's/,/ -arch /g'`
--
- CXXFLAGS="$OSX_ARCH_OPTS $CXXFLAGS"
- CFLAGS="$OSX_ARCH_OPTS $CFLAGS"
- OBJCXXFLAGS="$OSX_ARCH_OPTS $OBJCXXFLAGS"
-@@ -29071,16 +29069,18 @@
+--- configure.orig
++++ configure
+@@ -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,31 +25,3 @@
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 @@
- DYLIB_RPATH_POSTLINK="${HOST_PREFIX}install_name_tool -id \$@ \$@"
- cat <<EOF >change-install-names
- #!/bin/sh
--libnames=\`cd \${2} ; ls -1 | grep '\.[[0-9]][[0-9]]*\.dylib\$'\`
--for i in \${libnames} ; do
-- ${HOST_PREFIX}install_name_tool -id \${3}/\${i} \${1}/\${i}
-- for dep in \${libnames} ; do
-- ${HOST_PREFIX}install_name_tool -change \${2}/\${dep} \${3}/\${dep} \${1}/\${i}
-- done
-+libnames=\`find \$4 -type f -a -regex '.*\.[0-9]+\.dylib' -exec basename '{}' \;\`
-+changes=''
-+for dep in \$libnames; do
-+ changes="\$changes -change \$4/\$dep \$3/\$dep"
- done
-+for i in \$libnames; do
-+ ${HOST_PREFIX}install_name_tool \$changes -id \$3/\$i \$1/\$i
-+done
-+${HOST_PREFIX}install_name_tool \$changes \$2/wxrc-2.9
- EOF
- chmod +x change-install-names
-- DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${DESTDIR}\${libdir} \$(wx_top_builddir)/lib \${libdir}"
-+ DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${DESTDIR}\${libdir} \${DESTDIR}\${bindir} \${libdir} \$(wx_top_builddir)/lib"
- fi
-
- dnl the HEADER_PAD_OPTION is required by some wx samples to avoid the error:
Deleted: trunk/dports/graphics/wxWidgets-devel/files/patch-src-osx-cocoa-window.mm.diff
===================================================================
--- trunk/dports/graphics/wxWidgets-devel/files/patch-src-osx-cocoa-window.mm.diff 2013-08-02 00:15:42 UTC (rev 108793)
+++ trunk/dports/graphics/wxWidgets-devel/files/patch-src-osx-cocoa-window.mm.diff 2013-08-02 00:31:39 UTC (rev 108794)
@@ -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/20130801/de898b81/attachment-0001.html>
More information about the macports-changes
mailing list