<!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>[125164] 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/125164">125164</a></dd>
<dt>Author</dt> <dd>jwa@macports.org</dd>
<dt>Date</dt> <dd>2014-09-08 02:33:13 -0700 (Mon, 08 Sep 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>wxWidgets-3.0: update wxPython subport to 3.0.1, remove the unnecessary patch, the subset added to the ticket (as well as a simple script to create that subset)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicswxWidgets30Portfile">trunk/dports/graphics/wxWidgets-3.0/Portfile</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsgraphicswxWidgets30filespatchsrcosxcocoautilsmmdiff">trunk/dports/graphics/wxWidgets-3.0/files/patch-src-osx-cocoa-utils.mm.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 (125163 => 125164)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/wxWidgets-3.0/Portfile 2014-09-08 08:35:37 UTC (rev 125163)
+++ trunk/dports/graphics/wxWidgets-3.0/Portfile 2014-09-08 09:33:13 UTC (rev 125164)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> subport wxPython-3.0 {}
</span><span class="cx"> subport wxgtk-3.0 {}
</span><span class="cx"> version 3.0.1
</span><del>-set wxpython_ver 3.0.0.0
</del><ins>+set wxpython_ver 3.0.1.0
</ins><span class="cx"> # when revbumping remember to change the revision also for wxPython-3.0
</span><span class="cx">
</span><span class="cx"> set installname wxWidgets
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx"> wxWidgets.use wxWidgets-3.0-libcxx
</span><span class="cx"> } elseif {${subport} eq "wxPython-3.0"} {
</span><span class="cx"> wxWidgets.use wxPython-3.0
</span><del>- version 3.0.0
</del><ins>+ version 3.0.1
</ins><span class="cx"> revision 0
</span><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="lines">@@ -125,20 +125,13 @@
</span><span class="cx"> of wxWidgets and wxPython differ.
</span><span class="cx">
</span><span class="cx"> checksums ${distname}-${version}${extract.suffix} \
</span><del>- rmd160 6113a95125b743309c7b21dd5530f4b675b8b82f \
- sha256 ff340539bcb6e45d8dbce848d3c13ebce34da6ffb9004a0a88e9541bec45bf85
</del><ins>+ rmd160 d4cfb25a5e15f9238addd48a98faf5a525d8fb5c \
+ sha256 bd671b79ec56af8fb3844e11cafceac1a4276fb02c79404d06b91b6c19d2c5f5
</ins><span class="cx">
</span><span class="cx"> checksums-append ${wxpythonsubset}${extract.suffix} \
</span><del>- rmd160 d3915cf55d6d8244515794ebf2316d151d69ba68 \
- sha256 b9377c6917c3a393ab9b190e1d558e4c5b80b13b435b93e11aad748f4d57bf61
</del><ins>+ rmd160 c43c82dfe9cc429543bf99b94082e1b9e867a1d5 \
+ sha256 888e4e4217b82ca0fba419e69d973b1e127b794b1b877384a4e5812094c9af5d
</ins><span class="cx">
</span><del>- # remove this patch in wxPython 3.0.1.0
- if {${os.major} >= 10} {
- # the patch doesn't work on 10.5, but it's still better to have working wxWidgets with a flaw
- # than not being able to compile it at all
- patchfiles-append patch-src-osx-cocoa-utils.mm.diff
- }
-
</del><span class="cx"> post-destroot {
</span><span class="cx"> # copy a subset of wxPython to wxWidgets to prevent a conflict
</span><span class="cx"> # between py2X-wxpython-3.0 and py2Y-wxpython-3.0
</span></span></pre></div>
<a id="trunkdportsgraphicswxWidgets30filespatchsrcosxcocoautilsmmdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/graphics/wxWidgets-3.0/files/patch-src-osx-cocoa-utils.mm.diff (125163 => 125164)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/graphics/wxWidgets-3.0/files/patch-src-osx-cocoa-utils.mm.diff 2014-09-08 08:35:37 UTC (rev 125163)
+++ trunk/dports/graphics/wxWidgets-3.0/files/patch-src-osx-cocoa-utils.mm.diff 2014-09-08 09:33:13 UTC (rev 125164)
</span><span class="lines">@@ -1,104 +0,0 @@
</span><del>-http://trac.wxwidgets.org/changeset/75142
-
-This patch is in trunk, but not in 3.0.0.
-It also doesn't work on 10.5, so the problem of non-bundled applications still exists on 10.5.
-
---- src/osx/cocoa/utils.mm.orig
-+++ src/osx/cocoa/utils.mm
-@@ -255,6 +255,50 @@ void wxBell()
- }
- @end
-
-+
-+// more on bringing non-bundled apps to the foreground
-+// https://devforums.apple.com/thread/203753
-+
-+#if 0
-+
-+// one possible solution is also quoted here
-+// from http://stackoverflow.com/questions/7596643/when-calling-transformprocesstype-the-app-menu-doesnt-show-up
-+
-+@interface wxNSNonBundledAppHelper : NSObject {
-+
-+}
-+
-++ (void)transformToForegroundApplication;
-+
-+@end
-+
-+@implementation wxNSNonBundledAppHelper
-+
-++ (void)transformToForegroundApplication {
-+ for (NSRunningApplication * app in [NSRunningApplication runningApplicationsWithBundleIdentifier:@"com.apple.finder"]) {
-+ [app activateWithOptions:NSApplicationActivateIgnoringOtherApps];
-+ break;
-+ }
-+ [self performSelector:@selector(transformStep2) withObject:nil afterDelay:0.1];
-+}
-+
-++ (void)transformStep2
-+{
-+ ProcessSerialNumber psn = { 0, kCurrentProcess };
-+ (void) TransformProcessType(&psn, kProcessTransformToForegroundApplication);
-+
-+ [self performSelector:@selector(transformStep3) withObject:nil afterDelay:0.1];
-+}
-+
-++ (void)transformStep3
-+{
-+ [[NSRunningApplication currentApplication] activateWithOptions:NSApplicationActivateIgnoringOtherApps];
-+}
-+
-+@end
-+
-+#endif
-+
- // here we subclass NSApplication, for the purpose of being able to override sendEvent.
- @interface wxNSApplication : NSApplication
- {
-@@ -276,6 +320,24 @@ void wxBell()
- return self;
- }
-
-+- (void) transformToForegroundApplication {
-+ ProcessSerialNumber psn = { 0, kCurrentProcess };
-+ TransformProcessType(&psn, kProcessTransformToForegroundApplication);
-+
-+ if ( UMAGetSystemVersion() < 0x1090 )
-+ {
-+ [self deactivate];
-+ [self activateIgnoringOtherApps:YES];
-+ }
-+ else
-+ {
-+ [[NSRunningApplication currentApplication] activateWithOptions:
-+ (NSApplicationActivateAllWindows | NSApplicationActivateIgnoringOtherApps)];
-+ }
-+}
-+
-+
-+
- /* This is needed because otherwise we don't receive any key-up events for command-key
- combinations (an AppKit bug, apparently) */
- - (void)sendEvent:(NSEvent *)anEvent
-@@ -311,6 +373,20 @@ bool wxApp::DoInitGui()
- if (!sm_isEmbedded)
- {
- [wxNSApplication sharedApplication];
-+
-+ if ( OSXIsGUIApplication() )
-+ {
-+ CFURLRef url = CFBundleCopyBundleURL(CFBundleGetMainBundle() ) ;
-+ CFStringRef path = CFURLCopyFileSystemPath ( url , kCFURLPOSIXPathStyle ) ;
-+ CFRelease( url ) ;
-+ wxString app = wxCFStringRef(path).AsString(wxLocale::GetSystemEncoding());
-+
-+ // workaround is only needed for non-bundled apps
-+ if ( !app.EndsWith(".app") )
-+ {
-+ [(wxNSApplication*) [wxNSApplication sharedApplication] transformToForegroundApplication];
-+ }
-+ }
-
- appcontroller = OSXCreateAppController();
- [NSApp setDelegate:appcontroller];
</del></span></pre>
</div>
</div>
</body>
</html>