<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[115985] trunk/dports/graphics/wxWidgets-3.0</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/115985">115985</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2014-01-15 16:38:35 -0800 (Wed, 15 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>wxPerl-3.0: a new subport for a temporary workaround to support wxPerl (only compatible with wx 2.9.4)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicswxWidgets30Portfile">trunk/dports/graphics/wxWidgets-3.0/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicswxWidgets30filespatchconfigure294diff">trunk/dports/graphics/wxWidgets-3.0/files/patch-configure.294.diff</a></li>
<li><a href="#trunkdportsgraphicswxWidgets30filespatchupstreamsrcosxcocoawindowmm294diff">trunk/dports/graphics/wxWidgets-3.0/files/patch-upstream-src-osx-cocoa-window.mm.294.diff</a></li>
<li><a href="#trunkdportsgraphicswxWidgets30fileswxPerl30">trunk/dports/graphics/wxWidgets-3.0/files/wxPerl-3.0</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicswxWidgets30filespatchconfigure295diff">trunk/dports/graphics/wxWidgets-3.0/files/patch-configure295.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgraphicswxWidgets30Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/graphics/wxWidgets-3.0/Portfile (115984 => 115985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/wxWidgets-3.0/Portfile 2014-01-16 00:08:24 UTC (rev 115984)
+++ trunk/dports/graphics/wxWidgets-3.0/Portfile 2014-01-16 00:38:35 UTC (rev 115985)
</span><span class="lines">@@ -9,6 +9,8 @@
</span><span class="cx"> name wxWidgets-3.0
</span><span class="cx"> subport wxPython-3.0 {}
</span><span class="cx"> subport wxgtk-3.0 {}
</span><ins>+# wxPerl is just a temporary port with the last version that's compatible with wxPerl
+subport wxPerl-3.0 {}
</ins><span class="cx"> version 3.0.0
</span><span class="cx"> set wxpython_ver 3.0.0.0
</span><span class="cx"> revision 5
</span><span class="lines">@@ -21,6 +23,10 @@
</span><span class="cx"> } elseif {${subport} eq "wxPython-3.0"} {
</span><span class="cx"> wxWidgets.use wxPython-3.0
</span><span class="cx"> revision 0
</span><ins>+} elseif {${subport} eq "wxPerl-3.0"} {
+ wxWidgets.use wxPerl-3.0
+ version 2.9.4
+ revision 0
</ins><span class="cx"> } elseif {${subport} eq "wxgtk-3.0"} {
</span><span class="cx"> # with satisfactory Cocoa support there is no real need for GTK-based wxWidgets any more
</span><span class="cx"> # wxgtk-3.0 is here mainly for testing purposes
</span><span class="lines">@@ -125,6 +131,15 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> livecheck.type none
</span><ins>+} elseif {${subport} eq "wxPerl-3.0"} {
+ checksums ${distname}-${version}${extract.suffix} \
+ rmd160 62301f8ce39a8aa96e65318f9d1e947c9dc09c50 \
+ sha256 6c530c35f40c3b1a5f9a4577c3ee8a9982e745081f23e3fbb9951d6d17514d12
+
+ patchfiles patch-configure.294.diff \
+ patch-upstream-src-osx-cocoa-window.mm.294.diff
+
+ livecheck.type none
</ins><span class="cx"> } elseif {${subport} eq "wxgtk-3.0"} {
</span><span class="cx"> # both patches could be added to wxWidgets-3.0, but they are not needed for Cocoa
</span><span class="cx"> #
</span></span></pre></div>
<a id="trunkdportsgraphicswxWidgets30filespatchconfigure294difffromrev115980trunkdportsgraphicswxWidgets30filespatchconfigure295diff"></a>
<div class="copfile"><h4>Copied: trunk/dports/graphics/wxWidgets-3.0/files/patch-configure.294.diff (from rev 115980, trunk/dports/graphics/wxWidgets-3.0/files/patch-configure295.diff) (0 => 115985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/wxWidgets-3.0/files/patch-configure.294.diff (rev 0)
+++ trunk/dports/graphics/wxWidgets-3.0/files/patch-configure.294.diff 2014-01-16 00:38:35 UTC (rev 115985)
</span><span class="lines">@@ -0,0 +1,79 @@
</span><ins>+The first part is for GTK and makes sure that the port finds the right OpenGL library
+The second part makes sure that install_name_tool doesn't break library names and links (http://trac.wxwidgets.org/ticket/15452)
+--- configure.orig
++++ configure
+@@ -21750,48 +21750,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+
+-SEARCH_INCLUDE="\
+- /usr/local/include \
+- /usr/local/X11/include \
+- /usr/local/include/X11 \
+- /usr/local/X11R7/include \
+- /usr/local/X11R6/include \
+- /usr/local/include/X11R7 \
+- /usr/local/include/X11R6 \
+- \
+- /usr/Motif-2.1/include \
+- /usr/Motif-1.2/include \
+- /usr/include/Motif1.2 \
+- \
+- /usr/dt/include \
+- /usr/openwin/include \
+- \
+- /usr/include/Xm \
+- \
+- /usr/X11R7/include \
+- /usr/X11R6/include \
+- /usr/X11R6.4/include \
+- \
+- /usr/include/X11R7 \
+- /usr/include/X11R6 \
+- \
+- /usr/X11/include \
+- /usr/include/X11 \
+- \
+- /usr/XFree86/include/X11 \
+- /usr/pkg/include \
+- \
+- /usr/local/X1R5/include \
+- /usr/local/include/X11R5 \
+- /usr/X11R5/include \
+- /usr/include/X11R5 \
+- \
+- /usr/local/X11R4/include \
+- /usr/local/include/X11R4 \
+- /usr/X11R4/include \
+- /usr/include/X11R4 \
+- \
+- /usr/openwin/share/include"
++SEARCH_INCLUDE="@@PREFIX@@/include"
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libraries directories" >&5
+ $as_echo_n "checking for libraries directories... " >&6; }
+@@ -29066,24 +29025,6 @@ rm -f core conftest.err conftest.$ac_objext \
+ ;;
+
+ *-*-darwin* )
+- install_name_tool=`which ${HOST_PREFIX}install_name_tool`
+- if test "$install_name_tool" -a -x "$install_name_tool"; then
+- 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
+-done
+-EOF
+- chmod +x change-install-names
+- DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${DESTDIR}\${libdir} \$(wx_top_builddir)/lib \${libdir}"
+- fi
+-
+- HEADER_PAD_OPTION="-headerpad_max_install_names"
+ ;;
+
+ *-*-cygwin* | *-*-mingw32* )
</ins></span></pre></div>
<a id="trunkdportsgraphicswxWidgets30filespatchconfigure295diff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/wxWidgets-3.0/files/patch-configure295.diff (115984 => 115985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/wxWidgets-3.0/files/patch-configure295.diff 2014-01-16 00:08:24 UTC (rev 115984)
+++ trunk/dports/graphics/wxWidgets-3.0/files/patch-configure295.diff 2014-01-16 00:38:35 UTC (rev 115985)
</span><span class="lines">@@ -1,79 +0,0 @@
</span><del>-The first part is for GTK and makes sure that the port finds the right OpenGL library
-The second part makes sure that install_name_tool doesn't break library names and links (http://trac.wxwidgets.org/ticket/15452)
---- configure.orig
-+++ configure
-@@ -22038,48 +22038,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-
-
--SEARCH_INCLUDE="\
-- /usr/local/include \
-- /usr/local/X11/include \
-- /usr/local/include/X11 \
-- /usr/local/X11R7/include \
-- /usr/local/X11R6/include \
-- /usr/local/include/X11R7 \
-- /usr/local/include/X11R6 \
-- \
-- /usr/Motif-2.1/include \
-- /usr/Motif-1.2/include \
-- /usr/include/Motif1.2 \
-- \
-- /usr/dt/include \
-- /usr/openwin/include \
-- \
-- /usr/include/Xm \
-- \
-- /usr/X11R7/include \
-- /usr/X11R6/include \
-- /usr/X11R6.4/include \
-- \
-- /usr/include/X11R7 \
-- /usr/include/X11R6 \
-- \
-- /usr/X11/include \
-- /usr/include/X11 \
-- \
-- /usr/XFree86/include/X11 \
-- /usr/pkg/include \
-- \
-- /usr/local/X1R5/include \
-- /usr/local/include/X11R5 \
-- /usr/X11R5/include \
-- /usr/include/X11R5 \
-- \
-- /usr/local/X11R4/include \
-- /usr/local/include/X11R4 \
-- /usr/X11R4/include \
-- /usr/include/X11R4 \
-- \
-- /usr/openwin/share/include"
-+SEARCH_INCLUDE="@@PREFIX@@/include"
-
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libraries directories" >&5
- $as_echo_n "checking for libraries directories... " >&6; }
-@@ -29402,24 +29361,6 @@ rm -f core conftest.err conftest.$ac_objext \
- ;;
-
- *-*-darwin* )
-- install_name_tool=`which ${HOST_PREFIX}install_name_tool`
-- if test "$install_name_tool" -a -x "$install_name_tool"; then
-- 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
--done
--EOF
-- chmod +x change-install-names
-- DYLIB_RPATH_INSTALL="\$(wx_top_builddir)/change-install-names \${DESTDIR}\${libdir} \$(wx_top_builddir)/lib \${libdir}"
-- fi
--
-- HEADER_PAD_OPTION="-headerpad_max_install_names"
- ;;
-
- *-*-cygwin* | *-*-mingw32* )
</del></span></pre></div>
<a id="trunkdportsgraphicswxWidgets30filespatchupstreamsrcosxcocoawindowmm294difffromrev110234trunkdportsgraphicswxWidgets30filespatchsrcosxcocoawindowmmdiff"></a>
<div class="copfile"><h4>Copied: trunk/dports/graphics/wxWidgets-3.0/files/patch-upstream-src-osx-cocoa-window.mm.294.diff (from rev 110234, trunk/dports/graphics/wxWidgets-3.0/files/patch-src-osx-cocoa-window.mm.diff) (0 => 115985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/wxWidgets-3.0/files/patch-upstream-src-osx-cocoa-window.mm.294.diff (rev 0)
+++ trunk/dports/graphics/wxWidgets-3.0/files/patch-upstream-src-osx-cocoa-window.mm.294.diff 2014-01-16 00:38:35 UTC (rev 115985)
</span><span class="lines">@@ -0,0 +1,64 @@
</span><ins>+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);
++ }
+ }
+
</ins></span></pre></div>
<a id="trunkdportsgraphicswxWidgets30fileswxPerl30"></a>
<div class="addfile"><h4>Added: trunk/dports/graphics/wxWidgets-3.0/files/wxPerl-3.0 (0 => 115985)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/wxWidgets-3.0/files/wxPerl-3.0 (rev 0)
+++ trunk/dports/graphics/wxWidgets-3.0/files/wxPerl-3.0 2014-01-16 00:38:35 UTC (rev 115985)
</span><span class="lines">@@ -0,0 +1,8 @@
</span><ins>+${frameworks_dir}/wxWidgets.framework/Versions/wxPerl/2.9/bin/wx-config
+${frameworks_dir}/wxWidgets.framework/Versions/wxPerl/2.9/bin/wxrc-2.9
+${frameworks_dir}/wxWidgets.framework/Versions/wxPerl/2.9/share/aclocal/wxwin.m4
+${frameworks_dir}/wxWidgets.framework/Versions/wxPerl/2.9/share/bakefile/presets/wx.bkl
+${frameworks_dir}/wxWidgets.framework/Versions/wxPerl/2.9/share/bakefile/presets/wx_presets.py
+${frameworks_dir}/wxWidgets.framework/Versions/wxPerl/2.9/share/bakefile/presets/wx_unix.bkl
+${frameworks_dir}/wxWidgets.framework/Versions/wxPerl/2.9/share/bakefile/presets/wx_win32.bkl
+${frameworks_dir}/wxWidgets.framework/Versions/wxPerl/2.9/share/bakefile/presets/wx_xrc.bkl
</ins></span></pre>
</div>
</div>
</body>
</html>