[73367] trunk/dports/devel/codeblocks
afb at macports.org
afb at macports.org
Thu Nov 11 01:46:34 PST 2010
Revision: 73367
http://trac.macports.org/changeset/73367
Author: afb at macports.org
Date: 2010-11-11 01:46:28 -0800 (Thu, 11 Nov 2010)
Log Message:
-----------
port upgrade: from 8.02 to 10.05-p1
Modified Paths:
--------------
trunk/dports/devel/codeblocks/Portfile
Added Paths:
-----------
trunk/dports/devel/codeblocks/files/codeblocks-debugger.diff
trunk/dports/devel/codeblocks/files/codeblocks-keybinder.diff
trunk/dports/devel/codeblocks/files/codeblocks-splashscreen.diff
trunk/dports/devel/codeblocks/files/patch-HexEditor-HexEditPanel.cpp
trunk/dports/devel/codeblocks/files/patch-MouseSap-Makefile.am
Removed Paths:
-------------
trunk/dports/devel/codeblocks/files/patch-wxscoder.cpp.diff
Modified: trunk/dports/devel/codeblocks/Portfile
===================================================================
--- trunk/dports/devel/codeblocks/Portfile 2010-11-11 09:40:51 UTC (rev 73366)
+++ trunk/dports/devel/codeblocks/Portfile 2010-11-11 09:46:28 UTC (rev 73367)
@@ -3,7 +3,7 @@
PortSystem 1.0
name codeblocks
-version 8.02
+version 10.05
platforms darwin freebsd
categories devel aqua x11
maintainers afb
@@ -17,21 +17,25 @@
master_sites http://download.berlios.de/codeblocks/ \
sourceforge:codeblocks
distname ${name}-${version}-src
-worksrcdir ${name}-${version}
+worksrcdir ${name}-${version}-release
use_bzip2 yes
-checksums md5 ac15b4b3de50d7650c2f7a8dbcb30f88 \
- sha1 078932cfd4fee2066ec931cb6dfa8079235c1237 \
- rmd160 88451f42ac4de2b98d57416a3cea1a0647344b30
+checksums md5 ab077d562e98b0586f2f86c14cb773ba \
+ sha1 b7697f512de69ad731f0febac4b91bb6c605fa57 \
+ rmd160 a1b4e93f4cc41ae6b7fd955689dae8648f0fd2f9
configure.args --with-contrib-plugins=all
+patchfiles patch-HexEditor-HexEditPanel.cpp patch-MouseSap-Makefile.am
+
post-destroot {
system "strip -S ${destroot}${prefix}/bin/codeblocks"
system "strip -S ${destroot}${prefix}/lib/libcodeblocks*.so || true"
system "strip -S ${destroot}${prefix}/lib/libcodeblocks*.dylib || true"
system "strip -S ${destroot}${prefix}/lib/libwxsmithlib*.so || true"
system "strip -S ${destroot}${prefix}/lib/libwxsmithlib*.dylib || true"
- system "strip -S ${destroot}${prefix}/share/codeblocks/plugins/*.so"
+ system "strip -S ${destroot}${prefix}/lib/wxSmithContribItems/lib*.so || true"
+ system "strip -S ${destroot}${prefix}/lib/wxSmithContribItems/lib*.dylib || true"
+ system "strip -S ${destroot}${prefix}/lib/codeblocks/plugins/*.so"
}
platform macosx {}
@@ -46,6 +50,8 @@
variant aqua conflicts x11 description "Use the wxMac port of wxWidgets" {
depends_lib port:wxWidgets
+ patchfiles-append codeblocks-splashscreen.diff codeblocks-keybinder.diff codeblocks-debugger.diff
+
post-destroot {
xinstall -d -m 0755 ${destroot}/Applications/MacPorts
set appPath ${destroot}/Applications/MacPorts/CodeBlocks.app/Contents
@@ -92,7 +98,5 @@
# wxgtk is not universal
universal_variant no
depends_lib port:wxgtk
-
- patchfiles patch-wxscoder.cpp.diff
}
Added: trunk/dports/devel/codeblocks/files/codeblocks-debugger.diff
===================================================================
--- trunk/dports/devel/codeblocks/files/codeblocks-debugger.diff (rev 0)
+++ trunk/dports/devel/codeblocks/files/codeblocks-debugger.diff 2010-11-11 09:46:28 UTC (rev 73367)
@@ -0,0 +1,55 @@
+Index: src/plugins/debuggergdb/debuggergdb.cpp
+===================================================================
+--- src/plugins/debuggergdb/debuggergdb.cpp (revision 6335)
++++ src/plugins/debuggergdb/debuggergdb.cpp (revision 6336)
+@@ -1530,7 +1530,7 @@
+ m_State.GetDriver()->Prepare(target, target && target->GetTargetType() == ttConsoleOnly);
+ m_State.ApplyBreakpoints();
+
+- #ifdef __WXGTK__
++ #ifndef __WXMSW__
+ // create xterm and issue tty "/dev/pts/#" to GDB where
+ // # is the tty for the newly created xterm
+ m_bIsConsole = (target && target->GetTargetType() == ttConsoleOnly);
+@@ -1543,7 +1543,7 @@
+ DebugLog(wxString::Format( _("Queued:[%s]"), gdbTtyCmd.c_str()) );
+ }
+ }//if
+- #endif//def __WXGTK__
++ #endif//ndef __WXMSW__
+
+ // Don't issue 'run' if attaching to a process (Bug #1391904)
+ if (m_PidToAttach == 0)
+@@ -2903,15 +2903,20 @@
+ // redirecting program stdin/stdout/stderr to the xterm console.
+
+ wxString cmd;
++ wxString cmd2;
+ wxString title = wxT("Program Console");
+ m_nConsolePid = 0;
+ // for non-win platforms, use m_ConsoleTerm to run the console app
+ wxString term = Manager::Get()->GetConfigManager(_T("app"))->Read(_T("/console_terminal"), DEFAULT_CONSOLE_TERM);
+ term.Replace(_T("$TITLE"), _T("'") + title + _T("'"));
+ cmd << term << _T(" ");
+- cmd << wxT("sleep ");
+- cmd << wxString::Format(wxT("%d"),80000 + ::wxGetProcessId());
++ cmd2 << wxT("sleep ");
++ cmd2 << wxString::Format(wxT("%d"),80000 + ::wxGetProcessId());
+
++ if (!cmd.Replace(_T("$SCRIPT"), cmd2))
++ // if they didn't specify $SCRIPT, append:
++ cmd << cmd2;
++
+ Manager::Get()->GetMacrosManager()->ReplaceEnvVars(cmd);
+ DebugLog(wxString::Format( _("Executing: %s"), cmd.c_str()) );
+ //start xterm -e sleep {some unique # of seconds}
+@@ -2988,7 +2993,7 @@
+ do
+ {
+ // check for correct "sleep" line
+- if (psCmd.Contains(wxT("-T")))
++ if (psCmd.Contains(wxT("-T")) || psCmd.Contains(wxT("osascript")))
+ break; //error;wrong sleep line.
+ // found "sleep 93343" string, extract tty field
+ ConsTtyStr = wxT("/dev/") + psCmd.BeforeFirst(' ');
+------------------------------------------------------------------------
Added: trunk/dports/devel/codeblocks/files/codeblocks-keybinder.diff
===================================================================
--- trunk/dports/devel/codeblocks/files/codeblocks-keybinder.diff (rev 0)
+++ trunk/dports/devel/codeblocks/files/codeblocks-keybinder.diff 2010-11-11 09:46:28 UTC (rev 73367)
@@ -0,0 +1,77 @@
+Index: src/plugins/contrib/keybinder/keybinder.h
+===================================================================
+--- src/plugins/contrib/keybinder/keybinder.h (revision 6332)
++++ src/plugins/contrib/keybinder/keybinder.h (revision 6333)
+@@ -75,7 +75,7 @@
+ {
+ protected:
+
+- //! One of wxACCEL_ALT, wxACCEL_CTRL or wxACCEL_SHIFT flags.
++ //! One of wxACCEL_ALT, wxACCEL_CTRL, wxACCEL_SHIFT, or wxACCEL_CMD flags.
+ int m_nFlags;
+
+ //! One of the wxWidgets key code which defines the key shortcut.
+@@ -1171,7 +1171,7 @@
+ const wxValidator& validator = wxDefaultValidator,
+ const wxString& name = wxTextCtrlNameStr) :
+ wxTextCtrl(parent, id, value, pos, size, style, validator, name)
+- { validCmdPrefixes = wxT("Ctrl-Alt-Shift-");}
++ { validCmdPrefixes = wxT("Ctrl-XCtrl-Alt-Shift-");}
+
+ virtual ~wxKeyMonitorTextCtrl() {}
+
+Index: src/plugins/contrib/keybinder/keybinder.cpp
+===================================================================
+--- src/plugins/contrib/keybinder/keybinder.cpp (revision 6332)
++++ src/plugins/contrib/keybinder/keybinder.cpp (revision 6333)
+@@ -482,9 +482,14 @@
+ {
+ wxString result;
+
+- if (keyModifier & wxACCEL_CTRL)
++ if (keyModifier & wxACCEL_CMD)
+ //result += wxT("Ctrl+"); //CB uses dashes
+ result += wxT("Ctrl-");
++#if defined(__WXMAC__) || defined(__WXCOCOA__)
++ if (keyModifier & wxACCEL_CTRL)
++ //result += wxT("XCtrl+"); //CB uses dashes
++ result += wxT("XCtrl-");
++#endif
+ if (keyModifier & wxACCEL_ALT)
+ //result += wxT("Alt+"); //CB uses dashes
+ result += wxT("Alt-");
+@@ -509,7 +514,11 @@
+ mod |= wxACCEL_ALT;
+
+ if (str.Contains(wxT("CTRL")))
++ mod |= wxACCEL_CMD;
++#if defined(__WXMAC__) || defined(__WXCOCOA__)
++ if (str.Contains(wxT("XCTRL")))
+ mod |= wxACCEL_CTRL;
++#endif
+
+ if (str.Contains(wxT("SHIFT")))
+ mod |= wxACCEL_SHIFT;
+@@ -536,6 +545,11 @@
+ if (event.ShiftDown())
+ mod |= wxACCEL_SHIFT;
+
++#if defined(__WXMAC__) || defined(__WXCOCOA__)
++ if (event.CmdDown())
++ mod |= wxACCEL_CMD;
++#endif
++
+ return mod;
+ }
+
+@@ -560,6 +574,9 @@
+ b &= (key.AltDown() == ((m_nFlags & wxACCEL_ALT) != 0));
+ b &= (key.ControlDown() == ((m_nFlags & wxACCEL_CTRL) != 0));
+ b &= (key.ShiftDown() == ((m_nFlags & wxACCEL_SHIFT) != 0));
++#if defined(__WXMAC__) || defined(__WXCOCOA__)
++ b &= (key.CmdDown() == ((m_nFlags & wxACCEL_CMD) != 0));
++#endif
+
+ return b;
+ }
+------------------------------------------------------------------------
Added: trunk/dports/devel/codeblocks/files/codeblocks-splashscreen.diff
===================================================================
--- trunk/dports/devel/codeblocks/files/codeblocks-splashscreen.diff (rev 0)
+++ trunk/dports/devel/codeblocks/files/codeblocks-splashscreen.diff 2010-11-11 09:46:28 UTC (rev 73367)
@@ -0,0 +1,14 @@
+Index: src/src/splashscreen.cpp
+===================================================================
+--- src/src/splashscreen.cpp (revision 6330)
++++ src/src/splashscreen.cpp (revision 6331)
+@@ -126,7 +126,7 @@
+ }
+
+ cbSplashScreen::cbSplashScreen(wxBitmap &label, long timeout, wxWindow *parent, wxWindowID id, long style)
+-: wxFrame(parent, id, wxEmptyString, wxPoint(0, 0), wxSize(100, 100), style),
++: wxFrame(parent, id, wxEmptyString, wxPoint(0, 0), wxSize(440, 217), style),
+ m_timer(this, cbSplashScreen_timer_id), m_region(0, 0, 181, 181)
+ {
+ m_region.Union(50, 35, 181, 181);
+------------------------------------------------------------------------
Added: trunk/dports/devel/codeblocks/files/patch-HexEditor-HexEditPanel.cpp
===================================================================
--- trunk/dports/devel/codeblocks/files/patch-HexEditor-HexEditPanel.cpp (rev 0)
+++ trunk/dports/devel/codeblocks/files/patch-HexEditor-HexEditPanel.cpp 2010-11-11 09:46:28 UTC (rev 73367)
@@ -0,0 +1,14 @@
+--- src/plugins/contrib/HexEditor//HexEditPanel.cpp.orig 2010-05-22 12:20:13.000000000 +0200
++++ src/plugins/contrib/HexEditor//HexEditPanel.cpp 2010-11-11 09:59:58.000000000 +0100
+@@ -1028,7 +1028,11 @@ void HexEditPanel::OnDrawAreaKeyDown(wxK
+
+ default:
+ {
++#if wxUSE_UNICODE
+ m_ActiveView->PutChar( event.GetUnicodeKey() );
++#else
++ m_ActiveView->PutChar( event.GetKeyCode() & 0xFF );
++#endif
+ break;
+ }
+ }
Added: trunk/dports/devel/codeblocks/files/patch-MouseSap-Makefile.am
===================================================================
--- trunk/dports/devel/codeblocks/files/patch-MouseSap-Makefile.am (rev 0)
+++ trunk/dports/devel/codeblocks/files/patch-MouseSap-Makefile.am 2010-11-11 09:46:28 UTC (rev 73367)
@@ -0,0 +1,22 @@
+--- src/plugins/contrib/MouseSap/Makefile.am.orig 2010-05-22 12:20:19.000000000 +0200
++++ src/plugins/contrib/MouseSap/Makefile.am 2010-11-11 10:03:40.000000000 +0100
+@@ -7,7 +7,7 @@ pluginlibdir = $(pkglibdir)/plugins
+
+ pluginlib_LTLIBRARIES = libMouseSap.la
+
+-libMouseSap_la_LDFLAGS = -module -version-info 0:1:0 -shared -no-undefined -avoid-version
++libMouseSap_la_LDFLAGS = $(WX_GTK2_LIBS) -module -version-info 0:1:0 -shared -no-undefined -avoid-version
+
+ libMouseSap_la_LIBADD = $(PLUGIN_WX_LIBS) ../../../sdk/libcodeblocks.la
+
+--- src/plugins/contrib/MouseSap/Makefile.in.orig 2010-06-08 10:55:48.000000000 +0200
++++ src/plugins/contrib/MouseSap/Makefile.in 2010-11-11 10:04:07.000000000 +0100
+@@ -288,7 +288,7 @@ INCLUDES = $(WX_CXXFLAGS) \
+
+ pluginlibdir = $(pkglibdir)/plugins
+ pluginlib_LTLIBRARIES = libMouseSap.la
+-libMouseSap_la_LDFLAGS = -module -version-info 0:1:0 -shared -no-undefined -avoid-version
++libMouseSap_la_LDFLAGS = $(WX_GTK2_LIBS) -module -version-info 0:1:0 -shared -no-undefined -avoid-version
+ libMouseSap_la_LIBADD = $(PLUGIN_WX_LIBS) ../../../sdk/libcodeblocks.la
+ libMouseSap_la_SOURCES = MouseSap.cpp
+ noinst_HEADERS = MouseSap.h
Deleted: trunk/dports/devel/codeblocks/files/patch-wxscoder.cpp.diff
===================================================================
--- trunk/dports/devel/codeblocks/files/patch-wxscoder.cpp.diff 2010-11-11 09:40:51 UTC (rev 73366)
+++ trunk/dports/devel/codeblocks/files/patch-wxscoder.cpp.diff 2010-11-11 09:46:28 UTC (rev 73367)
@@ -1,22 +0,0 @@
-Index: src/plugins/contrib/wxSmith/wxscoder.cpp
-===================================================================
---- src/plugins/contrib/wxSmith/wxscoder.cpp (revision 4921)
-+++ src/plugins/contrib/wxSmith/wxscoder.cpp (arbetskopia)
-@@ -375,7 +375,7 @@
- ( ch == _T('\t') ) ? _T('\t') : _T(' '));
- }
-
-- Code = RebuildCode(BaseIndentation,Code.c_str(),(int)Code.Length(),EOL);
-+ Code = RebuildCode(BaseIndentation,Code.wc_str(wxConvLocal),(int)Code.Length(),EOL);
-
- // Fixing up positions to contain or not header / ending sequence
- if ( !CodeHasHeader ) Position += Header.Length();
-@@ -463,7 +463,7 @@
- ( ch == _T('\t') ) ? _T('\t') : _T(' '));
- }
-
-- Code = RebuildCode(BaseIndentation,Code.c_str(),Code.Length(),EOL);
-+ Code = RebuildCode(BaseIndentation,Code.wc_str(wxConvLocal),Code.Length(),EOL);
-
- // Checking if code has really changed
- if ( Content.Mid(0,EndPosition) == Code )
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20101111/b1c36bd6/attachment.html>
More information about the macports-changes
mailing list