<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[119054] trunk/dports/devel/codeblocks</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/119054">119054</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2014-04-15 14:40:31 -0700 (Tue, 15 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>codeblocks: various patches (closes #43367)
* remove an obsolete patch for -lfontconfig (fixed upstream, closes #43367)
* report wxOSX and use pkg-config instead of hardcoding CB_HUNSPELL_LIBS
* add a patch to work around compile error
* rename some files</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelcodeblocksPortfile">trunk/dports/devel/codeblocks/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsdevelcodeblocksfilespatchconfigurehunspelldiff">trunk/dports/devel/codeblocks/files/patch-configure-hunspell.diff</a></li>
<li><a href="#trunkdportsdevelcodeblocksfilespatchconfiguremallocdiff">trunk/dports/devel/codeblocks/files/patch-configure-malloc.diff</a></li>
<li><a href="#trunkdportsdevelcodeblocksfilespatchconfigurenodebugdiff">trunk/dports/devel/codeblocks/files/patch-configure-nodebug.diff</a></li>
<li><a href="#trunkdportsdevelcodeblocksfilespatchsrcsdkwxscintillasrcscintillasrcCallTiphdiff">trunk/dports/devel/codeblocks/files/patch-src-sdk-wxscintilla-src-scintilla-src-CallTip.h.diff</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkdportsdevelcodeblocksfilespatchmallocdiff">trunk/dports/devel/codeblocks/files/patch-malloc.diff</a></li>
<li><a href="#trunkdportsdevelcodeblocksfilespatchnodebugdiff">trunk/dports/devel/codeblocks/files/patch-nodebug.diff</a></li>
<li><a href="#trunkdportsdevelcodeblocksfilespatchsrcpluginscontribsource_exporterMakefilediff">trunk/dports/devel/codeblocks/files/patch-src-plugins-contrib-source_exporter-Makefile.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelcodeblocksPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/codeblocks/Portfile (119053 => 119054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/codeblocks/Portfile 2014-04-15 21:35:12 UTC (rev 119053)
+++ trunk/dports/devel/codeblocks/Portfile 2014-04-15 21:40:31 UTC (rev 119054)
</span><span class="lines">@@ -28,7 +28,6 @@
</span><span class="cx">
</span><span class="cx"> # TODO: maybe more dependencies are needed in this version, please help complete the list (see also the list below)
</span><span class="cx"> depends_build path:bin/pkg-config:pkgconfig
</span><del>-# TODO: if hunspell is updated, fix post-configure below (or patch configure[.in])
</del><span class="cx"> depends_lib port:boost \
</span><span class="cx"> port:hunspell
</span><span class="cx">
</span><span class="lines">@@ -37,8 +36,10 @@
</span><span class="cx"> # patch-src-src-Makefile.in.diff: https://trac.macports.org/ticket/40531
</span><span class="cx"> patchfiles patch-Makefile.diff \
</span><span class="cx"> patch-src-src-Makefile.in.diff \
</span><del>- patch-nodebug.diff \
- patch-malloc.diff
</del><ins>+ patch-src-sdk-wxscintilla-src-scintilla-src-CallTip.h.diff \
+ patch-configure-hunspell.diff \
+ patch-configure-nodebug.diff \
+ patch-configure-malloc.diff
</ins><span class="cx">
</span><span class="cx"> # not sure what this patch was used for
</span><span class="cx"> # patch-sdk-configmanager.cpp
</span><span class="lines">@@ -48,13 +49,6 @@
</span><span class="cx"> # so it was disabled for now
</span><span class="cx"> configure.args --with-contrib-plugins=all,-FileManager
</span><span class="cx">
</span><del>-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
- }
-}
-
</del><span class="cx"> post-destroot {
</span><span class="cx"> # TODO: this might need a review
</span><span class="cx"> system "strip -S ${destroot}${prefix}/bin/codeblocks"
</span><span class="lines">@@ -131,7 +125,7 @@
</span><span class="cx"> }
</span><span class="cx"> variant wxgtk28 conflicts wxwidgets30 wxwidgets28 description {Use wxWidgets 2.8 with GTK} {
</span><span class="cx"> wxWidgets.use wxGTK-2.8
</span><del>- patchfiles-append patch-src-plugins-contrib-source_exporter-Makefile.diff
</del><ins>+
</ins><span class="cx"> # TODO: someone needs to do a careful check of this list of dependencies
</span><span class="cx"> # codeblocks ends up linking against these, but it is quite possible that
</span><span class="cx"> # some of them are also needed when liking against Carbon/Cocoa-based wxWidgets
</span></span></pre></div>
<a id="trunkdportsdevelcodeblocksfilespatchconfigurehunspelldiff"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/codeblocks/files/patch-configure-hunspell.diff (0 => 119054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/codeblocks/files/patch-configure-hunspell.diff (rev 0)
+++ trunk/dports/devel/codeblocks/files/patch-configure-hunspell.diff 2014-04-15 21:40:31 UTC (rev 119054)
</span><span class="lines">@@ -0,0 +1,304 @@
</span><ins>+http://developer.berlios.de/bugs/?group_id=5358&func=detailbug&bug_id=19135
+
+--- configure.orig
++++ configure
+@@ -21530,6 +21530,269 @@ fi
+
+ MACSETFILE="\$(SETFILE)"
+ ;;
++ *wx_osx*)
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: wxOSX" >&5
++$as_echo "wxOSX" >&6; }
++
++ if test "x$BUILD_SPELLCHECKER_TRUE" = "x" ; then
++
++ # Extract the first word of "pkg-config", so it can be a program name with args.
++set dummy pkg-config; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_prog_HAVE_PKG_CONFIG+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ if test -n "$HAVE_PKG_CONFIG"; then
++ ac_cv_prog_HAVE_PKG_CONFIG="$HAVE_PKG_CONFIG" # Let the user override the test.
++else
++as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ ac_cv_prog_HAVE_PKG_CONFIG="yes"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
++
++ test -z "$ac_cv_prog_HAVE_PKG_CONFIG" && ac_cv_prog_HAVE_PKG_CONFIG="no"
++fi
++fi
++HAVE_PKG_CONFIG=$ac_cv_prog_HAVE_PKG_CONFIG
++if test -n "$HAVE_PKG_CONFIG"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_PKG_CONFIG" >&5
++$as_echo "$HAVE_PKG_CONFIG" >&6; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++
++
++
++
++
++
++
++
++
++if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
++ if test -n "$ac_tool_prefix"; then
++ # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
++set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_path_PKG_CONFIG+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ case $PKG_CONFIG in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
++
++ ;;
++esac
++fi
++PKG_CONFIG=$ac_cv_path_PKG_CONFIG
++if test -n "$PKG_CONFIG"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
++$as_echo "$PKG_CONFIG" >&6; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++
++fi
++if test -z "$ac_cv_path_PKG_CONFIG"; then
++ ac_pt_PKG_CONFIG=$PKG_CONFIG
++ # Extract the first word of "pkg-config", so it can be a program name with args.
++set dummy pkg-config; ac_word=$2
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
++$as_echo_n "checking for $ac_word... " >&6; }
++if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
++ $as_echo_n "(cached) " >&6
++else
++ case $ac_pt_PKG_CONFIG in
++ [\\/]* | ?:[\\/]*)
++ ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
++ ;;
++ *)
++ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
++for as_dir in $PATH
++do
++ IFS=$as_save_IFS
++ test -z "$as_dir" && as_dir=.
++ for ac_exec_ext in '' $ac_executable_extensions; do
++ if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
++ ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
++ $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
++ break 2
++ fi
++done
++ done
++IFS=$as_save_IFS
++
++ ;;
++esac
++fi
++ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
++if test -n "$ac_pt_PKG_CONFIG"; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
++$as_echo "$ac_pt_PKG_CONFIG" >&6; }
++else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++fi
++
++ if test "x$ac_pt_PKG_CONFIG" = x; then
++ PKG_CONFIG=""
++ else
++ case $cross_compiling:$ac_tool_warned in
++yes:)
++{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
++$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
++ac_tool_warned=yes ;;
++esac
++ PKG_CONFIG=$ac_pt_PKG_CONFIG
++ fi
++else
++ PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
++fi
++
++fi
++if test -n "$PKG_CONFIG"; then
++ _pkg_min_version=0.9.0
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
++$as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
++ if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++ else
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++ PKG_CONFIG=""
++ fi
++fi
++
++ if test "x$HAVE_PKG_CONFIG" = "xyes"; then
++
++pkg_failed=no
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for HUNSPELL" >&5
++$as_echo_n "checking for HUNSPELL... " >&6; }
++
++if test -n "$HUNSPELL_CFLAGS"; then
++ pkg_cv_HUNSPELL_CFLAGS="$HUNSPELL_CFLAGS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hunspell\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "hunspell") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_HUNSPELL_CFLAGS=`$PKG_CONFIG --cflags "hunspell" 2>/dev/null`
++ test "x$?" != "x0" && pkg_failed=yes
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++if test -n "$HUNSPELL_LIBS"; then
++ pkg_cv_HUNSPELL_LIBS="$HUNSPELL_LIBS"
++ elif test -n "$PKG_CONFIG"; then
++ if test -n "$PKG_CONFIG" && \
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"hunspell\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "hunspell") 2>&5
++ ac_status=$?
++ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
++ test $ac_status = 0; }; then
++ pkg_cv_HUNSPELL_LIBS=`$PKG_CONFIG --libs "hunspell" 2>/dev/null`
++ test "x$?" != "x0" && pkg_failed=yes
++else
++ pkg_failed=yes
++fi
++ else
++ pkg_failed=untried
++fi
++
++
++
++if test $pkg_failed = yes; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++
++if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
++ _pkg_short_errors_supported=yes
++else
++ _pkg_short_errors_supported=no
++fi
++ if test $_pkg_short_errors_supported = yes; then
++ HUNSPELL_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "hunspell" 2>&1`
++ else
++ HUNSPELL_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "hunspell" 2>&1`
++ fi
++ # Put the nasty error message in config.log where it belongs
++ echo "$HUNSPELL_PKG_ERRORS" >&5
++
++ as_fn_error $? "Package requirements (hunspell) were not met:
++
++$HUNSPELL_PKG_ERRORS
++
++Consider adjusting the PKG_CONFIG_PATH environment variable if you
++installed software in a non-standard prefix.
++
++Alternatively, you may set the environment variables HUNSPELL_CFLAGS
++and HUNSPELL_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details." "$LINENO" 5
++elif test $pkg_failed = untried; then
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
++$as_echo "no" >&6; }
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
++$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
++as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
++is in your PATH or set the PKG_CONFIG environment variable to the full
++path to pkg-config.
++
++Alternatively, you may set the environment variables HUNSPELL_CFLAGS
++and HUNSPELL_LIBS to avoid the need to call pkg-config.
++See the pkg-config man page for more details.
++
++To get pkg-config, see <http://pkg-config.freedesktop.org/>.
++See \`config.log' for more details" "$LINENO" 5; }
++else
++ HUNSPELL_CFLAGS=$pkg_cv_HUNSPELL_CFLAGS
++ HUNSPELL_LIBS=$pkg_cv_HUNSPELL_LIBS
++ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
++$as_echo "yes" >&6; }
++
++fi
++ fi
++ fi
++ CB_HUNSPELL_CFLAGS="$HUNSPELL_CFLAGS"
++ CB_HUNSPELL_LIBS="$HUNSPELL_LIBS"
++ ;;
+ *)
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: other" >&5
+ $as_echo "other" >&6; }
+#--- configure.ac.orig
+#+++ configure.ac
+#@@ -223,6 +223,27 @@ case $WX_BASENAME in
+# AC_CHECK_PROG(SETFILE, SetFile, SetFile, /Developer/Tools/SetFile)
+# MACSETFILE="\$(SETFILE)"
+# ;;
+#+ *wx_osx*)
+#+ AC_MSG_RESULT(wxOSX)
+#+
+#+ if test "x$BUILD_SPELLCHECKER_TRUE" = "x" ; then
+#+
+#+ AC_CHECK_PROG(HAVE_PKG_CONFIG, pkg-config, yes, no)
+#+ ifdef([PKG_CHECK_MODULES],[],[
+#+ define([PKG_CHECK_MODULES],
+#+ [ echo "You don't have pkg.m4 properly installed" >&2
+#+ exit 1
+#+ ])
+#+ ])
+#+ PKG_PROG_PKG_CONFIG
+#+
+#+ if test "x$HAVE_PKG_CONFIG" = "xyes"; then
+#+ PKG_CHECK_MODULES([HUNSPELL], [hunspell])
+#+ fi
+#+ fi
+#+ CB_HUNSPELL_CFLAGS="$HUNSPELL_CFLAGS"
+#+ CB_HUNSPELL_LIBS="$HUNSPELL_LIBS"
+#+ ;;
+# *)
+# AC_MSG_RESULT(other)
+# ;;
</ins></span></pre></div>
<a id="trunkdportsdevelcodeblocksfilespatchconfiguremallocdifffromrev118550trunkdportsdevelcodeblocksfilespatchmallocdiff"></a>
<div class="copfile"><h4>Copied: trunk/dports/devel/codeblocks/files/patch-configure-malloc.diff (from rev 118550, trunk/dports/devel/codeblocks/files/patch-malloc.diff) (0 => 119054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/codeblocks/files/patch-configure-malloc.diff (rev 0)
+++ trunk/dports/devel/codeblocks/files/patch-configure-malloc.diff 2014-04-15 21:40:31 UTC (rev 119054)
</span><span class="lines">@@ -0,0 +1,23 @@
</span><ins>+http://developer.berlios.de/bugs/?func=detailbug&bug_id=19114&group_id=5358
+--- configure.orig
++++ configure
+@@ -16967,7 +16967,7 @@ $as_echo "#define STDC_HEADERS 1" >>confdefs.h
+
+ fi
+
+-for ac_header in fcntl.h limits.h stdlib.h string.h sys/param.h unistd.h malloc.h
++for ac_header in fcntl.h limits.h stdlib.h string.h sys/param.h unistd.h sys/malloc.h
+ do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+#--- configure.ac.orig
+#+++ configure.ac
+#@@ -36,7 +36,7 @@ AC_PROG_LIBTOOL
+# dnl Checks for header files.
+# AC_HEADER_DIRENT
+# AC_HEADER_STDC
+#-AC_CHECK_HEADERS([fcntl.h limits.h stdlib.h string.h sys/param.h unistd.h malloc.h])
+#+AC_CHECK_HEADERS([fcntl.h limits.h stdlib.h string.h sys/param.h unistd.h sys/malloc.h])
+#
+# dnl Checks for typedefs, structures, and compiler characteristics.
+# AC_HEADER_STDBOOL
</ins></span></pre></div>
<a id="trunkdportsdevelcodeblocksfilespatchconfigurenodebugdifffromrev118550trunkdportsdevelcodeblocksfilespatchnodebugdiff"></a>
<div class="copfile"><h4>Copied: trunk/dports/devel/codeblocks/files/patch-configure-nodebug.diff (from rev 118550, trunk/dports/devel/codeblocks/files/patch-nodebug.diff) (0 => 119054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/codeblocks/files/patch-configure-nodebug.diff (rev 0)
+++ trunk/dports/devel/codeblocks/files/patch-configure-nodebug.diff 2014-04-15 21:40:31 UTC (rev 119054)
</span><span class="lines">@@ -0,0 +1,37 @@
</span><ins>+# http://developer.berlios.de/bugs/?func=detailbug&bug_id=19110&group_id=5358
+#
+# the files where these LDFLAGS would cause problems:
+# * src/build_tools/autorevision/Makefile
+# * src/sdk/Makefile
+# * src/src/Makefile
+#--- acinclude.m4.orig
+#+++ acinclude.m4
+#@@ -69,12 +69,10 @@ AC_ARG_ENABLE(debug, [AC_HELP_STRING([--enable-debug], [turn on debugging (defau
+# if test "x$enable_debug" = "xyes"; then
+# CFLAGS="-g -DDEBUG -DCB_AUTOCONF $CFLAGS"
+# CXXFLAGS="-g -DDEBUG -DCB_AUTOCONF $CXXFLAGS"
+#- LDFLAGS="-Wl,--no-undefined"
+# AC_MSG_RESULT(yes)
+# else
+# CFLAGS="-O2 -ffast-math -DCB_AUTOCONF $CFLAGS"
+# CXXFLAGS="-O2 -ffast-math -DCB_AUTOCONF $CXXFLAGS"
+#- LDFLAGS="-Wl,--no-undefined"
+# AC_MSG_RESULT(no)
+# fi
+# ])
+--- configure.orig
++++ configure
+@@ -11932,13 +11932,11 @@ fi
+ if test "x$enable_debug" = "xyes"; then
+ CFLAGS="-g -DDEBUG -DCB_AUTOCONF $CFLAGS"
+ CXXFLAGS="-g -DDEBUG -DCB_AUTOCONF $CXXFLAGS"
+- LDFLAGS="-Wl,--no-undefined"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
+ else
+ CFLAGS="-O2 -ffast-math -DCB_AUTOCONF $CFLAGS"
+ CXXFLAGS="-O2 -ffast-math -DCB_AUTOCONF $CXXFLAGS"
+- LDFLAGS="-Wl,--no-undefined"
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+ fi
</ins></span></pre></div>
<a id="trunkdportsdevelcodeblocksfilespatchmallocdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/codeblocks/files/patch-malloc.diff (119053 => 119054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/codeblocks/files/patch-malloc.diff 2014-04-15 21:35:12 UTC (rev 119053)
+++ trunk/dports/devel/codeblocks/files/patch-malloc.diff 2014-04-15 21:40:31 UTC (rev 119054)
</span><span class="lines">@@ -1,23 +0,0 @@
</span><del>-http://developer.berlios.de/bugs/?func=detailbug&bug_id=19114&group_id=5358
---- configure.orig
-+++ configure
-@@ -16967,7 +16967,7 @@ $as_echo "#define STDC_HEADERS 1" >>confdefs.h
-
- fi
-
--for ac_header in fcntl.h limits.h stdlib.h string.h sys/param.h unistd.h malloc.h
-+for ac_header in fcntl.h limits.h stdlib.h string.h sys/param.h unistd.h sys/malloc.h
- do :
- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
- ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
-#--- configure.ac.orig
-#+++ configure.ac
-#@@ -36,7 +36,7 @@ AC_PROG_LIBTOOL
-# dnl Checks for header files.
-# AC_HEADER_DIRENT
-# AC_HEADER_STDC
-#-AC_CHECK_HEADERS([fcntl.h limits.h stdlib.h string.h sys/param.h unistd.h malloc.h])
-#+AC_CHECK_HEADERS([fcntl.h limits.h stdlib.h string.h sys/param.h unistd.h sys/malloc.h])
-#
-# dnl Checks for typedefs, structures, and compiler characteristics.
-# AC_HEADER_STDBOOL
</del></span></pre></div>
<a id="trunkdportsdevelcodeblocksfilespatchnodebugdiff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/codeblocks/files/patch-nodebug.diff (119053 => 119054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/codeblocks/files/patch-nodebug.diff 2014-04-15 21:35:12 UTC (rev 119053)
+++ trunk/dports/devel/codeblocks/files/patch-nodebug.diff 2014-04-15 21:40:31 UTC (rev 119054)
</span><span class="lines">@@ -1,37 +0,0 @@
</span><del>-# http://developer.berlios.de/bugs/?func=detailbug&bug_id=19110&group_id=5358
-#
-# the files where these LDFLAGS would cause problems:
-# * src/build_tools/autorevision/Makefile
-# * src/sdk/Makefile
-# * src/src/Makefile
-#--- acinclude.m4.orig
-#+++ acinclude.m4
-#@@ -69,12 +69,10 @@ AC_ARG_ENABLE(debug, [AC_HELP_STRING([--enable-debug], [turn on debugging (defau
-# if test "x$enable_debug" = "xyes"; then
-# CFLAGS="-g -DDEBUG -DCB_AUTOCONF $CFLAGS"
-# CXXFLAGS="-g -DDEBUG -DCB_AUTOCONF $CXXFLAGS"
-#- LDFLAGS="-Wl,--no-undefined"
-# AC_MSG_RESULT(yes)
-# else
-# CFLAGS="-O2 -ffast-math -DCB_AUTOCONF $CFLAGS"
-# CXXFLAGS="-O2 -ffast-math -DCB_AUTOCONF $CXXFLAGS"
-#- LDFLAGS="-Wl,--no-undefined"
-# AC_MSG_RESULT(no)
-# fi
-# ])
---- configure.orig
-+++ configure
-@@ -11932,13 +11932,11 @@ fi
- if test "x$enable_debug" = "xyes"; then
- CFLAGS="-g -DDEBUG -DCB_AUTOCONF $CFLAGS"
- CXXFLAGS="-g -DDEBUG -DCB_AUTOCONF $CXXFLAGS"
-- LDFLAGS="-Wl,--no-undefined"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
- $as_echo "yes" >&6; }
- else
- CFLAGS="-O2 -ffast-math -DCB_AUTOCONF $CFLAGS"
- CXXFLAGS="-O2 -ffast-math -DCB_AUTOCONF $CXXFLAGS"
-- LDFLAGS="-Wl,--no-undefined"
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
- $as_echo "no" >&6; }
- fi
</del></span></pre></div>
<a id="trunkdportsdevelcodeblocksfilespatchsrcpluginscontribsource_exporterMakefilediff"></a>
<div class="delfile"><h4>Deleted: trunk/dports/devel/codeblocks/files/patch-src-plugins-contrib-source_exporter-Makefile.diff (119053 => 119054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/codeblocks/files/patch-src-plugins-contrib-source_exporter-Makefile.diff 2014-04-15 21:35:12 UTC (rev 119053)
+++ trunk/dports/devel/codeblocks/files/patch-src-plugins-contrib-source_exporter-Makefile.diff 2014-04-15 21:40:31 UTC (rev 119054)
</span><span class="lines">@@ -1,24 +0,0 @@
</span><del>-This is only needed for wxGTK-based installation
-http://developer.berlios.de/bugs/?func=detailbug&bug_id=19116&group_id=5358
-#--- 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
-
</del></span></pre></div>
<a id="trunkdportsdevelcodeblocksfilespatchsrcsdkwxscintillasrcscintillasrcCallTiphdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/codeblocks/files/patch-src-sdk-wxscintilla-src-scintilla-src-CallTip.h.diff (0 => 119054)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/codeblocks/files/patch-src-sdk-wxscintilla-src-scintilla-src-CallTip.h.diff (rev 0)
+++ trunk/dports/devel/codeblocks/files/patch-src-sdk-wxscintilla-src-scintilla-src-CallTip.h.diff 2014-04-15 21:40:31 UTC (rev 119054)
</span><span class="lines">@@ -0,0 +1,12 @@
</span><ins>+http://developer.berlios.de/bugs/?func=detailbug&bug_id=19113&group_id=5358
+--- src/sdk/wxscintilla/src/scintilla/src/CallTip.h.orig
++++ src/sdk/wxscintilla/src/scintilla/src/CallTip.h
+@@ -8,6 +8,8 @@
+ #ifndef CALLTIP_H
+ #define CALLTIP_H
+
++#include <string>
++
+ #ifdef SCI_NAMESPACE
+ namespace Scintilla {
+ #endif
</ins></span></pre>
</div>
</div>
</body>
</html>