[120498] users/mojca/ports
mojca at macports.org
mojca at macports.org
Fri May 30 08:26:00 PDT 2014
Revision: 120498
https://trac.macports.org/changeset/120498
Author: mojca at macports.org
Date: 2014-05-30 08:25:59 -0700 (Fri, 30 May 2014)
Log Message:
-----------
mojca/wxWidgets-3.1: just for testing purposes
Modified Paths:
--------------
users/mojca/ports/graphics/wxWidgets-3.1/files/patch-configure.diff
Added Paths:
-----------
users/mojca/ports/graphics/
users/mojca/ports/graphics/wxWidgets-3.1/
users/mojca/ports/graphics/wxWidgets-3.1/Portfile
users/mojca/ports/graphics/wxWidgets-3.1/files/wxWidgets-3.1
Removed Paths:
-------------
users/mojca/ports/graphics/wxWidgets-3.1/Portfile
users/mojca/ports/graphics/wxWidgets-3.1/files/patch-configure.294.diff
users/mojca/ports/graphics/wxWidgets-3.1/files/patch-src-osx-cocoa-utils.mm.diff
users/mojca/ports/graphics/wxWidgets-3.1/files/patch-upstream-src-osx-cocoa-textctrl.mm.diff
users/mojca/ports/graphics/wxWidgets-3.1/files/patch-upstream-src-osx-cocoa-window.mm.294.diff
users/mojca/ports/graphics/wxWidgets-3.1/files/patch-upstream-src-osx-cocoa-window.mm.diff
users/mojca/ports/graphics/wxWidgets-3.1/files/wxPerl-3.0
users/mojca/ports/graphics/wxWidgets-3.1/files/wxPython-3.0
users/mojca/ports/graphics/wxWidgets-3.1/files/wxWidgets-3.0
users/mojca/ports/graphics/wxWidgets-3.1/files/wxgtk-3.0
Deleted: users/mojca/ports/graphics/wxWidgets-3.1/Portfile
===================================================================
--- trunk/dports/graphics/wxWidgets-3.0/Portfile 2014-04-03 20:15:53 UTC (rev 118522)
+++ users/mojca/ports/graphics/wxWidgets-3.1/Portfile 2014-05-30 15:25:59 UTC (rev 120498)
@@ -1,231 +0,0 @@
-# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
-# $Id$
-
-PortSystem 1.0
-PortGroup active_variants 1.1
-PortGroup select 1.0
-PortGroup wxWidgets 1.0
-
-name wxWidgets-3.0
-subport wxPython-3.0 {}
-subport wxgtk-3.0 {}
-# wxPerl is just a temporary port with the last version that's compatible with wxPerl
-subport wxPerl-3.0 {}
-version 3.0.0
-set wxpython_ver 3.0.0.0
-revision 5
-
-set installname wxWidgets
-set wxtype osx_cocoa
-
-if {${subport} eq ${name}} {
- wxWidgets.use wxWidgets-3.0
-} elseif {${subport} eq "wxPython-3.0"} {
- wxWidgets.use wxPython-3.0
- revision 0
-} elseif {${subport} eq "wxPerl-3.0"} {
- wxWidgets.use wxPerl-3.0
- version 2.9.4
- revision 0
-} elseif {${subport} eq "wxgtk-3.0"} {
- # with satisfactory Cocoa support there is no real need for GTK-based wxWidgets any more
- # wxgtk-3.0 is here mainly for testing purposes
- # it might be useful to report GTK-related bugs upstream
- # and play with quartz-based GTK
- # (and maybe backport changes to 2.8)
- wxWidgets.use wxGTK-3.0
- set installname wxGTK
- set wxtype gtk3
-}
-set branch [join [lrange [split ${version} .] 0 1] .]
-
-categories graphics devel
-platforms darwin
-license wxwidgets-3.1
-maintainers jwa mojca
-
-description C++ framework for cross-platform GUI development
-long_description wxWidgets ${branch} is an open-source cross-platform C++ \
- GUI framework for Mac OS, Unix, Linux, Windows.
-
-homepage http://www.wxwidgets.org/
-distname wxWidgets
-master_sites sourceforge:project/wxwindows/${version} \
- http://biolpc22.york.ac.uk/pub/${version}/ \
- http://trac.macports.org/raw-attachment/ticket/19190/:trac
-
-use_bzip2 yes
-
-distfiles ${distname}-${version}${extract.suffix}
-dist_subdir ${distname}/${version}
-
-checksums ${distname}-${version}${extract.suffix} \
- rmd160 6113a95125b743309c7b21dd5530f4b675b8b82f \
- sha256 ff340539bcb6e45d8dbce848d3c13ebce34da6ffb9004a0a88e9541bec45bf85
-
-depends_lib port:jpeg \
- port:tiff \
- port:libpng \
- port:zlib \
- port:libiconv \
- port:expat
-
-depends_run port:wxWidgets_select
-
-select.group wxWidgets
-select.file ${filespath}/${subport}
-
-worksrcdir ${distname}-${version}/build
-
-patch.dir ${worksrcpath}/..
-
-patchfiles-append patch-configure.diff
-
-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 bing able to compile it at all
- patchfiles-append \
- patch-src-osx-cocoa-utils.mm.diff
-}
-
-post-patch {
- reinplace "s|@@PREFIX@@|${prefix}|g" ${patch.dir}/configure
-}
-
-configure.cmd ../configure
-configure.args --prefix=${wxWidgets.prefix} \
- --with-libiconv-prefix=${prefix} \
- --with-libjpeg \
- --with-libtiff \
- --with-libpng \
- --with-zlib \
- --with-opengl \
- --with-cocoa \
- --without-sdl \
- --enable-aui \
- --disable-sdltest \
- --enable-unicode \
- --enable-display \
- --enable-xrc \
- --enable-graphics_ctx \
- --with-macosx-sdk=no \
- --with-macosx-version-min=no
-
-if {${subport} eq "wxPython-3.0"} {
- set wxpythonsubset wxPython-${wxpython_ver}-MacPorts-subset
- distfiles-append ${wxpythonsubset}${extract.suffix}:trac
-
- description wxWidgets ${branch} for the wxPython distribution
- long_description The port installs wxWidgets ${branch} for wxPython \
- to guarantee compatibility even when the upstream versions \
- of wxWidgets and wxPython differ.
-
- checksums-append ${wxpythonsubset}${extract.suffix} \
- rmd160 d3915cf55d6d8244515794ebf2316d151d69ba68 \
- sha256 b9377c6917c3a393ab9b190e1d558e4c5b80b13b435b93e11aad748f4d57bf61
-
- post-destroot {
- # copy a subset of wxPython to wxWidgets to prevent a conflict
- # between py2X-wxpython-3.0 and py2Y-wxpython-3.0
- copy ${workpath}/wxPython ${destroot}${wxWidgets.prefix}/include/wx-${branch}/wx/
- }
-
- livecheck.type none
-} 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
-} elseif {${subport} eq "wxgtk-3.0"} {
- # both patches could be added to wxWidgets-3.0, but they are not needed for Cocoa
- #
- # patch-sdl.diff: the patch allows using --wxth-sdl
- patchfiles-append patch-sdl.diff
-
- depends_build-append port:pkgconfig
- depends_lib-append path:lib/pkgconfig/cairo.pc:cairo \
- port:libsdl \
- port:libsdl_mixer
-
- configure.args-delete --with-cocoa \
- --without-sdl
- configure.args-append --with-sdl
-
- #variant gtk2 conflicts gtk3 description {} {
- # depends_lib-append port:gtk2
- # configure.args-append --with-gtk=2
- # set wxtype gtk2
- #}
- #variant gtk3 conflicts gtk2 description {} {
- depends_lib-append port:gtk3
- configure.args-append --with-gtk=3
- #}
- #variant quartz conflicts x11 {
- # require_active_variants path:lib/pkgconfig/cairo.pc:cairo quartz
- # require_active_variants gtk3 quartz
- #}
- #variant x11 conflicts quartz {
- depends_lib-append port:mesa
- require_active_variants path:lib/pkgconfig/cairo.pc:cairo x11
- require_active_variants gtk3 x11
- #}
- #if{![variant_isset gtk2] && ![variant_isset gtk3]} {
- # default_variants-append +gtk3
- #}
- #if{![variant_isset quartz] && ![variant_isset x11]} {
- # default_variants-append +quartz
- #}
- #if{[variant_isset gtk2]} {
- # if{[variant_isset quartz]} {
- # require_active_variants gtk2 quartz
- # } else {
- # require_active_variants gtk2 x11
- # }
- #} else {
- # if{[variant_isset quartz]} {
- # require_active_variants gtk3 quartz
- # } else {
- # require_active_variants gtk3 x11
- # }
- #}
-}
-
-post-destroot {
- set confscript ${wxWidgets.prefix}/lib/wx/config/${wxtype}-unicode-${branch}
- ln -sf ${confscript} ${destroot}${wxWidgets.prefix}/bin/wx-config
- xinstall -m 755 -d ${destroot}${prefix}/share/bakefile/presets
-}
-
-destroot.keepdirs ${destroot}${prefix}/share/bakefile/presets
-
-variant universal {
- set archs [join ${configure.universal_archs} ,]
- # --disable-precomp-headers is automatically selected with cocoa, but not with gtk
- # http://trac.wxwidgets.org/ticket/15454
- configure.args-append --enable-universal_binary=${archs} \
- --disable-precomp-headers
-}
-
-variant monolithic description {build only one library} {
- configure.args-append --enable-monolithic
-}
-
-variant debug description {add debug info to libraries} {
- configure.args-append --enable-debug
-}
-
-variant stdlib description {add support for various standard library features} {
- configure.args-append --enable-stl \
- --enable-std_containers \
- --enable-std_iostreams \
- --enable-std_string \
- --enable-std_string_conv_in_wxstring
-}
-
-livecheck.type regex
-livecheck.url ${homepage}/downloads/
-livecheck.regex Release.*(\[23\]\\.\[0-9\]\\.\[0-9\]+)
Copied: users/mojca/ports/graphics/wxWidgets-3.1/Portfile (from rev 118523, trunk/dports/graphics/wxWidgets-3.0/Portfile)
===================================================================
--- users/mojca/ports/graphics/wxWidgets-3.1/Portfile (rev 0)
+++ users/mojca/ports/graphics/wxWidgets-3.1/Portfile 2014-05-30 15:25:59 UTC (rev 120498)
@@ -0,0 +1,116 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
+# $Id$
+
+PortSystem 1.0
+PortGroup active_variants 1.1
+PortGroup github 1.0
+PortGroup select 1.0
+PortGroup wxWidgets 1.0
+
+set svn_revision 76625
+set git_checksum 86e4b188d7
+github.setup wxWidgets wxWidgets ${git_checksum}
+name wxWidgets-3.1
+version 3.1.0-r${svn_revision}
+
+set installname wxWidgets
+set wxtype osx_cocoa
+
+if {${subport} eq ${name}} {
+ wxWidgets.use wxWidgets-3.2
+}
+set branch [join [lrange [split ${version} .] 0 1] .]
+
+categories graphics devel
+platforms darwin
+license wxwidgets-3.1
+maintainers mojca openmaintainer
+
+description C++ framework for cross-platform GUI development
+long_description wxWidgets ${branch} is an open-source cross-platform C++ \
+ GUI framework for Mac OS, Unix, Linux, Windows.
+
+homepage http://www.wxwidgets.org/
+distname wxWidgets
+
+dist_subdir ${distname}/${version}
+
+checksums rmd160 14b330b8b89f2009ee86c9fc0012945adaf47f3d \
+ sha256 d7e05026488cdc1ab238172ddf504baf9513dc9d3cb604d19eeb67d87035e0f4
+
+depends_lib port:jpeg \
+ port:tiff \
+ port:libpng \
+ port:zlib \
+ port:libiconv \
+ port:expat
+
+depends_run port:wxWidgets_select
+
+select.group wxWidgets
+select.file ${filespath}/${subport}
+
+worksrcdir ${distname}/build
+
+patch.dir ${worksrcpath}/..
+
+patchfiles-append patch-configure.diff
+
+post-patch {
+ reinplace "s|@@PREFIX@@|${prefix}|g" ${patch.dir}/configure
+}
+
+configure.cmd ../configure
+configure.args --prefix=${wxWidgets.prefix} \
+ --with-libiconv-prefix=${prefix} \
+ --with-libjpeg \
+ --with-libtiff \
+ --with-libpng \
+ --with-zlib \
+ --with-opengl \
+ --with-cocoa \
+ --without-sdl \
+ --enable-aui \
+ --disable-sdltest \
+ --enable-unicode \
+ --enable-display \
+ --enable-xrc \
+ --enable-graphics_ctx \
+ --with-macosx-sdk=no \
+ --with-macosx-version-min=no
+
+post-destroot {
+ set confscript ${wxWidgets.prefix}/lib/wx/config/${wxtype}-unicode-${branch}
+ ln -sf ${confscript} ${destroot}${wxWidgets.prefix}/bin/wx-config
+ xinstall -m 755 -d ${destroot}${prefix}/share/bakefile/presets
+}
+
+destroot.keepdirs ${destroot}${prefix}/share/bakefile/presets
+
+variant universal {
+ set archs [join ${configure.universal_archs} ,]
+ # --disable-precomp-headers is automatically selected with cocoa, but not with gtk
+ # http://trac.wxwidgets.org/ticket/15454
+ configure.args-append --enable-universal_binary=${archs} \
+ --disable-precomp-headers
+}
+
+variant monolithic description {build only one library} {
+ configure.args-append --enable-monolithic
+}
+
+variant debug description {add debug info to libraries} {
+ configure.args-append --enable-debug
+}
+
+variant stdlib description {add support for various standard library features} {
+ configure.args-append --enable-stl \
+ --enable-std_containers \
+ --enable-std_iostreams \
+ --enable-std_string \
+ --enable-std_string_conv_in_wxstring
+}
+
+# livecheck.type regex
+# livecheck.url ${homepage}/downloads/
+# livecheck.regex Release.*(\[23\]\\.\[0-9\]\\.\[0-9\]+)
Deleted: users/mojca/ports/graphics/wxWidgets-3.1/files/patch-configure.294.diff
===================================================================
--- trunk/dports/graphics/wxWidgets-3.0/files/patch-configure.294.diff 2014-04-03 20:15:53 UTC (rev 118522)
+++ users/mojca/ports/graphics/wxWidgets-3.1/files/patch-configure.294.diff 2014-05-30 15:25:59 UTC (rev 120498)
@@ -1,79 +0,0 @@
-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* )
Modified: users/mojca/ports/graphics/wxWidgets-3.1/files/patch-configure.diff
===================================================================
--- trunk/dports/graphics/wxWidgets-3.0/files/patch-configure.diff 2014-04-03 20:15:53 UTC (rev 118522)
+++ users/mojca/ports/graphics/wxWidgets-3.1/files/patch-configure.diff 2014-05-30 15:25:59 UTC (rev 120498)
@@ -1,7 +1,7 @@
This patch is needed for GTK to make sure that the port finds the right OpenGL library
--- configure.orig
+++ configure
-@@ -21893,48 +21893,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+@@ -21627,48 +21627,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
Deleted: users/mojca/ports/graphics/wxWidgets-3.1/files/patch-src-osx-cocoa-utils.mm.diff
===================================================================
--- trunk/dports/graphics/wxWidgets-3.0/files/patch-src-osx-cocoa-utils.mm.diff 2014-04-03 20:15:53 UTC (rev 118522)
+++ users/mojca/ports/graphics/wxWidgets-3.1/files/patch-src-osx-cocoa-utils.mm.diff 2014-05-30 15:25:59 UTC (rev 120498)
@@ -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];
Deleted: users/mojca/ports/graphics/wxWidgets-3.1/files/patch-upstream-src-osx-cocoa-textctrl.mm.diff
===================================================================
--- trunk/dports/graphics/wxWidgets-3.0/files/patch-upstream-src-osx-cocoa-textctrl.mm.diff 2014-04-03 20:15:53 UTC (rev 118522)
+++ users/mojca/ports/graphics/wxWidgets-3.1/files/patch-upstream-src-osx-cocoa-textctrl.mm.diff 2014-05-30 15:25:59 UTC (rev 120498)
@@ -1,38 +0,0 @@
-http://trac.wxwidgets.org/ticket/15345
-http://trac.wxwidgets.org/changeset/75046
-
---- src/osx/cocoa/textctrl.mm (revision 75045)
-+++ src/osx/cocoa/textctrl.mm (revision 75046)
-@@ -93,6 +93,12 @@
- // Returns the last view we were instantiated for or NULL.
- static NSView *GetCurrentlyEditedView() { return ms_viewCurrentlyEdited; }
-
-+ // Returns true if this editor is the one currently being modified.
-+ static bool IsCurrentEditor(wxNSTextFieldEditor* e)
-+ {
-+ return e == [(NSTextField*)ms_viewCurrentlyEdited currentEditor];
-+ }
-+
- protected :
- BOOL m_formerEditable ;
- BOOL m_formerSelectable;
-@@ -284,9 +290,14 @@
- - (void) insertText:(id) str
- {
-- wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( (WXWidget) [self delegate] );
-- if ( impl == NULL || lastKeyDownEvent==nil || !impl->DoHandleCharEvent(lastKeyDownEvent, str) )
-- {
-- [super insertText:str];
-- }
-+ // We should never generate char events for the text being inserted
-+ // programmatically.
-+ if ( !wxMacEditHelper::IsCurrentEditor(self) )
-+ {
-+ wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( (WXWidget) [self delegate] );
-+ if ( impl && lastKeyDownEvent && impl->DoHandleCharEvent(lastKeyDownEvent, str) )
-+ return;
-+ }
-+
-+ [super insertText:str];
- }
-
Deleted: users/mojca/ports/graphics/wxWidgets-3.1/files/patch-upstream-src-osx-cocoa-window.mm.294.diff
===================================================================
--- trunk/dports/graphics/wxWidgets-3.0/files/patch-upstream-src-osx-cocoa-window.mm.294.diff 2014-04-03 20:15:53 UTC (rev 118522)
+++ users/mojca/ports/graphics/wxWidgets-3.1/files/patch-upstream-src-osx-cocoa-window.mm.294.diff 2014-05-30 15:25:59 UTC (rev 120498)
@@ -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);
-+ }
- }
-
Deleted: users/mojca/ports/graphics/wxWidgets-3.1/files/patch-upstream-src-osx-cocoa-window.mm.diff
===================================================================
--- trunk/dports/graphics/wxWidgets-3.0/files/patch-upstream-src-osx-cocoa-window.mm.diff 2014-04-03 20:15:53 UTC (rev 118522)
+++ users/mojca/ports/graphics/wxWidgets-3.1/files/patch-upstream-src-osx-cocoa-window.mm.diff 2014-05-30 15:25:59 UTC (rev 120498)
@@ -1,280 +0,0 @@
-http://trac.wxwidgets.org/ticket/15345
-http://trac.wxwidgets.org/changeset/74613
-http://trac.wxwidgets.org/changeset/74945
-
---- include/wx/osx/cocoa/private.h.orig
-+++ include/wx/osx/cocoa/private.h
-@@ -161,6 +161,7 @@ public :
- virtual void cursorUpdate(WX_NSEvent event, WXWidget slf, void* _cmd);
- virtual void keyEvent(WX_NSEvent event, WXWidget slf, void* _cmd);
- virtual void insertText(NSString* text, WXWidget slf, void* _cmd);
-+ virtual void doCommandBySelector(void* sel, WXWidget slf, void* _cmd);
- virtual bool performKeyEquivalent(WX_NSEvent event, WXWidget slf, void* _cmd);
- virtual bool acceptsFirstResponder(WXWidget slf, void* _cmd);
- virtual bool becomeFirstResponder(WXWidget slf, void* _cmd);
---- src/osx/cocoa/window.mm.orig
-+++ src/osx/cocoa/window.mm
-@@ -110,6 +110,22 @@ NSRect wxOSXGetFrameForControl( wxWindowMac* window , const wxPoint& pos , const
-
- @end // wxNSView
-
-+ at interface wxNSView(TextInput) <NSTextInputClient>
-+
-+- (void)insertText:(id)aString replacementRange:(NSRange)replacementRange;
-+- (void)doCommandBySelector:(SEL)aSelector;
-+- (void)setMarkedText:(id)aString selectedRange:(NSRange)selectedRange replacementRange:(NSRange)replacementRange;
-+- (void)unmarkText;
-+- (NSRange)selectedRange;
-+- (NSRange)markedRange;
-+- (BOOL)hasMarkedText;
-+- (NSAttributedString *)attributedSubstringForProposedRange:(NSRange)aRange actualRange:(NSRangePointer)actualRange;
-+- (NSArray*)validAttributesForMarkedText;
-+- (NSRect)firstRectForCharacterRange:(NSRange)aRange actualRange:(NSRangePointer)actualRange;
-+- (NSUInteger)characterIndexForPoint:(NSPoint)aPoint;
-+
-+ at end
-+
- @interface NSView(PossibleMethods)
- - (void)setTitle:(NSString *)aString;
- - (void)setStringValue:(NSString *)aString;
-@@ -837,6 +853,73 @@ void wxWidgetCocoaImpl::SetupMouseEvent( wxMouseEvent &wxevent , NSEvent * nsEve
-
- @end // wxNSView
-
-+// We need to adopt NSTextInputClient protocol in order to interpretKeyEvents: to work.
-+// Currently, only insertText:(replacementRange:) is
-+// implemented here, and the rest of the methods are stubs.
-+// It is hoped that someday IME-related functionality is implemented in
-+// wxWidgets and the methods of this protocol are fully working.
-+
-+ at implementation wxNSView(TextInput)
-+
-+void wxOSX_insertText(NSView* self, SEL _cmd, NSString* text);
-+
-+- (void)insertText:(id)aString replacementRange:(NSRange)replacementRange
-+{
-+ wxOSX_insertText(self, @selector(insertText:), aString);
-+}
-+
-+- (void)doCommandBySelector:(SEL)aSelector
-+{
-+ wxWidgetCocoaImpl* impl = (wxWidgetCocoaImpl* ) wxWidgetImpl::FindFromWXWidget( self );
-+ if (impl)
-+ impl->doCommandBySelector(aSelector, self, _cmd);
-+}
-+
-+- (void)setMarkedText:(id)aString selectedRange:(NSRange)selectedRange replacementRange:(NSRange)replacementRange
-+{
-+}
-+
-+- (void)unmarkText
-+{
-+}
-+
-+- (NSRange)selectedRange
-+{
-+ return NSMakeRange(NSNotFound, 0);
-+}
-+
-+- (NSRange)markedRange
-+{
-+ return NSMakeRange(NSNotFound, 0);
-+}
-+
-+- (BOOL)hasMarkedText
-+{
-+ return NO;
-+}
-+
-+- (NSAttributedString *)attributedSubstringForProposedRange:(NSRange)aRange actualRange:(NSRangePointer)actualRange
-+{
-+ return nil;
-+}
-+
-+- (NSArray*)validAttributesForMarkedText
-+{
-+ return nil;
-+}
-+
-+- (NSRect)firstRectForCharacterRange:(NSRange)aRange actualRange:(NSRangePointer)actualRange
-+{
-+ return NSMakeRect(0, 0, 0, 0);
-+}
-+- (NSUInteger)characterIndexForPoint:(NSPoint)aPoint
-+{
-+ return NSNotFound;
-+}
-+
-+ at end // wxNSView(TextInput)
-+
-+
- //
- // event handlers
- //
-@@ -1286,13 +1369,80 @@ void wxWidgetCocoaImpl::keyEvent(WX_NSEvent event, WXWidget slf, void *_cmd)
-
- void wxWidgetCocoaImpl::insertText(NSString* text, WXWidget slf, void *_cmd)
- {
-- if ( m_lastKeyDownEvent==NULL || m_hasEditor || !DoHandleCharEvent(m_lastKeyDownEvent, text) )
-+ bool result = false;
-+ if ( IsUserPane() && !m_hasEditor && [text length] > 0)
-+ {
-+ if ( m_lastKeyDownEvent!=NULL && [text isEqualToString:[m_lastKeyDownEvent characters]])
-+ {
-+ // If we have a corresponding key event, send wxEVT_KEY_DOWN now.
-+ // (see also: wxWidgetCocoaImpl::DoHandleKeyEvent)
-+ {
-+ wxKeyEvent wxevent(wxEVT_KEY_DOWN);
-+ SetupKeyEvent( wxevent, m_lastKeyDownEvent );
-+ result = GetWXPeer()->OSXHandleKeyEvent(wxevent);
-+ }
-+
-+ // ...and wxEVT_CHAR.
-+ result = result || DoHandleCharEvent(m_lastKeyDownEvent, text);
-+ }
-+ else
-+ {
-+ // If we don't have a corresponding key event (e.g. IME-composed
-+ // characters), send wxEVT_CHAR without sending wxEVT_KEY_DOWN.
-+ for (NSUInteger i = 0; i < [text length]; ++i)
-+ {
-+ wxKeyEvent wxevent(wxEVT_CHAR);
-+ wxevent.m_shiftDown = wxevent.m_controlDown = wxevent.m_altDown = wxevent.m_metaDown = false;
-+ wxevent.m_rawCode = 0;
-+ wxevent.m_rawFlags = 0;
-+ wxevent.SetTimestamp();
-+ unichar aunichar = [text characterAtIndex:i];
-+ wxevent.m_uniChar = aunichar;
-+ wxevent.m_keyCode = aunichar < 0x80 ? aunichar : WXK_NONE;
-+ wxWindowMac* peer = GetWXPeer();
-+ if ( peer )
-+ {
-+ wxevent.SetEventObject(peer);
-+ wxevent.SetId(peer->GetId());
-+ }
-+ result = GetWXPeer()->OSXHandleKeyEvent(wxevent) || result;
-+ }
-+ }
-+ }
-+ if ( !result )
- {
- wxOSX_TextEventHandlerPtr superimpl = (wxOSX_TextEventHandlerPtr) [[slf superclass] instanceMethodForSelector:(SEL)_cmd];
- superimpl(slf, (SEL)_cmd, text);
- }
- }
-
-+void wxWidgetCocoaImpl::doCommandBySelector(void* sel, WXWidget slf, void* _cmd)
-+{
-+ if ( m_lastKeyDownEvent!=NULL )
-+ {
-+ // If we have a corresponding key event, send wxEVT_KEY_DOWN now.
-+ // (see also: wxWidgetCocoaImpl::DoHandleKeyEvent)
-+ wxKeyEvent wxevent(wxEVT_KEY_DOWN);
-+ SetupKeyEvent( wxevent, m_lastKeyDownEvent );
-+ bool result = GetWXPeer()->OSXHandleKeyEvent(wxevent);
-+
-+ if (!result)
-+ {
-+ // Generate wxEVT_CHAR if wxEVT_KEY_DOWN is not handled.
-+
-+ long keycode = wxOSXTranslateCocoaKey( m_lastKeyDownEvent, wxEVT_CHAR );
-+
-+ wxKeyEvent wxevent2(wxevent) ;
-+ wxevent2.SetEventType(wxEVT_CHAR);
-+ SetupKeyEvent( wxevent2, m_lastKeyDownEvent );
-+ if ( (keycode > 0 && keycode < WXK_SPACE) || keycode == WXK_DELETE || keycode >= WXK_START )
-+ {
-+ wxevent2.m_keyCode = keycode;
-+ }
-+ GetWXPeer()->OSXHandleKeyEvent(wxevent2);
-+ }
-+ }
-+}
-
- bool wxWidgetCocoaImpl::performKeyEquivalent(WX_NSEvent event, WXWidget slf, void *_cmd)
- {
-@@ -2555,10 +2705,18 @@ void wxWidgetCocoaImpl::InstallEventHandler( WXWidget control )
-
- bool wxWidgetCocoaImpl::DoHandleCharEvent(NSEvent *event, NSString *text)
- {
-- wxKeyEvent wxevent(wxEVT_CHAR);
-- SetupKeyEvent( wxevent, event, text );
-+ bool result = false;
-+
-+ for (NSUInteger i = 0; i < [text length]; ++i)
-+ {
-+ wxKeyEvent wxevent(wxEVT_CHAR);
-+ unichar c = [text characterAtIndex:i];
-+ SetupKeyEvent( wxevent, event, [NSString stringWithCharacters:&c length:1]);
-
-- return GetWXPeer()->OSXHandleKeyEvent(wxevent);
-+ result = GetWXPeer()->OSXHandleKeyEvent(wxevent) || result;
-+ }
-+
-+ return result;
- }
-
- bool wxWidgetCocoaImpl::DoHandleKeyEvent(NSEvent *event)
-@@ -2577,48 +2735,23 @@ bool wxWidgetCocoaImpl::DoHandleKeyEvent(NSEvent *event)
- return true;
- }
-
-- bool result = GetWXPeer()->OSXHandleKeyEvent(wxevent);
--
-- // this will fire higher level events, like insertText, to help
-- // us handle EVT_CHAR, etc.
-+ if ( IsUserPane() && [event type] == NSKeyDown)
-+ {
-+ // Don't fire wxEVT_KEY_DOWN here in order to allow IME to intercept
-+ // some key events. If the event is not handled by IME, either
-+ // insertText: or doCommandBySelector: is called, so we send
-+ // wxEVT_KEY_DOWN and wxEVT_CHAR there.
-
-- if ( !result )
-+ if ( [m_osxView isKindOfClass:[NSScrollView class] ] )
-+ [[(NSScrollView*)m_osxView documentView] interpretKeyEvents:[NSArray arrayWithObject:event]];
-+ else
-+ [m_osxView interpretKeyEvents:[NSArray arrayWithObject:event]];
-+ return true;
-+ }
-+ else
- {
-- if ( [event type] == NSKeyDown)
-- {
-- long keycode = wxOSXTranslateCocoaKey( event, wxEVT_CHAR );
--
-- if ( (keycode > 0 && keycode < WXK_SPACE) || keycode == WXK_DELETE || keycode >= WXK_START )
-- {
-- // eventually we could setup a doCommandBySelector catcher and retransform this into the wx key chars
-- wxKeyEvent wxevent2(wxevent) ;
-- wxevent2.SetEventType(wxEVT_CHAR);
-- SetupKeyEvent( wxevent2, event );
-- wxevent2.m_keyCode = keycode;
-- result = GetWXPeer()->OSXHandleKeyEvent(wxevent2);
-- }
-- else if (wxevent.CmdDown())
-- {
-- wxKeyEvent wxevent2(wxevent) ;
-- wxevent2.SetEventType(wxEVT_CHAR);
-- SetupKeyEvent( wxevent2, event );
-- result = GetWXPeer()->OSXHandleKeyEvent(wxevent2);
-- }
-- else
-- {
-- if ( IsUserPane() && !wxevent.CmdDown() )
-- {
-- if ( [m_osxView isKindOfClass:[NSScrollView class] ] )
-- [[(NSScrollView*)m_osxView documentView] interpretKeyEvents:[NSArray arrayWithObject:event]];
-- else
-- [m_osxView interpretKeyEvents:[NSArray arrayWithObject:event]];
-- result = true;
-- }
-- }
-- }
-+ return GetWXPeer()->OSXHandleKeyEvent(wxevent);
- }
--
-- return result;
- }
-
- bool wxWidgetCocoaImpl::DoHandleMouseEvent(NSEvent *event)
Deleted: users/mojca/ports/graphics/wxWidgets-3.1/files/wxPerl-3.0
===================================================================
--- trunk/dports/graphics/wxWidgets-3.0/files/wxPerl-3.0 2014-04-03 20:15:53 UTC (rev 118522)
+++ users/mojca/ports/graphics/wxWidgets-3.1/files/wxPerl-3.0 2014-05-30 15:25:59 UTC (rev 120498)
@@ -1,8 +0,0 @@
-${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
Deleted: users/mojca/ports/graphics/wxWidgets-3.1/files/wxPython-3.0
===================================================================
--- trunk/dports/graphics/wxWidgets-3.0/files/wxPython-3.0 2014-04-03 20:15:53 UTC (rev 118522)
+++ users/mojca/ports/graphics/wxWidgets-3.1/files/wxPython-3.0 2014-05-30 15:25:59 UTC (rev 120498)
@@ -1,8 +0,0 @@
-${frameworks_dir}/wxWidgets.framework/Versions/wxPython/3.0/bin/wx-config
-${frameworks_dir}/wxWidgets.framework/Versions/wxPython/3.0/bin/wxrc-3.0
-${frameworks_dir}/wxWidgets.framework/Versions/wxPython/3.0/share/aclocal/wxwin.m4
-${frameworks_dir}/wxWidgets.framework/Versions/wxPython/3.0/share/bakefile/presets/wx.bkl
-${frameworks_dir}/wxWidgets.framework/Versions/wxPython/3.0/share/bakefile/presets/wx_presets.py
-${frameworks_dir}/wxWidgets.framework/Versions/wxPython/3.0/share/bakefile/presets/wx_unix.bkl
-${frameworks_dir}/wxWidgets.framework/Versions/wxPython/3.0/share/bakefile/presets/wx_win32.bkl
-${frameworks_dir}/wxWidgets.framework/Versions/wxPython/3.0/share/bakefile/presets/wx_xrc.bkl
Deleted: users/mojca/ports/graphics/wxWidgets-3.1/files/wxWidgets-3.0
===================================================================
--- trunk/dports/graphics/wxWidgets-3.0/files/wxWidgets-3.0 2014-04-03 20:15:53 UTC (rev 118522)
+++ users/mojca/ports/graphics/wxWidgets-3.1/files/wxWidgets-3.0 2014-05-30 15:25:59 UTC (rev 120498)
@@ -1,8 +0,0 @@
-${frameworks_dir}/wxWidgets.framework/Versions/wxWidgets/3.0/bin/wx-config
-${frameworks_dir}/wxWidgets.framework/Versions/wxWidgets/3.0/bin/wxrc-3.0
-${frameworks_dir}/wxWidgets.framework/Versions/wxWidgets/3.0/share/aclocal/wxwin.m4
-${frameworks_dir}/wxWidgets.framework/Versions/wxWidgets/3.0/share/bakefile/presets/wx.bkl
-${frameworks_dir}/wxWidgets.framework/Versions/wxWidgets/3.0/share/bakefile/presets/wx_presets.py
-${frameworks_dir}/wxWidgets.framework/Versions/wxWidgets/3.0/share/bakefile/presets/wx_unix.bkl
-${frameworks_dir}/wxWidgets.framework/Versions/wxWidgets/3.0/share/bakefile/presets/wx_win32.bkl
-${frameworks_dir}/wxWidgets.framework/Versions/wxWidgets/3.0/share/bakefile/presets/wx_xrc.bkl
Copied: users/mojca/ports/graphics/wxWidgets-3.1/files/wxWidgets-3.1 (from rev 118522, trunk/dports/graphics/wxWidgets-3.0/files/wxWidgets-3.0)
===================================================================
--- users/mojca/ports/graphics/wxWidgets-3.1/files/wxWidgets-3.1 (rev 0)
+++ users/mojca/ports/graphics/wxWidgets-3.1/files/wxWidgets-3.1 2014-05-30 15:25:59 UTC (rev 120498)
@@ -0,0 +1,8 @@
+${frameworks_dir}/wxWidgets.framework/Versions/wxWidgets/3.1/bin/wx-config
+${frameworks_dir}/wxWidgets.framework/Versions/wxWidgets/3.1/bin/wxrc-3.1
+${frameworks_dir}/wxWidgets.framework/Versions/wxWidgets/3.1/share/aclocal/wxwin.m4
+${frameworks_dir}/wxWidgets.framework/Versions/wxWidgets/3.1/share/bakefile/presets/wx.bkl
+${frameworks_dir}/wxWidgets.framework/Versions/wxWidgets/3.1/share/bakefile/presets/wx_presets.py
+${frameworks_dir}/wxWidgets.framework/Versions/wxWidgets/3.1/share/bakefile/presets/wx_unix.bkl
+${frameworks_dir}/wxWidgets.framework/Versions/wxWidgets/3.1/share/bakefile/presets/wx_win32.bkl
+${frameworks_dir}/wxWidgets.framework/Versions/wxWidgets/3.1/share/bakefile/presets/wx_xrc.bkl
Deleted: users/mojca/ports/graphics/wxWidgets-3.1/files/wxgtk-3.0
===================================================================
--- trunk/dports/graphics/wxWidgets-3.0/files/wxgtk-3.0 2014-04-03 20:15:53 UTC (rev 118522)
+++ users/mojca/ports/graphics/wxWidgets-3.1/files/wxgtk-3.0 2014-05-30 15:25:59 UTC (rev 120498)
@@ -1,8 +0,0 @@
-${frameworks_dir}/wxWidgets.framework/Versions/wxGTK/3.0/bin/wx-config
-${frameworks_dir}/wxWidgets.framework/Versions/wxGTK/3.0/bin/wxrc-3.0
-${frameworks_dir}/wxWidgets.framework/Versions/wxGTK/3.0/share/aclocal/wxwin.m4
-${frameworks_dir}/wxWidgets.framework/Versions/wxGTK/3.0/share/bakefile/presets/wx.bkl
-${frameworks_dir}/wxWidgets.framework/Versions/wxGTK/3.0/share/bakefile/presets/wx_presets.py
-${frameworks_dir}/wxWidgets.framework/Versions/wxGTK/3.0/share/bakefile/presets/wx_unix.bkl
-${frameworks_dir}/wxWidgets.framework/Versions/wxGTK/3.0/share/bakefile/presets/wx_win32.bkl
-${frameworks_dir}/wxWidgets.framework/Versions/wxGTK/3.0/share/bakefile/presets/wx_xrc.bkl
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140530/f5465e9c/attachment-0001.html>
More information about the macports-changes
mailing list