[125164] trunk/dports/graphics/wxWidgets-3.0
jwa at macports.org
jwa at macports.org
Mon Sep 8 02:33:13 PDT 2014
Revision: 125164
https://trac.macports.org/changeset/125164
Author: jwa at macports.org
Date: 2014-09-08 02:33:13 -0700 (Mon, 08 Sep 2014)
Log Message:
-----------
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)
Modified Paths:
--------------
trunk/dports/graphics/wxWidgets-3.0/Portfile
Removed Paths:
-------------
trunk/dports/graphics/wxWidgets-3.0/files/patch-src-osx-cocoa-utils.mm.diff
Modified: trunk/dports/graphics/wxWidgets-3.0/Portfile
===================================================================
--- 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)
@@ -11,7 +11,7 @@
subport wxPython-3.0 {}
subport wxgtk-3.0 {}
version 3.0.1
-set wxpython_ver 3.0.0.0
+set wxpython_ver 3.0.1.0
# when revbumping remember to change the revision also for wxPython-3.0
set installname wxWidgets
@@ -24,7 +24,7 @@
wxWidgets.use wxWidgets-3.0-libcxx
} elseif {${subport} eq "wxPython-3.0"} {
wxWidgets.use wxPython-3.0
- version 3.0.0
+ version 3.0.1
revision 0
} elseif {${subport} eq "wxgtk-3.0"} {
# with satisfactory Cocoa support there is no real need for GTK-based wxWidgets any more
@@ -125,20 +125,13 @@
of wxWidgets and wxPython differ.
checksums ${distname}-${version}${extract.suffix} \
- rmd160 6113a95125b743309c7b21dd5530f4b675b8b82f \
- sha256 ff340539bcb6e45d8dbce848d3c13ebce34da6ffb9004a0a88e9541bec45bf85
+ rmd160 d4cfb25a5e15f9238addd48a98faf5a525d8fb5c \
+ sha256 bd671b79ec56af8fb3844e11cafceac1a4276fb02c79404d06b91b6c19d2c5f5
checksums-append ${wxpythonsubset}${extract.suffix} \
- rmd160 d3915cf55d6d8244515794ebf2316d151d69ba68 \
- sha256 b9377c6917c3a393ab9b190e1d558e4c5b80b13b435b93e11aad748f4d57bf61
+ rmd160 c43c82dfe9cc429543bf99b94082e1b9e867a1d5 \
+ sha256 888e4e4217b82ca0fba419e69d973b1e127b794b1b877384a4e5812094c9af5d
- # 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
- }
-
post-destroot {
# copy a subset of wxPython to wxWidgets to prevent a conflict
# between py2X-wxpython-3.0 and py2Y-wxpython-3.0
Deleted: trunk/dports/graphics/wxWidgets-3.0/files/patch-src-osx-cocoa-utils.mm.diff
===================================================================
--- 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)
@@ -1,104 +0,0 @@
-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
-+
-+ at interface wxNSNonBundledAppHelper : NSObject {
-+
-+}
-+
-++ (void)transformToForegroundApplication;
-+
-+ at end
-+
-+ at 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];
-+}
-+
-+ at 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];
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140908/cf3f8907/attachment.html>
More information about the macports-changes
mailing list