[110270] trunk/dports/devel/codeblocks
mojca at macports.org
mojca at macports.org
Thu Aug 29 05:03:48 PDT 2013
Revision: 110270
https://trac.macports.org/changeset/110270
Author: mojca at macports.org
Date: 2013-08-29 05:03:47 -0700 (Thu, 29 Aug 2013)
Log Message:
-----------
codeblocks: upgrade to version 12.11, adapt to new wxWidgets layout (#38375), but needs a review
Modified Paths:
--------------
trunk/dports/devel/codeblocks/Portfile
Added Paths:
-----------
trunk/dports/devel/codeblocks/files/patch-Makefile.diff
trunk/dports/devel/codeblocks/files/patch-src-plugins-contrib-source_exporter-Makefile.diff
Removed 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
Modified: trunk/dports/devel/codeblocks/Portfile
===================================================================
--- trunk/dports/devel/codeblocks/Portfile 2013-08-29 11:51:16 UTC (rev 110269)
+++ trunk/dports/devel/codeblocks/Portfile 2013-08-29 12:03:47 UTC (rev 110270)
@@ -1,124 +1,123 @@
+# -*- coding: utf-8; mode: tcl; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=2:ts=2:sts=2
# $Id$
-PortSystem 1.0
+PortSystem 1.0
+PortGroup wxWidgets 1.0
-name codeblocks
-version 10.05
-revision 2
-platforms darwin freebsd
-categories devel aqua x11
-license GPL-3+
-maintainers afb
-description Open Source, Cross-platform, Free C/C++/D IDE
-long_description Code::Blocks is a free C++ IDE built specifically \
- to meet the most demanding needs of its users. \
- It was designed, right from the start, to be \
- extensible and configurable.
+name codeblocks
+version 12.11
+set release 8629
+platforms darwin freebsd
+categories devel aqua x11
+license GPL-3+
+maintainers afb
+description Open Source, Cross-platform, Free C/C++/D IDE
+long_description Code::Blocks is a free C++ IDE built specifically \
+ to meet the most demanding needs of its users. \
+ It was designed, right from the start, to be \
+ extensible and configurable.
-homepage http://codeblocks.org/
-master_sites http://download.berlios.de/codeblocks/ \
- sourceforge:codeblocks
-distname ${name}-${version}-src
-worksrcdir ${name}-${version}-release
-use_bzip2 yes
-checksums md5 ab077d562e98b0586f2f86c14cb773ba \
- sha1 b7697f512de69ad731f0febac4b91bb6c605fa57 \
- rmd160 a1b4e93f4cc41ae6b7fd955689dae8648f0fd2f9
+homepage http://codeblocks.org/
+master_sites http://download.berlios.de/codeblocks/ \
+ sourceforge:codeblocks
+distname ${name}_${version}-1
+worksrcdir ${name}-${version}release${release}
+checksums rmd160 669ff13ce89729d869a4002ef56814020aede0c0 \
+ sha256 af57635b97aa6ea52ba120c5fac2d847c2638d53e6bdb3fdd1561b7fa7ae6ed9
-# wxgtk is not universal
-universal_variant no
-
-# TODO: Project bug, file upstream report
+# TODO: Project bug, file upstream report, fixing might be doable
# http://trac.macports.org/ticket/35072
-compiler.blacklist clang
+compiler.blacklist clang
-configure.args --with-contrib-plugins=all
+# FileManager requires "gamin" to be installed when using wxGTK,
+# so it was disabled for now
+configure.args "--with-contrib-plugins=all,-FileManager"
-patchfiles patch-HexEditor-HexEditPanel.cpp patch-MouseSap-Makefile.am patch-sdk-configmanager.cpp
+# TODO:
+# patch-MouseSap-Makefile.am: report upstream
+# patch-Makefile.diff: not sure why it is needed
+# patch-src-plugins-contrib-source_exporter-Makefile.diff: report upstream
+patchfiles patch-MouseSap-Makefile.am \
+ patch-Makefile.diff \
+ patch-src-plugins-contrib-source_exporter-Makefile.diff
+# not sure what this patch was used for
+# patch-sdk-configmanager.cpp
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}/lib/wxSmithContribItems/lib*.so || true"
- system "strip -S ${destroot}${prefix}/lib/wxSmithContribItems/lib*.dylib || true"
- system "strip -S ${destroot}${prefix}/lib/codeblocks/plugins/*.so"
-}
+ # TODO: this might need a review
+ 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}/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 {}
-if { ([variant_isset macosx] || ([info exists os.subplatform] && ${os.subplatform} == "macosx"))
- && ![variant_isset x11] } {
- default_variants +aqua
-} else {
- default_variants +x11
-}
+ set appPath ${destroot}${applications_dir}/CodeBlocks.app/Contents
+ xinstall -d -m 0755 ${destroot}${applications_dir}
+ xinstall -d -m 0755 ${appPath}
+ xinstall -d -m 0755 ${appPath}/Resources
+ file copy -force ${worksrcpath}/codeblocks.plist ${appPath}/Info.plist
+ foreach {icn} {app cbp csd c cg cpp d f h rc} {
+ file copy -force ${worksrcpath}/src/src/resources/icons/${icn}.icns ${appPath}/Resources
+ }
-if { ([variant_isset macosx] || ([info exists os.subplatform] && ${os.subplatform} == "macosx")) } {
-variant aqua conflicts x11 description "Use the wxMac port of wxWidgets" {
- # wxmac is not 64-bit
- supported_archs i386 ppc
- depends_lib port:wxWidgets
+ xinstall -d -m 0755 ${appPath}/MacOS
+ ln -sf ${prefix}/bin/codeblocks ${appPath}/MacOS/CodeBlocks
+ xinstall -d -m 0755 ${appPath}/Resources/share
+ ln -sf ${prefix}/share/codeblocks ${appPath}/Resources/share/codeblocks
+ xinstall -d -m 0755 ${appPath}/Resources/lib
+ ln -sf ${prefix}/lib/codeblocks ${appPath}/Resources/lib/codeblocks
-platform darwin 11 {
- macosx_deployment_target 10.6
- if {[vercmp $xcodeversion 4.3] >= 0} {
- configure.sdkroot ${developer_dir}/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk
- } else {
- configure.sdkroot ${developer_dir}/SDKs/MacOSX10.6.sdk
- }
+ delete ${destroot}${prefix}/share/applications/codeblocks.desktop
+ delete ${destroot}${prefix}/share/icons/hicolor
+ delete ${destroot}${prefix}/share/mime/packages/codeblocks.xml
+ delete ${destroot}${prefix}/share/pixmaps/codeblocks.png
+
+ # TODO without the following block the app fails to start and throws the following error:
+ #
+ # Cannot find resources...
+ # Code::Blocks was configured to be installed in '/Applications/MacPorts/CodeBlocks.app/Contents/MacOS/share/codeblocks'.
+ # Please use the command-line switch '--prefix' or set the CODEBLOCKS_DATA_DIR environment variable to point where Code::Blocks is installed,
+ # or try re-installing the application...
+ #
+ # but this seems like a bug
+ xinstall -d -m 0755 ${appPath}/MacOS/share
+ ln -sf ${prefix}/share/codeblocks ${appPath}/MacOS/share
}
- patchfiles-append codeblocks-splashscreen.diff codeblocks-keybinder.diff codeblocks-debugger.diff
+# TODO: keep the old variants/descriptions?
+# variant aqua / x11
+# variant aqua conflicts x11 description "Use the wxMac port of wxWidgets"
+# variant x11 description "Use the wxGTK port of wxWidgets"
- post-destroot {
- xinstall -d -m 0755 ${destroot}${applications_dir}
- set appPath ${destroot}${applications_dir}/CodeBlocks.app/Contents
+variant aqua {}
+variant x11 {}
- xinstall -d -m 0755 ${appPath}
- file copy -force ${worksrcpath}/codeblocks.plist \
- ${appPath}/Info.plist
- xinstall -d -m 0755 ${appPath}/Resources
- file copy -force ${worksrcpath}/src/src/resources/icons/app.icns \
- ${appPath}/Resources
- file copy -force ${worksrcpath}/src/src/resources/icons/cbp.icns \
- ${appPath}/Resources
- file copy -force ${worksrcpath}/src/src/resources/icons/csd.icns \
- ${appPath}/Resources
- file copy -force ${worksrcpath}/src/src/resources/icons/c.icns \
- ${appPath}/Resources
- file copy -force ${worksrcpath}/src/src/resources/icons/cg.icns \
- ${appPath}/Resources
- file copy -force ${worksrcpath}/src/src/resources/icons/cpp.icns \
- ${appPath}/Resources
- file copy -force ${worksrcpath}/src/src/resources/icons/d.icns \
- ${appPath}/Resources
- file copy -force ${worksrcpath}/src/src/resources/icons/f.icns \
- ${appPath}/Resources
- file copy -force ${worksrcpath}/src/src/resources/icons/h.icns \
- ${appPath}/Resources
- file copy -force ${worksrcpath}/src/src/resources/icons/rc.icns \
- ${appPath}/Resources
+variant wxwidgets28 conflicts wxgtk28 description {Use 32-bit Carbon-based wxWidgets 2.8} {
+ wxWidgets.use wxWidgets-2.8
+ depends_lib-append port:${wxWidgets.port}
+ configure.args-append --with-wxdir=${wxWidgets.wxdir}
- xinstall -d -m 0755 ${appPath}/MacOS
- ln -sf ${prefix}/bin/codeblocks ${appPath}/MacOS/CodeBlocks
- xinstall -d -m 0755 ${appPath}/Resources/share
- ln -sf ${prefix}/share/codeblocks ${appPath}/Resources/share/codeblocks
- xinstall -d -m 0755 ${appPath}/Resources/lib
- ln -sf ${prefix}/lib/codeblocks ${appPath}/Resources/lib/codeblocks
-
- delete ${destroot}${prefix}/share/applications/codeblocks.desktop
- delete ${destroot}${prefix}/share/icons/hicolor
- delete ${destroot}${prefix}/share/mime/packages/codeblocks.xml
- delete ${destroot}${prefix}/share/pixmaps/codeblocks.png
+ if {${wxWidgets.sdk} != ""} {
+ configure.sdkroot ${wxWidgets.sdk}
}
}
+variant wxgtk28 conflicts wxwidgets28 description {Use wxWidgets 2.8 with GTK} {
+ wxWidgets.use wxGTK-2.8
+ depends_lib-append port:${wxWidgets.port}
+ configure.args-append --with-wxdir=${wxWidgets.wxdir}
}
-variant x11 description "Use the wxGTK port of wxWidgets" {
- # wxgtk is not universal
- universal_variant no
- depends_lib port:wxgtk
+if {![variant_isset wxwidgets28] && ![variant_isset wxgtk28]} {
+ if {[variant_isset aqua]} {
+ default_variants +wxwidgets28
+ } elseif {[variant_isset x11]} {
+ default_variants +wxgtk28
+ } elseif {[vercmp $xcodeversion 4.4] >= 0} {
+ default_variants +wxgtk28
+ } else {
+ default_variants +wxwidgets28
+ }
}
-
Deleted: trunk/dports/devel/codeblocks/files/codeblocks-debugger.diff
===================================================================
--- trunk/dports/devel/codeblocks/files/codeblocks-debugger.diff 2013-08-29 11:51:16 UTC (rev 110269)
+++ trunk/dports/devel/codeblocks/files/codeblocks-debugger.diff 2013-08-29 12:03:47 UTC (rev 110270)
@@ -1,55 +0,0 @@
-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(' ');
-------------------------------------------------------------------------
Deleted: trunk/dports/devel/codeblocks/files/codeblocks-keybinder.diff
===================================================================
--- trunk/dports/devel/codeblocks/files/codeblocks-keybinder.diff 2013-08-29 11:51:16 UTC (rev 110269)
+++ trunk/dports/devel/codeblocks/files/codeblocks-keybinder.diff 2013-08-29 12:03:47 UTC (rev 110270)
@@ -1,77 +0,0 @@
-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;
- }
-------------------------------------------------------------------------
Deleted: trunk/dports/devel/codeblocks/files/codeblocks-splashscreen.diff
===================================================================
--- trunk/dports/devel/codeblocks/files/codeblocks-splashscreen.diff 2013-08-29 11:51:16 UTC (rev 110269)
+++ trunk/dports/devel/codeblocks/files/codeblocks-splashscreen.diff 2013-08-29 12:03:47 UTC (rev 110270)
@@ -1,14 +0,0 @@
-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);
-------------------------------------------------------------------------
Deleted: trunk/dports/devel/codeblocks/files/patch-HexEditor-HexEditPanel.cpp
===================================================================
--- trunk/dports/devel/codeblocks/files/patch-HexEditor-HexEditPanel.cpp 2013-08-29 11:51:16 UTC (rev 110269)
+++ trunk/dports/devel/codeblocks/files/patch-HexEditor-HexEditPanel.cpp 2013-08-29 12:03:47 UTC (rev 110270)
@@ -1,14 +0,0 @@
---- 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-Makefile.diff
===================================================================
--- trunk/dports/devel/codeblocks/files/patch-Makefile.diff (rev 0)
+++ trunk/dports/devel/codeblocks/files/patch-Makefile.diff 2013-08-29 12:03:47 UTC (rev 110270)
@@ -0,0 +1,87 @@
+sent by afb
+--- src/include/Makefile.am.orig
++++ src/include/Makefile.am
+@@ -1,13 +1,14 @@
+ SUBDIRS = scripting tinyxml
+
+ if PRECOMPILE_HEADERS
+-BUILT_SOURCES = $(top_builddir)/src/include/sdk.h.gch \
+- $(top_builddir)/src/include/sdk_precomp.h.gch
++BUILT_SOURCES = sdk.h.gch \
++ sdk_precomp.h.gch
+ else
+ BUILT_SOURCES =
+ endif
+
+ INCLUDES = $(WX_CXXFLAGS) \
++ -I$(top_builddir)/src/include \
+ -I$(top_srcdir)/src/include \
+ -I$(top_srcdir)/src/sdk/wxscintilla/include \
+ -I$(top_srcdir)/src/include/tinyxml \
+@@ -157,16 +158,16 @@ ALLHEADERS = annoyingdialog.h \
+
+ sdk_HEADERS = $(ALLHEADERS)
+
+-$(top_builddir)/src/include/sdk.h.gch: $(top_builddir)/src/include/sdk_precomp.h.gch $(ALLHEADERS)
+- -rm -f $(top_builddir)/src/include/sdk.h.gch
+- $(CXXCOMPILE) -o $(top_builddir)/src/include/sdk.h.gch -xc++-header $(srcdir)/sdk.h
++sdk.h.gch: sdk_precomp.h.gch $(ALLHEADERS)
++ -rm -f sdk.h.gch
++ $(CXXCOMPILE) -o sdk.h.gch -xc++-header $(srcdir)/sdk.h
+
+-$(top_builddir)/src/include/sdk_precomp.h.gch: $(ALLHEADERS)
+- -rm -f $(top_builddir)/src/include/sdk_precomp.h.gch
+- $(CXXCOMPILE) -o $(top_builddir)/src/include/sdk_precomp.h.gch -xc++-header $(srcdir)/sdk_precomp.h
++sdk_precomp.h.gch: $(ALLHEADERS)
++ -rm -f sdk_precomp.h.gch
++ $(CXXCOMPILE) -o sdk_precomp.h.gch -xc++-header $(srcdir)/sdk_precomp.h
+
+ clean-local:
+- -rm -f $(top_builddir)/src/include/sdk.h.gch
+- -rm -f $(top_builddir)/src/include/sdk_precomp.h.gch
++ -rm -f sdk.h.gch
++ -rm -f sdk_precomp.h.gch
+
+ EXTRA_DIST = autorevision.h
+--- src/include/Makefile.in.orig
++++ src/include/Makefile.in
+@@ -355,10 +355,11 @@ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
+ SUBDIRS = scripting tinyxml
+ @PRECOMPILE_HEADERS_FALSE at BUILT_SOURCES =
+- at PRECOMPILE_HEADERS_TRUE@BUILT_SOURCES = $(top_builddir)/src/include/sdk.h.gch \
+- at PRECOMPILE_HEADERS_TRUE@ $(top_builddir)/src/include/sdk_precomp.h.gch
++ at PRECOMPILE_HEADERS_TRUE@BUILT_SOURCES = sdk.h.gch \
++ at PRECOMPILE_HEADERS_TRUE@ sdk_precomp.h.gch
+
+ INCLUDES = $(WX_CXXFLAGS) \
++ -I$(top_builddir)/src/include \
+ -I$(top_srcdir)/src/include \
+ -I$(top_srcdir)/src/sdk/wxscintilla/include \
+ -I$(top_srcdir)/src/include/tinyxml \
+@@ -903,17 +904,17 @@ uninstall-am: uninstall-sdkHEADERS
+ uninstall-sdkHEADERS
+
+
+-$(top_builddir)/src/include/sdk.h.gch: $(top_builddir)/src/include/sdk_precomp.h.gch $(ALLHEADERS)
+- -rm -f $(top_builddir)/src/include/sdk.h.gch
+- $(CXXCOMPILE) -o $(top_builddir)/src/include/sdk.h.gch -xc++-header $(srcdir)/sdk.h
++sdk.h.gch: sdk_precomp.h.gch $(ALLHEADERS)
++ -rm -f sdk.h.gch
++ $(CXXCOMPILE) -o sdk.h.gch -xc++-header $(srcdir)/sdk.h
+
+-$(top_builddir)/src/include/sdk_precomp.h.gch: $(ALLHEADERS)
+- -rm -f $(top_builddir)/src/include/sdk_precomp.h.gch
+- $(CXXCOMPILE) -o $(top_builddir)/src/include/sdk_precomp.h.gch -xc++-header $(srcdir)/sdk_precomp.h
++sdk_precomp.h.gch: $(ALLHEADERS)
++ -rm -f sdk_precomp.h.gch
++ $(CXXCOMPILE) -o sdk_precomp.h.gch -xc++-header $(srcdir)/sdk_precomp.h
+
+ clean-local:
+- -rm -f $(top_builddir)/src/include/sdk.h.gch
+- -rm -f $(top_builddir)/src/include/sdk_precomp.h.gch
++ -rm -f sdk.h.gch
++ -rm -f sdk_precomp.h.gch
+
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
Added: trunk/dports/devel/codeblocks/files/patch-src-plugins-contrib-source_exporter-Makefile.diff
===================================================================
--- trunk/dports/devel/codeblocks/files/patch-src-plugins-contrib-source_exporter-Makefile.diff (rev 0)
+++ trunk/dports/devel/codeblocks/files/patch-src-plugins-contrib-source_exporter-Makefile.diff 2013-08-29 12:03:47 UTC (rev 110270)
@@ -0,0 +1,22 @@
+--- src/plugins/contrib/source_exporter/Makefile.am.orig
++++ src/plugins/contrib/source_exporter/Makefile.am
+@@ -12,7 +12,7 @@ pluginlib_LTLIBRARIES = libexporter.la
+
+ libexporter_la_CPPFLAGS = -DwxPDF_USE_WXMODULE=0
+
+-libexporter_la_LDFLAGS = -module -version-info 0:1:0 -shared -no-undefined -avoid-version
++libexporter_la_LDFLAGS = -module -version-info 0:1:0 -shared -no-undefined -avoid-version -lfontconfig
+
+ libexporter_la_LIBADD = $(PLUGIN_WX_LIBS) ../../../sdk/libcodeblocks.la \
+ wxPdfDocument/libwxPdfDocument.la
+--- src/plugins/contrib/source_exporter/Makefile.in.orig
++++ src/plugins/contrib/source_exporter/Makefile.in
+@@ -392,7 +392,7 @@ INCLUDES = $(WX_CXXFLAGS) \
+ pluginlibdir = $(pkglibdir)/plugins
+ pluginlib_LTLIBRARIES = libexporter.la
+ libexporter_la_CPPFLAGS = -DwxPDF_USE_WXMODULE=0
+-libexporter_la_LDFLAGS = -module -version-info 0:1:0 -shared -no-undefined -avoid-version
++libexporter_la_LDFLAGS = -module -version-info 0:1:0 -shared -no-undefined -avoid-version -lfontconfig
+ libexporter_la_LIBADD = $(PLUGIN_WX_LIBS) ../../../sdk/libcodeblocks.la \
+ wxPdfDocument/libwxPdfDocument.la
+
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130829/43a7524e/attachment-0001.html>
More information about the macports-changes
mailing list