Revision: 111763 https://trac.macports.org/changeset/111763 Author: mojca@macports.org Date: 2013-09-30 23:53:03 -0700 (Mon, 30 Sep 2013) Log Message: ----------- codeblocks: fix the +wxwidgets28 variant (#40389) and make it default again, rename a patch Modified Paths: -------------- trunk/dports/devel/codeblocks/Portfile Added Paths: ----------- trunk/dports/devel/codeblocks/files/patch-src-plugins-contrib-NassiShneiderman-NassiView.cpp.diff Removed Paths: ------------- trunk/dports/devel/codeblocks/files/patch-wxWidgets30-compatibility-plugins-NassiShneiderman.diff Modified: trunk/dports/devel/codeblocks/Portfile =================================================================== --- trunk/dports/devel/codeblocks/Portfile 2013-10-01 06:30:04 UTC (rev 111762) +++ trunk/dports/devel/codeblocks/Portfile 2013-10-01 06:53:03 UTC (rev 111763) @@ -59,6 +59,18 @@ # not sure what this patch was used for # patch-sdk-configmanager.cpp +# FileManager requires "gamin" to be installed when using wxGTK, +# not sure whether it works with Carbon/Cocoa at all, +# so it was disabled for now +configure.args --with-contrib-plugins=all,-FileManager + +post-configure { + if {![variant_isset wxgtk28]} { + # TODO: this should be properly patched in configure[.in] rather than in this Makefile + reinplace "s|CB_HUNSPELL_LIBS =|CB_HUNSPELL_LIBS = -lhunspell-1.3.0|" ${worksrcpath}/src/plugins/contrib/SpellChecker/Makefile + } +} + post-destroot { # TODO: this might need a review system "strip -S ${destroot}${prefix}/bin/codeblocks" @@ -119,24 +131,15 @@ variant wxwidgets30 conflicts wxwidgets28 wxgtk28 description {Use wxWidgets 2.9 (experimental)} { wxWidgets.use wxWidgets-3.0 depends_lib-append port:${wxWidgets.port} - # TODO: maybe the patch for NassiShneiderman also solves the issue with wxWidgets 2.8 - patchfiles-append patch-wxWidgets30-compatibility-plugins-NassiShneiderman.diff - configure.args-append --with-wxdir=${wxWidgets.wxdir} \ - --with-contrib-plugins=all,-FileManager - - # TODO: this should be patched in configure[.in] - post-configure { - reinplace "s|CB_HUNSPELL_LIBS =|CB_HUNSPELL_LIBS = -lhunspell-1.3.0|" ${worksrcpath}/src/plugins/contrib/SpellChecker/Makefile - } + patchfiles-append patch-src-plugins-contrib-NassiShneiderman-NassiView.cpp.diff + configure.args-append --with-wxdir=${wxWidgets.wxdir} } -# this variant seems to be broken variant wxwidgets28 conflicts wxwidgets30 wxgtk28 description {Use 32-bit Carbon-based wxWidgets 2.8} { wxWidgets.use wxWidgets-2.8 depends_lib-append port:${wxWidgets.port} - # NassiShneiderman seems to be broken (http://trac.macports.org/ticket/40389) - configure.args-append --with-wxdir=${wxWidgets.wxdir} \ - --with-contrib-plugins=all,-FileManager,-NassiShneiderman + patchfiles-append patch-src-plugins-contrib-NassiShneiderman-NassiView.cpp.diff + configure.args-append --with-wxdir=${wxWidgets.wxdir} if {${wxWidgets.sdk} != ""} { configure.sdkroot ${wxWidgets.sdk} @@ -169,10 +172,7 @@ port:xorg-libXrandr \ port:xrender \ port:${wxWidgets.port} - # FileManager requires "gamin" to be installed when using wxGTK, - # so it was disabled for now - configure.args-append --with-wxdir=${wxWidgets.wxdir} \ - --with-contrib-plugins=all,-FileManager + configure.args-append --with-wxdir=${wxWidgets.wxdir} } if {![variant_isset wxwidgets30] && ![variant_isset wxwidgets28] && ![variant_isset wxgtk28]} { @@ -180,7 +180,9 @@ default_variants +wxwidgets28 } elseif {[variant_isset x11]} { default_variants +wxgtk28 + } elseif {[vercmp $xcodeversion 4.4] >= 0} { + default_variants +wxgtk28 } else { - default_variants +wxgtk28 + default_variants +wxwidgets28 } } Copied: trunk/dports/devel/codeblocks/files/patch-src-plugins-contrib-NassiShneiderman-NassiView.cpp.diff (from rev 111716, trunk/dports/devel/codeblocks/files/patch-wxWidgets30-compatibility-plugins-NassiShneiderman.diff) =================================================================== --- trunk/dports/devel/codeblocks/files/patch-src-plugins-contrib-NassiShneiderman-NassiView.cpp.diff (rev 0) +++ trunk/dports/devel/codeblocks/files/patch-src-plugins-contrib-NassiShneiderman-NassiView.cpp.diff 2013-10-01 06:53:03 UTC (rev 111763) @@ -0,0 +1,22 @@ +This patch might not work with wxGTK, but it's needed for wxMAC and wxOSX (2.8 and 2.9). +It needs to be fixed upstream, but a better patch is needed to deal with the problem. +See also http://docs.wxwidgets.org/2.9.5/overview_bitmap.html + +--- src/plugins/contrib/NassiShneiderman/NassiView.cpp.orig ++++ src/plugins/contrib/NassiShneiderman/NassiView.cpp +@@ -1048,15 +1048,9 @@ + + if ( dataptr ) + { +- #if defined(__WXMSW__) + wxCursor copycursor(dnd_copy_cur_xpm); + wxCursor movecursor(dnd_move_cur_xpm); + wxCursor nonecursor(dnd_none_cur_xpm); +- #else +- wxIcon copycursor(dnd_copy_cur_xpm); +- wxIcon movecursor(dnd_move_cur_xpm); +- wxIcon nonecursor(dnd_none_cur_xpm); +- #endif + //wxDragResult result; + + wxDropSource dndSource(m_diagramwindow, copycursor, movecursor, nonecursor); Deleted: trunk/dports/devel/codeblocks/files/patch-wxWidgets30-compatibility-plugins-NassiShneiderman.diff =================================================================== --- trunk/dports/devel/codeblocks/files/patch-wxWidgets30-compatibility-plugins-NassiShneiderman.diff 2013-10-01 06:30:04 UTC (rev 111762) +++ trunk/dports/devel/codeblocks/files/patch-wxWidgets30-compatibility-plugins-NassiShneiderman.diff 2013-10-01 06:53:03 UTC (rev 111763) @@ -1,22 +0,0 @@ -This patch might not work with wxGTK, but it's needed for wxMAC and wxOSX (2.8 and 2.9). -It needs to be fixed upstream, but a better patch is needed to deal with the problem. -See also http://docs.wxwidgets.org/2.9.5/overview_bitmap.html - ---- src/plugins/contrib/NassiShneiderman/NassiView.cpp.orig -+++ src/plugins/contrib/NassiShneiderman/NassiView.cpp -@@ -1048,15 +1048,9 @@ - - if ( dataptr ) - { -- #if defined(__WXMSW__) - wxCursor copycursor(dnd_copy_cur_xpm); - wxCursor movecursor(dnd_move_cur_xpm); - wxCursor nonecursor(dnd_none_cur_xpm); -- #else -- wxIcon copycursor(dnd_copy_cur_xpm); -- wxIcon movecursor(dnd_move_cur_xpm); -- wxIcon nonecursor(dnd_none_cur_xpm); -- #endif - //wxDragResult result; - - wxDropSource dndSource(m_diagramwindow, copycursor, movecursor, nonecursor);